diff --git a/.editorconfig b/.editorconfig
index 880331a09e5..56631484cd5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,3 +21,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.eslintignore b/.eslintignore
index b715bcd4f69..5d117f54b54 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,6 @@
-src/component-index.js
 test/end-to-end-tests/node_modules/
 test/end-to-end-tests/element/
 test/end-to-end-tests/synapse/
 test/end-to-end-tests/lib/
+# Legacy skinning file that some people might still have
+src/component-index.js
diff --git a/.eslintrc.js b/.eslintrc.js
index 45cd05506f6..67e6ab1e642 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -92,6 +92,7 @@ module.exports = {
             files: [
                 "src/**/*.{ts,tsx}",
                 "test/**/*.{ts,tsx}",
+                "cypress/**/*.ts",
             ],
             extends: [
                 "plugin:matrix-org/typescript",
@@ -123,7 +124,6 @@ module.exports = {
                 "src/components/structures/UserMenu.tsx",
                 "src/components/views/avatars/WidgetAvatar.tsx",
                 "src/components/views/dialogs/AddExistingToSpaceDialog.tsx",
-                "src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx",
                 "src/components/views/dialogs/ForwardDialog.tsx",
                 "src/components/views/dialogs/InviteDialog.tsx",
                 "src/components/views/dialogs/ModalWidgetDialog.tsx",
diff --git a/.github/codecov.yml b/.github/codecov.yml
new file mode 100644
index 00000000000..449fa0a733a
--- /dev/null
+++ b/.github/codecov.yml
@@ -0,0 +1,12 @@
+codecov:
+  allow_coverage_offsets: True
+coverage:
+  status:
+    project: off
+    patch: off
+comment:
+  layout: "diff, files"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: no
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
deleted file mode 100644
index 456c97d5807..00000000000
--- a/.github/workflows/develop.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Develop
-on:
-    # These tests won't work for non-develop branches at the moment as they
-    # won't pull in the right versions of other repos, so they're only enabled
-    # on develop.
-    push:
-        branches: [develop]
-    pull_request:
-        branches: [develop]
-jobs:
-    end-to-end:
-        runs-on: ubuntu-latest
-        env:
-          PR_NUMBER: ${{github.event.number}}
-        container: vectorim/element-web-ci-e2etests-env:latest
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v2
-            - name: Prepare End-to-End tests
-              run: ./scripts/ci/prepare-end-to-end-tests.sh
-            - name: Run End-to-End tests
-              run: ./scripts/ci/run-end-to-end-tests.sh
-            - name: Archive logs
-              uses: actions/upload-artifact@v2
-              if: ${{ always() }}
-              with:
-                path: |
-                    test/end-to-end-tests/logs/**/*
-                    test/end-to-end-tests/synapse/installations/consent/homeserver.log
-                retention-days: 14
-            - name: Download previous benchmark data
-              uses: actions/cache@v1
-              with:
-                path: ./cache
-                key: ${{ runner.os }}-benchmark
-            - name: Store benchmark result
-              uses: matrix-org/github-action-benchmark@jsperfentry-1
-              with:
-                tool: 'jsperformanceentry'
-                output-file-path: test/end-to-end-tests/performance-entries.json
-                fail-on-alert: false
-                comment-on-alert: false
-                # Only temporary to monitor where failures occur
-                alert-comment-cc-users: '@gsouquet'
-                github-token: ${{ secrets.DEPLOY_GH_PAGES }}
-                auto-push: ${{ github.ref == 'refs/heads/develop' }}
diff --git a/.github/workflows/element-build-and-test.yaml b/.github/workflows/element-build-and-test.yaml
new file mode 100644
index 00000000000..9b3d0f373a0
--- /dev/null
+++ b/.github/workflows/element-build-and-test.yaml
@@ -0,0 +1,102 @@
+# Produce a build of element-web with this version of react-sdk
+# and any matching branches of element-web and js-sdk, output it
+# as an artifact and run integration tests.
+name: Element Web - Build and Test
+on:
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+  repository_dispatch:
+    types: [ upstream-sdk-notify ]
+env:
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+  build:
+    name: "Build Element-Web"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Fetch layered build
+        id: layered_build
+        run: |
+          scripts/ci/layered.sh
+          JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
+          REACT_SHA=$(git rev-parse --short=12 HEAD)
+          VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD)
+          echo "::set-output name=VERSION::$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA"
+
+      - name: Copy config
+        run: cp element.io/develop/config.json config.json
+        working-directory: ./element-web
+
+      - name: Build
+        env:
+          CI_PACKAGE: true
+          VERSION: "${{ steps.layered_build.outputs.VERSION }}"
+        run: yarn build
+        working-directory: ./element-web
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: previewbuild
+          path: element-web/webapp
+          # We'll only use this in a triggered job, then we're done with it
+          retention-days: 1
+
+  cypress:
+    name: "Cypress End to End Tests"
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download build
+        uses: actions/download-artifact@v3
+        with:
+          name: previewbuild
+          path: webapp
+
+      - name: Run Cypress tests
+        uses: cypress-io/github-action@v2
+        with:
+          # The built in Electron runner seems to grind to a halt trying
+          # to run the tests, so use chrome.
+          browser: chrome
+          start: npx serve -p 8080 webapp
+          record: true
+        env:
+          # pass the Dashboard record key as an environment variable
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          # pass GitHub token to allow accurately detecting a build vs a re-run build
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Artifact
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: cypress-results
+          path: |
+            cypress/screenshots
+            cypress/videos
+            cypress/synapselogs
+
+  app-tests:
+    name: Element Web Integration Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Run tests
+        run: "./scripts/ci/app-tests.sh"
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
new file mode 100644
index 00000000000..6c663a0e018
--- /dev/null
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -0,0 +1,59 @@
+name: End-to-end Tests
+on:
+  # These tests won't work for non-develop branches at the moment as they
+  # won't pull in the right versions of other repos, so they're only enabled
+  # on develop.
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+  repository_dispatch:
+    types: [ upstream-sdk-notify ]
+env:
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+  end-to-end:
+    runs-on: ubuntu-latest
+    container: vectorim/element-web-ci-e2etests-env:latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Prepare End-to-End tests
+        run: ./scripts/ci/prepare-end-to-end-tests.sh
+
+      - name: Run End-to-End tests
+        run: ./scripts/ci/run-end-to-end-tests.sh
+
+      - name: Archive logs
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          path: |
+            test/end-to-end-tests/logs/**/*
+            test/end-to-end-tests/synapse/installations/consent/homeserver.log
+            retention-days: 14
+
+      - name: Download previous benchmark data
+        uses: actions/cache@v1
+        with:
+          path: ./cache
+          key: ${{ runner.os }}-benchmark
+
+      - name: Store benchmark result
+        uses: matrix-org/github-action-benchmark@jsperfentry-1
+        with:
+          tool: 'jsperformanceentry'
+          output-file-path: test/end-to-end-tests/performance-entries.json
+          fail-on-alert: false
+          comment-on-alert: false
+          # Only temporary to monitor where failures occur
+          alert-comment-cc-users: '@gsouquet'
+          github-token: ${{ secrets.DEPLOY_GH_PAGES }}
+          auto-push: ${{ github.ref == 'refs/heads/develop' }}
diff --git a/.github/workflows/layered-build.yaml b/.github/workflows/layered-build.yaml
deleted file mode 100644
index fd531fc9689..00000000000
--- a/.github/workflows/layered-build.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Layered Preview Build
-on:
-    pull_request:
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        env:
-          PR_NUMBER: ${{github.event.number}}
-        steps:
-            - uses: actions/checkout@v2
-            - name: Build
-              run: scripts/ci/layered.sh && cd element-web && cp element.io/develop/config.json config.json && CI_PACKAGE=true yarn build
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v2
-              with:
-                  name: previewbuild
-                  path: element-web/webapp
-                  # We'll only use this in a triggered job, then we're done with it
-                  retention-days: 1
-
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index 7c472ab24d1..260f8f130c5 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -1,75 +1,94 @@
+# Triggers after the layered build has finished, taking the artifact
+# and uploading it to netlify
 name: Upload Preview Build to Netlify
 on:
-    workflow_run:
-        workflows: ["Layered Preview Build"]
-        types:
-            - completed
+  workflow_run:
+    workflows: [ "Element Web - Build and Test" ]
+    types:
+      - completed
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        if: >
-            ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
-        steps:
-            - name: "🔍 Read PR number"
-              id: readctx
-              # we need to find the PR number that corresponds to the branch, which we do by
-              # searching the GH API
-              # The workflow_run event includes a list of pull requests, but it doesn't get populated for
-              # forked PRs: https://docs.github.com/en/rest/reference/checks#create-a-check-run
-              run: |
-                head_branch='${{github.event.workflow_run.head_repository.owner.login}}:${{github.event.workflow_run.head_branch}}'
-                echo "head branch: $head_branch"
-                pulls_uri="https://api.github.com/repos/${{ github.repository }}/pulls?head=$(jq -Rr '@uri' <<<$head_branch)"
-                pr_number=$(curl -s -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' "$pulls_uri" |
-                     jq -r '.[] | .number')
-                echo "PR number: $pr_number"
-                echo "::set-output name=prnumber::$pr_number"
-            # There's a 'download artifact' action but it hasn't been updated for the
-            # workflow_run action (https://github.com/actions/download-artifact/issues/60)
-            # so instead we get this mess:
-            - name: 'Download artifact'
-              uses: actions/github-script@v3.1.0
-              with:
-                script: |
-                  var artifacts = await github.actions.listWorkflowRunArtifacts({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     run_id: ${{github.event.workflow_run.id }},
-                  });
-                  var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-                    return artifact.name == "previewbuild"
-                  })[0];
-                  var download = await github.actions.downloadArtifact({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     artifact_id: matchArtifact.id,
-                     archive_format: 'zip',
-                  });
-                  var fs = require('fs');
-                  fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
-            - name: Extract Artifacts
-              run: unzip -d webapp previewbuild.zip && rm previewbuild.zip
-            - name: Deploy to Netlify
-              id: netlify
-              uses: nwtgck/actions-netlify@v1.2
-              with:
-                  publish-dir: webapp
-                  deploy-message: "Deploy from GitHub Actions"
-                  # These don't work because we're in workflow_run
-                  enable-pull-request-comment: false
-                  enable-commit-comment: false
-                  alias: pr${{ steps.readctx.outputs.prnumber }}
-              env:
-                  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-              timeout-minutes: 1
-            - name: Edit PR Description
-              uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                  pull-request-number: ${{ steps.readctx.outputs.prnumber }}
-                  description-message: |
-                      Preview: ${{ steps.netlify.outputs.deploy-url }}
-                      ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
+  deploy:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
+    steps:
+      - name: "🔍 Read PR number"
+        id: readctx
+        # We need to find the PR number that corresponds to the branch, which we do by searching the GH API
+        # The workflow_run event includes a list of pull requests, but it doesn't get populated for
+        # forked PRs: https://docs.github.com/en/rest/reference/checks#create-a-check-run
+        run: |
+          head_branch='${{github.event.workflow_run.head_repository.owner.login}}:${{github.event.workflow_run.head_branch}}'
+          echo "Head branch: $head_branch"
+          pulls_uri="https://api.github.com/repos/${{ github.repository }}/pulls?head=$(jq -Rr '@uri' <<<$head_branch)"
+          pr_number=$(curl -s -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' "$pulls_uri" |
+               jq -r '.[] | .number')
+          echo "PR number: $pr_number"
+          echo "::set-output name=prnumber::$pr_number"
 
+      - name: Create Deployment
+        uses: bobheadxi/deployments@v1
+        id: deployment
+        with:
+          step: start
+          token: ${{ secrets.GITHUB_TOKEN }}
+          env: Netlify
+          ref: ${{ github.event.workflow_run.head_sha }}
+          desc: |
+            Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
+            Exercise caution. Use test accounts.
+
+      # There's a 'download artifact' action, but it hasn't been updated for the
+      # workflow_run action (https://github.com/actions/download-artifact/issues/60)
+      # so instead we get this mess:
+      - name: 'Download artifact'
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            const artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{ github.event.workflow_run.id }},
+            });
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                return artifact.name == "previewbuild"
+            })[0];
+            const download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+            });
+            const fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
+
+      - name: Extract Artifacts
+        run: unzip -d webapp previewbuild.zip && rm previewbuild.zip
+
+      - name: Deploy to Netlify
+        id: netlify
+        uses: nwtgck/actions-netlify@v1.2
+        with:
+          publish-dir: webapp
+          deploy-message: "Deploy from GitHub Actions"
+          # These don't work because we're in workflow_run
+          enable-pull-request-comment: false
+          enable-commit-comment: false
+          alias: pr${{ steps.readctx.outputs.prnumber }}
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+        timeout-minutes: 1
+
+      - name: Update deployment status
+        uses: bobheadxi/deployments@v1
+        if: always()
+        with:
+          step: finish
+          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          env: ${{ steps.deployment.outputs.env }}
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+          env_url: ${{ steps.netlify.outputs.deploy-url }}
+          desc: |
+            Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
+            Exercise caution. Use test accounts.
diff --git a/.github/workflows/notify-element-web.yml b/.github/workflows/notify-element-web.yml
index ef463784f38..1d60a1523cc 100644
--- a/.github/workflows/notify-element-web.yml
+++ b/.github/workflows/notify-element-web.yml
@@ -1,15 +1,17 @@
 name: Notify element-web
 on:
-    push:
-        branches: [develop]
+  push:
+    branches: [ develop ]
+  repository_dispatch:
+    types: [ upstream-sdk-notify ]
 jobs:
-    notify-element-web:
-        runs-on: ubuntu-latest
-        environment: develop
-        steps:
-            -   name: Notify element-web repo that a new SDK build is on develop
-                uses: peter-evans/repository-dispatch@v1
-                with:
-                    token: ${{ secrets.ELEMENT_WEB_NOTIFY_TOKEN }}
-                    repository: vector-im/element-web
-                    event-type: element-web-notify
+  notify-element-web:
+    name: "Notify Element Web"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify element-web repo that a new SDK build is on develop
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          repository: vector-im/element-web
+          event-type: element-web-notify
diff --git a/.github/workflows/preview_changelog.yaml b/.github/workflows/preview_changelog.yaml
index d68d19361da..786d828d419 100644
--- a/.github/workflows/preview_changelog.yaml
+++ b/.github/workflows/preview_changelog.yaml
@@ -3,10 +3,10 @@ on:
   pull_request_target:
     types: [ opened, edited, labeled ]
 jobs:
-    changelog:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Preview Changelog
-              uses: matrix-org/allchange@main
-              with:
-                  ghToken: ${{ secrets.GITHUB_TOKEN }}
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Preview Changelog
+        uses: matrix-org/allchange@main
+        with:
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
new file mode 100644
index 00000000000..63e939f7f9a
--- /dev/null
+++ b/.github/workflows/static_analysis.yaml
@@ -0,0 +1,102 @@
+name: Static Analysis
+on:
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+  repository_dispatch:
+    types: [ upstream-sdk-notify ]
+env:
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+  ts_lint:
+    name: "Typescript Syntax Check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Deps
+        run: "./scripts/ci/install-deps.sh --ignore-scripts"
+
+      - name: Typecheck
+        run: "yarn run lint:types"
+
+      - name: Switch js-sdk to release mode
+        run: |
+          scripts/ci/js-sdk-to-release.js
+          cd node_modules/matrix-js-sdk
+          yarn install
+          yarn run build:compile
+          yarn run build:types
+
+      - name: Typecheck (release mode)
+        run: "yarn run lint:types"
+
+  i18n_lint:
+    name: "i18n Diff Check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install"
+
+      - name: i18n Check
+        run: "yarn run diff-i18n"
+
+  js_lint:
+    name: "ESLint"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install"
+
+      - name: Run Linter
+        run: "yarn run lint:js"
+
+  style_lint:
+    name: "Style Lint"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install"
+
+      - name: Run Linter
+        run: "yarn run lint:style"
+
+  sonarqube:
+    name: "SonarQube"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 00000000000..f160e42844d
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,41 @@
+name: Tests
+on:
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+  repository_dispatch:
+    types: [ upstream-sdk-notify ]
+env:
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+  jest:
+    name: Jest with Codecov
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          # If this is a pull request, make sure we check out its head rather than the
+          # automatically generated merge commit, so that the coverage diff excludes
+          # unrelated changes in the base branch
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}
+
+      - name: Yarn cache
+        uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Deps
+        run: "./scripts/ci/install-deps.sh --ignore-scripts"
+
+      - name: Run tests with coverage
+        run: "yarn coverage"
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: false
+          verbose: true
+          override_commit: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}
diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml
deleted file mode 100644
index 49db29ff5c1..00000000000
--- a/.github/workflows/triage-move-review-requests.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-name: Move pull requests asking for review to the relevant project
-on:
-  pull_request_target:
-    types: [review_requested]
-
-jobs:
-  add_design_pr_to_project:
-    name: Move PRs asking for design review to the design board
-    runs-on: ubuntu-latest
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: find_team_members
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            query find_team_members($team: String!) {
-              organization(login: "matrix-org") {
-                team(slug: $team) {
-                  members {
-                    nodes {
-                      login
-                    }
-                  }
-                }
-              }
-            }
-          team: ${{ env.TEAM }}
-        env:
-          TEAM: "design"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-      - id: any_matching_reviewers
-        run: |
-          # Fetch requested reviewers, and people who are on the team
-          echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
-          echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
-          jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
-          jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt
-
-          # Fetch requested team reviewers, and the name of the team
-          echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
-          jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
-          echo '${{ env.TEAM }}' | tee /tmp/team.txt
-
-          # If either a reviewer matches a team member, or a team matches our team, say "true"
-          if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
-            echo "::set-output name=match::true"
-          elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
-            echo "::set-output name=match::true"
-          else
-            echo "::set-output name=match::false"
-          fi
-        env:
-          TEAM: "design"
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        if: steps.any_matching_reviewers.outputs.match == 'true'
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.pull_request.node_id }}
-        env:
-          PROJECT_ID: "PN_kwDOAM0swc0sUA"
-          TEAM: "design"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  add_product_pr_to_project:
-    name: Move PRs asking for design review to the design board
-    runs-on: ubuntu-latest
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: find_team_members
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            query find_team_members($team: String!) {
-              organization(login: "matrix-org") {
-                team(slug: $team) {
-                  members {
-                    nodes {
-                      login
-                    }
-                  }
-                }
-              }
-            }
-          team: ${{ env.TEAM }}
-        env:
-          TEAM: "product"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-      - id: any_matching_reviewers
-        run: |
-          # Fetch requested reviewers, and people who are on the team
-          echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
-          echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
-          jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
-          jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt
-
-          # Fetch requested team reviewers, and the name of the team
-          echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
-          jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
-          echo '${{ env.TEAM }}' | tee /tmp/team.txt
-
-          # If either a reviewer matches a team member, or a team matches our team, say "true"
-          if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
-            echo "::set-output name=match::true"
-          elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
-            echo "::set-output name=match::true"
-          else
-            echo "::set-output name=match::false"
-          fi
-        env:
-          TEAM: "product"
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        if: steps.any_matching_reviewers.outputs.match == 'true'
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.pull_request.node_id }}
-        env:
-          PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
-          TEAM: "product"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/typecheck.yaml b/.github/workflows/typecheck.yaml
deleted file mode 100644
index f6ab6439582..00000000000
--- a/.github/workflows/typecheck.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Type Check
-on:
-    pull_request:
-        branches: [develop]
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        env:
-          PR_NUMBER: ${{github.event.number}}
-        steps:
-            - uses: actions/checkout@v2
-            - uses: c-hive/gha-yarn-cache@v2
-            - name: Install Deps
-              run: "./scripts/ci/install-deps.sh --ignore-scripts"
-            - name: Typecheck
-              run: "yarn run lint:types"
-            - name: Switch js-sdk to release mode
-              run: |
-                  scripts/ci/js-sdk-to-release.js
-                  cd node_modules/matrix-js-sdk
-                  yarn install
-                  yarn run build:compile
-                  yarn run build:types
-            - name: Typecheck (release mode)
-              run: "yarn run lint:types"
-
diff --git a/.gitignore b/.gitignore
index 102f4b5ec1f..8e14ba9057b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ package-lock.json
 /matrix-react-sdk-*.tgz
 
 /.idea
+# Legacy skinning file that some people might still have
 /src/component-index.js
 
 .DS_Store
@@ -18,3 +19,11 @@ package-lock.json
 
 .vscode
 .vscode/
+
+/cypress/videos
+/cypress/downloads
+/cypress/screenshots
+/cypress/synapselogs
+# These could have files in them but don't currently
+# Cypress will still auto-create them though...
+/cypress/fixtures
diff --git a/.stylelintrc.js b/.stylelintrc.js
index 0bdea3cccd7..e72e8ca55c3 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -23,5 +23,10 @@ module.exports = {
             // https://github.com/vector-im/element-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
         }],
+        // Disable `&_kind`-style selectors while our unused CSS approach is "Find & Replace All"
+        // rather than a CI thing. Shorthand selectors are harder to detect when searching for a
+        // class name. This regex is trying to *allow* anything except `&words`, such as `&::before`,
+        // `&.mx_Class`, etc.
+        "selector-nested-pattern": "^((&[ :.\\\[,])|([^&]))"
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa6b18fc2a..841a7360a10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,253 @@
+Changes in [3.43.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.43.0) (2022-04-26)
+=====================================================================================================
+
+## ✨ Features
+ * Improve performance of switching to rooms with lots of servers and ACLs ([\#8347](https://github.com/matrix-org/matrix-react-sdk/pull/8347)).
+ * Avoid a reflow when setting caret position on an empty composer ([\#8348](https://github.com/matrix-org/matrix-react-sdk/pull/8348)).
+ * Add message right-click context menu as a labs feature ([\#5672](https://github.com/matrix-org/matrix-react-sdk/pull/5672)).
+ * Live location sharing - basic maximised beacon map ([\#8310](https://github.com/matrix-org/matrix-react-sdk/pull/8310)).
+ * Live location sharing - render users own beacons in timeline ([\#8296](https://github.com/matrix-org/matrix-react-sdk/pull/8296)).
+ * Improve Threads beta around degraded mode ([\#8318](https://github.com/matrix-org/matrix-react-sdk/pull/8318)).
+ * Live location sharing -  beacon in timeline happy path ([\#8285](https://github.com/matrix-org/matrix-react-sdk/pull/8285)).
+ * Add copy button to View Source screen ([\#8278](https://github.com/matrix-org/matrix-react-sdk/pull/8278)). Fixes vector-im/element-web#21482. Contributed by @olivialivia.
+ * Add heart effect ([\#6188](https://github.com/matrix-org/matrix-react-sdk/pull/6188)). Contributed by @CicadaCinema.
+ * Update new room icon ([\#8239](https://github.com/matrix-org/matrix-react-sdk/pull/8239)).
+
+## 🐛 Bug Fixes
+ * Fix: "Code formatting button does not escape backticks" ([\#8181](https://github.com/matrix-org/matrix-react-sdk/pull/8181)). Contributed by @yaya-usman.
+ * Fix beta indicator dot causing excessive CPU usage ([\#8340](https://github.com/matrix-org/matrix-react-sdk/pull/8340)). Fixes vector-im/element-web#21793.
+ * Fix overlapping timestamps on empty messages ([\#8205](https://github.com/matrix-org/matrix-react-sdk/pull/8205)). Fixes vector-im/element-web#21381. Contributed by @goelesha.
+ * Fix power selector not showing up in user info when state_default undefined ([\#8297](https://github.com/matrix-org/matrix-react-sdk/pull/8297)). Fixes vector-im/element-web#21669.
+ * Avoid looking up settings during timeline rendering ([\#8313](https://github.com/matrix-org/matrix-react-sdk/pull/8313)). Fixes vector-im/element-web#21740.
+ * Fix a soft crash with video rooms ([\#8333](https://github.com/matrix-org/matrix-react-sdk/pull/8333)).
+ * Fixes call tiles overflow ([\#8096](https://github.com/matrix-org/matrix-react-sdk/pull/8096)). Fixes vector-im/element-web#20254. Contributed by @luixxiul.
+ * Fix a bug with emoji autocomplete sorting where adding the final "&#58;" would cause the emoji with the typed shortcode to no longer be at the top of the autocomplete list. ([\#8086](https://github.com/matrix-org/matrix-react-sdk/pull/8086)). Fixes vector-im/element-web#19302. Contributed by @commonlawfeature.
+ * Fix image preview sizing for edge cases ([\#8322](https://github.com/matrix-org/matrix-react-sdk/pull/8322)). Fixes vector-im/element-web#20088.
+ * Refactor SecurityRoomSettingsTab and remove unused state ([\#8306](https://github.com/matrix-org/matrix-react-sdk/pull/8306)). Fixes matrix-org/element-web-rageshakes#12002.
+ * Don't show the prompt to enable desktop notifications immediately after registration ([\#8274](https://github.com/matrix-org/matrix-react-sdk/pull/8274)).
+ * Stop tracking threads if threads support is disabled ([\#8308](https://github.com/matrix-org/matrix-react-sdk/pull/8308)). Fixes vector-im/element-web#21766.
+ * Fix some issues with threads rendering ([\#8305](https://github.com/matrix-org/matrix-react-sdk/pull/8305)). Fixes vector-im/element-web#21670.
+ * Fix threads rendering issue in Safari ([\#8298](https://github.com/matrix-org/matrix-react-sdk/pull/8298)). Fixes vector-im/element-web#21757.
+ * Fix space panel width change on hovering over space item ([\#8299](https://github.com/matrix-org/matrix-react-sdk/pull/8299)). Fixes vector-im/element-web#19891.
+ * Hide the reply in thread button in deployments where beta is forcibly disabled ([\#8294](https://github.com/matrix-org/matrix-react-sdk/pull/8294)). Fixes vector-im/element-web#21753.
+ * Prevent soft crash around room list header context menu when space changes ([\#8289](https://github.com/matrix-org/matrix-react-sdk/pull/8289)). Fixes matrix-org/element-web-rageshakes#11416, matrix-org/element-web-rageshakes#11692, matrix-org/element-web-rageshakes#11739, matrix-org/element-web-rageshakes#11772, matrix-org/element-web-rageshakes#11891 matrix-org/element-web-rageshakes#11858 and matrix-org/element-web-rageshakes#11456.
+ * When selecting reply in thread on a thread response open existing thread ([\#8291](https://github.com/matrix-org/matrix-react-sdk/pull/8291)). Fixes vector-im/element-web#21743.
+ * Handle thread bundled relationships coming from the server via MSC3666 ([\#8292](https://github.com/matrix-org/matrix-react-sdk/pull/8292)). Fixes vector-im/element-web#21450.
+ * Fix: Avatar preview does not update when same file is selected repeatedly ([\#8288](https://github.com/matrix-org/matrix-react-sdk/pull/8288)). Fixes vector-im/element-web#20098.
+ * Fix a bug where user gets a warning when changing powerlevel from **Admin** to **custom level (100)** ([\#8248](https://github.com/matrix-org/matrix-react-sdk/pull/8248)). Fixes vector-im/element-web#21682. Contributed by @Jumeb.
+ * Use a consistent alignment for all text items in a list ([\#8276](https://github.com/matrix-org/matrix-react-sdk/pull/8276)). Fixes vector-im/element-web#21731. Contributed by @luixxiul.
+ * Fixes button labels being collapsed per a character in CJK languages ([\#8212](https://github.com/matrix-org/matrix-react-sdk/pull/8212)). Fixes vector-im/element-web#21287. Contributed by @luixxiul.
+ * Fix: Remove jittery timeline scrolling after jumping to an event ([\#8263](https://github.com/matrix-org/matrix-react-sdk/pull/8263)).
+ * Fix regression of edits showing up in the timeline with hidden events shown ([\#8260](https://github.com/matrix-org/matrix-react-sdk/pull/8260)). Fixes vector-im/element-web#21694.
+ * Fix reporting events not working ([\#8257](https://github.com/matrix-org/matrix-react-sdk/pull/8257)). Fixes vector-im/element-web#21713.
+ * Make Jitsi widgets in video rooms immutable ([\#8244](https://github.com/matrix-org/matrix-react-sdk/pull/8244)). Fixes vector-im/element-web#21647.
+ * Fix: Ensure links to events scroll the correct events into view ([\#8250](https://github.com/matrix-org/matrix-react-sdk/pull/8250)). Fixes vector-im/element-web#19934.
+
+Changes in [3.42.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.4) (2022-04-14)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes vector-im/element-web#21762.
+
+Changes in [3.42.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.3) (2022-04-12)
+=====================================================================================================
+
+## ✨ Features
+ * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes vector-im/element-web#21351.
+ * More video rooms design updates ([\#8222](https://github.com/matrix-org/matrix-react-sdk/pull/8222)).
+ * Update video rooms to new design specs ([\#8207](https://github.com/matrix-org/matrix-react-sdk/pull/8207)). Fixes vector-im/element-web#21515, vector-im/element-web#21516 vector-im/element-web#21519 and vector-im/element-web#21526.
+ * Live Location Sharing - left panel warning with error ([\#8201](https://github.com/matrix-org/matrix-react-sdk/pull/8201)).
+ * Live location sharing - Stop publishing location to beacons with consecutive errors ([\#8194](https://github.com/matrix-org/matrix-react-sdk/pull/8194)).
+ * Live location sharing: allow retry when stop sharing fails ([\#8193](https://github.com/matrix-org/matrix-react-sdk/pull/8193)).
+ * Allow voice messages to be scrubbed in the timeline ([\#8079](https://github.com/matrix-org/matrix-react-sdk/pull/8079)). Fixes vector-im/element-web#18713.
+ * Live location sharing - stop sharing to beacons in rooms you left ([\#8187](https://github.com/matrix-org/matrix-react-sdk/pull/8187)).
+ * Allow sending and thumbnailing AVIF images ([\#8172](https://github.com/matrix-org/matrix-react-sdk/pull/8172)).
+ * Live location sharing - handle geolocation errors ([\#8179](https://github.com/matrix-org/matrix-react-sdk/pull/8179)).
+ * Show voice room participants when not connected ([\#8136](https://github.com/matrix-org/matrix-react-sdk/pull/8136)). Fixes vector-im/element-web#21513.
+ * Add margins between labs sections ([\#8169](https://github.com/matrix-org/matrix-react-sdk/pull/8169)).
+ * Live location sharing - send geolocation beacon events - happy path ([\#8127](https://github.com/matrix-org/matrix-react-sdk/pull/8127)).
+ * Add support for Animated (A)PNG ([\#8158](https://github.com/matrix-org/matrix-react-sdk/pull/8158)). Fixes vector-im/element-web#12967.
+ * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes vector-im/element-web#20908.
+ * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes vector-im/element-web#16193 and vector-im/element-web#6684.
+ * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes vector-im/element-web#21539.
+ * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes vector-im/element-web#21438.
+ * Live location sharing - refresh beacon expiry in room ([\#8116](https://github.com/matrix-org/matrix-react-sdk/pull/8116)).
+ * Use styled mxids in member list v2 ([\#8110](https://github.com/matrix-org/matrix-react-sdk/pull/8110)). Fixes vector-im/element-web#14825. Contributed by @SimonBrandner.
+ * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes vector-im/element-web#17532.
+ * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes vector-im/element-web#3546.
+
+## 🐛 Bug Fixes
+ * Fix editing `<ol>` tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes vector-im/element-web#21625.
+ * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes vector-im/element-web#21659.
+ * Don't use m.call for Jitsi video rooms ([\#8223](https://github.com/matrix-org/matrix-react-sdk/pull/8223)).
+ * Scale emoji with size of surrounding text ([\#8224](https://github.com/matrix-org/matrix-react-sdk/pull/8224)).
+ * Make "Jump to date" translatable ([\#8218](https://github.com/matrix-org/matrix-react-sdk/pull/8218)).
+ * Normalize call buttons ([\#8129](https://github.com/matrix-org/matrix-react-sdk/pull/8129)). Fixes vector-im/element-web#21493. Contributed by @luixxiul.
+ * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes vector-im/element-web#21542.
+ * Update more strings to not wrongly mention room when it is/could be a space ([\#7722](https://github.com/matrix-org/matrix-react-sdk/pull/7722)). Fixes vector-im/element-web#20243 and vector-im/element-web#20910.
+ * Fix issue with redacting via edit composer flow causing stuck editStates ([\#8184](https://github.com/matrix-org/matrix-react-sdk/pull/8184)).
+ * Fix some image/video scroll jumps ([\#8182](https://github.com/matrix-org/matrix-react-sdk/pull/8182)).
+ * Fix "react error on share dialog" ([\#8170](https://github.com/matrix-org/matrix-react-sdk/pull/8170)). Contributed by @yaya-usman.
+ * Fix disambiguated profile in threads in bubble layout ([\#8168](https://github.com/matrix-org/matrix-react-sdk/pull/8168)). Fixes vector-im/element-web#21570. Contributed by @SimonBrandner.
+ * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes vector-im/element-web#21554. Contributed by @luixxiul.
+ * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes vector-im/element-web#21567. Contributed by @luixxiul.
+ * Null guard TimelinePanel unmount edge ([\#8171](https://github.com/matrix-org/matrix-react-sdk/pull/8171)).
+ * Fix beta pill label breaking ([\#8162](https://github.com/matrix-org/matrix-react-sdk/pull/8162)). Fixes vector-im/element-web#21566. Contributed by @luixxiul.
+ * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes vector-im/element-web#19769, vector-im/element-web#18067 vector-im/element-web#21015 and vector-im/element-web#10924.
+ * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes vector-im/element-web#21435.
+ * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes vector-im/element-web#21534.
+ * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes vector-im/element-web#21486. Contributed by @luixxiul.
+ * Fix issue with falsey hrefs being sent in events ([\#8113](https://github.com/matrix-org/matrix-react-sdk/pull/8113)). Fixes vector-im/element-web#21417.
+ * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes vector-im/element-web#20072.
+
+Changes in [3.42.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.0) (2022-03-15)
+=====================================================================================================
+
+## 🔒 SECURITY FIXES
+
+ * Fix a bug where URL previews could be enabled in the left-panel when they
+   should not have been.
+
+## ✨ Features
+ * Add unexposed account setting for hiding poll creation ([\#7972](https://github.com/matrix-org/matrix-react-sdk/pull/7972)).
+ * Allow pinning polls ([\#7922](https://github.com/matrix-org/matrix-react-sdk/pull/7922)). Fixes vector-im/element-web#20152.
+ * Make trailing `:` into a setting ([\#6711](https://github.com/matrix-org/matrix-react-sdk/pull/6711)). Fixes vector-im/element-web#16682. Contributed by @SimonBrandner.
+ * Location sharing > back button ([\#7958](https://github.com/matrix-org/matrix-react-sdk/pull/7958)).
+ * use LocationAssetType ([\#7965](https://github.com/matrix-org/matrix-react-sdk/pull/7965)).
+ * Location share type UI ([\#7924](https://github.com/matrix-org/matrix-react-sdk/pull/7924)).
+ * Add a few more UIComponent flags, and ensure they are used in existing code ([\#7937](https://github.com/matrix-org/matrix-react-sdk/pull/7937)).
+ * Add support for overriding strings in the app ([\#7886](https://github.com/matrix-org/matrix-react-sdk/pull/7886)).
+ * Add support for redirecting to external pages after logout ([\#7905](https://github.com/matrix-org/matrix-react-sdk/pull/7905)).
+ * Expose redaction power level in room settings ([\#7599](https://github.com/matrix-org/matrix-react-sdk/pull/7599)). Fixes vector-im/element-web#20590. Contributed by @SimonBrandner.
+ * Update and expand ways to access pinned messages ([\#7906](https://github.com/matrix-org/matrix-react-sdk/pull/7906)). Fixes vector-im/element-web#21209 and vector-im/element-web#21211.
+ * Add slash command to switch to a room's virtual room ([\#7839](https://github.com/matrix-org/matrix-react-sdk/pull/7839)).
+
+## 🐛 Bug Fixes
+ * Merge pull request from GHSA-qmf4-7w7j-vf23 ([\#8059](https://github.com/matrix-org/matrix-react-sdk/pull/8059)).
+ * Add another null guard for member ([\#7984](https://github.com/matrix-org/matrix-react-sdk/pull/7984)). Fixes vector-im/element-web#21319.
+ * Fix room account settings ([\#7999](https://github.com/matrix-org/matrix-react-sdk/pull/7999)).
+ * Fix missing summary text for pinned message changes ([\#7989](https://github.com/matrix-org/matrix-react-sdk/pull/7989)). Fixes vector-im/element-web#19823.
+ * Pass room to getRoomTombstone to avoid racing with setState ([\#7986](https://github.com/matrix-org/matrix-react-sdk/pull/7986)).
+ * Hide composer and call buttons when the room is tombstoned ([\#7975](https://github.com/matrix-org/matrix-react-sdk/pull/7975)). Fixes vector-im/element-web#21286.
+ * Fix bad ternary statement in autocomplete user pill insertions ([\#7977](https://github.com/matrix-org/matrix-react-sdk/pull/7977)). Fixes vector-im/element-web#21307.
+ * Fix sending locations into threads and fix i18n ([\#7943](https://github.com/matrix-org/matrix-react-sdk/pull/7943)). Fixes vector-im/element-web#21267.
+ * Fix location map attribution rendering over message action bar ([\#7974](https://github.com/matrix-org/matrix-react-sdk/pull/7974)). Fixes vector-im/element-web#21297.
+ * Fix wrongly asserting that PushRule::conditions is non-null ([\#7973](https://github.com/matrix-org/matrix-react-sdk/pull/7973)). Fixes vector-im/element-web#21305.
+ * Fix account & room settings race condition ([\#7953](https://github.com/matrix-org/matrix-react-sdk/pull/7953)). Fixes vector-im/element-web#21163.
+ * Fix bug with some space selections not being applied ([\#7971](https://github.com/matrix-org/matrix-react-sdk/pull/7971)). Fixes vector-im/element-web#21290.
+ * Revert "replace all require(.svg) with esm import" ([\#7969](https://github.com/matrix-org/matrix-react-sdk/pull/7969)). Fixes vector-im/element-web#21293.
+ * Hide unpinnable pinned messages in more cases ([\#7921](https://github.com/matrix-org/matrix-react-sdk/pull/7921)).
+ * Fix room list being laggy while scrolling 🐌 ([\#7939](https://github.com/matrix-org/matrix-react-sdk/pull/7939)). Fixes vector-im/element-web#21262.
+ * Make pinned messages more reliably reflect edits ([\#7920](https://github.com/matrix-org/matrix-react-sdk/pull/7920)). Fixes vector-im/element-web#17098.
+ * Improve accessibility of the BetaPill ([\#7949](https://github.com/matrix-org/matrix-react-sdk/pull/7949)). Fixes vector-im/element-web#21255.
+ * Autofocus correct composer after sending reaction ([\#7950](https://github.com/matrix-org/matrix-react-sdk/pull/7950)). Fixes vector-im/element-web#21273.
+ * Consider polls as message events for rendering redactions ([\#7944](https://github.com/matrix-org/matrix-react-sdk/pull/7944)). Fixes vector-im/element-web#21125.
+ * Prevent event tiles being shrunk/collapsed by flexbox ([\#7942](https://github.com/matrix-org/matrix-react-sdk/pull/7942)). Fixes vector-im/element-web#21269.
+ * Fix ExportDialog title on export cancellation ([\#7936](https://github.com/matrix-org/matrix-react-sdk/pull/7936)). Fixes vector-im/element-web#21260. Contributed by @luixxiul.
+ * Mandate use of js-sdk/src/matrix import over js-sdk/src ([\#7933](https://github.com/matrix-org/matrix-react-sdk/pull/7933)). Fixes vector-im/element-web#21253.
+ * Fix backspace not working in the invite dialog ([\#7931](https://github.com/matrix-org/matrix-react-sdk/pull/7931)). Fixes vector-im/element-web#21249. Contributed by @SimonBrandner.
+ * Fix right panel soft crashes due to missing room prop ([\#7923](https://github.com/matrix-org/matrix-react-sdk/pull/7923)). Fixes vector-im/element-web#21243.
+ * fix color of location share caret ([\#7917](https://github.com/matrix-org/matrix-react-sdk/pull/7917)).
+ * Wrap all EventTiles with a TileErrorBoundary and guard parsePermalink ([\#7916](https://github.com/matrix-org/matrix-react-sdk/pull/7916)). Fixes vector-im/element-web#21216.
+ * Fix changing space sometimes bouncing to the wrong space ([\#7910](https://github.com/matrix-org/matrix-react-sdk/pull/7910)). Fixes vector-im/element-web#20425.
+ * Ensure EventListSummary key does not change during backpagination ([\#7915](https://github.com/matrix-org/matrix-react-sdk/pull/7915)). Fixes vector-im/element-web#9192.
+ * Fix positioning of the thread context menu ([\#7918](https://github.com/matrix-org/matrix-react-sdk/pull/7918)). Fixes vector-im/element-web#21236.
+ * Inject sender into pinned messages ([\#7904](https://github.com/matrix-org/matrix-react-sdk/pull/7904)). Fixes vector-im/element-web#20314.
+ * Tweak info message padding in right panel timeline ([\#7901](https://github.com/matrix-org/matrix-react-sdk/pull/7901)). Fixes vector-im/element-web#21212.
+ * Fix another freeze on room switch ([\#7900](https://github.com/matrix-org/matrix-react-sdk/pull/7900)). Fixes vector-im/element-web#21127.
+ * Clean up error listener when location picker closes ([\#7902](https://github.com/matrix-org/matrix-react-sdk/pull/7902)). Fixes vector-im/element-web#21213.
+ * Fix edge case in context menu chevron positioning ([\#7899](https://github.com/matrix-org/matrix-react-sdk/pull/7899)).
+ * Fix composer format buttons on WebKit ([\#7898](https://github.com/matrix-org/matrix-react-sdk/pull/7898)). Fixes vector-im/element-web#20868.
+ * manage voicerecording state when deleting or sending a voice message ([\#7896](https://github.com/matrix-org/matrix-react-sdk/pull/7896)). Fixes vector-im/element-web#21151.
+ * Fix bug with useRoomHierarchy tight-looping loadMore on error ([\#7893](https://github.com/matrix-org/matrix-react-sdk/pull/7893)).
+ * Fix upload button & shortcut not working for narrow composer mode ([\#7894](https://github.com/matrix-org/matrix-react-sdk/pull/7894)). Fixes vector-im/element-web#21175 and vector-im/element-web#21142.
+ * Fix emoji insertion in thread composer going to the main composer ([\#7895](https://github.com/matrix-org/matrix-react-sdk/pull/7895)). Fixes vector-im/element-web#21202.
+ * Try harder to keep context menus inside the window ([\#7863](https://github.com/matrix-org/matrix-react-sdk/pull/7863)). Fixes vector-im/element-web#17527 and vector-im/element-web#18377.
+ * Fix edge case around event list summary layout ([\#7891](https://github.com/matrix-org/matrix-react-sdk/pull/7891)). Fixes vector-im/element-web#21180.
+ * Fix event list summary 1 hidden message pluralisation ([\#7890](https://github.com/matrix-org/matrix-react-sdk/pull/7890)). Fixes vector-im/element-web#21196.
+ * Fix vanishing recently viewed menu ([\#7887](https://github.com/matrix-org/matrix-react-sdk/pull/7887)). Fixes vector-im/element-web#20827.
+ * Fix freeze on room switch ([\#7884](https://github.com/matrix-org/matrix-react-sdk/pull/7884)). Fixes vector-im/element-web#21127.
+ * Check 'useSystemTheme' in quick settings theme switcher ([\#7809](https://github.com/matrix-org/matrix-react-sdk/pull/7809)). Fixes vector-im/element-web#21061.
+ * Fix 'my threads' filtering to include participated threads ([\#7882](https://github.com/matrix-org/matrix-react-sdk/pull/7882)). Fixes vector-im/element-web#20877.
+ * Remove log line to try to fix freeze on answering VoIP call ([\#7883](https://github.com/matrix-org/matrix-react-sdk/pull/7883)).
+ * Support social login & password on soft logout page ([\#7879](https://github.com/matrix-org/matrix-react-sdk/pull/7879)). Fixes vector-im/element-web#21099.
+ * Fix missing padding on server picker ([\#7864](https://github.com/matrix-org/matrix-react-sdk/pull/7864)).
+ * Throttle RoomState.members handlers ([\#7876](https://github.com/matrix-org/matrix-react-sdk/pull/7876)). Fixes vector-im/element-web#21127.
+ * Only show joined/invited in search dialog ([\#7875](https://github.com/matrix-org/matrix-react-sdk/pull/7875)). Fixes vector-im/element-web#21161.
+ * Don't pillify code blocks ([\#7861](https://github.com/matrix-org/matrix-react-sdk/pull/7861)). Fixes vector-im/element-web#20851 and vector-im/element-web#18687.
+ * Fix keyboard shortcut icons on macOS ([\#7869](https://github.com/matrix-org/matrix-react-sdk/pull/7869)).
+
+Changes in [3.42.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.0-rc.1) (2022-03-08)
+===============================================================================================================
+
+## ✨ Features
+ * Add unexposed account setting for hiding poll creation ([\#7972](https://github.com/matrix-org/matrix-react-sdk/pull/7972)).
+ * Allow pinning polls ([\#7922](https://github.com/matrix-org/matrix-react-sdk/pull/7922)). Fixes vector-im/element-web#20152.
+ * Make trailing `:` into a setting ([\#6711](https://github.com/matrix-org/matrix-react-sdk/pull/6711)). Fixes vector-im/element-web#16682. Contributed by @SimonBrandner.
+ * Location sharing > back button ([\#7958](https://github.com/matrix-org/matrix-react-sdk/pull/7958)).
+ * use LocationAssetType ([\#7965](https://github.com/matrix-org/matrix-react-sdk/pull/7965)).
+ * Location share type UI ([\#7924](https://github.com/matrix-org/matrix-react-sdk/pull/7924)).
+ * Add a few more UIComponent flags, and ensure they are used in existing code ([\#7937](https://github.com/matrix-org/matrix-react-sdk/pull/7937)).
+ * Add support for overriding strings in the app ([\#7886](https://github.com/matrix-org/matrix-react-sdk/pull/7886)).
+ * Add support for redirecting to external pages after logout ([\#7905](https://github.com/matrix-org/matrix-react-sdk/pull/7905)).
+ * Expose redaction power level in room settings ([\#7599](https://github.com/matrix-org/matrix-react-sdk/pull/7599)). Fixes vector-im/element-web#20590. Contributed by @SimonBrandner.
+ * Update and expand ways to access pinned messages ([\#7906](https://github.com/matrix-org/matrix-react-sdk/pull/7906)). Fixes vector-im/element-web#21209 and vector-im/element-web#21211.
+ * Add slash command to switch to a room's virtual room ([\#7839](https://github.com/matrix-org/matrix-react-sdk/pull/7839)).
+
+## 🐛 Bug Fixes
+ * Add another null guard for member ([\#7984](https://github.com/matrix-org/matrix-react-sdk/pull/7984)). Fixes vector-im/element-web#21319.
+ * Fix room account settings ([\#7999](https://github.com/matrix-org/matrix-react-sdk/pull/7999)).
+ * Fix missing summary text for pinned message changes ([\#7989](https://github.com/matrix-org/matrix-react-sdk/pull/7989)). Fixes vector-im/element-web#19823.
+ * Pass room to getRoomTombstone to avoid racing with setState ([\#7986](https://github.com/matrix-org/matrix-react-sdk/pull/7986)).
+ * Hide composer and call buttons when the room is tombstoned ([\#7975](https://github.com/matrix-org/matrix-react-sdk/pull/7975)). Fixes vector-im/element-web#21286.
+ * Fix bad ternary statement in autocomplete user pill insertions ([\#7977](https://github.com/matrix-org/matrix-react-sdk/pull/7977)). Fixes vector-im/element-web#21307.
+ * Fix sending locations into threads and fix i18n ([\#7943](https://github.com/matrix-org/matrix-react-sdk/pull/7943)). Fixes vector-im/element-web#21267.
+ * Fix location map attribution rendering over message action bar ([\#7974](https://github.com/matrix-org/matrix-react-sdk/pull/7974)). Fixes vector-im/element-web#21297.
+ * Fix wrongly asserting that PushRule::conditions is non-null ([\#7973](https://github.com/matrix-org/matrix-react-sdk/pull/7973)). Fixes vector-im/element-web#21305.
+ * Fix account & room settings race condition ([\#7953](https://github.com/matrix-org/matrix-react-sdk/pull/7953)). Fixes vector-im/element-web#21163.
+ * Fix bug with some space selections not being applied ([\#7971](https://github.com/matrix-org/matrix-react-sdk/pull/7971)). Fixes vector-im/element-web#21290.
+ * Revert "replace all require(.svg) with esm import" ([\#7969](https://github.com/matrix-org/matrix-react-sdk/pull/7969)). Fixes vector-im/element-web#21293.
+ * Hide unpinnable pinned messages in more cases ([\#7921](https://github.com/matrix-org/matrix-react-sdk/pull/7921)).
+ * Fix room list being laggy while scrolling 🐌 ([\#7939](https://github.com/matrix-org/matrix-react-sdk/pull/7939)). Fixes vector-im/element-web#21262.
+ * Make pinned messages more reliably reflect edits ([\#7920](https://github.com/matrix-org/matrix-react-sdk/pull/7920)). Fixes vector-im/element-web#17098.
+ * Improve accessibility of the BetaPill ([\#7949](https://github.com/matrix-org/matrix-react-sdk/pull/7949)). Fixes vector-im/element-web#21255.
+ * Autofocus correct composer after sending reaction ([\#7950](https://github.com/matrix-org/matrix-react-sdk/pull/7950)). Fixes vector-im/element-web#21273.
+ * Consider polls as message events for rendering redactions ([\#7944](https://github.com/matrix-org/matrix-react-sdk/pull/7944)). Fixes vector-im/element-web#21125.
+ * Prevent event tiles being shrunk/collapsed by flexbox ([\#7942](https://github.com/matrix-org/matrix-react-sdk/pull/7942)). Fixes vector-im/element-web#21269.
+ * Fix ExportDialog title on export cancellation ([\#7936](https://github.com/matrix-org/matrix-react-sdk/pull/7936)). Fixes vector-im/element-web#21260. Contributed by @luixxiul.
+ * Mandate use of js-sdk/src/matrix import over js-sdk/src ([\#7933](https://github.com/matrix-org/matrix-react-sdk/pull/7933)). Fixes vector-im/element-web#21253.
+ * Fix backspace not working in the invite dialog ([\#7931](https://github.com/matrix-org/matrix-react-sdk/pull/7931)). Fixes vector-im/element-web#21249. Contributed by @SimonBrandner.
+ * Fix right panel soft crashes due to missing room prop ([\#7923](https://github.com/matrix-org/matrix-react-sdk/pull/7923)). Fixes vector-im/element-web#21243.
+ * fix color of location share caret ([\#7917](https://github.com/matrix-org/matrix-react-sdk/pull/7917)).
+ * Wrap all EventTiles with a TileErrorBoundary and guard parsePermalink ([\#7916](https://github.com/matrix-org/matrix-react-sdk/pull/7916)). Fixes vector-im/element-web#21216.
+ * Fix changing space sometimes bouncing to the wrong space ([\#7910](https://github.com/matrix-org/matrix-react-sdk/pull/7910)). Fixes vector-im/element-web#20425.
+ * Ensure EventListSummary key does not change during backpagination ([\#7915](https://github.com/matrix-org/matrix-react-sdk/pull/7915)). Fixes vector-im/element-web#9192.
+ * Fix positioning of the thread context menu ([\#7918](https://github.com/matrix-org/matrix-react-sdk/pull/7918)). Fixes vector-im/element-web#21236.
+ * Inject sender into pinned messages ([\#7904](https://github.com/matrix-org/matrix-react-sdk/pull/7904)). Fixes vector-im/element-web#20314.
+ * Tweak info message padding in right panel timeline ([\#7901](https://github.com/matrix-org/matrix-react-sdk/pull/7901)). Fixes vector-im/element-web#21212.
+ * Fix another freeze on room switch ([\#7900](https://github.com/matrix-org/matrix-react-sdk/pull/7900)). Fixes vector-im/element-web#21127.
+ * Clean up error listener when location picker closes ([\#7902](https://github.com/matrix-org/matrix-react-sdk/pull/7902)). Fixes vector-im/element-web#21213.
+ * Fix edge case in context menu chevron positioning ([\#7899](https://github.com/matrix-org/matrix-react-sdk/pull/7899)).
+ * Fix composer format buttons on WebKit ([\#7898](https://github.com/matrix-org/matrix-react-sdk/pull/7898)). Fixes vector-im/element-web#20868.
+ * manage voicerecording state when deleting or sending a voice message ([\#7896](https://github.com/matrix-org/matrix-react-sdk/pull/7896)). Fixes vector-im/element-web#21151.
+ * Fix bug with useRoomHierarchy tight-looping loadMore on error ([\#7893](https://github.com/matrix-org/matrix-react-sdk/pull/7893)).
+ * Fix upload button & shortcut not working for narrow composer mode ([\#7894](https://github.com/matrix-org/matrix-react-sdk/pull/7894)). Fixes vector-im/element-web#21175 and vector-im/element-web#21142.
+ * Fix emoji insertion in thread composer going to the main composer ([\#7895](https://github.com/matrix-org/matrix-react-sdk/pull/7895)). Fixes vector-im/element-web#21202.
+ * Try harder to keep context menus inside the window ([\#7863](https://github.com/matrix-org/matrix-react-sdk/pull/7863)). Fixes vector-im/element-web#17527 and vector-im/element-web#18377.
+ * Fix edge case around event list summary layout ([\#7891](https://github.com/matrix-org/matrix-react-sdk/pull/7891)). Fixes vector-im/element-web#21180.
+ * Fix event list summary 1 hidden message pluralisation ([\#7890](https://github.com/matrix-org/matrix-react-sdk/pull/7890)). Fixes vector-im/element-web#21196.
+ * Fix vanishing recently viewed menu ([\#7887](https://github.com/matrix-org/matrix-react-sdk/pull/7887)). Fixes vector-im/element-web#20827.
+ * Fix freeze on room switch ([\#7884](https://github.com/matrix-org/matrix-react-sdk/pull/7884)). Fixes vector-im/element-web#21127.
+ * Check 'useSystemTheme' in quick settings theme switcher ([\#7809](https://github.com/matrix-org/matrix-react-sdk/pull/7809)). Fixes vector-im/element-web#21061.
+ * Fix 'my threads' filtering to include participated threads ([\#7882](https://github.com/matrix-org/matrix-react-sdk/pull/7882)). Fixes vector-im/element-web#20877.
+ * Remove log line to try to fix freeze on answering VoIP call ([\#7883](https://github.com/matrix-org/matrix-react-sdk/pull/7883)).
+ * Support social login & password on soft logout page ([\#7879](https://github.com/matrix-org/matrix-react-sdk/pull/7879)). Fixes vector-im/element-web#21099.
+ * Fix missing padding on server picker ([\#7864](https://github.com/matrix-org/matrix-react-sdk/pull/7864)).
+ * Throttle RoomState.members handlers ([\#7876](https://github.com/matrix-org/matrix-react-sdk/pull/7876)). Fixes vector-im/element-web#21127.
+ * Only show joined/invited in search dialog ([\#7875](https://github.com/matrix-org/matrix-react-sdk/pull/7875)). Fixes vector-im/element-web#21161.
+ * Don't pillify code blocks ([\#7861](https://github.com/matrix-org/matrix-react-sdk/pull/7861)). Fixes vector-im/element-web#20851 and vector-im/element-web#18687.
+ * Fix keyboard shortcut icons on macOS ([\#7869](https://github.com/matrix-org/matrix-react-sdk/pull/7869)).
+
 Changes in [3.41.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.41.1) (2022-03-01)
 =====================================================================================================
 
@@ -278,7 +528,7 @@ Changes in [3.39.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/
 =====================================================================================================
 
 ## 🐛 Bug Fixes
- * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797. 
+ * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797.
  * Ensure UserInfo can be rendered without a room ([\#7687](https://github.com/matrix-org/matrix-react-sdk/pull/7687)). Fixes vector-im/element-web#20830.
  * Fix publishing address wrongly demanding the alias be available ([\#7690](https://github.com/matrix-org/matrix-react-sdk/pull/7690)). Fixes vector-im/element-web#12013 and vector-im/element-web#20833.
 
@@ -1137,7 +1387,7 @@ Changes in [3.32.1](https://github.com/vector-im/element-desktop/releases/tag/v3
 ## 🐛 Bug Fixes
 
  * Upgrade to matrix-js-sdk#14.0.1
- 
+
 Changes in [3.32.0](https://github.com/vector-im/element-desktop/releases/tag/v3.32.0) (2021-10-11)
 ===================================================================================================
 
@@ -2283,7 +2533,7 @@ related to file upload. When uploading a file, the local file preview can lead
 to execution of scripts embedded in the uploaded file, but only after several
 user interactions to open the preview in a separate tab. This only impacts the
 local user while in the process of uploading. It cannot be exploited remotely
-or by other users. Thanks to [Muhammad Zaid Ghifari](https://github.com/MR-ZHEEV) 
+or by other users. Thanks to [Muhammad Zaid Ghifari](https://github.com/MR-ZHEEV)
 for responsibly disclosing this via Matrix's Security Disclosure Policy.
 
 ## All changes
@@ -6278,7 +6528,7 @@ Changes in [2.1.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.1...v2.1.0-rc.2)
 
- * Fix error in previous attempt to upgrade JS SDK 
+ * Fix error in previous attempt to upgrade JS SDK
 
 Changes in [2.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.1) (2020-02-13)
 =============================================================================================================
diff --git a/README.md b/README.md
index 9059c5b5b8f..4664887360a 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ tracks lots of state for its child components which it passes into them for visu
 rendering via props.
 
 Good separation between the components is maintained by adopting various best
-practices that anyone working with the SDK needs to be be aware of and uphold:
+practices that anyone working with the SDK needs to be aware of and uphold:
 
   * Components are named with upper camel case (e.g. views/rooms/EventTile.js)
 
@@ -65,13 +65,9 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
     component is a view or a structure, and then a broad functional grouping
     (e.g. 'rooms' here)
 
-  * After creating a new component you must run `yarn reskindex` to regenerate
-    the `component-index.js` for the SDK (used in future for skinning)
-    <!-- TODO: Remove this once this approach to skinning is replaced -->
-
   * The view's CSS file MUST have the same name (e.g. view/rooms/MessageTile.css).
     CSS for matrix-react-sdk currently resides in
-    https://github.com/vector-im/element-web/tree/master/src/skins/vector/css/matrix-react-sdk.
+    https://github.com/matrix-org/matrix-react-sdk/tree/master/res/css.
 
   * Per-view CSS is optional - it could choose to inherit all its styling from
     the context of the rest of the app, although this is unusual for any but
@@ -158,9 +154,6 @@ cd matrix-react-sdk
 git checkout develop
 yarn link matrix-js-sdk
 yarn install
-
-# Generate the `component-index.js` file.
-yarn reskindex
 ```
 
 See the [help for `yarn link`](https://classic.yarnpkg.com/docs/cli/link) for
diff --git a/__mocks__/maplibre-gl.js b/__mocks__/maplibre-gl.js
index b1f114e8eff..599cacde13d 100644
--- a/__mocks__/maplibre-gl.js
+++ b/__mocks__/maplibre-gl.js
@@ -1,20 +1,30 @@
 const EventEmitter = require("events");
-const { LngLat } = require('maplibre-gl');
+const { LngLat, NavigationControl, LngLatBounds } = require('maplibre-gl');
 
 class MockMap extends EventEmitter {
     addControl = jest.fn();
     removeControl = jest.fn();
+    zoomIn = jest.fn();
+    zoomOut = jest.fn();
+    setCenter = jest.fn();
+    setStyle = jest.fn();
+    fitBounds = jest.fn();
 }
-class MockGeolocateControl extends EventEmitter {
+const MockMapInstance = new MockMap();
 
+class MockGeolocateControl extends EventEmitter {
+    trigger = jest.fn();
 }
-class MockMarker extends EventEmitter {
-    setLngLat = jest.fn().mockReturnValue(this);
-    addTo = jest.fn();
-}
+const MockGeolocateInstance = new MockGeolocateControl();
+const MockMarker = {}
+MockMarker.setLngLat = jest.fn().mockReturnValue(MockMarker);
+MockMarker.addTo = jest.fn().mockReturnValue(MockMarker);
+MockMarker.remove = jest.fn().mockReturnValue(MockMarker);
 module.exports = {
-    Map: MockMap,
-    GeolocateControl: MockGeolocateControl,
-    Marker: MockMarker,
+    Map: jest.fn().mockReturnValue(MockMapInstance),
+    GeolocateControl: jest.fn().mockReturnValue(MockGeolocateInstance),
+    Marker: jest.fn().mockReturnValue(MockMarker),
     LngLat,
+    LngLatBounds,
+    NavigationControl,
 };
diff --git a/babel.config.js b/babel.config.js
index f00e83652c1..ac94a29559e 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -13,7 +13,6 @@ module.exports = {
         "@babel/preset-react",
     ],
     "plugins": [
-        ["@babel/plugin-proposal-decorators", {legacy: true}],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
diff --git a/cypress.json b/cypress.json
new file mode 100644
index 00000000000..2c39bb411fe
--- /dev/null
+++ b/cypress.json
@@ -0,0 +1,5 @@
+{
+    "baseUrl": "http://localhost:8080",
+    "videoUploadOnPasses": false,
+    "projectId": "ppvnzg"
+}
diff --git a/cypress/integration/1-register/register.spec.ts b/cypress/integration/1-register/register.spec.ts
new file mode 100644
index 00000000000..f719da55477
--- /dev/null
+++ b/cypress/integration/1-register/register.spec.ts
@@ -0,0 +1,52 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/// <reference types="cypress" />
+
+import { SynapseInstance } from "../../plugins/synapsedocker/index";
+
+describe("Registration", () => {
+    let synapseId;
+    let synapsePort;
+
+    beforeEach(() => {
+        cy.task<SynapseInstance>("synapseStart", "consent").then(result => {
+            synapseId = result.synapseId;
+            synapsePort = result.port;
+        });
+        cy.visit("/#/register");
+    });
+
+    afterEach(() => {
+        cy.task("synapseStop", synapseId);
+    });
+
+    it("registers an account and lands on the home screen", () => {
+        cy.get(".mx_ServerPicker_change", { timeout: 15000 }).click();
+        cy.get(".mx_ServerPickerDialog_otherHomeserver").type(`http://localhost:${synapsePort}`);
+        cy.get(".mx_ServerPickerDialog_continue").click();
+        // wait for the dialog to go away
+        cy.get('.mx_ServerPickerDialog').should('not.exist');
+        cy.get("#mx_RegistrationForm_username").type("alice");
+        cy.get("#mx_RegistrationForm_password").type("totally a great password");
+        cy.get("#mx_RegistrationForm_passwordConfirm").type("totally a great password");
+        cy.get(".mx_Login_submit").click();
+        cy.get(".mx_RegistrationEmailPromptDialog button.mx_Dialog_primary").click();
+        cy.get(".mx_InteractiveAuthEntryComponents_termsPolicy input").click();
+        cy.get(".mx_InteractiveAuthEntryComponents_termsSubmit").click();
+        cy.url().should('contain', '/#/home');
+    });
+});
diff --git a/test/minimal-sdk.js b/cypress/plugins/index.ts
similarity index 74%
rename from test/minimal-sdk.js
rename to cypress/plugins/index.ts
index f39893f78c2..db01ceceb4f 100644
--- a/test/minimal-sdk.js
+++ b/cypress/plugins/index.ts
@@ -14,16 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/*
- * minimal-sdk.js
- *
- * Starts up the skin system with even less than `skinned-sdk`.
- */
-
-import * as sdk from "../src/index";
-
-const components = {};
+/// <reference types="cypress" />
 
-sdk.loadSkin({ components });
+import { synapseDocker } from "./synapsedocker/index";
 
-export default sdk;
+export default function(on, config) {
+    synapseDocker(on, config);
+}
diff --git a/cypress/plugins/synapsedocker/index.ts b/cypress/plugins/synapsedocker/index.ts
new file mode 100644
index 00000000000..0f029e7b2ed
--- /dev/null
+++ b/cypress/plugins/synapsedocker/index.ts
@@ -0,0 +1,212 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/// <reference types="cypress" />
+
+import * as path from "path";
+import * as os from "os";
+import * as crypto from "crypto";
+import * as childProcess from "child_process";
+import * as fse from "fs-extra";
+
+// A cypress plugins to add command to start & stop synapses in
+// docker with preset templates.
+
+interface SynapseConfig {
+    configDir: string;
+    registrationSecret: string;
+}
+
+export interface SynapseInstance extends SynapseConfig {
+    synapseId: string;
+    port: number;
+}
+
+const synapses = new Map<string, SynapseInstance>();
+
+function randB64Bytes(numBytes: number): string {
+    return crypto.randomBytes(numBytes).toString("base64").replace(/=*$/, "");
+}
+
+async function cfgDirFromTemplate(template: string): Promise<SynapseConfig> {
+    const templateDir = path.join(__dirname, "templates", template);
+
+    const stats = await fse.stat(templateDir);
+    if (!stats?.isDirectory) {
+        throw new Error(`No such template: ${template}`);
+    }
+    const tempDir = await fse.mkdtemp(path.join(os.tmpdir(), 'react-sdk-synapsedocker-'));
+
+    // change permissions on the temp directory so the docker container can see its contents
+    await fse.chmod(tempDir, 0o777);
+
+    // copy the contents of the template dir, omitting homeserver.yaml as we'll template that
+    console.log(`Copy ${templateDir} -> ${tempDir}`);
+    await fse.copy(templateDir, tempDir, { filter: f => path.basename(f) !== 'homeserver.yaml' });
+
+    const registrationSecret = randB64Bytes(16);
+    const macaroonSecret = randB64Bytes(16);
+    const formSecret = randB64Bytes(16);
+
+    // now copy homeserver.yaml, applying sustitutions
+    console.log(`Gen ${path.join(templateDir, "homeserver.yaml")}`);
+    let hsYaml = await fse.readFile(path.join(templateDir, "homeserver.yaml"), "utf8");
+    hsYaml = hsYaml.replace(/{{REGISTRATION_SECRET}}/g, registrationSecret);
+    hsYaml = hsYaml.replace(/{{MACAROON_SECRET_KEY}}/g, macaroonSecret);
+    hsYaml = hsYaml.replace(/{{FORM_SECRET}}/g, formSecret);
+    await fse.writeFile(path.join(tempDir, "homeserver.yaml"), hsYaml);
+
+    // now generate a signing key (we could use synapse's config generation for
+    // this, or we could just do this...)
+    // NB. This assumes the homeserver.yaml specifies the key in this location
+    const signingKey = randB64Bytes(32);
+    console.log(`Gen ${path.join(templateDir, "localhost.signing.key")}`);
+    await fse.writeFile(path.join(tempDir, "localhost.signing.key"), `ed25519 x ${signingKey}`);
+
+    return {
+        configDir: tempDir,
+        registrationSecret,
+    };
+}
+
+// Start a synapse instance: the template must be the name of
+// one of the templates in the cypress/plugins/synapsedocker/templates
+// directory
+async function synapseStart(template: string): Promise<SynapseInstance> {
+    const synCfg = await cfgDirFromTemplate(template);
+
+    console.log(`Starting synapse with config dir ${synCfg.configDir}...`);
+
+    const containerName = `react-sdk-cypress-synapse-${crypto.randomBytes(4).toString("hex")}`;
+
+    const synapseId = await new Promise<string>((resolve, reject) => {
+        childProcess.execFile('docker', [
+            "run",
+            "--name", containerName,
+            "-d",
+            "-v", `${synCfg.configDir}:/data`,
+            "-p", "8008/tcp",
+            "matrixdotorg/synapse:develop",
+            "run",
+        ], (err, stdout) => {
+            if (err) reject(err);
+            resolve(stdout.trim());
+        });
+    });
+
+    // Get the port that docker allocated: specifying only one
+    // port above leaves docker to just grab a free one, although
+    // in hindsight we need to put the port in public_baseurl in the
+    // config really, so this will probably need changing to use a fixed
+    // / configured port.
+    const port = await new Promise<number>((resolve, reject) => {
+        childProcess.execFile('docker', [
+            "port", synapseId, "8008",
+        ], { encoding: 'utf8' }, (err, stdout) => {
+            if (err) reject(err);
+            resolve(Number(stdout.trim().split(":")[1]));
+        });
+    });
+
+    synapses.set(synapseId, Object.assign({
+        port,
+        synapseId,
+    }, synCfg));
+
+    console.log(`Started synapse with id ${synapseId} on port ${port}.`);
+    return synapses.get(synapseId);
+}
+
+async function synapseStop(id) {
+    const synCfg = synapses.get(id);
+
+    if (!synCfg) throw new Error("Unknown synapse ID");
+
+    try {
+        const synapseLogsPath = path.join("cypress", "synapselogs", id);
+        await fse.ensureDir(synapseLogsPath);
+
+        const stdoutFile = await fse.open(path.join(synapseLogsPath, "stdout.log"), "w");
+        const stderrFile = await fse.open(path.join(synapseLogsPath, "stderr.log"), "w");
+        await new Promise<void>((resolve, reject) => {
+            childProcess.spawn('docker', [
+                "logs",
+                id,
+            ], {
+                stdio: ["ignore", stdoutFile, stderrFile],
+            }).once('close', resolve);
+        });
+        await fse.close(stdoutFile);
+        await fse.close(stderrFile);
+
+        await new Promise<void>((resolve, reject) => {
+            childProcess.execFile('docker', [
+                "stop",
+                id,
+            ], err => {
+                if (err) reject(err);
+                resolve();
+            });
+        });
+    } finally {
+        await new Promise<void>((resolve, reject) => {
+            childProcess.execFile('docker', [
+                "rm",
+                id,
+            ], err => {
+                if (err) reject(err);
+                resolve();
+            });
+        });
+    }
+
+    await fse.remove(synCfg.configDir);
+
+    synapses.delete(id);
+
+    console.log(`Stopped synapse id ${id}.`);
+    // cypres deliberately fails if you return 'undefined', so
+    // return null to signal all is well and we've handled the task.
+    return null;
+}
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+export function synapseDocker(on, config) {
+    on("task", {
+        synapseStart, synapseStop,
+    });
+
+    on("after:spec", async (spec) => {
+        // Cleans up any remaining synapse instances after a spec run
+        // This is on the theory that we should avoid re-using synapse
+        // instances between spec runs: they should be cheap enough to
+        // start that we can have a separate one for each spec run or even
+        // test. If we accidentally re-use synapses, we could inadvertantly
+        // make our tests depend on each other.
+        for (const synId of synapses.keys()) {
+            console.warn(`Cleaning up synapse ID ${synId} after ${spec.name}`);
+            await synapseStop(synId);
+        }
+    });
+
+    on("before:run", async () => {
+        // tidy up old synapse log files before each run
+        await fse.emptyDir(path.join("cypress", "synapselogs"));
+    });
+}
diff --git a/cypress/plugins/synapsedocker/templates/COPYME/README.md b/cypress/plugins/synapsedocker/templates/COPYME/README.md
new file mode 100644
index 00000000000..df1ed89e6e4
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/COPYME/README.md
@@ -0,0 +1,3 @@
+# Meta-template for synapse templates
+
+To make another template, you can copy this directory
diff --git a/cypress/plugins/synapsedocker/templates/COPYME/homeserver.yaml b/cypress/plugins/synapsedocker/templates/COPYME/homeserver.yaml
new file mode 100644
index 00000000000..fab1bc1c451
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/COPYME/homeserver.yaml
@@ -0,0 +1,72 @@
+server_name: "localhost"
+pid_file: /data/homeserver.pid
+# XXX: This won't actually be right: it lets docker allocate an ephemeral port,
+# so we have a chicken-and-egg problem
+public_baseurl: http://localhost:8008/
+# Listener is always port 8008 (configured in the container)
+listeners:
+  - port: 8008
+    tls: false
+    bind_addresses: ['::']
+    type: http
+    x_forwarded: true
+
+    resources:
+      - names: [client, federation, consent]
+        compress: false
+
+# An sqlite in-memory database is fast & automatically wipes each time
+database:
+  name: "sqlite3"
+  args:
+    database: ":memory:"
+
+# Needs to be configured to log to the console like a good docker process
+log_config: "/data/log.config"
+
+rc_messages_per_second: 10000
+rc_message_burst_count: 10000
+rc_registration:
+ per_second: 10000
+ burst_count: 10000
+
+rc_login:
+  address:
+    per_second: 10000
+    burst_count: 10000
+  account:
+    per_second: 10000
+    burst_count: 10000
+  failed_attempts:
+    per_second: 10000
+    burst_count: 10000
+
+media_store_path: "/data/media_store"
+uploads_path: "/data/uploads"
+enable_registration: true
+enable_registration_without_verification: true
+disable_msisdn_registration: false
+# These placeholders will be be replaced with values generated at start
+registration_shared_secret: "{{REGISTRATION_SECRET}}"
+report_stats: false
+macaroon_secret_key: "{{MACAROON_SECRET_KEY}}"
+form_secret: "{{FORM_SECRET}}"
+# Signing key must be here: it will be generated to this file
+signing_key_path: "/data/localhost.signing.key"
+email:
+   enable_notifs: false
+   smtp_host: "localhost"
+   smtp_port: 25
+   smtp_user: "exampleusername"
+   smtp_pass: "examplepassword"
+   require_transport_security: False
+   notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
+   app_name: Matrix
+   notif_template_html: notif_mail.html
+   notif_template_text: notif_mail.txt
+   notif_for_new_users: True
+   client_base_url: "http://localhost/element"
+
+trusted_key_servers:
+  - server_name: "matrix.org"
+suppress_key_server_warning: true
diff --git a/cypress/plugins/synapsedocker/templates/COPYME/log.config b/cypress/plugins/synapsedocker/templates/COPYME/log.config
new file mode 100644
index 00000000000..ac232762da3
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/COPYME/log.config
@@ -0,0 +1,50 @@
+# Log configuration for Synapse.
+#
+# This is a YAML file containing a standard Python logging configuration
+# dictionary. See [1] for details on the valid settings.
+#
+# Synapse also supports structured logging for machine readable logs which can
+# be ingested by ELK stacks. See [2] for details.
+#
+# [1]: https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
+# [2]: https://matrix-org.github.io/synapse/latest/structured_logging.html
+
+version: 1
+
+formatters:
+    precise:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+
+handlers:
+    # A handler that writes logs to stderr. Unused by default, but can be used
+    # instead of "buffer" and "file" in the logger handlers.
+    console:
+        class: logging.StreamHandler
+        formatter: precise
+
+loggers:
+    synapse.storage.SQL:
+        # beware: increasing this to DEBUG will make synapse log sensitive
+        # information such as access tokens.
+        level: INFO
+
+    twisted:
+        # We send the twisted logging directly to the file handler,
+        # to work around https://github.com/matrix-org/synapse/issues/3471
+        # when using "buffer" logger. Use "console" to log to stderr instead.
+        handlers: [console]
+        propagate: false
+
+root:
+    level: INFO
+
+    # Write logs to the `buffer` handler, which will buffer them together in memory,
+    # then write them to a file.
+    #
+    # Replace "buffer" with "console" to log to stderr instead. (Note that you'll
+    # also need to update the configuration for the `twisted` logger above, in
+    # this case.)
+    #
+    handlers: [console]
+
+disable_existing_loggers: false
diff --git a/cypress/plugins/synapsedocker/templates/consent/README.md b/cypress/plugins/synapsedocker/templates/consent/README.md
new file mode 100644
index 00000000000..713e55f9d51
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/consent/README.md
@@ -0,0 +1 @@
+A synapse configured with user privacy consent enabled
diff --git a/cypress/plugins/synapsedocker/templates/consent/homeserver.yaml b/cypress/plugins/synapsedocker/templates/consent/homeserver.yaml
new file mode 100644
index 00000000000..e26133f6d11
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/consent/homeserver.yaml
@@ -0,0 +1,84 @@
+server_name: "localhost"
+pid_file: /data/homeserver.pid
+public_baseurl: http://localhost:5005/
+listeners:
+  - port: 8008
+    tls: false
+    bind_addresses: ['::']
+    type: http
+    x_forwarded: true
+
+    resources:
+      - names: [client, federation, consent]
+        compress: false
+
+database:
+  name: "sqlite3"
+  args:
+    database: ":memory:"
+
+log_config: "/data/log.config"
+
+rc_messages_per_second: 10000
+rc_message_burst_count: 10000
+rc_registration:
+ per_second: 10000
+ burst_count: 10000
+
+rc_login:
+  address:
+    per_second: 10000
+    burst_count: 10000
+  account:
+    per_second: 10000
+    burst_count: 10000
+  failed_attempts:
+    per_second: 10000
+    burst_count: 10000
+
+media_store_path: "/data/media_store"
+uploads_path: "/data/uploads"
+enable_registration: true
+enable_registration_without_verification: true
+disable_msisdn_registration: false
+registration_shared_secret: "{{REGISTRATION_SECRET}}"
+report_stats: false
+macaroon_secret_key: "{{MACAROON_SECRET_KEY}}"
+form_secret: "{{FORM_SECRET}}"
+signing_key_path: "/data/localhost.signing.key"
+email:
+   enable_notifs: false
+   smtp_host: "localhost"
+   smtp_port: 25
+   smtp_user: "exampleusername"
+   smtp_pass: "examplepassword"
+   require_transport_security: False
+   notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
+   app_name: Matrix
+   notif_template_html: notif_mail.html
+   notif_template_text: notif_mail.txt
+   notif_for_new_users: True
+   client_base_url: "http://localhost/element"
+
+user_consent:
+  template_dir: /data/res/templates/privacy
+  version: 1.0
+  server_notice_content:
+    msgtype: m.text
+    body: >-
+      To continue using this homeserver you must review and agree to the
+      terms and conditions at %(consent_uri)s
+  send_server_notice_to_guests: True
+  block_events_error: >-
+    To continue using this homeserver you must review and agree to the
+    terms and conditions at %(consent_uri)s
+  require_at_registration: true
+
+server_notices:
+  system_mxid_localpart: notices
+  system_mxid_display_name: "Server Notices"
+  system_mxid_avatar_url: "mxc://localhost:5005/oumMVlgDnLYFaPVkExemNVVZ"
+  room_name: "Server Notices"
+trusted_key_servers:
+  - server_name: "matrix.org"
+suppress_key_server_warning: true
diff --git a/cypress/plugins/synapsedocker/templates/consent/log.config b/cypress/plugins/synapsedocker/templates/consent/log.config
new file mode 100644
index 00000000000..ac232762da3
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/consent/log.config
@@ -0,0 +1,50 @@
+# Log configuration for Synapse.
+#
+# This is a YAML file containing a standard Python logging configuration
+# dictionary. See [1] for details on the valid settings.
+#
+# Synapse also supports structured logging for machine readable logs which can
+# be ingested by ELK stacks. See [2] for details.
+#
+# [1]: https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
+# [2]: https://matrix-org.github.io/synapse/latest/structured_logging.html
+
+version: 1
+
+formatters:
+    precise:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+
+handlers:
+    # A handler that writes logs to stderr. Unused by default, but can be used
+    # instead of "buffer" and "file" in the logger handlers.
+    console:
+        class: logging.StreamHandler
+        formatter: precise
+
+loggers:
+    synapse.storage.SQL:
+        # beware: increasing this to DEBUG will make synapse log sensitive
+        # information such as access tokens.
+        level: INFO
+
+    twisted:
+        # We send the twisted logging directly to the file handler,
+        # to work around https://github.com/matrix-org/synapse/issues/3471
+        # when using "buffer" logger. Use "console" to log to stderr instead.
+        handlers: [console]
+        propagate: false
+
+root:
+    level: INFO
+
+    # Write logs to the `buffer` handler, which will buffer them together in memory,
+    # then write them to a file.
+    #
+    # Replace "buffer" with "console" to log to stderr instead. (Note that you'll
+    # also need to update the configuration for the `twisted` logger above, in
+    # this case.)
+    #
+    handlers: [console]
+
+disable_existing_loggers: false
diff --git a/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/1.0.html b/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/1.0.html
new file mode 100644
index 00000000000..d4959b4bcb3
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/1.0.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>Test Privacy policy</title>
+  </head>
+  <body>
+  {% if has_consented %}
+    <p>
+      Thank you, you've already accepted the license.
+    </p>
+  {% else %}
+    <p>
+      Please accept the license!
+    </p>
+    <form method="post" action="consent">
+      <input type="hidden" name="v" value="{{version}}"/>
+      <input type="hidden" name="u" value="{{user}}"/>
+      <input type="hidden" name="h" value="{{userhmac}}"/>
+      <input type="submit" value="Sure thing!"/>
+    </form>
+  {% endif %}
+  </body>
+</html>
\ No newline at end of file
diff --git a/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/success.html b/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/success.html
new file mode 100644
index 00000000000..abe27d87ca1
--- /dev/null
+++ b/cypress/plugins/synapsedocker/templates/consent/res/templates/privacy/en/success.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>Test Privacy policy</title>
+  </head>
+  <body>
+    <p>Danke schon</p>
+  </body>
+</html>
\ No newline at end of file
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
new file mode 100644
index 00000000000..9901ef4cb80
--- /dev/null
+++ b/cypress/support/index.ts
@@ -0,0 +1,3 @@
+// Empty file to prevent cypress from recreating a helpful example
+// file on every run (their example file doesn't use semicolons and
+// so fails our lint rules).
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
new file mode 100644
index 00000000000..85239e1a2a7
--- /dev/null
+++ b/cypress/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "target": "es2016",
+        "lib": ["es2020", "dom"],
+        "types": ["cypress"],
+        "moduleResolution": "node"
+    },
+    "include": ["**/*.ts"]
+}
diff --git a/docs/features/keyboardShortcuts.md b/docs/features/keyboardShortcuts.md
index 71814023543..349535918b3 100644
--- a/docs/features/keyboardShortcuts.md
+++ b/docs/features/keyboardShortcuts.md
@@ -1,6 +1,6 @@
 # Keyboard shortcuts
 
-## Using the `KeyBindingManger`
+## Using the `KeyBindingManager`
 
 The `KeyBindingManager` (accessible using `getKeyBindingManager()`) is a class
 with several methods that allow you to get a `KeyBindingAction` based on a
diff --git a/docs/settings.md b/docs/settings.md
index 379f3c5dcd4..dae6eb22b81 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -1,38 +1,38 @@
 # Settings Reference
 
-This document serves as developer documentation for using "Granular Settings". Granular Settings allow users to specify 
-different values for a setting at particular levels of interest. For example, a user may say that in a particular room 
-they want URL previews off, but in all other rooms they want them enabled. The `SettingsStore` helps mask the complexity 
+This document serves as developer documentation for using "Granular Settings". Granular Settings allow users to specify
+different values for a setting at particular levels of interest. For example, a user may say that in a particular room
+they want URL previews off, but in all other rooms they want them enabled. The `SettingsStore` helps mask the complexity
 of dealing with the different levels and exposes easy to use getters and setters.
 
 
 ## Levels
 
-Granular Settings rely on a series of known levels in order to use the correct value for the scenario. These levels, in 
+Granular Settings rely on a series of known levels in order to use the correct value for the scenario. These levels, in
 order of priority, are:
 * `device` - The current user's device
 * `room-device` - The current user's device, but only when in a specific room
 * `room-account` - The current user's account, but only when in a specific room
 * `account` - The current user's account
 * `room` - A specific room (setting for all members of the room)
-* `config` - Values are defined by the `settingDefaults` key (usually) in `config.json`
+* `config` - Values are defined by the `setting_defaults` key (usually) in `config.json`
 * `default` - The hardcoded default for the settings
 
-Individual settings may control which levels are appropriate for them as part of the defaults. This is often to ensure 
+Individual settings may control which levels are appropriate for them as part of the defaults. This is often to ensure
 that room administrators cannot force account-only settings upon participants.
 
 
 ## Settings
 
-Settings are the different options a user may set or experience in the application. These are pre-defined in 
+Settings are the different options a user may set or experience in the application. These are pre-defined in
 `src/settings/Settings.tsx` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
 
-Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some 
+Settings that support the config level can be set in the config file under the `setting_defaults` key (note that some
 settings, like the "theme" setting, are special cased in the config file):
-```json
+```json5
 {
   ...
-  "settingDefaults": {
+  "setting_defaults": {
     "settingName": true
   },
   ...
@@ -41,20 +41,20 @@ settings, like the "theme" setting, are special cased in the config file):
 
 ### Getting values for a setting
 
-After importing `SettingsStore`, simply make a call to `SettingsStore.getValue`. The `roomId` parameter should always 
-be supplied where possible, even if the setting does not have a per-room level value. This is to ensure that the value 
+After importing `SettingsStore`, simply make a call to `SettingsStore.getValue`. The `roomId` parameter should always
+be supplied where possible, even if the setting does not have a per-room level value. This is to ensure that the value
 returned is best represented in the room, particularly if the setting ever gets a per-room level in the future.
 
-In settings pages it is often desired to have the value at a particular level instead of getting the calculated value. 
-Call `SettingsStore.getValueAt` to get the value of a setting at a particular level, and optionally make it explicitly 
-at that level. By default `getValueAt` will traverse the tree starting at the provided level; making it explicit means 
-it will not go beyond the provided level. When using `getValueAt`, please be sure to use `SettingLevel` to represent the 
+In settings pages it is often desired to have the value at a particular level instead of getting the calculated value.
+Call `SettingsStore.getValueAt` to get the value of a setting at a particular level, and optionally make it explicitly
+at that level. By default `getValueAt` will traverse the tree starting at the provided level; making it explicit means
+it will not go beyond the provided level. When using `getValueAt`, please be sure to use `SettingLevel` to represent the
 target level.
 
 ### Setting values for a setting
 
-Values are defined at particular levels and should be done in a safe manner. There are two checks to perform to ensure a 
-clean save: is the level supported and can the user actually set the value. In most cases, neither should be an issue 
+Values are defined at particular levels and should be done in a safe manner. There are two checks to perform to ensure a
+clean save: is the level supported and can the user actually set the value. In most cases, neither should be an issue
 although there are circumstances where this changes. An example of a safe call is:
 ```javascript
 const isSupported = SettingsStore.isLevelSupported(SettingLevel.ROOM);
@@ -66,12 +66,12 @@ if (isSupported) {
 }
 ```
 
-These checks may also be performed in different areas of the application to avoid the verbose example above. For 
+These checks may also be performed in different areas of the application to avoid the verbose example above. For
 instance, the component which allows changing the setting may be hidden conditionally on the above conditions.
 
 ##### `SettingsFlag` component
 
-Where possible, the `SettingsFlag` component should be used to set simple "flip-a-bit" (true/false) settings. The 
+Where possible, the `SettingsFlag` component should be used to set simple "flip-a-bit" (true/false) settings. The
 `SettingsFlag` also supports simple radio button options, such as the theme the user would like to use.
 ```html
 <SettingsFlag name="theSettingId"
@@ -81,7 +81,7 @@ Where possible, the `SettingsFlag` component should be used to set simple "flip-
               onChange={function(newValue) { }} // optional, called after saving
               isExplicit={false} // this is passed along to `SettingsStore.getValueAt`, defaulting to false
               manualSave={false} // if true, saving is delayed. You will need to call .save() on this component
-              
+
               // Options for radio buttons
               group="your-radio-group" // this enables radio button support
               value="yourValueHere" // the value for this particular option
@@ -90,7 +90,7 @@ Where possible, the `SettingsFlag` component should be used to set simple "flip-
 
 ### Getting the display name for a setting
 
-Simply call `SettingsStore.getDisplayName`. The appropriate display name will be returned and automatically translated 
+Simply call `SettingsStore.getDisplayName`. The appropriate display name will be returned and automatically translated
 for you. If a display name cannot be found, it will return `null`.
 
 
@@ -135,11 +135,11 @@ UI feature is disabled.
 
 ## Setting controllers
 
-Settings may have environmental factors that affect their value or need additional code to be called when they are 
-modified. A setting controller is able to override the calculated value for a setting and react to changes in that 
-setting. Controllers are not a replacement for the level handlers and should only be used to ensure the environment is 
-kept up to date with the setting where it is otherwise not possible. An example of this is the notification settings: 
-they can only be considered enabled if the platform supports notifications, and enabling notifications requires 
+Settings may have environmental factors that affect their value or need additional code to be called when they are
+modified. A setting controller is able to override the calculated value for a setting and react to changes in that
+setting. Controllers are not a replacement for the level handlers and should only be used to ensure the environment is
+kept up to date with the setting where it is otherwise not possible. An example of this is the notification settings:
+they can only be considered enabled if the platform supports notifications, and enabling notifications requires
 additional steps to actually enable notifications.
 
 For more information, see `src/settings/controllers/SettingController.ts`.
@@ -147,11 +147,11 @@ For more information, see `src/settings/controllers/SettingController.ts`.
 
 ## Local echo
 
-`SettingsStore` will perform local echo on all settings to ensure that immediately getting values does not cause a 
-split-brain scenario. As mentioned in the "Setting values for a setting" section, the appropriate checks should be done 
-to ensure that the user is allowed to set the value. The local echo system assumes that the user has permission and that 
-the request will go through successfully. The local echo only takes effect until the request to save a setting has 
-completed (either successfully or otherwise). 
+`SettingsStore` will perform local echo on all settings to ensure that immediately getting values does not cause a
+split-brain scenario. As mentioned in the "Setting values for a setting" section, the appropriate checks should be done
+to ensure that the user is allowed to set the value. The local echo system assumes that the user has permission and that
+the request will go through successfully. The local echo only takes effect until the request to save a setting has
+completed (either successfully or otherwise).
 
 ```javascript
 SettingsStore.setValue(...).then(() => {
@@ -163,27 +163,27 @@ SettingsStore.getValue(...); // this will return the value set in `setValue` abo
 
 ## Watching for changes
 
-Most use cases do not need to set up a watcher because they are able to react to changes as they are made, or the 
-changes which are made are not significant enough for it to matter. Watchers are intended to be used in scenarios where 
-it is important to react to changes made by other logged in devices. Typically, this would be done within the component 
-itself, however the component should not be aware of the intricacies of setting inversion or remapping to particular 
-data structures. Instead, a generic watcher interface is provided on `SettingsStore` to watch (and subsequently unwatch) 
+Most use cases do not need to set up a watcher because they are able to react to changes as they are made, or the
+changes which are made are not significant enough for it to matter. Watchers are intended to be used in scenarios where
+it is important to react to changes made by other logged in devices. Typically, this would be done within the component
+itself, however the component should not be aware of the intricacies of setting inversion or remapping to particular
+data structures. Instead, a generic watcher interface is provided on `SettingsStore` to watch (and subsequently unwatch)
 for changes in a setting.
 
 An example of a watcher in action would be:
 
 ```javascript
 class MyComponent extends React.Component {
-    
+
     settingWatcherRef = null;
-    
+
     componentWillMount() {
         const callback = (settingName, roomId, level, newValAtLevel, newVal) => {
             this.setState({color: newVal});
         };
         this.settingWatcherRef = SettingsStore.watchSetting("roomColor", "!example:matrix.org", callback);
     }
-    
+
     componentWillUnmount() {
         SettingsStore.unwatchSetting(this.settingWatcherRef);
     }
@@ -193,29 +193,29 @@ class MyComponent extends React.Component {
 
 # Maintainers Reference
 
-The granular settings system has a few complex parts to power it. This section is to document how the `SettingsStore` is 
+The granular settings system has a few complex parts to power it. This section is to document how the `SettingsStore` is
 supposed to work.
 
 ### General information
 
-The `SettingsStore` uses the hardcoded `LEVEL_ORDER` constant to ensure that it is using the correct override procedure. 
-The array is checked from left to right, simulating the behaviour of overriding values from the higher levels. Each 
+The `SettingsStore` uses the hardcoded `LEVEL_ORDER` constant to ensure that it is using the correct override procedure.
+The array is checked from left to right, simulating the behaviour of overriding values from the higher levels. Each
 level should be defined in this array, including `default`.
 
-Handlers (`src/settings/handlers/SettingsHandler.ts`) represent a single level and are responsible for getting and 
-setting values at that level. Handlers also provide additional information to the `SettingsStore` such as if the level 
-is supported or if the current user may set values at the level. The `SettingsStore` will use the handler to enforce 
-checks and manipulate settings. Handlers are also responsible for dealing with migration patterns or legacy settings for 
-their level (for example, a setting being renamed or using a different key from other settings in the underlying store). 
-Handlers are provided to the `SettingsStore` via the `LEVEL_HANDLERS` constant. `SettingsStore` will optimize lookups by 
+Handlers (`src/settings/handlers/SettingsHandler.ts`) represent a single level and are responsible for getting and
+setting values at that level. Handlers also provide additional information to the `SettingsStore` such as if the level
+is supported or if the current user may set values at the level. The `SettingsStore` will use the handler to enforce
+checks and manipulate settings. Handlers are also responsible for dealing with migration patterns or legacy settings for
+their level (for example, a setting being renamed or using a different key from other settings in the underlying store).
+Handlers are provided to the `SettingsStore` via the `LEVEL_HANDLERS` constant. `SettingsStore` will optimize lookups by
 only considering handlers that are supported on the platform.
 
-Local echo is achieved through `src/settings/handlers/LocalEchoWrapper.ts` which acts as a wrapper around a given 
-handler. This is automatically applied to all defined `LEVEL_HANDLERS` and proxies the calls to the wrapped handler 
-where possible. The echo is achieved by a simple object cache stored within the class itself. The cache is invalidated 
+Local echo is achieved through `src/settings/handlers/LocalEchoWrapper.ts` which acts as a wrapper around a given
+handler. This is automatically applied to all defined `LEVEL_HANDLERS` and proxies the calls to the wrapped handler
+where possible. The echo is achieved by a simple object cache stored within the class itself. The cache is invalidated
 immediately upon the proxied save call succeeding or failing.
 
-Controllers are notified of changes by the `SettingsStore`, and are given the opportunity to override values after the 
+Controllers are notified of changes by the `SettingsStore`, and are given the opportunity to override values after the
 `SettingsStore` has deemed the value calculated. Controllers are invoked as the last possible step in the code.
 
 ### Features
@@ -224,17 +224,17 @@ See above for feature reference.
 
 ### Watchers
 
-Watchers can appear complicated under the hood: there is a central `WatchManager` which handles the actual invocation 
-of callbacks, and callbacks are managed by the SettingsStore by redirecting the caller's callback to a dedicated 
-callback. This is done so that the caller can reuse the same function as their callback without worrying about whether 
-or not it'll unsubscribe all watchers. 
+Watchers can appear complicated under the hood: there is a central `WatchManager` which handles the actual invocation
+of callbacks, and callbacks are managed by the SettingsStore by redirecting the caller's callback to a dedicated
+callback. This is done so that the caller can reuse the same function as their callback without worrying about whether
+or not it'll unsubscribe all watchers.
 
-Setting changes are emitted into the default `WatchManager`, which calculates the new value for the setting. Ideally, 
-we'd also try and suppress updates which don't have a consequence on this value, however there's not an easy way to do 
-this. Instead, we just dispatch an update for all changes and leave it up to the consumer to deduplicate. 
+Setting changes are emitted into the default `WatchManager`, which calculates the new value for the setting. Ideally,
+we'd also try and suppress updates which don't have a consequence on this value, however there's not an easy way to do
+this. Instead, we just dispatch an update for all changes and leave it up to the consumer to deduplicate.
 
-In practice, handlers which rely on remote changes (account data, room events, etc) will always attach a listener to the 
-`MatrixClient`. They then watch for changes to events they care about and send off appropriate updates to the 
-generalized `WatchManager` - a class specifically designed to deduplicate the logic of managing watchers. The handlers 
-which are localized to the local client (device) generally just trigger the `WatchManager` when they manipulate the 
+In practice, handlers which rely on remote changes (account data, room events, etc) will always attach a listener to the
+`MatrixClient`. They then watch for changes to events they care about and send off appropriate updates to the
+generalized `WatchManager` - a class specifically designed to deduplicate the logic of managing watchers. The handlers
+which are localized to the local client (device) generally just trigger the `WatchManager` when they manipulate the
 setting themselves as there's nothing to really 'watch'.
diff --git a/docs/skinning.md b/docs/skinning.md
index 229bc783724..0186186c24a 100644
--- a/docs/skinning.md
+++ b/docs/skinning.md
@@ -1,71 +1,18 @@
 # Skinning
 
-The react-sdk can be skinned to replace presentation components, CSS, or
-other relevant parts of the SDK. Typically consumers will replace entire
-components and get the ability for custom CSS as a result.
-
-This doc isn't exhaustive on how skinning works, though it should cover
-some of the more complicated parts such as component replacement.
-
-## Loading a skin
-
-1. Generate a `component-index.js` (preferably using the tools that the react-sdk
-exposes). This can typically be done with a npm script like `"reskindex -h src/header"`.
-2. In your app's entry point, add something like this code:
-   ```javascript
-   import {loadSkin} from "matrix-react-sdk";
-   loadSkin(import("component-index").components);
-   // The rest of your imports go under this.
-   ```
-3. Import the remainder of the SDK and bootstrap your app.
-
-It is extremely important that you **do not** import anything else from the
-SDK prior to loading your skin as otherwise the skin might not work. Loading
-the skin should be one of the first things your app does, if not the very
-first thing.
-
-Additionally, **do not** provide `loadSkin` with the react-sdk components
-themselves otherwise the app might explode. The SDK is already aware of its
-components and doesn't need to be told.
-
-## Replacing components
-
-Components that replace the react-sdk ones MUST have a `replaces` static
-key on the component's class to describe which component it overrides. For
-example, if your `VectorAuthPage` component is meant to replace the react-sdk
-`AuthPage` component then you'd add `static replaces = 'views.auth.AuthPage';`
-to the `VectorAuthPage` class.
-
-Other than that, the skin just needs to be loaded normally as mentioned above.
-Consumers of the SDK likely will not be interested in the rest of this section.
-
-### SDK developer notes
-
-Components in the react-sdk MUST be decorated with the `@replaceableComponent`
-function. For components that can't use the decorator, they must use a
-variation that provides similar functionality. The decorator gives consumers
-an opportunity to load skinned components by abusing import ordering and 
-behaviour.
-
-Decorators are executed at import time which is why we can abuse the import
-ordering behaviour: importing `loadSkin` doesn't trigger any components to
-be imported, allowing the consumer to specify a skin. When the consumer does
-import a component (for example, `MatrixChat`), it starts to pull in all the
-components via `import` statements. When the components get pulled in the
-decorator checks with the skinned components to see if it should be replacing
-the component being imported. The decorator then effectively replaces the
-components when needed by specifying the skinned component as an override for
-the SDK's component, which should in theory override critical functions like
-`render()` and lifecycle event handlers. 
-
-The decorator also means that older usage of `getComponent()` is no longer
-required because components should be replaced by the decorator. Eventually
-the react-sdk should only have one usage of `getComponent()`: the decorator.
-
-The decorator assumes that if `getComponent()` returns null that there is
-no skinned version of the component and continues on using the SDK's component.
-In previous versions of the SDK, the function would throw an error instead
-because it also expected the skin to list the SDK's components as well, however
-that is no longer possible due to the above.
-
-In short, components should always be `import`ed.
+Skinning in the context of the react-sdk is component replacement rather than CSS. This means you can override (replace)
+any accessible component in the project to implement custom behaviour, look & feel, etc. Depending on your approach,
+overriding CSS classes to apply custom styling is also possible, though harder to do.
+
+At present, the react-sdk offers no stable interface for components - this means properties and state can and do change
+at any time without notice. Once we determine the react-sdk to be stable enough to use as a proper SDK, we will adjust
+this policy. In the meantime, skinning is done completely at your own risk.
+
+The approach you take is up to you - we suggest using a module replacement plugin, as found in
+[webpack](https://webpack.js.org/plugins/normal-module-replacement-plugin/), though you're free to use whichever build
+system works for you. The react-sdk does not have any particular functions to call to load skins, so simply replace or
+extend the components/stores/etc you're after and build. As a reminder though, this is done completely at your own risk
+as we cannot guarantee a stable interface at this time.
+
+Taking a look at [element-web](https://github.com/vector-im/element-web)'s approach to skinning may be worthwhile, as it
+overrides some relatively simple components.
diff --git a/docs/slate-formats.md b/docs/slate-formats.md
deleted file mode 100644
index 7bb2fc9c5ff..00000000000
--- a/docs/slate-formats.md
+++ /dev/null
@@ -1,88 +0,0 @@
-Guide to data types used by the Slate-based Rich Text Editor
-------------------------------------------------------------
-
-We always store the Slate editor state in its Value form.
-
-The schema for the Value is the same whether the editor is in MD or rich text mode, and is currently (rather arbitrarily)
-dictated by the schema expected by slate-md-serializer, simply because it was the only bit of the pipeline which
-has opinions on the schema. (slate-html-serializer lets you define how to serialize whatever schema you like).
-
-The BLOCK_TAGS and MARK_TAGS give the mapping from HTML tags to the schema's node types (for blocks, which describe
-block content like divs, and marks, which describe inline formatted sections like spans).
-
-We use <p/> as the parent tag for the message (XXX: although some tags are technically not allowed to be nested within p's)
-
-Various conversions are performed as content is moved between HTML, MD, and plaintext representations of HTML and MD.
-
-The primitives used are:
-
- * Markdown.js - models commonmark-formatted MD strings (as entered by the composer in MD mode)
-   * toHtml() - renders them to HTML suitable for sending on the wire
-   * isPlainText() - checks whether the parsed MD contains anything other than simple text.
-   * toPlainText() - renders MD to plain text in order to remove backslashes.  Only works if the MD is already plaintext (otherwise it just emits HTML)
-
- * slate-html-serializer
-   * converts Values to HTML (serialising) using our schema rules
-   * converts HTML to Values (deserialising) using our schema rules
-
- * slate-md-serializer
-   * converts rich Values to MD strings (serialising) but using a non-commonmark generic MD dialect.
-   * This should use commonmark, but we use the serializer here for expedience rather than writing a commonmark one.
-
- * slate-plain-serializer
-  * converts Values to plain text strings (serialising them) by concatenating the strings together
-  * converts Values from plain text strings (deserialiasing them).
-  * Used to initialise the editor by deserializing "" into a Value. Apparently this is the idiomatic way to initialise a blank editor.
-  * Used (as a bodge) to turn a rich text editor into a MD editor, when deserialising the converted MD string of the editor into a value
-
- * PlainWithPillsSerializer
-  * A fork of slate-plain-serializer which is aware of Pills (hence the name) and Emoji.
-  * It can be configured to output Pills as:
-    * "plain": Pills are rendered via their 'completion' text - e.g. 'Matthew'; used for sending messages)
-    * "md": Pills are rendered as MD, e.g. [Matthew](https://matrix.to/#/@matthew:matrix.org) )
-    * "id": Pills are rendered as IDs, e.g. '@matthew:matrix.org' (used for authoring / commands)
-  * Emoji nodes are converted to inline utf8 emoji.
-
-The actual conversion transitions are:
-
- * Quoting:
-   * The message being quoted is taken as HTML
-   * ...and deserialised into a Value
-   * ...and then serialised into MD via slate-md-serializer if the editor is in MD mode
-
- * Roundtripping between MD and rich text editor mode
-   * From MD to richtext (mdToRichEditorState):
-     * Serialise the MD-format Value to a MD string (converting pills to MD) with PlainWithPillsSerializer in 'md' mode
-     * Convert that MD string to HTML via Markdown.js
-     * Deserialise that Value to HTML via slate-html-serializer
-   * From richtext to MD (richToMdEditorState):
-     * Serialise the richtext-format Value to a MD string with slate-md-serializer (XXX: this should use commonmark)
-     * Deserialise that to a plain text value via slate-plain-serializer
-
- * Loading history in one format into an editor which is in the other format
-   * Uses the same functions as for roundtripping
-
- * Scanning the editor for a slash command
-   * If the editor is a single line node starting with /, then serialize it to a string with PlainWithPillsSerializer in 'id' mode
-     So that pills get converted to IDs suitable for commands being passed around
-
- * Sending messages
-   * In RT mode:
-     * If there is rich content, serialize the RT-format Value to HTML body via slate-html-serializer
-     * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
-   * In MD mode:
-     * Serialize the MD-format Value into an MD string with PlainWithPillsSerializer in 'md' mode
-     * Parse the string with Markdown.js
-     * If it contains no formatting:
-       * Send as plaintext (as taken from Markdown.toPlainText())
-     * Otherwise
-       * Send as HTML (as taken from Markdown.toHtml())
-       * Serialize the RT-format Value to the plain text fallback via PlainWithPillsSerializer in 'plain' mode
-
- * Pasting HTML
-   * Deserialize HTML to a RT Value via slate-html-serializer
-   * In RT mode, insert it straight into the editor as a fragment
-   * In MD mode, serialise it to an MD string via slate-md-serializer and then insert the string into the editor as a fragment.
-
-The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the above
-gives sufficient detail on how it's all meant to work.
\ No newline at end of file
diff --git a/package.json b/package.json
index 957982c474d..c62184810c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.41.1",
+  "version": "3.43.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -22,10 +22,7 @@
     "README.md",
     "package.json"
   ],
-  "bin": {
-    "reskindex": "scripts/reskindex.js"
-  },
-  "main": "./src/index.ts",
+  "main": "./lib/index.ts",
   "matrix_src_main": "./src/index.ts",
   "matrix_lib_main": "./lib/index.ts",
   "matrix_lib_typings": "./lib/index.d.ts",
@@ -37,23 +34,23 @@
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-    "reskindex": "node scripts/reskindex.js -h header",
     "make-component": "node scripts/make-react-component.js",
-    "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "rethemendex": "res/css/rethemendex.sh",
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
-    "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
+    "build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
     "build:types": "tsc --emitDeclarationOnly --jsx react",
     "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
-    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
+    "start:all": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:build",
     "start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint --max-warnings 0 src test",
-    "lint:js-fix": "eslint --fix src test",
-    "lint:types": "tsc --noEmit --jsx react",
-    "lint:style": "stylelint 'res/css/**/*.scss'",
+    "lint:js": "eslint --max-warnings 0 src test cypress",
+    "lint:js-fix": "eslint --fix src test cypress",
+    "lint:types": "tsc --noEmit --jsx react && tsc --noEmit -p cypress",
+    "lint:style": "stylelint \"res/css/**/*.scss\"",
     "test": "jest",
+    "test:cypress": "cypress run",
+    "test:cypress:open": "cypress open",
     "test:e2e": "./test/end-to-end-tests/run.sh --app-url http://localhost:8080",
     "coverage": "yarn test --coverage"
   },
@@ -64,7 +61,6 @@
     "@types/geojson": "^7946.0.8",
     "await-lock": "^2.1.0",
     "blurhash": "^1.1.3",
-    "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
     "cheerio": "^1.0.0-rc.9",
     "classnames": "^2.2.6",
@@ -72,8 +68,9 @@
     "counterpart": "^0.18.6",
     "diff-dom": "^4.2.2",
     "diff-match-patch": "^1.0.5",
-    "emojibase-data": "^6.2.0",
-    "emojibase-regex": "^5.1.3",
+    "emojibase": "6.0.2",
+    "emojibase-data": "7.0.0",
+    "emojibase-regex": "6.0.0",
     "escape-html": "^1.0.3",
     "file-saver": "^2.0.5",
     "filesize": "6.1.0",
@@ -91,7 +88,8 @@
     "linkifyjs": "^4.0.0-beta.4",
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
-    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90",
+    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e",
+    "matrix-encrypt-attachment": "^1.0.3",
     "matrix-events-sdk": "^0.0.1-beta.7",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.18",
@@ -124,7 +122,6 @@
     "@babel/eslint-plugin": "^7.12.10",
     "@babel/parser": "^7.12.11",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-decorators": "^7.12.12",
     "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-numeric-separator": "^7.12.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
@@ -137,15 +134,17 @@
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
     "@peculiar/webcrypto": "^1.1.4",
     "@sentry/types": "^6.10.0",
-    "@sinonjs/fake-timers": "^7.0.2",
+    "@sinonjs/fake-timers": "^9.1.2",
     "@types/classnames": "^2.2.11",
     "@types/commonmark": "^0.27.4",
     "@types/counterpart": "^0.18.1",
     "@types/css-font-loading-module": "^0.0.6",
     "@types/diff-match-patch": "^1.0.32",
     "@types/enzyme": "^3.10.9",
+    "@types/escape-html": "^1.0.1",
     "@types/file-saver": "^2.0.3",
     "@types/flux": "^3.1.9",
+    "@types/fs-extra": "^9.0.13",
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.168",
     "@types/modernizr": "^3.5.3",
@@ -156,6 +155,7 @@
     "@types/react": "17.0.14",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-dom": "17.0.9",
+    "@types/react-test-renderer": "^17.0.1",
     "@types/react-transition-group": "^4.4.0",
     "@types/sanitize-html": "^2.3.1",
     "@types/zxcvbn": "^4.4.0",
@@ -164,8 +164,9 @@
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
     "allchange": "^1.0.6",
     "babel-jest": "^26.6.3",
+    "blob-polyfill": "^6.0.20211015",
     "chokidar": "^3.5.1",
-    "concurrently": "^5.3.0",
+    "cypress": "^9.5.4",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
     "eslint": "8.9.0",
@@ -175,6 +176,7 @@
     "eslint-plugin-matrix-org": "^0.4.0",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
+    "fs-extra": "^10.0.1",
     "glob": "^7.1.6",
     "jest": "^27.4.0",
     "jest-canvas-mock": "^2.3.0",
@@ -231,7 +233,9 @@
       "<rootDir>/src/**/*.{js,ts,tsx}"
     ],
     "coverageReporters": [
-      "text"
+      "text",
+      "json"
     ]
-  }
+  },
+  "typings": "./lib/index.d.ts"
 }
diff --git a/res/css/_common.scss b/res/css/_common.scss
index a4b470d0527..94ec5ea0115 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -254,7 +254,7 @@ legend {
 }
 
 // These are magic constants which are excluded from tinting, to let themes
-// (which only have CSS, unlike skins) tell the app what their non-tinted
+// (which only have CSS) tell the app what their non-tinted
 // colourscheme is by inspecting the stylesheet DOM.
 //
 // They are not used for layout!!
@@ -294,7 +294,6 @@ legend {
     background-color: $background;
     color: $light-fg-color;
     z-index: 4012;
-    font-weight: 300;
     font-size: $font-15px;
     position: relative;
     padding: 24px;
@@ -670,3 +669,54 @@ legend {
     line-height: inherit;
     cursor: pointer;
 }
+
+@define-mixin CallButton {
+    box-sizing: border-box;
+    font-weight: 600;
+    height: $font-24px;
+    line-height: $font-24px;
+    margin-right: 0;
+
+    span {
+        display: flex;
+        align-items: center;
+
+        &::before {
+            content: '';
+            display: inline-block;
+            background-color: $button-fg-color;
+            mask-position: center;
+            mask-repeat: no-repeat;
+            margin-right: 8px;
+        }
+    }
+}
+
+@define-mixin ThreadsAmount {
+    $threadInfoLineHeight: calc(2 * $font-12px);
+
+    color: $secondary-content;
+    font-weight: $font-semi-bold;
+    line-height: $threadInfoLineHeight;
+    white-space: nowrap;
+    position: relative;
+    padding: 0 $spacing-12 0 $spacing-8;
+}
+
+@define-mixin ThreadInfoIcon {
+    content: "";
+    display: inline-block;
+    mask-image: url('$(res)/img/element-icons/thread-summary.svg');
+    mask-position: center;
+    height: 18px;
+    min-width: 18px;
+    background-color: $secondary-content !important;
+    mask-repeat: no-repeat;
+    mask-size: contain;
+}
+
+@define-mixin ListResetDefault {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 65ce8742b87..3f371478d12 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -4,28 +4,38 @@
 @import "./_font-sizes.scss";
 @import "./_font-weights.scss";
 @import "./_spacing.scss";
+@import "./components/views/beacon/_BeaconListItem.scss";
+@import "./components/views/beacon/_BeaconStatus.scss";
+@import "./components/views/beacon/_BeaconViewDialog.scss";
+@import "./components/views/beacon/_DialogOwnBeaconStatus.scss";
+@import "./components/views/beacon/_DialogSidebar.scss";
+@import "./components/views/beacon/_LeftPanelLiveShareWarning.scss";
+@import "./components/views/beacon/_LiveTimeRemaining.scss";
+@import "./components/views/beacon/_OwnBeaconStatus.scss";
+@import "./components/views/beacon/_RoomLiveShareWarning.scss";
+@import "./components/views/beacon/_StyledLiveBeaconIcon.scss";
+@import "./components/views/location/_EnableLiveShare.scss";
+@import "./components/views/location/_LiveDurationDropdown.scss";
 @import "./components/views/location/_LocationShareMenu.scss";
+@import "./components/views/location/_MapError.scss";
+@import "./components/views/location/_Marker.scss";
 @import "./components/views/location/_ShareDialogButtons.scss";
 @import "./components/views/location/_ShareType.scss";
+@import "./components/views/location/_ZoomButtons.scss";
+@import "./components/views/messages/_MBeaconBody.scss";
 @import "./components/views/spaces/_QuickThemeSwitcher.scss";
 @import "./structures/_AutoHideScrollbar.scss";
 @import "./structures/_BackdropPanel.scss";
 @import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
-@import "./structures/_CreateRoom.scss";
-@import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FileDropTarget.scss";
 @import "./structures/_FilePanel.scss";
 @import "./structures/_GenericErrorPage.scss";
-@import "./structures/_GroupFilterPanel.scss";
-@import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";
 @import "./structures/_LeftPanel.scss";
-@import "./structures/_LeftPanelWidget.scss";
 @import "./structures/_MainSplit.scss";
 @import "./structures/_MatrixChat.scss";
-@import "./structures/_MyGroups.scss";
 @import "./structures/_NonUrgentToastContainer.scss";
 @import "./structures/_NotificationPanel.scss";
 @import "./structures/_QuickSettingsButton.scss";
@@ -43,6 +53,7 @@
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserMenu.scss";
+@import "./structures/_VideoRoomView.scss";
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
@@ -71,31 +82,24 @@
 @import "./views/context_menus/_CallContextMenu.scss";
 @import "./views/context_menus/_IconizedContextMenu.scss";
 @import "./views/context_menus/_MessageContextMenu.scss";
-@import "./views/context_menus/_TagTileContextMenu.scss";
 @import "./views/dialogs/_AddExistingToSpaceDialog.scss";
-@import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
 @import "./views/dialogs/_AnalyticsLearnMoreDialog.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
+@import "./views/dialogs/_BulkRedactDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
-@import "./views/dialogs/_CommunityPrototypeInviteDialog.scss";
 @import "./views/dialogs/_CompoundDialog.scss";
 @import "./views/dialogs/_ConfirmSpaceUserActionDialog.scss";
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
-@import "./views/dialogs/_CreateCommunityPrototypeDialog.scss";
-@import "./views/dialogs/_CreateGroupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
-@import "./views/dialogs/_CreateSpaceFromCommunityDialog.scss";
 @import "./views/dialogs/_CreateSubspaceDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
-@import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
 @import "./views/dialogs/_ExportDialog.scss";
 @import "./views/dialogs/_FeedbackDialog.scss";
 @import "./views/dialogs/_ForwardDialog.scss";
 @import "./views/dialogs/_GenericFeatureFeedbackDialog.scss";
-@import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_HostSignupDialog.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
@@ -181,13 +185,11 @@
 @import "./views/elements/_TooltipButton.scss";
 @import "./views/elements/_Validation.scss";
 @import "./views/emojipicker/_EmojiPicker.scss";
-@import "./views/groups/_GroupPublicityToggle.scss";
-@import "./views/groups/_GroupRoomList.scss";
-@import "./views/groups/_GroupUserSettings.scss";
 @import "./views/location/_LocationPicker.scss";
 @import "./views/messages/_CallEvent.scss";
 @import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
+@import "./views/messages/_DisambiguatedProfile.scss";
 @import "./views/messages/_EventTileBubble.scss";
 @import "./views/messages/_HiddenBody.scss";
 @import "./views/messages/_JumpToDatePicker.scss";
@@ -210,7 +212,6 @@
 @import "./views/messages/_ReactionsRowButton.scss";
 @import "./views/messages/_RedactedBody.scss";
 @import "./views/messages/_RoomAvatarEvent.scss";
-@import "./views/messages/_SenderProfile.scss";
 @import "./views/messages/_TextualEvent.scss";
 @import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";
@@ -248,6 +249,7 @@
 @import "./views/rooms/_NotificationBadge.scss";
 @import "./views/rooms/_PinnedEventTile.scss";
 @import "./views/rooms/_PresenceLabel.scss";
+@import "./views/rooms/_ReadReceiptGroup.scss";
 @import "./views/rooms/_RecentlyViewedButton.scss";
 @import "./views/rooms/_ReplyPreview.scss";
 @import "./views/rooms/_ReplyTile.scss";
@@ -262,6 +264,7 @@
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SendMessageComposer.scss";
 @import "./views/rooms/_Stickers.scss";
+@import "./views/rooms/_ThreadSummary.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
 @import "./views/rooms/_VoiceRecordComposerTile.scss";
 @import "./views/rooms/_WhoIsTypingTile.scss";
@@ -275,6 +278,7 @@
 @import "./views/settings/_ImageSizePanel.scss";
 @import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_JoinRuleSettings.scss";
+@import "./views/settings/_KeyboardShortcut.scss";
 @import "./views/settings/_LayoutSwitcher.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
@@ -323,3 +327,4 @@
 @import "./views/voip/_DialPadModal.scss";
 @import "./views/voip/_PiPContainer.scss";
 @import "./views/voip/_VideoFeed.scss";
+@import "./views/voip/_VideoLobby.scss";
diff --git a/res/css/components/views/beacon/_BeaconListItem.scss b/res/css/components/views/beacon/_BeaconListItem.scss
new file mode 100644
index 00000000000..60311a4466f
--- /dev/null
+++ b/res/css/components/views/beacon/_BeaconListItem.scss
@@ -0,0 +1,61 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_BeaconListItem {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    padding: $spacing-12 0;
+
+    border-bottom: 1px solid $system;
+}
+
+.mx_BeaconListItem_avatarIcon {
+    flex: 0 0;
+    height: 32px;
+    width: 32px;
+}
+
+.mx_BeaconListItem_avatar {
+    flex: 0 0;
+    box-sizing: border-box;
+
+    margin-right: $spacing-8;
+    border: 2px solid $location-live-color;
+}
+
+.mx_BeaconListItem_info {
+    flex: 1 1 0;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.mx_BeaconListItem_status {
+    // override beacon status padding
+    padding: 0 !important;
+    margin-bottom: $spacing-8;
+
+    .mx_BeaconStatus_label {
+        font-weight: $font-semi-bold;
+    }
+}
+
+.mx_BeaconListItem_lastUpdated {
+    color: $tertiary-content;
+    font-size: $font-10px;
+}
diff --git a/res/css/components/views/beacon/_BeaconStatus.scss b/res/css/components/views/beacon/_BeaconStatus.scss
new file mode 100644
index 00000000000..4dd3d325475
--- /dev/null
+++ b/res/css/components/views/beacon/_BeaconStatus.scss
@@ -0,0 +1,65 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_BeaconStatus {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+
+    box-sizing: border-box;
+    padding: $spacing-8;
+
+    color: var(--color);
+    font-size: $font-12px;
+}
+
+.mx_BeaconStatus_Loading,
+.mx_BeaconStatus_Stopped {
+    --color: $tertiary-content;
+}
+
+.mx_BeaconStatus_Active,
+.mx_BeaconStatus_Error {
+    --color: $primary-content;
+}
+
+.mx_BeaconStatus_icon {
+    height: 32px;
+    width: 32px;
+
+    flex: 0 0 32px;
+    margin-right: $spacing-8;
+}
+
+.mx_BeaconStatus_description {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    line-height: $font-14px;
+
+    padding-right: $spacing-8;
+
+    // TODO handle text-overflow
+}
+
+.mx_BeaconStatus_expiryTime {
+    color: $secondary-content;
+}
+
+.mx_BeaconStatus_label {
+    margin-bottom: 2px;
+}
diff --git a/res/css/components/views/beacon/_BeaconViewDialog.scss b/res/css/components/views/beacon/_BeaconViewDialog.scss
new file mode 100644
index 00000000000..6ad1a2a6139
--- /dev/null
+++ b/res/css/components/views/beacon/_BeaconViewDialog.scss
@@ -0,0 +1,88 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_BeaconViewDialog_wrapper .mx_Dialog {
+    padding: 0px;
+
+    /* Unset contain and position to allow the close button
+    to appear outside the dialog */
+    contain: unset;
+    position: unset;
+}
+
+.mx_BeaconViewDialog {
+    /* subtract 0.5px to prevent single-pixel margin due to rounding */
+    width: calc(80vw - 0.5px);
+    height: calc(80vh - 0.5px);
+    overflow: hidden;
+
+    // sidebar is absolutely positioned inside
+    position: relative;
+
+    .mx_Dialog_header {
+        margin: 0px;
+        padding: 0px;
+        position: unset;
+
+        .mx_Dialog_title {
+            display: none;
+        }
+
+        .mx_Dialog_cancelButton {
+            z-index: 4010;
+            position: fixed;
+            right: 5vw;
+            top: 5vh;
+            width: 20px;
+            height: 20px;
+            background-color: $dialog-close-external-color;
+        }
+    }
+}
+
+.mx_BeaconViewDialog_map {
+    width: 80vw;
+    height: 80vh;
+    border-radius: 8px;
+}
+
+.mx_BeaconViewDialog_mapFallback {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    background: url('$(res)/img/location/map.svg');
+    background-size: cover;
+}
+
+.mx_BeaconViewDialog_mapFallbackIcon {
+    width: 65px;
+    margin-bottom: $spacing-16;
+    color: $quaternary-content;
+}
+
+.mx_BeaconViewDialog_mapFallbackMessage {
+    color: $secondary-content;
+    margin-bottom: $spacing-16;
+}
+
+.mx_BeaconViewDialog_viewListButton {
+    position: absolute;
+    top: $spacing-24;
+    left: $spacing-24;
+}
diff --git a/res/css/components/views/beacon/_DialogOwnBeaconStatus.scss b/res/css/components/views/beacon/_DialogOwnBeaconStatus.scss
new file mode 100644
index 00000000000..791e276f050
--- /dev/null
+++ b/res/css/components/views/beacon/_DialogOwnBeaconStatus.scss
@@ -0,0 +1,55 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_DialogOwnBeaconStatus {
+    position: absolute;
+    bottom: $spacing-32;
+    width: 300px;
+    margin-left: -150px;
+    left: 50%;
+
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: stretch;
+
+    background: $background;
+    border-radius: 8px;
+    box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
+
+    padding: 0 $spacing-12;
+}
+
+.mx_DialogOwnBeaconStatus_avatarIcon {
+    flex: 0 0;
+    height: 32px;
+    width: 32px;
+    margin: $spacing-8 0 $spacing-8 0;
+}
+
+.mx_DialogOwnBeaconStatus_avatar {
+    flex: 0 0;
+    box-sizing: border-box;
+
+    border: 2px solid $location-live-color;
+    margin: $spacing-8 0 $spacing-8 0;
+}
+
+.mx_DialogOwnBeaconStatus_status {
+    flex: 1 1;
+    padding-right: 0;
+}
diff --git a/res/css/components/views/beacon/_DialogSidebar.scss b/res/css/components/views/beacon/_DialogSidebar.scss
new file mode 100644
index 00000000000..1989b57c301
--- /dev/null
+++ b/res/css/components/views/beacon/_DialogSidebar.scss
@@ -0,0 +1,60 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_DialogSidebar {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 265px;
+
+    display: flex;
+    flex-direction: column;
+
+    box-sizing: border-box;
+    padding: $spacing-16;
+
+    background-color: $background;
+    box-shadow: 0px 4px 4px $menu-box-shadow-color;
+}
+
+.mx_DialogSidebar_header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+
+    flex: 0 0;
+    margin-bottom: $spacing-16;
+
+    color: $primary-content;
+}
+
+.mx_DialogSidebar_closeButton {
+    @mixin ButtonResetDefault;
+}
+
+.mx_DialogSidebar_closeButtonIcon {
+    color: $tertiary-content;
+    height: 12px;
+}
+
+.mx_DialogSidebar_list {
+    @mixin ListResetDefault;
+    flex: 1 1 0;
+    width: 100%;
+    overflow: auto;
+}
diff --git a/res/css/components/views/beacon/_LeftPanelLiveShareWarning.scss b/res/css/components/views/beacon/_LeftPanelLiveShareWarning.scss
new file mode 100644
index 00000000000..04645c965ed
--- /dev/null
+++ b/res/css/components/views/beacon/_LeftPanelLiveShareWarning.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_LeftPanelLiveShareWarning {
+    @mixin ButtonResetDefault;
+    width: 100%;
+    box-sizing: border-box;
+
+    padding: $spacing-4;
+    text-align: center;
+
+    background-color: $accent;
+    color: #fff;
+    font-size: $font-10px;
+
+    // panel backdrops overlay the whole sidepanel
+    // go above to get hover for title
+    z-index: 1;
+}
+
+.mx_LeftPanelLiveShareWarning__error {
+    background-color: $alert;
+}
diff --git a/res/css/views/groups/_GroupUserSettings.scss b/res/css/components/views/beacon/_LiveTimeRemaining.scss
similarity index 73%
rename from res/css/views/groups/_GroupUserSettings.scss
rename to res/css/components/views/beacon/_LiveTimeRemaining.scss
index b207aa29585..de13f7aab2e 100644
--- a/res/css/views/groups/_GroupUserSettings.scss
+++ b/res/css/components/views/beacon/_LiveTimeRemaining.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GroupUserSettings_groupPublicity_scrollbox {
-    height: 200px;
-    border: 1px solid $primary-hairline-color;
-    border-radius: 3px;
-    overflow: hidden;
+.mx_LiveTimeRemaining {
+    color: $secondary-content;
+    font-size: $font-12px;
 }
diff --git a/res/css/components/views/beacon/_OwnBeaconStatus.scss b/res/css/components/views/beacon/_OwnBeaconStatus.scss
new file mode 100644
index 00000000000..aa01b6269a4
--- /dev/null
+++ b/res/css/components/views/beacon/_OwnBeaconStatus.scss
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_EventTile[data-layout="bubble"] .mx_OwnBeaconStatus_button {
+    // align to top to make room for timestamp
+    // in bubble view
+    align-self: start;
+}
+
+.mx_OwnBeaconStatus_destructiveButton {
+    // override button link_inline styles
+    color: $alert !important;
+    font-weight: $font-semi-bold !important;
+}
diff --git a/res/css/components/views/beacon/_RoomLiveShareWarning.scss b/res/css/components/views/beacon/_RoomLiveShareWarning.scss
new file mode 100644
index 00000000000..f82c7f4de40
--- /dev/null
+++ b/res/css/components/views/beacon/_RoomLiveShareWarning.scss
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomLiveShareWarning {
+    width: 100%;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    box-sizing: border-box;
+    padding: $spacing-12 $spacing-16;
+
+    color: $primary-content;
+    background-color: $system;
+}
+
+.mx_RoomLiveShareWarning_icon {
+    height: 32px;
+    width: 32px;
+    margin-right: $spacing-8;
+}
+
+.mx_RoomLiveShareWarning_label {
+    flex: 1;
+    font-size: $font-15px;
+}
+
+.mx_RoomLiveShareWarning_spinner {
+    margin-right: $spacing-16;
+}
+
+.mx_RoomLiveShareWarning_closeButton {
+    @mixin ButtonResetDefault;
+    margin-left: $spacing-16;
+}
+
+.mx_RoomLiveShareWarning_stopButton {
+    margin-left: $spacing-16;
+}
+
+.mx_RoomLiveShareWarning_closeButtonIcon {
+    height: $font-18px;
+    padding: $spacing-4;
+}
diff --git a/res/css/components/views/beacon/_StyledLiveBeaconIcon.scss b/res/css/components/views/beacon/_StyledLiveBeaconIcon.scss
new file mode 100644
index 00000000000..9096c3c71f4
--- /dev/null
+++ b/res/css/components/views/beacon/_StyledLiveBeaconIcon.scss
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_StyledLiveBeaconIcon {
+    flex-grow: 0;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    border-width: 2px;
+    border-style: solid;
+    border-radius: 50%;
+
+    background-color: $location-live-color;
+    border-color: $location-live-secondary-color;
+    padding: 2px;
+    // colors icon
+    color: white;
+}
+
+.mx_StyledLiveBeaconIcon.mx_StyledLiveBeaconIcon_error {
+    background-color: $alert;
+    border-color: $alert;
+}
+
+.mx_StyledLiveBeaconIcon.mx_StyledLiveBeaconIcon_idle {
+    background-color: $quaternary-content;
+    border-color: $quaternary-content;
+}
diff --git a/res/css/components/views/location/_EnableLiveShare.scss b/res/css/components/views/location/_EnableLiveShare.scss
new file mode 100644
index 00000000000..7c10cc1923f
--- /dev/null
+++ b/res/css/components/views/location/_EnableLiveShare.scss
@@ -0,0 +1,48 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_EnableLiveShare {
+    flex: 1 1 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: center;
+
+    padding: $spacing-32 $spacing-16;
+    text-align: center;
+    box-sizing: border-box;
+}
+
+.mx_EnableLiveShare_heading {
+    padding-top: $spacing-24;
+}
+
+.mx_EnableLiveShare_icon {
+    height: 58px;
+    width: 58px;
+}
+
+.mx_EnableLiveShare_description {
+    padding: 0 $spacing-24;
+    margin-bottom: $spacing-32;
+    line-height: $font-20px;
+}
+
+.mx_EnableLiveShare_button {
+    margin-top: $spacing-32;
+    height: 48px;
+    width: 100%;
+}
diff --git a/res/css/views/dialogs/_GroupAddressPicker.scss b/res/css/components/views/location/_LiveDurationDropdown.scss
similarity index 82%
rename from res/css/views/dialogs/_GroupAddressPicker.scss
rename to res/css/components/views/location/_LiveDurationDropdown.scss
index 5fa18931f0a..9b0e39a07c6 100644
--- a/res/css/views/dialogs/_GroupAddressPicker.scss
+++ b/res/css/components/views/location/_LiveDurationDropdown.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GroupAddressPicker_checkboxContainer {
-    margin-top: 10px;
-    display: flex;
+.mx_LiveDurationDropdown {
+    margin-bottom: $spacing-16;
 }
diff --git a/res/css/components/views/location/_MapError.scss b/res/css/components/views/location/_MapError.scss
new file mode 100644
index 00000000000..83d6316ec44
--- /dev/null
+++ b/res/css/components/views/location/_MapError.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_MapError {
+    padding: 100px $spacing-32 0;
+    text-align: center;
+
+    p {
+        margin: $spacing-16 0 $spacing-32;
+    }
+}
+
+.mx_MapError_heading {
+    padding-top: $spacing-24;
+}
+
+.mx_MapError_icon {
+    height: 58px;
+
+    path {
+        fill: $secondary-content;
+    }
+}
diff --git a/res/css/components/views/location/_Marker.scss b/res/css/components/views/location/_Marker.scss
new file mode 100644
index 00000000000..7a1baccf9f1
--- /dev/null
+++ b/res/css/components/views/location/_Marker.scss
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_Marker_defaultColor {
+    color: $accent;
+}
+
+.mx_Marker_border {
+    width: 42px;
+    height: 42px;
+    border-radius: 50%;
+    filter: drop-shadow(0px 3px 5px rgba(0, 0, 0, 0.2));
+    background-color: currentColor;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    // caret down
+    &::before {
+        content: '';
+        border-left: 5px solid transparent;
+        border-right: 5px solid transparent;
+        border-top: 5px solid currentColor;
+        position: absolute;
+        bottom: -4px;
+    }
+}
+
+.mx_Marker_icon {
+    color: white;
+    height: 20px;
+}
diff --git a/res/css/components/views/location/_ShareType.scss b/res/css/components/views/location/_ShareType.scss
index ba21a7caa0d..458be106eb0 100644
--- a/res/css/components/views/location/_ShareType.scss
+++ b/res/css/components/views/location/_ShareType.scss
@@ -83,19 +83,10 @@ limitations under the License.
     border-style: solid;
     border-radius: 50%;
 
-    &.Own {
-        // color is set by user color class
-        // generated from id
-        border-color: currentColor;
-    }
+    // Live is styled by StyledLiveBeaconIcon
 
-    &.Live {
-        background-color: $location-live-color;
-        // 20% brightness $location-live-color
-        border-color: #deddfd;
-        padding: 2px;
-        // colors icon
-        color: white;
+    &.Own {
+        border-color: $accent;
     }
 
     &.Pin {
diff --git a/res/css/components/views/location/_ZoomButtons.scss b/res/css/components/views/location/_ZoomButtons.scss
new file mode 100644
index 00000000000..59d52477f97
--- /dev/null
+++ b/res/css/components/views/location/_ZoomButtons.scss
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ZoomButtons {
+    position: absolute;
+    bottom: $spacing-32;
+    right: $spacing-24;
+}
+
+.mx_ZoomButtons_button {
+    @mixin ButtonResetDefault;
+
+    margin-top: $spacing-8;
+    border-radius: 4px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+
+    height: 24px;
+    width: 24px;
+
+    background: $background;
+    box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.25);
+}
+
+.mx_ZoomButtons_icon {
+    height: 10px;
+    width: 10px;
+
+    color: $primary-content;
+}
diff --git a/res/css/components/views/messages/_MBeaconBody.scss b/res/css/components/views/messages/_MBeaconBody.scss
new file mode 100644
index 00000000000..dc63d6676db
--- /dev/null
+++ b/res/css/components/views/messages/_MBeaconBody.scss
@@ -0,0 +1,65 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_MBeaconBody {
+    position: relative;
+    height: 220px;
+    width: 325px;
+
+    border-radius: $timeline-image-border-radius;
+    overflow: hidden;
+}
+
+.mx_MBeaconBody_map {
+    height: 100%;
+    width: 100%;
+    z-index: 0; // keeps the entire map under the message action bar
+
+    &:not(.mx_MBeaconBody_mapFallback) {
+        cursor: pointer;
+    }
+}
+
+.mx_MBeaconBody_mapFallback {
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    // pushes spinner/icon up
+    // to appear more centered with the footer
+    padding-bottom: 50px;
+
+    background: url('$(res)/img/location/map.svg');
+    background-size: cover;
+}
+
+.mx_MBeaconBody_mapFallbackIcon {
+    width: 65px;
+    color: $quaternary-content;
+}
+
+.mx_MBeaconBody_chin {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    background-color: $overlay-background;
+}
+
+.mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MBeaconBody {
+    max-width: 100%;
+    width: 450px;
+}
diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
deleted file mode 100644
index 627644f1020..00000000000
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// TODO: Update design for custom tags to match new designs
-
-.mx_CustomRoomTagPanel {
-    background-color: $groupFilterPanel-bg-color;
-    max-height: 40vh;
-}
-
-.mx_CustomRoomTagPanel_scroller {
-    max-height: inherit;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.mx_CustomRoomTagPanel .mx_AccessibleButton {
-    margin: 0 auto;
-    width: 40px;
-    padding: 10px 0 9px 0;
-    position: relative;
-}
-
-.mx_CustomRoomTagPanel .mx_BaseAvatar_image {
-    box-sizing: border-box;
-    width: 40px;
-    height: 40px;
-}
-
-.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected::before {
-    content: '';
-    height: 56px;
-    background-color: $accent-alt;
-    width: 5px;
-    position: absolute;
-    left: -9px;
-    border-radius: 0 3px 3px 0;
-    top: 5px; // just feels right (see comment above about designs needing to be updated)
-}
diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index c180a8a02dd..634ce9604cc 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -93,7 +93,7 @@ limitations under the License.
     text-decoration: none;
 }
 
-.mx_FilePanel .mx_EventTile .mx_SenderProfile {
+.mx_FilePanel .mx_EventTile .mx_DisambiguatedProfile {
     flex: 1 1 auto;
     line-height: initial;
     padding: 0px;
diff --git a/res/css/structures/_GroupFilterPanel.scss b/res/css/structures/_GroupFilterPanel.scss
deleted file mode 100644
index bdbd9f76435..00000000000
--- a/res/css/structures/_GroupFilterPanel.scss
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
-
-.mx_GroupFilterPanelContainer {
-    flex-grow: 0;
-    flex-shrink: 0;
-    width: $groupFilterPanelWidth;
-    height: 100%;
-
-    // Create another flexbox so the GroupFilterPanel fills the container
-    display: flex;
-    flex-direction: column;
-
-    // GroupFilterPanel handles its own CSS
-}
-
-.mx_GroupFilterPanel {
-    z-index: 1;
-    background-color: $groupFilterPanel-bg-color;
-    flex: 1;
-    cursor: pointer;
-    position: relative;
-
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: space-between;
-    min-height: 0;
-}
-
-.mx_GroupFilterPanel_items_selected {
-    cursor: pointer;
-}
-
-.mx_GroupFilterPanel .mx_GroupFilterPanel_divider {
-    height: 0px;
-    width: 90%;
-    border: none;
-    border-bottom: 1px solid $tertiary-content;
-}
-
-.mx_GroupFilterPanel .mx_GroupFilterPanel_scroller {
-    flex-grow: 1;
-    width: 100%;
-}
-
-.mx_GroupFilterPanel .mx_GroupFilterPanel_tagTileContainer {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    padding-top: 6px;
-}
-.mx_GroupFilterPanel .mx_GroupFilterPanel_tagTileContainer > div {
-    margin: 6px 0;
-}
-
-.mx_GroupFilterPanel .mx_TagTile {
-    // opacity: 0.5;
-    position: relative;
-}
-
-.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_prototype {
-    padding: 3px;
-}
-
-.mx_GroupFilterPanel .mx_TagTile:focus,
-.mx_GroupFilterPanel .mx_TagTile:hover,
-.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected {
-    // opacity: 1;
-}
-
-.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
-    background-color: $background;
-    border-radius: 6px;
-}
-
-.mx_TagTile_selected_prototype {
-    .mx_TagTile_homeIcon::before {
-        background-color: $primary-content; // dark-on-light
-    }
-}
-
-.mx_TagTile:not(.mx_TagTile_selected_prototype) .mx_TagTile_homeIcon {
-    background-color: $roomheader-addroom-bg-color;
-    border-radius: 48px;
-
-    &::before {
-        background-color: $roomheader-addroom-fg-color;
-    }
-}
-
-.mx_TagTile_homeIcon {
-    width: 32px;
-    height: 32px;
-    position: relative;
-
-    &::before {
-        mask-image: url('$(res)/img/element-icons/home.svg');
-        mask-position: center;
-        mask-repeat: no-repeat;
-        mask-size: 21px;
-        content: '';
-        display: inline-block;
-        width: 32px;
-        height: 32px;
-        position: absolute;
-        top: calc(50% - 16px);
-        left: calc(50% - 16px);
-    }
-}
-
-.mx_GroupFilterPanel .mx_TagTile_plus {
-    margin-bottom: 12px;
-    height: 32px;
-    width: 32px;
-    border-radius: 20px;
-    background-color: $roomheader-addroom-bg-color;
-    position: relative;
-    /* overwrite mx_RoleButton inline-block */
-    display: block !important;
-
-    &::before {
-        background-color: $roomheader-addroom-fg-color;
-        mask-image: url('$(res)/img/feather-customised/plus.svg');
-        mask-position: center;
-        mask-repeat: no-repeat;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
-
-.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected::before {
-    content: '';
-    height: 100%;
-    background-color: $accent;
-    width: 4px;
-    position: absolute;
-    left: -12px;
-    border-radius: 0 3px 3px 0;
-}
-
-.mx_GroupFilterPanel .mx_TagTile.mx_AccessibleButton:focus {
-    filter: none;
-}
-
-.mx_TagTile_tooltip {
-    position: relative;
-    top: -30px;
-    left: 5px;
-}
-
-.mx_TagTile_context_button {
-    min-width: 15px;
-    height: 15px;
-    position: absolute;
-    right: -5px;
-    top: -8px;
-    border-radius: 8px;
-    background-color: $neutral-badge-color;
-    color: #000;
-    font-weight: 600;
-    font-size: $font-10px;
-    text-align: center;
-    padding-top: 1px;
-    padding-left: 4px;
-    padding-right: 4px;
-}
-
-.mx_TagTile_avatar {
-    position: relative;
-}
-
-.mx_TagTile_badge {
-    position: absolute;
-    right: -4px;
-    top: -2px;
-    border-radius: 8px;
-    color: $accent-fg-color;
-    font-weight: 600;
-    font-size: $font-14px;
-    padding: 0 5px;
-    background-color: $muted-fg-color;
-}
-
-.mx_TagTile_badgeHighlight {
-    background-color: $alert;
-}
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
deleted file mode 100644
index 9cbf632cdd0..00000000000
--- a/res/css/structures/_GroupView.scss
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_GroupView {
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    flex-grow: 1;
-}
-
-.mx_GroupView_error {
-    margin: auto;
-}
-
-.mx_GroupView_header {
-    min-height: 52px;
-    align-items: center;
-    display: flex;
-    padding-bottom: 10px;
-    padding-left: 19px;
-}
-
-.mx_GroupView_header_view {
-    border-bottom: 1px solid $primary-hairline-color;
-    padding-bottom: 0px;
-    padding-right: 8px;
-}
-
-.mx_GroupView_header_avatar, .mx_GroupView_header_info {
-    display: table-cell;
-    vertical-align: middle;
-}
-
-.mx_GroupHeader_button {
-    position: relative;
-    margin-left: 5px;
-    margin-right: 5px;
-    cursor: pointer;
-    height: 20px;
-    width: 20px;
-
-    &::before {
-        content: '';
-        position: absolute;
-        height: 20px;
-        width: 20px;
-        background-color: $header-panel-text-primary-color;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-    }
-}
-
-.mx_GroupHeader_editButton::before {
-    mask-image: url('$(res)/img/element-icons/settings.svg');
-}
-
-.mx_GroupHeader_shareButton::before {
-    mask-image: url('$(res)/img/element-icons/room/share.svg');
-}
-
-.mx_GroupView_hostingSignup img {
-    margin-left: 5px;
-}
-
-.mx_GroupView_editable {
-    border-bottom: 1px solid $strong-input-border-color !important;
-    min-width: 150px;
-    cursor: text;
-}
-
-.mx_GroupView_editable:focus {
-    border-bottom: 1px solid $accent !important;
-    outline: none;
-    box-shadow: none;
-}
-
-.mx_GroupView_header_isUserMember .mx_GroupView_header_name:hover div:not(.mx_GroupView_editable) {
-    color: $accent;
-    cursor: pointer;
-}
-
-.mx_GroupView_avatarPicker {
-    position: relative;
-}
-
-.mx_GroupView_avatarPicker_edit {
-    position: absolute;
-    top: 50px;
-    left: 15px;
-}
-
-.mx_GroupView_avatarPicker .mx_Spinner {
-    width: 48px;
-    height: 48px !important;
-}
-
-.mx_GroupView_header_leftCol {
-    flex: 1;
-
-    overflow: hidden;
-}
-
-.mx_GroupView_header_rightCol {
-    display: flex;
-    align-items: center;
-}
-
-.mx_GroupView_textButton {
-    display: inline-block;
-}
-
-.mx_GroupView_header_groupid {
-    font-weight: normal;
-    font-size: initial;
-    padding-left: 10px;
-}
-
-.mx_GroupView_header_name {
-    vertical-align: middle;
-    width: 100%;
-    height: 31px;
-    overflow: hidden;
-    color: $primary-content;
-    font-weight: bold;
-    font-size: $font-22px;
-    padding-left: 19px;
-    padding-right: 16px;
-    /* why isn't text-overflow working? */
-    text-overflow: ellipsis;
-    border-bottom: 1px solid transparent;
-}
-
-.mx_GroupView_header_shortDesc {
-    vertical-align: bottom;
-    float: left;
-    max-height: 42px;
-    color: $settings-grey-fg-color;
-    font-weight: 300;
-    font-size: $font-13px;
-    padding-left: 19px;
-    margin-right: 16px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    border-bottom: 1px solid transparent;
-}
-
-.mx_GroupView_avatarPicker_label {
-    cursor: pointer;
-}
-
-.mx_GroupView_cancelButton {
-    padding-left: 8px;
-}
-
-.mx_GroupView_cancelButton img {
-    position: relative;
-    top: 5px;
-}
-
-.mx_GroupView input[type='radio'] {
-    margin: 10px 10px 0px 10px;
-}
-
-.mx_GroupView_label_text {
-    display: inline-block;
-    max-width: 80%;
-    vertical-align: 0.1em;
-    line-height: 2em;
-}
-
-.mx_GroupView_body {
-    flex-grow: 1;
-    margin: 0 24px;
-}
-
-.mx_GroupView_rooms {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 200px;
-    user-select: none;
-}
-
-.mx_GroupView h3 {
-    text-transform: uppercase;
-    color: $h3-color;
-    font-weight: 600;
-    font-size: $font-13px;
-    margin-bottom: 10px;
-}
-
-.mx_GroupView_rooms_header .mx_AccessibleButton {
-    padding-left: 14px;
-    margin-bottom: 14px;
-    height: 24px;
-}
-
-.mx_GroupView_group {
-    border-top: 1px solid $primary-hairline-color;
-}
-
-.mx_GroupView_group_disabled {
-    opacity: 0.3;
-    pointer-events: none;
-}
-
-.mx_GroupView_rooms_header_addRow_button {
-    display: inline-block;
-}
-
-.mx_GroupView_rooms_header_addRow_button object {
-    pointer-events: none;
-}
-
-.mx_GroupView_rooms_header_addRow_label {
-    display: inline-block;
-    vertical-align: top;
-    line-height: $font-24px;
-    padding-left: 28px;
-    color: $accent;
-}
-
-.mx_GroupView_rooms .mx_RoomDetailList {
-    flex-grow: 1;
-    border-top: 1px solid $primary-hairline-color;
-    padding-top: 10px;
-    word-break: break-word;
-}
-
-.mx_GroupView .mx_RoomView_messageListWrapper {
-    justify-content: flex-start;
-}
-
-.mx_GroupView_membershipSection {
-    color: $info-plinth-fg-color;
-    margin-top: 10px;
-}
-
-.mx_GroupView_membershipSubSection {
-    justify-content: space-between;
-    display: flex;
-    padding-bottom: 8px;
-}
-
-.mx_GroupView_membershipSubSection .mx_Spinner {
-    justify-content: flex-end;
-}
-
-.mx_GroupView_membershipSection_description {
-    /* To match textButton */
-    line-height: $font-34px;
-}
-
-.mx_GroupView_membershipSection_description .mx_BaseAvatar {
-    margin-right: 10px;
-}
-
-.mx_GroupView_membershipSection .mx_GroupView_textButton {
-    margin-right: 0px;
-    margin-top: 0px;
-    margin-left: 8px;
-}
-
-.mx_GroupView_memberSettings_toggle label {
-    cursor: pointer;
-    user-select: none;
-}
-
-.mx_GroupView_memberSettings input {
-    margin-right: 6px;
-}
-
-.mx_GroupView_featuredThings {
-    margin-top: 20px;
-}
-
-.mx_GroupView_featuredThings_header {
-    font-weight: bold;
-    font-size: 120%;
-    margin-bottom: 20px;
-}
-
-.mx_GroupView_featuredThings_category {
-    font-weight: bold;
-    font-size: 110%;
-    margin-top: 10px;
-}
-
-.mx_GroupView_featuredThings_container {
-    display: flex;
-}
-
-.mx_GroupView_featuredThings_addButton,
-.mx_GroupView_featuredThing {
-    display: table-cell;
-    text-align: center;
-
-    width: 100px;
-    margin: 0px 20px;
-}
-
-.mx_GroupView_featuredThing {
-    position: relative;
-}
-
-.mx_GroupView_featuredThing .mx_GroupView_featuredThing_deleteButton {
-    position: absolute;
-    top: -7px;
-    right: 11px;
-    opacity: 0.4;
-}
-
-.mx_GroupView_featuredThing .mx_BaseAvatar {
-    /* To prevent misalignment with img (in addButton) */
-    vertical-align: initial;
-}
-
-.mx_GroupView_featuredThings_addButton object {
-    pointer-events: none;
-}
-
-.mx_GroupView_featuredThing_name {
-    word-wrap: break-word;
-}
-
-.mx_GroupView_uploadInput {
-    display: none;
-}
-
-.mx_GroupView_body .mx_AutoHideScrollbar > * {
-    margin: 11px 50px 50px 68px;
-}
-
-.mx_GroupView_groupDesc textarea {
-    width: 100%;
-    max-width: 100%;
-    height: 150px;
-}
-
-.mx_GroupView_groupDesc_placeholder,
-.mx_GroupView_changeDelayWarning {
-    background-color: $info-plinth-bg-color;
-    color: $info-plinth-fg-color;
-    border-radius: 10px;
-    text-align: center;
-
-    margin: 20px 0px;
-}
-
-.mx_GroupView_groupDesc_placeholder {
-    padding: 100px 20px;
-    cursor: pointer;
-}
-
-.mx_GroupView_changeDelayWarning {
-    padding: 40px 20px;
-}
-
-.mx_GroupView_spaceUpgradePrompt {
-    padding: 16px 50px;
-    background-color: $header-panel-bg-color;
-    border-radius: 8px;
-    max-width: 632px;
-    font-size: $font-15px;
-    line-height: $font-24px;
-    margin-top: 24px;
-    position: relative;
-
-    > h2 {
-        font-size: inherit;
-        font-weight: $font-semi-bold;
-    }
-
-    > p, h2 {
-        margin: 0;
-    }
-
-    &::before {
-        content: "";
-        position: absolute;
-        height: $font-24px;
-        width: 20px;
-        left: 18px;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: contain;
-        mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-        background-color: $secondary-content;
-    }
-
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-    }
-
-    .mx_GroupView_spaceUpgradePrompt_close {
-        width: 16px;
-        height: 16px;
-        border-radius: 8px;
-        background-color: $input-darker-bg-color;
-        position: absolute;
-        top: 16px;
-        right: 16px;
-
-        &::before {
-            content: "";
-            position: absolute;
-            width: inherit;
-            height: inherit;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-size: 8px;
-            mask-image: url('$(res)/img/image-view/close.svg');
-            background-color: $secondary-content;
-        }
-    }
-}
-
-.mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar > :not(.mx_MemberInfo_avatar) {
-    padding-left: 16px;
-    padding-right: 16px;
-}
diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 77da167099c..a85bb0c42b6 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -95,11 +95,13 @@ limitations under the License.
             &.mx_HomePage_button_sendDm::before {
                 mask-image: url('$(res)/img/element-icons/feedback.svg');
             }
+
             &.mx_HomePage_button_explore::before {
                 mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
             }
+
             &.mx_HomePage_button_createGroup::before {
-                mask-image: url('$(res)/img/element-icons/community-members.svg');
+                mask-image: url('$(res)/img/element-icons/group-members.svg');
             }
         }
     }
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 1113a5d9efd..18ef247b5f0 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -23,13 +23,21 @@ $roomListCollapsedWidth: 68px;
     }
 }
 
-.mx_LeftPanel_wrapper {
+.mx_LeftPanel_outerWrapper {
     display: flex;
+    flex-direction: column;
     max-width: 50%;
     position: relative;
 
     // Contain the amount of layers rendered by constraining what actually needs re-layering via css
     contain: layout paint;
+}
+
+.mx_LeftPanel_wrapper {
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+    height: 100%; // ensure space panel is still scrollable with an outer wrapper
 
     .mx_LeftPanel_wrapper--user {
         background-color: $roomlist-bg-color;
@@ -45,9 +53,8 @@ $roomListCollapsedWidth: 68px;
 
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
-    // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
 
-    // Create a row-based flexbox for the GroupFilterPanel and the room list
+    // Create a row-based flexbox for the space panel and the room list
     display: flex;
     contain: content;
     position: relative;
@@ -111,11 +118,6 @@ $roomListCollapsedWidth: 68px;
             display: flex;
             align-items: center;
 
-            .mx_UserMenu {
-                // mini-mode for when Space Panel is disabled
-                margin-right: 12px;
-            }
-
             & + .mx_RoomListHeader {
                 margin-top: 12px;
             }
diff --git a/res/css/structures/_LeftPanelWidget.scss b/res/css/structures/_LeftPanelWidget.scss
deleted file mode 100644
index 0a01a19b90a..00000000000
--- a/res/css/structures/_LeftPanelWidget.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_LeftPanelWidget {
-    // largely based on RoomSublist
-    margin-left: 8px;
-    margin-bottom: 4px;
-
-    .mx_LeftPanelWidget_headerContainer {
-        display: flex;
-        align-items: center;
-
-        height: 24px;
-        color: $tertiary-content;
-        margin-top: 4px;
-
-        .mx_LeftPanelWidget_stickable {
-            flex: 1;
-            max-width: 100%;
-
-            display: flex;
-            align-items: center;
-        }
-
-        .mx_LeftPanelWidget_headerText {
-            flex: 1;
-            max-width: calc(100% - 16px);
-            line-height: $font-16px;
-            font-size: $font-13px;
-            font-weight: 600;
-
-            // Ellipsize any text overflow
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-
-            .mx_LeftPanelWidget_collapseBtn {
-                display: inline-block;
-                position: relative;
-                width: 14px;
-                height: 14px;
-                margin-right: 6px;
-
-                &::before {
-                    content: '';
-                    width: 18px;
-                    height: 18px;
-                    position: absolute;
-                    mask-position: center;
-                    mask-size: contain;
-                    mask-repeat: no-repeat;
-                    background-color: $tertiary-content;
-                    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
-                }
-
-                &.mx_LeftPanelWidget_collapseBtn_collapsed::before {
-                    transform: rotate(-90deg);
-                }
-            }
-        }
-    }
-
-    .mx_LeftPanelWidget_resizeBox {
-        position: relative;
-
-        display: flex;
-        flex-direction: column;
-        overflow: visible; // let the resize handle out
-    }
-
-    .mx_AppTileFullWidth {
-        flex: 1 0 0;
-        overflow: hidden;
-        // need this to be flex otherwise the overflow hidden from above
-        // sometimes vertically centers the clipped list ... no idea why it would do this
-        // as the box model should be top aligned. Happens in both FF and Chromium
-        display: flex;
-        flex-direction: column;
-        box-sizing: border-box;
-
-        mask-image: linear-gradient(0deg, transparent, black 4px);
-    }
-
-    .mx_LeftPanelWidget_resizerHandle {
-        cursor: ns-resize;
-        border-radius: 3px;
-
-        // Override styles from library
-        width: unset !important;
-        height: 4px !important;
-
-        position: absolute;
-        top: -24px !important; // override from library - puts it in the margin-top of the headerContainer
-
-        // Together, these make the bar 64px wide
-        // These are also overridden from the library
-        left: calc(50% - 32px) !important;
-        right: calc(50% - 32px) !important;
-    }
-
-    &:hover .mx_LeftPanelWidget_resizerHandle {
-        opacity: 0.8;
-        background-color: $primary-content;
-    }
-
-    .mx_LeftPanelWidget_maximizeButton {
-        margin-left: 8px;
-        margin-right: 7px;
-        position: relative;
-        width: 24px;
-        height: 24px;
-        border-radius: 32px;
-
-        &::before {
-            content: '';
-            width: 16px;
-            height: 16px;
-            position: absolute;
-            top: 4px;
-            left: 4px;
-            mask-position: center;
-            mask-size: contain;
-            mask-repeat: no-repeat;
-            mask-image: url("$(res)/img/element-icons/maximise-expand.svg");
-            background: $muted-fg-color;
-        }
-    }
-}
-
-.mx_LeftPanelWidget_maximizeButtonTooltip {
-    margin-top: -3px;
-}
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index a95bfa9eb9f..0523e677616 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -62,8 +62,8 @@ limitations under the License.
     transform: translateX(-50%);
 }
 
-/* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
+/* not the left panel, and not the resize handle, so the roomview and friends */
+.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_outerWrapper) {
     background-color: $background;
 
     flex: 1 1 0;
diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
deleted file mode 100644
index 9c0062b72d3..00000000000
--- a/res/css/structures/_MyGroups.scss
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_MyGroups {
-    display: flex;
-    flex-direction: column;
-
-    .mx_BetaCard {
-        margin: 0 72px;
-        max-width: 760px;
-    }
-}
-
-.mx_MyGroups .mx_RoomHeader_simpleHeader {
-    margin-left: 0px;
-}
-
-.mx_MyGroups_header {
-    /* Keep mid-point of create button aligned with icon in page header */
-    margin-left: 2px;
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.mx_MyGroups > :not(.mx_RoomHeader):not(.mx_BetaCard) {
-    max-width: 960px;
-    margin: 40px;
-}
-
-.mx_MyGroups_headerCard {
-    flex: 1 0 50%;
-    margin-bottom: 30px;
-    min-width: 400px;
-    display: flex;
-    align-items: center;
-}
-
-.mx_MyGroups_headerCard .mx_MyGroups_headerCard_button {
-    flex: 0 0 auto;
-    margin-right: 13px;
-    height: 40px;
-    width: 40px;
-    border-radius: 20px;
-    background-color: $roomheader-addroom-bg-color;
-    position: relative;
-
-    &::before {
-        background-color: $roomheader-addroom-fg-color;
-        mask: url('$(res)/img/icons-create-room.svg');
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 80%;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
-
-.mx_MyGroups_headerCard_header {
-    font-weight: bold;
-    margin-bottom: 10px;
-}
-
-.mx_MyGroups_headerCard_content {
-    padding-right: 15px;
-}
-
-/* Until the button is wired up */
-.mx_MyGroups_joinBox {
-    visibility: hidden;
-
-    /* When joinBox wraps onto its own row, it should take up zero height so
-       that there isn't an awkward gap between MyGroups_createBox and
-       MyGroups_content.
-    */
-    height: 0px;
-    margin: 0px;
-}
-
-.mx_MyGroups_content {
-    margin-left: 2px;
-
-    flex: 1 0 0;
-
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-}
-
-.mx_MyGroups_scrollable {
-    overflow-y: inherit;
-}
-
-.mx_MyGroups_placeholder {
-    background-color: $info-plinth-bg-color;
-    color: $info-plinth-fg-color;
-    line-height: $font-400px;
-    border-radius: 10px;
-    text-align: center;
-}
-
-.mx_MyGroups_joinedGroups {
-    border-top: 1px solid $primary-hairline-color;
-    overflow-x: hidden;
-
-    display: flex;
-    flex-flow: row wrap;
-    align-content: flex-start;
-}
-
-.mx_MyGroups_joinedGroups .mx_GroupTile {
-    min-width: 300px;
-    max-width: 33%;
-    flex: 1 0 300px;
-    height: 75px;
-    margin: 10px 0px;
-    display: flex;
-    align-items: flex-start;
-    cursor: pointer;
-}
-
-.mx_GroupTile_avatar {
-    cursor: grab, -webkit-grab;
-}
-
-.mx_GroupTile_profile {
-    margin-left: 10px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-}
-
-.mx_GroupTile_profile .mx_GroupTile_name,
-.mx_GroupTile_profile .mx_GroupTile_groupId,
-.mx_GroupTile_profile .mx_GroupTile_desc {
-    padding-right: 10px;
-}
-
-.mx_GroupTile_profile .mx_GroupTile_name {
-    margin: 0px;
-    font-size: $font-15px;
-}
-
-.mx_GroupTile_profile .mx_GroupTile_groupId {
-    font-size: $font-13px;
-    opacity: 0.7;
-}
-
-.mx_GroupTile_profile .mx_GroupTile_desc {
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    font-size: $font-13px;
-    max-height: 36px;
-    overflow: hidden;
-}
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index 68e1dd6a9a0..be953a750fc 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -77,7 +77,7 @@ limitations under the License.
     display: none; // we don't need this in this view
 }
 
-.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
+.mx_NotificationPanel .mx_EventTile .mx_DisambiguatedProfile,
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
     color: $primary-content;
     font-size: $font-12px;
diff --git a/res/css/structures/_QuickSettingsButton.scss b/res/css/structures/_QuickSettingsButton.scss
index 17417fa36f4..153dedf6b73 100644
--- a/res/css/structures/_QuickSettingsButton.scss
+++ b/res/css/structures/_QuickSettingsButton.scss
@@ -66,8 +66,9 @@ limitations under the License.
         margin: 0 0 16px;
     }
 
-    .mx_AccessibleButton_kind_primary_outline {
+    .mx_AccessibleButton_hasKind {
         display: block;
+        margin-top: 4px;
     }
 
     > div > h4 {
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 5fb57d19992..a25e172c731 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -93,17 +93,8 @@ limitations under the License.
     mask-position: center;
 }
 
-.mx_RightPanel_groupMembersButton::before {
-    mask-image: url('$(res)/img/element-icons/community-members.svg');
-    mask-position: center;
-}
-
-.mx_RightPanel_roomsButton::before {
-    mask-image: url('$(res)/img/element-icons/community-rooms.svg');
-    mask-position: center;
-}
-
-$dot-size: 7px;
+$dot-size: 8px;
+$dot-offset: -3px;
 $pulse-color: $alert;
 
 .mx_RightPanel_pinnedMessagesButton {
@@ -112,10 +103,11 @@ $pulse-color: $alert;
         mask-position: center;
     }
 }
+
 .mx_RightPanel_headerButton_unreadIndicator_bg {
     position: absolute;
-    right: 0;
-    top: 0;
+    right: $dot-offset;
+    top: $dot-offset;
     margin: 4px;
     width: $dot-size;
     height: $dot-size;
@@ -127,17 +119,9 @@ $pulse-color: $alert;
 
 .mx_RightPanel_headerButton_unreadIndicator {
     position: absolute;
-    right: 0;
-    top: 0;
+    right: $dot-offset;
+    top: $dot-offset;
     margin: 4px;
-    width: $dot-size;
-    height: $dot-size;
-    border-radius: 50%;
-    transform: scale(1);
-    background: rgba($pulse-color, 1);
-    box-shadow: 0 0 0 0 rgba($pulse-color, 1);
-    animation: mx_RightPanel_indicator_pulse 2s infinite;
-    animation-iteration-count: 1;
 
     &.mx_Indicator_red {
         background: rgba($alert, 1);
@@ -145,29 +129,13 @@ $pulse-color: $alert;
     }
 
     &.mx_Indicator_gray {
-        background: rgba($roomtile-default-badge-bg-color, 1);
-        box-shadow: rgba($roomtile-default-badge-bg-color, 1);
+        background: rgba($room-icon-unread-color, 1);
+        box-shadow: rgba($room-icon-unread-color, 1);
     }
 
     &.mx_Indicator_bold {
-        background: rgba($input-darker-fg-color, 1);
-        box-shadow: rgba($input-darker-fg-color, 1);
-    }
-
-    &::after {
-        content: "";
-        position: absolute;
-        width: inherit;
-        height: inherit;
-        top: 0;
-        left: 0;
-        transform: scale(1);
-        transform-origin: center center;
-        animation-name: mx_RightPanel_indicator_pulse_shadow;
-        animation-duration: inherit;
-        animation-iteration-count: inherit;
-        border-radius: 50%;
-        background: inherit;
+        background: rgba($primary-content, 1);
+        box-shadow: rgba($primary-content, 1);
     }
 }
 
@@ -207,7 +175,14 @@ $pulse-color: $alert;
     }
 }
 
-.mx_RightPanel_headerButton_highlight {
+.mx_RightPanel_headerButton_unread {
+    &::before {
+        background-color: $room-icon-unread-color !important;
+    }
+}
+
+.mx_RightPanel_headerButton_highlight,
+.mx_RightPanel_headerButton:hover {
     &::before {
         background-color: $accent !important;
     }
@@ -234,7 +209,6 @@ $pulse-color: $alert;
 
 .mx_RightPanel .mx_MemberList,
 .mx_RightPanel .mx_MemberInfo,
-.mx_RightPanel .mx_GroupRoomList,
 .mx_RightPanel_blank {
     order: 2;
     flex: 1 1 0;
@@ -253,7 +227,8 @@ $pulse-color: $alert;
         margin: 16px 0;
     }
 
-    h2, p {
+    h2,
+    p {
         font-size: $font-14px;
     }
 
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index a6b2970ddf6..eba8ae8f6e8 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -70,10 +70,6 @@ limitations under the License.
     overflow-y: auto;
     flex: 1 1 0;
     overflow-anchor: none;
-
-    &[data-scrollbar=false] {
-        overflow-y: hidden;
-    }
 }
 
 .mx_RoomView_messagePanelSearchSpinner {
@@ -105,7 +101,9 @@ limitations under the License.
     flex: 1;
     min-width: 0;
 
-    .mx_RoomView_messagePanel, .mx_RoomView_messagePanelSpinner, .mx_RoomView_messagePanelSearchSpinner {
+    .mx_RoomView_messagePanel,
+    .mx_RoomView_messagePanelSpinner,
+    .mx_RoomView_messagePanelSearchSpinner {
         order: 2;
     }
 }
@@ -147,20 +145,17 @@ limitations under the License.
 }
 
 .mx_RoomView_messageListWrapper {
-    min-height: 100%;
-
     display: flex;
-
     flex-direction: column;
-
     justify-content: flex-end;
+    position: relative;
 }
 
 .mx_RoomView_searchResultsPanel {
     .mx_RoomView_messageListWrapper {
         justify-content: flex-start;
 
-        > .mx_RoomView_MessageList > li > ol {
+        >.mx_RoomView_MessageList > li > ol {
             list-style-type: none;
         }
     }
@@ -212,6 +207,11 @@ hr.mx_RoomView_myReadMarker {
     opacity: 1;
 }
 
+// Rooms with immersive content
+.mx_RoomView_immersive .mx_RoomHeader_wrapper {
+    border: unset;
+}
+
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
     background-color: $background;
 }
@@ -278,3 +278,62 @@ hr.mx_RoomView_myReadMarker {
         min-height: 42px;
     }
 }
+
+@keyframes mx_Indicator_pulse {
+    0% {
+        transform: scale(0.95);
+    }
+
+    70% {
+        transform: scale(1);
+    }
+
+    100% {
+        transform: scale(0.95);
+    }
+}
+
+@keyframes mx_Indicator_pulse_shadow {
+    0% {
+        opacity: 0.7;
+    }
+
+    70% {
+        transform: scale(2.2);
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+.mx_Indicator {
+    position: absolute;
+    right: -3px;
+    top: -3px;
+    width: $dot-size;
+    height: $dot-size;
+    border-radius: 50%;
+    transform: scale(1);
+    background: rgba($pulse-color, 1);
+    box-shadow: 0 0 0 0 rgba($pulse-color, 1);
+    animation: mx_Indicator_pulse 2s infinite;
+    animation-iteration-count: 1;
+
+    &::after {
+        content: "";
+        position: absolute;
+        width: inherit;
+        height: inherit;
+        top: 0;
+        left: 0;
+        transform: scale(1);
+        transform-origin: center center;
+        animation-name: mx_Indicator_pulse_shadow;
+        animation-duration: inherit;
+        animation-iteration-count: inherit;
+        border-radius: 50%;
+        background: inherit;
+    }
+}
diff --git a/res/css/structures/_SpaceHierarchy.scss b/res/css/structures/_SpaceHierarchy.scss
index a43e538b721..32dda6b90d0 100644
--- a/res/css/structures/_SpaceHierarchy.scss
+++ b/res/css/structures/_SpaceHierarchy.scss
@@ -16,7 +16,6 @@ limitations under the License.
 
 .mx_SpaceRoomView_landing {
     .mx_AccessibleButton_kind_link {
-        padding: 0;
         font-size: inherit;
     }
 
@@ -36,24 +35,31 @@ limitations under the License.
 
     .mx_SpaceHierarchy_listHeader {
         display: flex;
-        min-height: 32px;
+        flex-flow: wrap;
+        justify-content: space-between;
         align-items: center;
+        gap: 12px;
         font-size: $font-15px;
         line-height: $font-24px;
         color: $primary-content;
         margin-bottom: 12px;
 
-        > h4 {
+        .mx_SpaceHierarchy_listHeader_header {
+            grid-column-start: 1;
             font-weight: $font-semi-bold;
             margin: 0;
         }
 
-        .mx_AccessibleButton {
-            padding: 4px 12px;
-            font-weight: normal;
+        .mx_SpaceHierarchy_listHeader_buttons {
+            grid-column-start: 2;
+            display: flex;
+            flex-flow: wrap;
+            gap: 12px;
+            min-height: 32px;
 
-            & + .mx_AccessibleButton {
-                margin-left: 16px;
+            .mx_AccessibleButton {
+                padding: 4px 12px;
+                font-weight: normal;
             }
         }
 
@@ -61,10 +67,6 @@ limitations under the License.
         .mx_AccessibleButton_kind_primary_outline {
             padding: 3px 12px; // to account for the 1px border
         }
-
-        > span {
-            margin-left: auto;
-        }
     }
 
     .mx_SpaceHierarchy_error {
@@ -89,12 +91,6 @@ limitations under the License.
         }
     }
 
-    .mx_SpaceHierarchy_list {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-    }
-
     .mx_SpaceHierarchy_roomCount {
         > h3 {
             display: inline;
@@ -152,124 +148,146 @@ limitations under the License.
         padding-left: 12px;
     }
 
-    .mx_SpaceHierarchy_roomTile {
-        position: relative;
-        padding: 8px 16px;
-        border-radius: 8px;
-        box-sizing: border-box;
-
-        display: grid;
-        grid-template-columns: 20px auto max-content;
-        grid-column-gap: 8px;
-        grid-row-gap: 6px;
-        align-items: center;
+    .mx_SpaceHierarchy_list {
+        list-style: none;
+        padding: 0;
+        margin: 0;
 
-        .mx_BaseAvatar {
-            grid-row: 1;
-            grid-column: 1;
-        }
+        li.mx_SpaceHierarchy_roomTileWrapper {
+            list-style: none;
 
-        .mx_SpaceHierarchy_roomTile_name {
-            font-weight: $font-semi-bold;
-            font-size: $font-15px;
-            line-height: $font-18px;
-            grid-row: 1;
-            grid-column: 2;
-
-            .mx_InfoTooltip,
-            .mx_SpaceHierarchy_roomTile_joined {
-                display: inline;
-                margin-left: 12px;
-                color: $tertiary-content;
-                font-size: $font-12px;
-                line-height: $font-15px;
-
-                .mx_InfoTooltip_icon {
-                    margin-right: 4px;
-                    position: relative;
-                    vertical-align: text-top;
-
-                    &::before {
-                        position: absolute;
-                        top: 0;
-                        left: 0;
+            .mx_SpaceHierarchy_roomTile {
+                position: relative;
+                padding: 8px 16px;
+                border-radius: 8px;
+                box-sizing: border-box;
+
+                display: flex;
+                flex-wrap: wrap;
+                gap: 6px 12px;
+
+                .mx_SpaceHierarchy_roomTile_item {
+                    font-weight: $font-semi-bold;
+                    font-size: $font-15px;
+                    line-height: $font-18px;
+                    display: grid;
+                    grid-template-columns: 20px auto;
+                    gap: 6px 8px;
+                    align-items: center;
+                    flex: 1; // wrap action buttons
+
+                    .mx_SpaceHierarchy_roomTile_avatar {
+                        grid-row: 1;
+                        grid-column: 1;
                     }
-                }
-            }
 
-            .mx_SpaceHierarchy_roomTile_joined {
-                position: relative;
-                padding-left: 16px;
-
-                &::before {
-                    content: '';
-                    width: 20px;
-                    height: 20px;
-                    top: -2px;
-                    left: -4px;
-                    position: absolute;
-                    mask-position: center;
-                    mask-size: contain;
-                    mask-repeat: no-repeat;
-                    background-color: $accent;
-                    mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+                    .mx_SpaceHierarchy_roomTile_name {
+                        grid-row: 1;
+                        grid-column: 2;
+
+                        .mx_InfoTooltip,
+                        .mx_SpaceHierarchy_roomTile_joined {
+                            margin-left: 12px;
+                            color: $tertiary-content;
+                            font-size: $font-12px;
+                            line-height: $font-15px;
+
+                            .mx_InfoTooltip_icon {
+                                margin-right: 4px;
+                                position: relative;
+                                vertical-align: text-top;
+
+                                &::before {
+                                    position: absolute;
+                                    top: 0;
+                                    left: 0;
+                                }
+                            }
+                        }
+
+                        .mx_InfoTooltip {
+                            display: inline-block;
+                        }
+
+                        .mx_SpaceHierarchy_roomTile_joined {
+                            display: inline;
+                            position: relative;
+                            padding-left: 16px;
+
+                            &::before {
+                                content: '';
+                                width: 20px;
+                                height: 20px;
+                                top: -2px;
+                                left: -4px;
+                                position: absolute;
+                                mask-position: center;
+                                mask-size: contain;
+                                mask-repeat: no-repeat;
+                                background-color: $accent;
+                                mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+                            }
+                        }
+                    }
+
+                    .mx_SpaceHierarchy_roomTile_info {
+                        grid-row: 2;
+                        grid-column: 2;
+                        font-size: $font-14px;
+                        font-weight: initial;
+                        line-height: $font-18px;
+                        color: $secondary-content;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 2;
+                        overflow: hidden;
+                    }
                 }
-            }
-        }
 
-        .mx_SpaceHierarchy_roomTile_info {
-            font-size: $font-14px;
-            line-height: $font-18px;
-            color: $secondary-content;
-            grid-row: 2;
-            grid-column: 2/3;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
-            overflow: hidden;
-        }
+                .mx_SpaceHierarchy_actions {
+                    display: flex;
+                    align-items: center;
+                    column-gap: 12px;
+                    margin-left: auto;
+
+                    .mx_AccessibleButton {
+                        line-height: $font-24px;
+                        padding: 4px 16px;
+                        display: inline-block;
+                        visibility: hidden;
+                    }
 
-        .mx_SpaceHierarchy_actions {
-            text-align: right;
-            margin-left: 20px;
-            grid-column: 3;
-            grid-row: 1/3;
+                    .mx_AccessibleButton_kind_danger_outline,
+                    .mx_AccessibleButton_kind_primary_outline {
+                        padding: 3px 16px; // to account for the 1px border
+                    }
 
-            .mx_AccessibleButton {
-                line-height: $font-24px;
-                padding: 4px 16px;
-                display: inline-block;
-                visibility: hidden;
-            }
+                    .mx_Checkbox {
+                        display: inline-flex;
 
-            .mx_AccessibleButton_kind_danger_outline,
-            .mx_AccessibleButton_kind_primary_outline {
-                padding: 3px 16px; // to account for the 1px border
-            }
+                        label {
+                            width: 16px;
+                            height: 16px;
+                        }
+                    }
+                }
 
-            .mx_Checkbox {
-                display: inline-flex;
-                vertical-align: middle;
-                margin-left: 12px;
-            }
-        }
+                &:hover, &:focus-within {
+                    background-color: $spacePanel-bg-color;
 
-        &:hover, &:focus-within {
-            background-color: $groupFilterPanel-bg-color;
+                    .mx_AccessibleButton {
+                        visibility: visible;
+                    }
+                }
 
-            .mx_AccessibleButton {
-                visibility: visible;
+                &.mx_SpaceHierarchy_joining {
+                    .mx_AccessibleButton {
+                        visibility: visible;
+                        padding: 4px 18px;
+                    }
+                }
             }
         }
-
-        &.mx_SpaceHierarchy_joining .mx_AccessibleButton {
-            visibility: visible;
-            padding: 4px 18px;
-        }
-    }
-
-    li.mx_SpaceHierarchy_roomTileWrapper {
-        list-style: none;
     }
 
     .mx_SpaceHierarchy_roomTile,
@@ -277,7 +295,7 @@ limitations under the License.
         &::before {
             content: "";
             position: absolute;
-            background-color: $groupFilterPanel-bg-color;
+            background-color: $spacePanel-bg-color;
             width: 1px;
             height: 100%;
             left: 6px;
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index d999ff89b8f..9d23dd5fc93 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -23,7 +23,7 @@ $activeBackgroundColor: $panel-actions;
 $activeBorderColor: $primary-content;
 
 .mx_SpacePanel {
-    background-color: $groupFilterPanel-bg-color;
+    background-color: $spacePanel-bg-color;
     flex: 0 0 auto;
     padding: 0;
     margin: 0;
@@ -155,6 +155,7 @@ $activeBorderColor: $primary-content;
             border-radius: 12px;
             padding: 4px;
             width: calc(100% - 32px);
+            min-width: 0;
         }
 
         .mx_SpaceButton_name {
@@ -251,7 +252,8 @@ $activeBorderColor: $primary-content;
             margin-top: auto;
             margin-bottom: auto;
             display: none;
-            position: relative;
+            position: absolute;
+            right: 4px;
 
             &::before {
                 top: 3px;
@@ -273,6 +275,7 @@ $activeBorderColor: $primary-content;
         display: flex;
         flex-direction: column;
         max-width: 250px;
+        min-width: 0;
         flex-grow: 1;
 
         .mx_BaseAvatar:not(.mx_UserMenu_userAvatar_BaseAvatar) .mx_BaseAvatar_initial {
@@ -309,13 +312,13 @@ $activeBorderColor: $primary-content;
         .mx_NotificationBadge_dot {
             // make the smaller dot occupy the same width for centering
             margin: 0 -1px 0 0;
-            border: 3px solid $groupFilterPanel-bg-color;
+            border: 3px solid $spacePanel-bg-color;
         }
 
         .mx_NotificationBadge_2char,
         .mx_NotificationBadge_3char {
             margin: -5px -5px 0 0;
-            border: 2px solid $groupFilterPanel-bg-color;
+            border: 2px solid $spacePanel-bg-color;
         }
     }
 
@@ -327,6 +330,16 @@ $activeBorderColor: $primary-content;
         }
     }
 
+    .mx_SpaceItem:not(.mx_SpaceItem_new) {
+        .mx_SpaceButton:hover,
+        .mx_SpaceButton:focus-within,
+        .mx_SpaceButton_hasMenuOpen {
+            &:not(.mx_SpaceButton_narrow):not(.mx_SpaceButton_invite) .mx_SpaceButton_name {
+                max-width: calc(100% - 56px);
+            }
+        }
+    }
+
     /* root space buttons are bigger and not indented */
     & > .mx_AutoHideScrollbar {
         flex: 1;
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 8fbd6fbb703..eed3d8830f6 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -137,6 +137,23 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 
+    .mx_SpaceRoomView_preview,
+    .mx_SpaceRoomView_landing {
+        .mx_SpaceRoomView_info_memberCount {
+            color: inherit;
+            position: relative;
+            padding: 0 0 0 16px;
+            font-size: $font-15px;
+            display: inline; // cancel inline-flex
+
+            &::before {
+                content: "·"; // visual separator
+                position: absolute;
+                left: 6px;
+            }
+        }
+    }
+
     .mx_SpaceRoomView_preview {
         padding: 32px 24px !important; // override default padding from above
         margin: auto;
@@ -152,6 +169,7 @@ $SpaceRoomViewInnerWidth: 428px;
             right: 24px;
             top: 32px;
         }
+
         // XXX remove this when spaces leaves Beta
         .mx_SpaceRoomView_preview_spaceBetaPrompt {
             font-weight: $font-semi-bold;
@@ -183,18 +201,6 @@ $SpaceRoomViewInnerWidth: 428px;
             }
         }
 
-        .mx_SpaceRoomView_preview_migratedCommunity {
-            margin-bottom: 16px;
-            padding: 8px 12px;
-            border-radius: 8px;
-            border: 1px solid $input-border-color;
-            width: max-content;
-
-            .mx_BaseAvatar {
-                margin-right: 4px;
-            }
-        }
-
         .mx_SpaceRoomView_preview_inviter {
             display: flex;
             align-items: center;
@@ -254,13 +260,27 @@ $SpaceRoomViewInnerWidth: 428px;
         flex-direction: column;
         min-width: 0;
 
-        > .mx_BaseAvatar {
-            width: 80px;
-        }
+        .mx_SpaceRoomView_landing_header {
+            display: flex;
+            justify-content: space-between;
+
+            .mx_BaseAvatar {
+                width: 80px;
 
-        > .mx_BaseAvatar_image,
-        > .mx_BaseAvatar > .mx_BaseAvatar_image {
-            border-radius: 12px;
+                .mx_BaseAvatar_image {
+                    border-radius: 12px;
+                }
+            }
+
+            // XXX: Temporary for the Spaces release only
+            .mx_SpaceFeedbackPrompt {
+                padding: 7px; // 8px - 1px border
+                border: 1px solid rgba($primary-content, .1);
+                border-radius: 8px;
+                width: max-content;
+                height: fit-content;
+                margin-left: 24px;
+            }
         }
 
         .mx_SpaceRoomView_landing_name {
@@ -269,13 +289,11 @@ $SpaceRoomViewInnerWidth: 428px;
             color: $secondary-content;
 
             > span {
-                display: inline-block;
-            }
+                display: flex;
+                flex-flow: column;
+                gap: 12px 0;
 
-            .mx_SpaceRoomView_landing_nameRow {
-                margin-top: 12px;
-
-                > h1 {
+                h1 {
                     display: inline-block;
                 }
             }
@@ -288,62 +306,101 @@ $SpaceRoomViewInnerWidth: 428px;
             }
         }
 
-        .mx_SpaceRoomView_landing_info {
+        .mx_SpaceRoomView_landing_infoBar {
             display: flex;
             align-items: center;
+            justify-content: space-between;
+            gap: 12px;
+            flex-wrap: wrap;
+            line-height: $font-24px;
 
             .mx_SpaceRoomView_info {
+                color: $secondary-content;
+                font-size: $font-15px;
                 display: inline-block;
-                margin: 0 auto 0 0;
-            }
 
-            .mx_FacePile {
-                display: inline-block;
-                margin-right: 12px;
+                .mx_SpaceRoomView_info_public,
+                .mx_SpaceRoomView_info_private {
+                    padding-left: 20px;
+                    position: relative;
+
+                    &::before {
+                        position: absolute;
+                        content: "";
+                        width: 20px;
+                        height: 20px;
+                        top: 0;
+                        left: -2px;
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                        background-color: $tertiary-content;
+                    }
+                }
 
-                .mx_FacePile_faces {
-                    cursor: pointer;
+                .mx_SpaceRoomView_info_public::before {
+                    mask-size: 12px;
+                    mask-image: url("$(res)/img/globe.svg");
+                }
+
+                .mx_SpaceRoomView_info_private::before {
+                    mask-size: 14px;
+                    mask-image: url("$(res)/img/element-icons/lock.svg");
                 }
             }
 
-            .mx_SpaceRoomView_landing_inviteButton {
-                position: relative;
-                padding: 4px 18px 4px 40px;
-                line-height: $font-24px;
-                height: min-content;
+            .mx_SpaceRoomView_landing_infoBar_interactive {
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+                gap: 12px 12px;
 
-                &::before {
-                    position: absolute;
-                    content: "";
-                    left: 8px;
-                    height: 16px;
-                    width: 16px;
-                    background: #ffffff; // white icon fill
-                    mask-position: center;
-                    mask-size: 16px;
-                    mask-repeat: no-repeat;
-                    mask-image: url('$(res)/img/element-icons/room/invite.svg');
+                .mx_FacePile {
+                    display: inline-block;
+
+                    .mx_FacePile_faces {
+                        cursor: pointer;
+                    }
                 }
-            }
 
-            .mx_SpaceRoomView_landing_settingsButton {
-                position: relative;
-                margin-left: 16px;
-                width: 24px;
-                height: 24px;
+                .mx_SpaceRoomView_landing_inviteButton,
+                .mx_SpaceRoomView_landing_settingsButton {
+                    position: relative;
 
-                &::before {
-                    position: absolute;
-                    content: "";
-                    left: 0;
-                    top: 0;
-                    height: 24px;
+                    &::before {
+                        position: absolute;
+                        content: "";
+                        mask-position: center;
+                        mask-repeat: no-repeat;
+                    }
+                }
+
+                .mx_SpaceRoomView_landing_inviteButton {
+                    padding: 4px 18px 4px 40px;
+                    height: min-content;
+
+                    &::before {
+                        left: 8px;
+                        height: 16px;
+                        width: 16px;
+                        background: #fff; // white icon fill
+                        mask-size: 16px;
+                        mask-image: url('$(res)/img/element-icons/room/invite.svg');
+                    }
+                }
+
+                .mx_SpaceRoomView_landing_settingsButton {
                     width: 24px;
-                    background: $tertiary-content;
-                    mask-position: center;
-                    mask-size: contain;
-                    mask-repeat: no-repeat;
-                    mask-image: url('$(res)/img/element-icons/settings.svg');
+                    height: 24px;
+
+                    &::before {
+                        left: 0;
+                        top: 0;
+                        height: 24px;
+                        width: 24px;
+                        background: $tertiary-content;
+                        mask-size: contain;
+                        mask-image: url('$(res)/img/element-icons/settings.svg');
+                    }
                 }
             }
         }
@@ -360,14 +417,6 @@ $SpaceRoomViewInnerWidth: 428px;
             margin: 0 0 20px;
             flex: 0;
         }
-
-        .mx_SpaceFeedbackPrompt {
-            padding: 7px; // 8px - 1px border
-            border: 1px solid rgba($primary-content, .1);
-            border-radius: 8px;
-            width: max-content;
-            margin: 0 0 -40px auto; // collapse its own height to not push other components down
-        }
     }
 
     .mx_SpaceRoomView_privateScope {
@@ -380,7 +429,7 @@ $SpaceRoomViewInnerWidth: 428px;
         }
 
         .mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before {
-            mask-image: url('$(res)/img/element-icons/community-members.svg');
+            mask-image: url('$(res)/img/element-icons/group-members.svg');
         }
     }
 
@@ -441,51 +490,3 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 }
-
-.mx_SpaceRoomView_info {
-    color: $secondary-content;
-    font-size: $font-15px;
-    line-height: $font-24px;
-    margin: 20px 0;
-
-    .mx_SpaceRoomView_info_public,
-    .mx_SpaceRoomView_info_private {
-        padding-left: 20px;
-        position: relative;
-
-        &::before {
-            position: absolute;
-            content: "";
-            width: 20px;
-            height: 20px;
-            top: 0;
-            left: -2px;
-            mask-position: center;
-            mask-repeat: no-repeat;
-            background-color: $tertiary-content;
-        }
-    }
-
-    .mx_SpaceRoomView_info_public::before {
-        mask-size: 12px;
-        mask-image: url("$(res)/img/globe.svg");
-    }
-
-    .mx_SpaceRoomView_info_private::before {
-        mask-size: 14px;
-        mask-image: url("$(res)/img/element-icons/lock.svg");
-    }
-
-    .mx_SpaceRoomView_info_memberCount {
-        color: inherit;
-        position: relative;
-        padding: 0 0 0 16px;
-        font-size: $font-15px;
-
-        &::before {
-            content: "·"; // visual separator
-            position: absolute;
-            left: 6px;
-        }
-    }
-}
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index e4fe3c1e664..00c7cd05b45 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -108,26 +108,25 @@ limitations under the License.
         }
 
         .mx_Toast_title {
+            display: flex;
+            align-items: center;
+            column-gap: 8px;
             width: 100%;
             box-sizing: border-box;
 
             h2 {
-                grid-column: 1 / 3;
-                grid-row: 1;
                 margin: 0;
                 font-size: $font-15px;
                 font-weight: 600;
                 display: inline;
                 width: auto;
-                vertical-align: middle;
             }
 
-            span {
-                padding-left: 8px;
-                float: right;
+            .mx_Toast_title_countIndicator {
                 font-size: $font-12px;
                 line-height: $font-22px;
                 color: $secondary-content;
+                margin-inline-start: auto; // on the end side of the div
             }
         }
 
@@ -137,17 +136,14 @@ limitations under the License.
         }
 
         .mx_Toast_buttons {
-            float: right;
             display: flex;
+            justify-content: flex-end;
+            column-gap: 5px;
 
             .mx_AccessibleButton {
                 min-width: 96px;
                 box-sizing: border-box;
             }
-
-            .mx_AccessibleButton + .mx_AccessibleButton {
-                margin-left: 5px;
-            }
         }
 
         .mx_Toast_description {
@@ -157,11 +153,6 @@ limitations under the License.
             margin: 4px 0 11px 0;
             font-size: $font-12px;
 
-            .mx_AccessibleButton_kind_link {
-                font-size: inherit;
-                padding: 0;
-            }
-
             a {
                 text-decoration: none;
             }
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index aa4e7d6403e..a88e9eddb90 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -64,9 +64,13 @@ limitations under the License.
     }
 }
 
-.mx_UserMenu_contextMenu {
-    width: 258px;
+.mx_IconizedContextMenu {
+    &.mx_UserMenu_contextMenu {
+        width: 258px;
+    }
+}
 
+.mx_UserMenu_contextMenu {
     &.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList_red {
         .mx_AccessibleButton {
             padding-top: 16px;
@@ -87,12 +91,15 @@ limitations under the License.
             flex-direction: column;
             width: calc(100% - 40px); // 40px = 32px theme button + 8px margin to theme button
 
-            * {
-                // Automatically grow all subelements to fit the container
+            .mx_UserMenu_contextMenu_displayName,
+            .mx_UserMenu_contextMenu_userId {
+                font-size: $font-15px;
+
+                // Automatically grow subelements to fit the container
                 flex: 1;
                 width: 100%;
 
-                // Ellipsize any text overflow
+                // Ellipsize text overflow
                 text-overflow: ellipsis;
                 overflow: hidden;
                 white-space: nowrap;
@@ -100,12 +107,10 @@ limitations under the License.
 
             .mx_UserMenu_contextMenu_displayName {
                 font-weight: bold;
-                font-size: $font-15px;
                 line-height: $font-20px;
             }
 
             .mx_UserMenu_contextMenu_userId {
-                font-size: $font-15px;
                 line-height: $font-24px;
             }
         }
@@ -142,12 +147,6 @@ limitations under the License.
                     margin-top: 8px;
                 }
             }
-
-            .mx_AccessibleButton_kind_link {
-                font-weight: normal;
-                font-size: inherit;
-                padding: 0;
-            }
         }
     }
 
diff --git a/res/css/structures/_VideoRoomView.scss b/res/css/structures/_VideoRoomView.scss
new file mode 100644
index 00000000000..d99b3f5894b
--- /dev/null
+++ b/res/css/structures/_VideoRoomView.scss
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_VideoRoomView {
+    flex-grow: 1;
+    min-height: 0;
+
+    display: flex;
+    flex-direction: column;
+    margin: $container-gap-width;
+    margin-right: calc($container-gap-width / 2);
+
+    background-color: $header-panel-bg-color;
+    padding-top: 33px; // to match the right panel chat heading
+    border: 8px solid $header-panel-bg-color;
+    border-radius: 8px;
+
+    .mx_AppTile {
+        width: auto;
+        height: 100%;
+        border: none;
+    }
+
+    // While the lobby is shown, the widget needs to stay loaded but hidden in the background
+    .mx_VideoLobby ~ .mx_AppTile {
+        display: none;
+    }
+}
diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index e3d6135ef30..3dc3e21489e 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -34,8 +34,17 @@ limitations under the License.
     padding: 0.5em 1em 0.5em 1em;
     word-wrap: break-word;
     white-space: pre-wrap;
+    overflow-wrap: anywhere;
 }
 
 .mx_ViewSource_details {
     margin-top: 0.8em;
 }
+
+.mx_ViewSource_container {
+    max-width: calc(100% - 24px);
+}
+
+.mx_ViewSource_container .mx_CopyableText_border {
+    width: 100%;
+}
diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 2290b6a3455..638917f1c28 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -88,14 +88,12 @@ limitations under the License.
 div.mx_AccessibleButton_kind_link.mx_Login_forgot {
     display: block;
     margin: 0 auto;
-    // style it as a link
-    font-size: inherit;
-    padding: 0;
 
     &.mx_AccessibleButton_disabled {
         cursor: not-allowed;
     }
 }
+
 .mx_Login_spinner {
     display: flex;
     justify-content: center;
diff --git a/res/css/views/audio_messages/_PlaybackContainer.scss b/res/css/views/audio_messages/_PlaybackContainer.scss
index 408a2953893..4999980beaf 100644
--- a/res/css/views/audio_messages/_PlaybackContainer.scss
+++ b/res/css/views/audio_messages/_PlaybackContainer.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ limitations under the License.
 
     contain: content;
 
+    // Waveforms are present in live recording only
     .mx_Waveform {
         .mx_Waveform_bar {
             background-color: $quaternary-content;
@@ -46,11 +47,22 @@ limitations under the License.
 
     .mx_Clock {
         width: $font-42px; // we're not using a monospace font, so fake it
+        min-width: $font-42px; // force sensible layouts in awkward flexboxes (file panel, for example)
         padding-right: 6px; // with the fixed width this ends up as a visual 8px most of the time, as intended.
         padding-left: 8px; // isolate from recording circle / play control
     }
 
-    &.mx_VoiceMessagePrimaryContainer_noWaveform {
-        max-width: 162px; // with all the padding this results in 185px wide
+    // For timeline-rendered playback, mirror the values for where the clock is in
+    // the waveform version.
+    .mx_SeekBar {
+        margin-left: 8px;
+        margin-right: 6px;
+
+        & + .mx_Clock {
+            text-align: right;
+
+            // Take the padding off the clock because it's accounted for in the seek bar
+            padding: 0;
+        }
     }
 }
diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index b912302f382..7927f82c2f5 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -65,6 +65,10 @@ limitations under the License.
         background-color: $presence-away;
     }
 
+    .mx_DecoratedRoomAvatar_icon_busy::before {
+        background-color: $presence-busy;
+    }
+
     .mx_NotificationBadge, .mx_RoomTile_badgeContainer {
         position: absolute;
         top: 0;
diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss
index 80a70ad0d62..658e43f051b 100644
--- a/res/css/views/beta/_BetaCard.scss
+++ b/res/css/views/beta/_BetaCard.scss
@@ -23,8 +23,13 @@ limitations under the License.
 
     .mx_BetaCard_columns {
         display: flex;
+        flex-flow: wrap;
+        gap: 20px;
+        justify-content: center;
+
+        .mx_BetaCard_columns_description {
+            flex: 1;
 
-        > div {
             .mx_BetaCard_title {
                 font-weight: $font-semi-bold;
                 font-size: $font-18px;
@@ -32,47 +37,60 @@ limitations under the License.
                 color: $primary-content;
                 margin: 4px 0 14px;
 
-                .mx_BetaCard_betaPill {
-                    margin-left: 12px;
-                }
+                display: flex;
+                align-items: center;
+                column-gap: 12px;
             }
 
             .mx_BetaCard_caption {
                 font-size: $font-15px;
                 line-height: $font-20px;
                 color: $secondary-content;
-                margin-bottom: 20px;
             }
 
-            .mx_BetaCard_buttons .mx_AccessibleButton {
-                display: block;
-                margin: 12px 0;
-                padding: 7px 40px;
-                width: auto;
+            .mx_BetaCard_buttons {
+                display: flex;
+                flex-wrap: wrap-reverse;
+                gap: 12px;
+                margin: 20px auto;
+
+                .mx_AccessibleButton {
+                    padding: 7px 40px;
+                    width: auto;
+                    flex: 1;
+                    white-space: nowrap; // text might overflow
+
+                    &:nth-child(1) {
+                        order: 2; // Place feedback button top and right
+                    }
+                }
             }
 
             .mx_BetaCard_disclaimer {
                 font-size: $font-12px;
                 line-height: $font-15px;
                 color: $secondary-content;
-                margin-top: 20px;
 
                 > h4 {
-                    margin: 0;
+                    margin: 12px 0 0;
                 }
 
                 > p {
-                    margin-top: 0;
+                    margin: 0;
                 }
             }
         }
 
-        > img {
-            margin: auto 0 auto 20px;
-            width: 300px;
-            object-fit: contain;
-            height: 100%;
-            border-radius: 4px;
+        .mx_BetaCard_columns_image_wrapper {
+            margin: auto 0;
+
+            .mx_BetaCard_columns_image {
+                width: 100%;
+                max-width: 300px;
+                object-fit: contain;
+                height: 100%;
+                border-radius: 4px;
+            }
         }
     }
 
@@ -104,6 +122,7 @@ limitations under the License.
     color: #FFFFFF;
     display: inline-block;
     vertical-align: text-bottom;
+    word-break: keep-all; // avoid multiple lines on CJK language
 
     &.mx_AccessibleButton {
         cursor: pointer;
diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
index e743619f8fd..b92ce10d355 100644
--- a/res/css/views/context_menus/_MessageContextMenu.scss
+++ b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -90,6 +90,22 @@ limitations under the License.
         mask-image: url('$(res)/img/element-icons/room/pin.svg');
     }
 
+    .mx_MessageContextMenu_iconCopy::before {
+        mask-image: url($copy-button-url);
+    }
+
+    .mx_MessageContextMenu_iconEdit::before {
+        mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
+    }
+
+    .mx_MessageContextMenu_iconReply::before {
+        mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
+    }
+
+    .mx_MessageContextMenu_iconReact::before {
+        mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
+    }
+
     .mx_MessageContextMenu_iconViewInRoom::before {
         mask-image: url('$(res)/img/element-icons/view-in-room.svg');
     }
diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
deleted file mode 100644
index 14f5ec817ef..00000000000
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_TagTileContextMenu_item {
-    padding: 8px;
-    padding-right: 20px;
-    cursor: pointer;
-    white-space: nowrap;
-    display: flex;
-    align-items: center;
-    line-height: $font-16px;
-}
-
-.mx_TagTileContextMenu_item::before {
-    content: '';
-    height: 15px;
-    width: 15px;
-    background-color: currentColor;
-    mask-repeat: no-repeat;
-    mask-size: contain;
-    margin-right: 8px;
-}
-
-.mx_TagTileContextMenu_viewCommunity::before {
-    mask-image: url('$(res)/img/element-icons/view-community.svg');
-}
-
-.mx_TagTileContextMenu_moveUp::before {
-    transform: rotate(180deg);
-    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
-}
-
-.mx_TagTileContextMenu_moveDown::before {
-    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
-}
-
-.mx_TagTileContextMenu_hideCommunity::before {
-    mask-image: url('$(res)/img/element-icons/hide.svg');
-}
-
-.mx_TagTileContextMenu_createSpace::before {
-    mask-image: url('$(res)/img/element-icons/message/fwd.svg');
-}
-
-.mx_TagTileContextMenu_separator {
-    margin-top: 0;
-    margin-bottom: 0;
-    border-bottom-style: none;
-    border-left-style: none;
-    border-right-style: none;
-    border-top-style: solid;
-    border-top-width: 1px;
-    border-color: $menu-border-color;
-}
diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
index 5d53a996610..f82a29c546b 100644
--- a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -54,7 +54,6 @@ limitations under the License.
             font-size: $font-12px;
             line-height: $font-15px;
             margin-top: 8px;
-            padding: 0;
         }
     }
 
@@ -136,10 +135,6 @@ limitations under the License.
                 left: 0;
             }
         }
-
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-        }
     }
 }
 
diff --git a/res/css/views/dialogs/_AddressPickerDialog.scss b/res/css/views/dialogs/_AddressPickerDialog.scss
deleted file mode 100644
index 44e9f94c5f7..00000000000
--- a/res/css/views/dialogs/_AddressPickerDialog.scss
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_AddressPickerDialog {
-    a:link,
-    a:hover,
-    a:visited {
-        @mixin mx_Dialog_link;
-    }
-}
-
-/* Using a textarea for this element, to circumvent autofill */
-.mx_AddressPickerDialog_input,
-.mx_AddressPickerDialog_input:focus {
-    height: 26px;
-    font-size: $font-14px;
-    padding-left: 12px;
-    padding-right: 12px;
-    margin: 0 !important;
-    border: 0 !important;
-    outline: 0 !important;
-    width: 1000%; /* Pretend that this is an "input type=text" */
-    resize: none;
-    overflow: hidden;
-    vertical-align: middle;
-    box-sizing: border-box;
-    word-wrap: nowrap;
-}
-
-.mx_AddressPickerDialog .mx_Dialog_content {
-    min-height: 50px;
-}
-
-.mx_AddressPickerDialog_inputContainer {
-    border-radius: 3px;
-    border: solid 1px $input-border-color;
-    line-height: $font-36px;
-    padding-left: 4px;
-    padding-right: 4px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-    max-height: 150px;
-    overflow-x: hidden;
-    overflow-y: auto;
-}
-
-.mx_AddressPickerDialog_error {
-    margin-top: 10px;
-    color: $alert;
-}
-
-.mx_AddressPickerDialog_cancel {
-    position: absolute;
-    right: 11px;
-    top: 13px;
-    cursor: pointer;
-}
-
-.mx_AddressPickerDialog_cancel object {
-    pointer-events: none;
-}
-
-.mx_AddressPickerDialog_identityServer {
-    margin-top: 1em;
-}
diff --git a/res/css/views/dialogs/_BugReportDialog.scss b/res/css/views/dialogs/_BugReportDialog.scss
index 1920ac33eaa..348d9ebb99e 100644
--- a/res/css/views/dialogs/_BugReportDialog.scss
+++ b/res/css/views/dialogs/_BugReportDialog.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_BugReportDialog {
     .mx_BugReportDialog_download {
         .mx_AccessibleButton_kind_link {
-            padding-left: 0;
+            margin-right: 18px; // Space between "Downloading logs..."
         }
     }
 }
diff --git a/res/css/views/messages/_SenderProfile.scss b/res/css/views/dialogs/_BulkRedactDialog.scss
similarity index 65%
rename from res/css/views/messages/_SenderProfile.scss
rename to res/css/views/dialogs/_BulkRedactDialog.scss
index 08644b14e3f..c6b2adff874 100644
--- a/res/css/views/messages/_SenderProfile.scss
+++ b/res/css/views/dialogs/_BulkRedactDialog.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2021 Robin Townsend <robin@robin.town>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SenderProfile_displayName {
-    font-weight: 600;
-}
+.mx_BulkRedactDialog {
+    .mx_Checkbox, .mx_BulkRedactDialog_checkboxMicrocopy {
+        line-height: $font-20px;
+    }
 
-.mx_SenderProfile_mxid {
-    font-weight: 600;
-    font-size: 1.1rem;
-    margin-left: 5px;
-    opacity: 0.5; // Match mx_TextualEvent
+    .mx_BulkRedactDialog_checkboxMicrocopy {
+        margin-left: 26px;
+        color: $secondary-content;
+    }
 }
diff --git a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss b/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
deleted file mode 100644
index 5d6c817b14d..00000000000
--- a/res/css/views/dialogs/_CommunityPrototypeInviteDialog.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_CommunityPrototypeInviteDialog {
-    &.mx_Dialog_fixedWidth {
-        width: 360px;
-    }
-
-    .mx_Dialog_content {
-        margin-bottom: 0;
-
-        .mx_CommunityPrototypeInviteDialog_people {
-            position: relative;
-            margin-bottom: 4px;
-
-            .mx_AccessibleButton {
-                display: inline-block;
-                background-color: $focus-bg-color; // XXX: Abuse of variables
-                border-radius: 4px;
-                padding: 3px 5px;
-                font-size: $font-12px;
-                float: right;
-            }
-        }
-
-        .mx_CommunityPrototypeInviteDialog_morePeople {
-            margin-top: 8px;
-        }
-
-        .mx_CommunityPrototypeInviteDialog_person {
-            position: relative;
-            margin-top: 4px;
-
-            & > * {
-                vertical-align: middle;
-            }
-
-            .mx_Checkbox {
-                position: absolute;
-                right: 0;
-                top: calc(50% - 8px); // checkbox is 16px high
-                width: 16px; // to force a square
-            }
-
-            .mx_CommunityPrototypeInviteDialog_personIdentifiers {
-                display: inline-block;
-
-                & > * {
-                    display: block;
-                }
-
-                .mx_CommunityPrototypeInviteDialog_personName {
-                    font-weight: 600;
-                    font-size: $font-14px;
-                    color: $primary-content;
-                    margin-left: 7px;
-                }
-
-                .mx_CommunityPrototypeInviteDialog_personId {
-                    font-size: $font-12px;
-                    color: $muted-fg-color;
-                    margin-left: 7px;
-                }
-            }
-        }
-
-        .mx_CommunityPrototypeInviteDialog_primaryButton {
-            display: block;
-            font-size: $font-13px;
-            line-height: 20px;
-            height: 20px;
-            margin-top: 24px;
-        }
-    }
-}
diff --git a/res/css/views/dialogs/_CreateCommunityPrototypeDialog.scss b/res/css/views/dialogs/_CreateCommunityPrototypeDialog.scss
deleted file mode 100644
index a2378115a85..00000000000
--- a/res/css/views/dialogs/_CreateCommunityPrototypeDialog.scss
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_CreateCommunityPrototypeDialog {
-    .mx_Dialog_content {
-        display: flex;
-        flex-direction: row;
-        margin-bottom: 12px;
-
-        .mx_CreateCommunityPrototypeDialog_colName {
-            flex-basis: 66.66%;
-            padding-right: 100px;
-
-            .mx_Field input {
-                font-size: $font-16px;
-                line-height: $font-20px;
-            }
-
-            .mx_CreateCommunityPrototypeDialog_subtext {
-                display: block;
-                color: $muted-fg-color;
-                margin-bottom: 16px;
-
-                &:last-child {
-                    margin-top: 16px;
-                }
-
-                &.mx_CreateCommunityPrototypeDialog_subtext_error {
-                    color: $alert;
-                }
-            }
-
-            .mx_CreateCommunityPrototypeDialog_communityId {
-                position: relative;
-
-                .mx_InfoTooltip {
-                    float: right;
-                }
-            }
-
-            .mx_AccessibleButton {
-                display: block;
-                height: 32px;
-                font-size: $font-16px;
-                line-height: 32px;
-            }
-        }
-
-        .mx_CreateCommunityPrototypeDialog_colAvatar {
-            flex-basis: 33.33%;
-
-            .mx_CreateCommunityPrototypeDialog_avatarContainer {
-                margin-top: 12px;
-                margin-bottom: 20px;
-
-                .mx_CreateCommunityPrototypeDialog_avatar,
-                .mx_CreateCommunityPrototypeDialog_placeholderAvatar {
-                    width: 96px;
-                    height: 96px;
-                    border-radius: 96px;
-                }
-
-                .mx_CreateCommunityPrototypeDialog_placeholderAvatar {
-                    background-color: #368bd6; // hardcoded for both themes
-
-                    &::before {
-                        display: inline-block;
-                        background-color: #fff; // hardcoded because the background is
-                        mask-repeat: no-repeat;
-                        mask-size: 96px;
-                        width: 96px;
-                        height: 96px;
-                        mask-position: center;
-                        content: '';
-                        vertical-align: middle;
-                        mask-image: url('$(res)/img/element-icons/add-photo.svg');
-                    }
-                }
-            }
-
-            .mx_CreateCommunityPrototypeDialog_tip {
-                & > b, & > span {
-                    display: block;
-                    color: $muted-fg-color;
-                }
-            }
-        }
-    }
-}
diff --git a/res/css/views/dialogs/_CreateGroupDialog.scss b/res/css/views/dialogs/_CreateGroupDialog.scss
deleted file mode 100644
index ef9c2b73d43..00000000000
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_CreateGroupDialog_inputRow {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.mx_CreateGroupDialog_label {
-    text-align: left;
-    padding-bottom: 12px;
-}
-
-.mx_CreateGroupDialog_input {
-    font-size: $font-15px;
-    border-radius: 3px;
-    border: 1px solid $input-border-color;
-    padding: 9px;
-    color: $primary-content;
-    background-color: $background;
-}
-
-.mx_CreateGroupDialog_input_hasPrefixAndSuffix {
-    border-radius: 0px;
-}
-
-.mx_CreateGroupDialog_input_group {
-    display: flex;
-}
-
-.mx_CreateGroupDialog_prefix,
-.mx_CreateGroupDialog_suffix {
-    padding: 0px 5px;
-    line-height: $font-37px;
-    background-color: $input-darker-bg-color;
-    border: 1px solid $input-border-color;
-    text-align: center;
-}
-
-.mx_CreateGroupDialog_prefix {
-    border-right: 0px;
-    border-radius: 3px 0px 0px 3px;
-}
-
-.mx_CreateGroupDialog_suffix {
-    border-left: 0px;
-    border-radius: 0px 3px 3px 0px;
-}
diff --git a/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss b/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
deleted file mode 100644
index 72c2d13ae38..00000000000
--- a/res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_CreateSpaceFromCommunityDialog_wrapper {
-    .mx_Dialog {
-        display: flex;
-        flex-direction: column;
-    }
-}
-
-.mx_CreateSpaceFromCommunityDialog {
-    width: 480px;
-    color: $primary-content;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    min-height: 0;
-
-    .mx_CreateSpaceFromCommunityDialog_content {
-        > p {
-            font-size: $font-15px;
-            line-height: $font-24px;
-
-            &:first-of-type {
-                margin-top: 0;
-            }
-
-            &.mx_CreateSpaceFromCommunityDialog_flairNotice {
-                font-size: $font-12px;
-                line-height: $font-15px;
-            }
-        }
-
-        .mx_SpaceBasicSettings {
-            > p {
-                font-size: $font-12px;
-                line-height: $font-15px;
-                margin: 16px 0;
-            }
-
-            .mx_Field_textarea {
-                margin-bottom: 0;
-            }
-        }
-
-        .mx_JoinRuleDropdown .mx_Dropdown_menu {
-            width: auto !important; // override fixed width
-        }
-
-        .mx_CreateSpaceFromCommunityDialog_nonPublicSpacer {
-            height: 63px; // balance the height of the missing room alias field to prevent modal bouncing
-        }
-    }
-
-    .mx_CreateSpaceFromCommunityDialog_footer {
-        display: flex;
-        margin-top: 20px;
-
-        > span {
-            flex-grow: 1;
-            font-size: $font-12px;
-            line-height: $font-15px;
-            color: $secondary-content;
-            margin-top: -13px; // match height of buttons to prevent height changing
-
-            .mx_ProgressBar {
-                height: 8px;
-                width: 100%;
-
-                @mixin ProgressBarBorderRadius 8px;
-            }
-
-            .mx_CreateSpaceFromCommunityDialog_progressText {
-                margin-top: 8px;
-                font-size: $font-15px;
-                line-height: $font-24px;
-                color: $primary-content;
-            }
-
-            > * {
-                vertical-align: middle;
-            }
-        }
-
-        .mx_CreateSpaceFromCommunityDialog_error {
-            padding-left: 12px;
-
-            > img {
-                align-self: center;
-            }
-
-            .mx_CreateSpaceFromCommunityDialog_errorHeading {
-                font-weight: $font-semi-bold;
-                font-size: $font-15px;
-                line-height: $font-18px;
-                color: $alert;
-            }
-
-            .mx_CreateSpaceFromCommunityDialog_errorCaption {
-                margin-top: 4px;
-                font-size: $font-12px;
-                line-height: $font-15px;
-                color: $primary-content;
-            }
-        }
-
-        .mx_AccessibleButton {
-            display: inline-block;
-            align-self: center;
-        }
-
-        .mx_AccessibleButton_kind_primary {
-            padding: 8px 36px;
-            margin-left: 24px;
-        }
-
-        .mx_AccessibleButton_kind_primary_outline {
-            margin-left: auto;
-        }
-
-        .mx_CreateSpaceFromCommunityDialog_retryButton {
-            margin-left: 12px;
-            padding-left: 24px;
-            position: relative;
-
-            &::before {
-                content: '';
-                position: absolute;
-                background-color: $primary-content;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
-                mask-image: url('$(res)/img/element-icons/retry.svg');
-                width: 18px;
-                height: 18px;
-                left: 0;
-            }
-        }
-
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-        }
-    }
-}
-
-.mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog {
-    .mx_InfoDialog {
-        max-width: 500px;
-    }
-
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-    }
-
-    .mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark {
-        position: relative;
-        border-radius: 50%;
-        border: 3px solid $accent;
-        width: 68px;
-        height: 68px;
-        margin: 12px auto 32px;
-
-        &::before {
-            width: inherit;
-            height: inherit;
-            content: '';
-            position: absolute;
-            background-color: $accent;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
-            mask-size: 48px;
-        }
-    }
-}
diff --git a/res/css/views/dialogs/_CreateSubspaceDialog.scss b/res/css/views/dialogs/_CreateSubspaceDialog.scss
index 1ed10df35c4..bcce6def89f 100644
--- a/res/css/views/dialogs/_CreateSubspaceDialog.scss
+++ b/res/css/views/dialogs/_CreateSubspaceDialog.scss
@@ -73,9 +73,5 @@ limitations under the License.
             margin-left: 16px;
             padding: 8px 36px;
         }
-
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-        }
     }
 }
diff --git a/res/css/views/dialogs/_DeactivateAccountDialog.scss b/res/css/views/dialogs/_DeactivateAccountDialog.scss
index 192917b2d00..8941afaf39c 100644
--- a/res/css/views/dialogs/_DeactivateAccountDialog.scss
+++ b/res/css/views/dialogs/_DeactivateAccountDialog.scss
@@ -18,10 +18,6 @@ limitations under the License.
     margin-bottom: 30px;
 }
 
-.mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section {
-    margin-top: 60px;
-}
-
 .mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section .mx_Field {
     width: 300px;
 }
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 37974d1358d..b1fed0d29bd 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -14,36 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DevTools_content {
-    margin: 10px 0;
+.mx_DevtoolsDialog_wrapper {
+    .mx_Dialog {
+        height: 100%;
+    }
+
+    .mx_Dialog_fixedWidth {
+        overflow-y: hidden;
+        height: 100%;
+    }
 }
 
-.mx_DevTools_ServersInRoomList_button {
-    /* Set the cursor back to default as `.mx_Dialog button` sets it to pointer */
-    cursor: default !important;
+.mx_DevTools_content {
+    overflow-y: auto;
+    height: calc(100% - 124px); // 58px for buttons + 50px for header + 8px margin around
 }
 
 .mx_DevTools_RoomStateExplorer_query {
     margin-bottom: 10px;
 }
 
-.mx_DevTools_RoomStateExplorer_button {
-    font-family: monospace;
+.mx_DevTools_button {
+    font-family: monospace !important;
+    margin-bottom: 8px !important;
 }
 
 .mx_DevTools_RoomStateExplorer_button_hasSpaces {
     text-decoration: underline;
 }
 
-.mx_DevTools_RoomStateExplorer_button.mx_DevTools_RoomStateExplorer_button_emptyString {
+.mx_DevTools_button.mx_DevTools_RoomStateExplorer_button_emptyString {
     font-style: italic;
 }
 
-.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_ServersInRoomList_button {
-    margin-bottom: 10px;
-    width: 100%;
-}
-
 .mx_DevTools_label_left {
     float: left;
 }
@@ -83,108 +86,6 @@ limitations under the License.
     margin-right: 42px;
 }
 
-.mx_DevTools_tgl {
-    display: none;
-
-    // add default box-sizing for this scope
-    &,
-    &::after,
-    &::before,
-    & *,
-    & *::after,
-    & *::before,
-    & + .mx_DevTools_tgl-btn {
-        box-sizing: border-box;
-        &::selection {
-            background: none;
-        }
-    }
-
-    + .mx_DevTools_tgl-btn {
-        outline: 0;
-        display: block;
-        width: 7em;
-        height: 2em;
-        position: relative;
-        cursor: pointer;
-        user-select: none;
-        &::after,
-        &::before {
-            position: relative;
-            display: block;
-            content: "";
-            width: 50%;
-            height: 100%;
-        }
-
-        &::after {
-            left: 0;
-        }
-
-        &::before {
-            display: none;
-        }
-    }
-
-    &:checked + .mx_DevTools_tgl-btn::after {
-        left: 50%;
-    }
-}
-
-.mx_DevTools_tgl-flip {
-    + .mx_DevTools_tgl-btn {
-        padding: 2px;
-        transition: all .2s ease;
-        perspective: 100px;
-        &::after,
-        &::before {
-            display: inline-block;
-            transition: all .4s ease;
-            width: 100%;
-            text-align: center;
-            position: absolute;
-            line-height: 2em;
-            font-weight: bold;
-            color: #fff;
-            top: 0;
-            left: 0;
-            backface-visibility: hidden;
-            border-radius: 4px;
-        }
-
-        &::after {
-            content: attr(data-tg-on);
-            background: #02c66f;
-            transform: rotateY(-180deg);
-        }
-
-        &::before {
-            background: #ff3a19;
-            content: attr(data-tg-off);
-        }
-
-        &:active::before {
-            transform: rotateY(-20deg);
-        }
-    }
-
-    &:checked + .mx_DevTools_tgl-btn {
-        &::before {
-            transform: rotateY(180deg);
-        }
-
-        &::after {
-            transform: rotateY(0);
-            left: 0;
-            background: #7fc6a6;
-        }
-
-        &:active::after {
-            transform: rotateY(20deg);
-        }
-    }
-}
-
 .mx_DevTools_VerificationRequest {
     border: 1px solid #cccccc;
     border-radius: 3px;
diff --git a/res/css/views/dialogs/_EditCommunityPrototypeDialog.scss b/res/css/views/dialogs/_EditCommunityPrototypeDialog.scss
deleted file mode 100644
index 75a56bf6b37..00000000000
--- a/res/css/views/dialogs/_EditCommunityPrototypeDialog.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// XXX: many of these styles are shared with the create dialog
-.mx_EditCommunityPrototypeDialog {
-    &.mx_Dialog_fixedWidth {
-        width: 360px;
-    }
-
-    .mx_Dialog_content {
-        margin-bottom: 12px;
-
-        .mx_AccessibleButton.mx_AccessibleButton_kind_primary {
-            display: block;
-            height: 32px;
-            font-size: $font-16px;
-            line-height: 32px;
-        }
-
-        .mx_EditCommunityPrototypeDialog_rowAvatar {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-        }
-
-        .mx_EditCommunityPrototypeDialog_avatarContainer {
-            margin-top: 20px;
-            margin-bottom: 20px;
-
-            .mx_EditCommunityPrototypeDialog_avatar,
-            .mx_EditCommunityPrototypeDialog_placeholderAvatar {
-                width: 96px;
-                height: 96px;
-                border-radius: 96px;
-            }
-
-            .mx_EditCommunityPrototypeDialog_placeholderAvatar {
-                background-color: #368bd6; // hardcoded for both themes
-
-                &::before {
-                    display: inline-block;
-                    background-color: #fff; // hardcoded because the background is
-                    mask-repeat: no-repeat;
-                    mask-size: 96px;
-                    width: 96px;
-                    height: 96px;
-                    mask-position: center;
-                    content: '';
-                    vertical-align: middle;
-                    mask-image: url('$(res)/img/element-icons/add-photo.svg');
-                }
-            }
-        }
-
-        .mx_EditCommunityPrototypeDialog_tip {
-            margin-left: 20px;
-
-            & > b, & > span {
-                display: block;
-                color: $muted-fg-color;
-            }
-        }
-    }
-}
diff --git a/res/css/views/dialogs/_FeedbackDialog.scss b/res/css/views/dialogs/_FeedbackDialog.scss
index 9e4cf5e8aae..8d11b83fe11 100644
--- a/res/css/views/dialogs/_FeedbackDialog.scss
+++ b/res/css/views/dialogs/_FeedbackDialog.scss
@@ -58,11 +58,6 @@ limitations under the License.
             line-height: $font-15px;
         }
 
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-            font-size: inherit;
-        }
-
         a, .mx_AccessibleButton_kind_link {
             color: $accent;
             text-decoration: underline;
diff --git a/res/css/views/dialogs/_ForwardDialog.scss b/res/css/views/dialogs/_ForwardDialog.scss
index 205aaaa2026..ad7bf9a8167 100644
--- a/res/css/views/dialogs/_ForwardDialog.scss
+++ b/res/css/views/dialogs/_ForwardDialog.scss
@@ -93,7 +93,7 @@ limitations under the License.
                 border-radius: 8px;
 
                 &:hover {
-                    background-color: $groupFilterPanel-bg-color;
+                    background-color: $spacePanel-bg-color;
                 }
 
                 .mx_ForwardList_roomButton {
diff --git a/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
index ab7496249dc..83f93495143 100644
--- a/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
+++ b/res/css/views/dialogs/_GenericFeatureFeedbackDialog.scss
@@ -21,10 +21,4 @@ limitations under the License.
         line-height: $font-20px;
         margin-bottom: 24px;
     }
-
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-        font-size: inherit;
-        line-height: inherit;
-    }
 }
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 546327ff40a..35fedd7cf28 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -43,7 +43,7 @@ limitations under the License.
             min-width: max-content; // prevent manipulation by flexbox
         }
 
-        // Mostly copied from AddressPickerDialog; overrides bunch of our default text input styles
+        // overrides bunch of our default text input styles
         > input[type="text"] {
             margin: 6px 0 !important;
             height: 24px;
@@ -97,11 +97,9 @@ limitations under the License.
         color: $primary-content;
     }
 
-    .mx_InviteDialog_subname {
-        margin-bottom: 10px;
-        margin-top: -10px; // HACK: Positioning with margins is bad
-        font-size: $font-12px;
-        color: $muted-fg-color;
+    .mx_InviteDialog_section_showMore {
+        margin: 7px 18px;
+        display: block;
     }
 }
 
@@ -273,10 +271,25 @@ limitations under the License.
 .mx_InviteDialog_other {
     // Prevent the dialog from jumping around randomly when elements change.
     height: 600px;
-    padding-left: 20px; // the design wants some padding on the left
+
+    .mx_InviteDialog_addressBar {
+        margin-right: 0;
+    }
 
     .mx_InviteDialog_userSections {
         height: calc(100% - 115px); // mx_InviteDialog's height minus some for the upper and lower elements
+        padding-right: 0;
+
+        .mx_InviteDialog_section {
+            padding-bottom: 0;
+            margin-top: 12px;
+        }
+    }
+
+    .mx_InviteDialog_hasFooter {
+        .mx_InviteDialog_userSections {
+            height: calc(100% - 175px); // For displaying an invite link on the footer of the dialog
+        }
     }
 }
 
@@ -432,3 +445,7 @@ limitations under the License.
         }
     }
 }
+
+.mx_InviteDialog_identityServer {
+    margin-top: 1em;
+}
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.scss b/res/css/views/dialogs/_JoinRuleDropdown.scss
index 19209e95361..b4d13909a77 100644
--- a/res/css/views/dialogs/_JoinRuleDropdown.scss
+++ b/res/css/views/dialogs/_JoinRuleDropdown.scss
@@ -60,7 +60,7 @@ limitations under the License.
     }
 
     .mx_JoinRuleDropdown_restricted::before {
-        mask-image: url('$(res)/img/element-icons/community-members.svg');
+        mask-image: url('$(res)/img/element-icons/group-members.svg');
         mask-size: contain;
     }
 }
diff --git a/res/css/views/dialogs/_LeaveSpaceDialog.scss b/res/css/views/dialogs/_LeaveSpaceDialog.scss
index baae73a90b9..aa20efe89a8 100644
--- a/res/css/views/dialogs/_LeaveSpaceDialog.scss
+++ b/res/css/views/dialogs/_LeaveSpaceDialog.scss
@@ -19,58 +19,49 @@ limitations under the License.
         display: flex;
         flex-direction: column;
         padding: 24px 32px;
-    }
-}
 
-.mx_LeaveSpaceDialog {
-    width: 440px;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    height: 520px;
+        .mx_LeaveSpaceDialog {
+            width: 440px;
+            display: flex;
+            flex-direction: column;
+            flex-wrap: nowrap;
+            height: 520px;
 
-    .mx_Dialog_content {
-        flex-grow: 1;
-        margin: 0;
-        overflow-y: auto;
+            .mx_Dialog_content {
+                flex-grow: 1;
+                margin: 0;
+                overflow-y: auto;
 
-        .mx_LeaveSpaceDialog_section_warning {
-            position: relative;
-            border-radius: 8px;
-            margin: 12px 0 0;
-            padding: 12px 8px 12px 42px;
-            background-color: $header-panel-bg-color;
+                .mx_LeaveSpaceDialog_section_warning {
+                    position: relative;
+                    border-radius: 8px;
+                    margin: 12px 0 0;
+                    padding: 12px 8px 12px 42px;
+                    background-color: $header-panel-bg-color;
 
-            font-size: $font-12px;
-            line-height: $font-15px;
-            color: $secondary-content;
+                    font-size: $font-12px;
+                    line-height: $font-15px;
+                    color: $secondary-content;
 
-            &::before {
-                content: '';
-                position: absolute;
-                left: 10px;
-                top: calc(50% - 8px); // vertical centering
-                height: 16px;
-                width: 16px;
-                background-color: $secondary-content;
-                mask-repeat: no-repeat;
-                mask-size: contain;
-                mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
-                mask-position: center;
-            }
-        }
+                    &::before {
+                        content: '';
+                        position: absolute;
+                        left: 10px;
+                        top: calc(50% - 8px); // vertical centering
+                        height: 16px;
+                        width: 16px;
+                        background-color: $secondary-content;
+                        mask-repeat: no-repeat;
+                        mask-size: contain;
+                        mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
+                        mask-position: center;
+                    }
+                }
 
-        > p {
-            color: $primary-content;
-        }
-    }
-
-    .mx_Dialog_buttons {
-        margin-top: 20px;
-
-        .mx_Dialog_primary {
-            background-color: $alert !important; // override default colour
-            border-color: $alert;
+                > p {
+                    color: $primary-content;
+                }
+            }
         }
     }
 }
diff --git a/res/css/views/dialogs/_LocationViewDialog.scss b/res/css/views/dialogs/_LocationViewDialog.scss
index e7cdaf88007..600c3082657 100644
--- a/res/css/views/dialogs/_LocationViewDialog.scss
+++ b/res/css/views/dialogs/_LocationViewDialog.scss
@@ -48,49 +48,10 @@ limitations under the License.
             background-color: $dialog-close-external-color;
         }
     }
+}
 
-    .mx_MLocationBody {
-        position: absolute;
-
-        .mx_MLocationBody_map {
-            width: 80vw;
-            height: 80vh;
-        }
-
-        .mx_MLocationBody_zoomButtons {
-            position: absolute;
-            display: grid;
-            grid-template-columns: auto;
-            grid-row-gap: 8px;
-
-            right: 24px;
-            bottom: 48px;
-
-            .mx_AccessibleButton {
-                background-color: $background;
-                box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.25);
-                border-radius: 4px;
-                width: 24px;
-                height: 24px;
-
-                .mx_MLocationBody_zoomButton {
-                    background-color: $primary-content;
-                    margin: 4px;
-                    width: 16px;
-                    height: 16px;
-                    mask-repeat: no-repeat;
-                    mask-size: contain;
-                    mask-position: center;
-                }
-
-                .mx_MLocationBody_plusButton {
-                    mask-image: url('$(res)/img/element-icons/plus-button.svg');
-                }
-
-                .mx_MLocationBody_minusButton {
-                    mask-image: url('$(res)/img/element-icons/minus-button.svg');
-                }
-            }
-        }
-    }
+.mx_LocationViewDialog_map {
+    width: 80vw;
+    height: 80vh;
+    border-radius: 8px;
 }
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index f18b4917cf1..07735ad0278 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -22,84 +22,99 @@ limitations under the License.
         margin: 0;
         padding: 0;
     }
-}
 
-.mx_RoomSettingsDialog_BridgeList li {
-    list-style-type: none;
-    padding: 5px;
-    margin-bottom: 8px;
-    border-width: 1px 1px;
-    border-color: $primary-hairline-color;
-    border-style: solid;
-    border-radius: 5px;
+    li {
+        list-style-type: none;
 
-    .column-icon {
-        float: left;
-        padding-right: 10px;
+        &.mx_RoomSettingsDialog_BridgeList_listItem {
+            display: flex;
+            flex-wrap: wrap;
+            gap: $spacing-8;
+            padding: 5px;
+            margin-bottom: $spacing-8;
 
-        * {
+            // border-style around each bridge list item
+            border-width: 1px 1px;
+            border-color: $primary-hairline-color;
+            border-style: solid;
             border-radius: 5px;
-            border: 1px solid $input-darker-bg-color;
-        }
-
-        .noProtocolIcon {
-            width: 48px;
-            height: 48px;
-            background: $input-darker-bg-color;
-            border-radius: 5px;
-        }
 
-        .protocol-icon {
-            float: left;
-            margin-right: 5px;
-            img {
-                border-radius: 5px;
-                border-width: 1px 1px;
-                border-color: $primary-hairline-color;
+            .mx_RoomSettingsDialog_column_icon {
+                .mx_RoomSettingsDialog_protocolIcon,
+                .mx_RoomSettingsDialog_protocolIcon span,
+                .mx_RoomSettingsDialog_noProtocolIcon {
+                    box-sizing: border-box;
+                    border-radius: 5px;
+                    border: 1px solid $input-darker-bg-color;
+                }
+
+                .mx_RoomSettingsDialog_noProtocolIcon,
+                .mx_RoomSettingsDialog_protocolIcon img {
+                    border-radius: 5px;
+                }
+
+                .mx_RoomSettingsDialog_noProtocolIcon {
+                    width: 48px;
+                    height: 48px;
+                    background: $input-darker-bg-color;
+                }
+
+                .mx_RoomSettingsDialog_protocolIcon {
+                    img {
+                        border-width: 1px 1px;
+                        border-color: $primary-hairline-color;
+                    }
+
+                    span {
+                        /* Correct letter placement */
+                        left: auto;
+                    }
+                }
             }
-            span {
-                /* Correct letter placement */
-                left: auto;
-            }
-        }
-    }
-
-    .column-data {
-        display: inline-block;
-        width: 85%;
-
-        > h3 {
-            margin-top: 0px;
-            margin-bottom: 0px;
-            font-size: 16pt;
-            color: $primary-content;
-        }
-
-        > * {
-            margin-top: 4px;
-            margin-bottom: 0;
-        }
-
-        .workspace-channel-details {
-            color: $primary-content;
-            font-weight: 600;
-
-            .channel {
-                margin-left: 5px;
-            }
-        }
 
-        .metadata {
-            color: $muted-fg-color;
-            margin-bottom: 0;
-            overflow-y: visible;
-            text-overflow: ellipsis;
-            white-space: normal;
-            padding: 0;
-
-            > li {
-                padding: 0;
-                border: 0;
+            .mx_RoomSettingsDialog_column_data {
+                display: inline-block;
+                width: 85%;
+
+                .mx_RoomSettingsDialog_column_data_details,
+                .mx_RoomSettingsDialog_column_data_metadata,
+                .mx_RoomSettingsDialog_column_data_metadata li,
+                .mx_RoomSettingsDialog_column_data_protocolName {
+                    margin-bottom: 0;
+                }
+
+                .mx_RoomSettingsDialog_column_data_details,
+                .mx_RoomSettingsDialog_column_data_metadata {
+                    margin-top: $spacing-4;
+                }
+
+                .mx_RoomSettingsDialog_column_data_metadata li {
+                    margin-top: $spacing-8;
+                }
+
+                .mx_RoomSettingsDialog_column_data_protocolName {
+                    margin-top: 0;
+                    font-size: 16pt;
+                    color: $primary-content;
+                }
+
+                .mx_RoomSettingsDialog_workspace_channel_details {
+                    color: $primary-content;
+                    font-weight: $font-semi-bold;
+
+                    .mx_RoomSettingsDialog_channel {
+                        margin-inline-start: 5px;
+                    }
+                }
+
+                .mx_RoomSettingsDialog_metadata {
+                    color: $muted-fg-color;
+                    margin-bottom: 0;
+                    overflow-y: visible;
+                    text-overflow: ellipsis;
+                    white-space: normal;
+                    padding: 0;
+                }
             }
         }
     }
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
index 8f064f6b380..ead082dba68 100644
--- a/res/css/views/dialogs/_SpaceSettingsDialog.scss
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -76,11 +76,13 @@ limitations under the License.
     }
 
     .mx_AccessibleButton_hasKind {
-        padding: 8px 22px;
+        &.mx_AccessibleButton_kind_link {
+            font-size: $font-14px;
+            margin: 7px 18px;
 
-        &.mx_SettingsTab_showAdvanced {
-            margin: 16px 0;
-            padding: 0;
+            &.mx_SettingsTab_showAdvanced {
+                margin: 18px 0;
+            }
         }
     }
 
diff --git a/res/css/views/dialogs/_SpotlightDialog.scss b/res/css/views/dialogs/_SpotlightDialog.scss
index 31358ad8a3b..9f78d905b52 100644
--- a/res/css/views/dialogs/_SpotlightDialog.scss
+++ b/res/css/views/dialogs/_SpotlightDialog.scss
@@ -100,6 +100,7 @@ limitations under the License.
                 display: flex;
                 white-space: nowrap;
                 overflow-x: hidden;
+                margin-right: 1px; // occlude the 1px visible of the very next tile to prevent it looking broken
             }
 
             .mx_AccessibleButton {
@@ -109,15 +110,16 @@ limitations under the License.
                 font-size: $font-12px;
                 line-height: $font-15px;
                 display: inline-block;
-                width: 50px;
-                min-width: 50px;
+                width: 58px;
+                height: 58px;
+                min-width: 58px;
                 box-sizing: border-box;
                 text-align: center;
                 overflow: hidden;
                 text-overflow: ellipsis;
 
                 .mx_DecoratedRoomAvatar {
-                    margin: 0 5px 4px; // maintain centering
+                    margin: 0 9px 4px; // maintain centering
                 }
 
                 & + .mx_AccessibleButton {
@@ -150,8 +152,8 @@ limitations under the License.
                 > .mx_DecoratedRoomAvatar,
                 > .mx_BaseAvatar {
                     margin-right: 8px;
-                    width: 20px;
-                    height: 20px;
+                    width: 24px;
+                    height: 24px;
 
                     .mx_BaseAvatar {
                         width: inherit;
@@ -186,8 +188,8 @@ limitations under the License.
                     mask-repeat: no-repeat;
                     mask-position: center;
                     mask-size: contain;
-                    width: 20px;
-                    height: 20px;
+                    width: 24px;
+                    height: 24px;
                     position: absolute;
                     left: 4px;
                     top: 50%;
@@ -214,9 +216,8 @@ limitations under the License.
 
             .mx_SpotlightDialog_otherSearches_messageSearchIcon {
                 display: inline-block;
-                margin-left: 8px;
-                width: 20px;
-                height: 20px;
+                width: 24px;
+                height: 24px;
                 background-color: $secondary-content;
                 vertical-align: text-bottom;
                 mask-repeat: no-repeat;
@@ -240,7 +241,6 @@ limitations under the License.
         .mx_SpotlightDialog_recentSearches > h4 > .mx_AccessibleButton_kind_link {
             padding: 0;
             float: right;
-            font-weight: normal;
             font-size: $font-12px;
             line-height: $font-15px;
             color: $secondary-content;
diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss
index b013b4998af..79cacb5c507 100644
--- a/res/css/views/dialogs/_UserSettingsDialog.scss
+++ b/res/css/views/dialogs/_UserSettingsDialog.scss
@@ -60,7 +60,3 @@ limitations under the License.
 .mx_UserSettingsDialog_mjolnirIcon::before {
     mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg');
 }
-
-.mx_UserSettingsDialog_flairIcon::before {
-    mask-image: url('$(res)/img/element-icons/settings/flair.svg');
-}
diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
index e8bde18232a..609c022f855 100644
--- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
+++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.scss
@@ -18,6 +18,8 @@ limitations under the License.
     position: relative;
     padding-left: 24px; // 16px icon + 8px padding
     margin-top: 7px; // vertical alignment to buttons
+    margin-bottom: 7px; // space between the buttons and the text when float is activated
+    text-align: left;
 
     &::before {
         content: "";
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index bf5440d6829..021e8ffc8c1 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -16,152 +16,159 @@ limitations under the License.
 
 .mx_AccessibleButton {
     cursor: pointer;
-}
-
-.mx_AccessibleButton_disabled {
-    cursor: default;
-}
-
-.mx_AccessibleButton_hasKind {
-    padding: 7px 18px;
-    text-align: center;
-    border-radius: 8px;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    font-size: $font-14px;
-    border: none; // override default <button /> styles
-}
-
-.mx_AccessibleButton_kind_primary {
-    color: $button-primary-fg-color;
-    background-color: $accent;
-    border: 1px solid $accent; // account for size loss of no border
-    font-weight: 600;
-}
-
-.mx_AccessibleButton_kind_primary_outline {
-    color: $accent;
-    background-color: $button-secondary-bg-color;
-    border: 1px solid $accent;
-    font-weight: 600;
-}
-
-.mx_AccessibleButton_kind_secondary {
-    color: $accent;
-    font-weight: 600;
-}
 
-.mx_AccessibleButton_kind_primary.mx_AccessibleButton_disabled,
-.mx_AccessibleButton_kind_primary_outline.mx_AccessibleButton_disabled {
-    opacity: 0.4;
-}
-
-.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_primary_sm {
-    padding: 5px 12px;
-    color: $button-primary-fg-color;
-    background-color: $accent;
-}
-
-.mx_AccessibleButton_kind_primary_sm.mx_AccessibleButton_disabled {
-    opacity: 0.4;
-}
-
-.mx_AccessibleButton_kind_danger {
-    color: $button-danger-fg-color;
-    background-color: $alert;
-}
-
-.mx_AccessibleButton_kind_danger_outline {
-    color: $alert;
-    background-color: transparent;
-    border: 1px solid $alert;
-}
+    &.mx_AccessibleButton_disabled {
+        cursor: default;
+
+        &.mx_AccessibleButton_kind_primary,
+        &.mx_AccessibleButton_kind_primary_outline,
+        &.mx_AccessibleButton_kind_primary_sm,
+        &.mx_AccessibleButton_kind_link,
+        &.mx_AccessibleButton_kind_link_inline,
+        &.mx_AccessibleButton_kind_link_sm {
+            opacity: 0.4;
+        }
+    }
 
-.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
-    color: $button-danger-disabled-fg-color;
-    background-color: $button-danger-disabled-bg-color;
-}
+    &.mx_AccessibleButton_hasKind {
+        padding: 7px 18px;
+        text-align: center;
+        border-radius: 8px;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        font-size: $font-14px;
+        border: none; // override default <button /> styles
+        word-break: keep-all; // prevent button text in Chinese/Japanese/Korean (CJK) from being collapsed
+
+        &.mx_AccessibleButton_kind_primary_sm,
+        &.mx_AccessibleButton_kind_danger_sm,
+        &.mx_AccessibleButton_kind_link_sm {
+            padding: 5px 12px;
+        }
+
+        &.mx_AccessibleButton_kind_primary_sm {
+            color: $button-primary-fg-color;
+            background-color: $accent;
+        }
+
+        &.mx_AccessibleButton_kind_danger_sm {
+            color: $button-danger-fg-color;
+            background-color: $alert;
+        }
+
+        &.mx_AccessibleButton_kind_link_sm {
+            color: $accent;
+        }
+
+        &.mx_AccessibleButton_kind_confirm_sm {
+            background-color: $accent;
+
+            &::before {
+                mask-image: url('$(res)/img/feather-customised/check.svg');
+            }
+        }
+
+        &.mx_AccessibleButton_kind_cancel_sm {
+            background-color: $alert;
+
+            &::before {
+                mask-image: url('$(res)/img/feather-customised/x.svg');
+            }
+        }
+    }
 
-.mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled {
-    color: $button-danger-disabled-bg-color;
-    border-color: $button-danger-disabled-bg-color;
-}
+    &.mx_AccessibleButton_kind_primary,
+    &.mx_AccessibleButton_kind_primary_outline,
+    &.mx_AccessibleButton_kind_secondary {
+        font-weight: 600;
+    }
 
-.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm {
-    padding: 5px 12px;
-    color: $button-danger-fg-color;
-    background-color: $alert;
-}
+    &.mx_AccessibleButton_kind_primary,
+    &.mx_AccessibleButton_kind_primary_outline {
+        border: 1px solid $accent;
+    }
 
-.mx_AccessibleButton_kind_danger_sm.mx_AccessibleButton_disabled {
-    color: $button-danger-disabled-fg-color;
-    background-color: $button-danger-disabled-bg-color;
-}
+    &.mx_AccessibleButton_kind_primary {
+        color: $button-primary-fg-color;
+        background-color: $accent;
+    }
 
-.mx_AccessibleButton_kind_link {
-    color: $accent;
-}
+    &.mx_AccessibleButton_kind_primary_outline {
+        color: $accent;
+        background-color: $button-secondary-bg-color;
+    }
 
-.mx_AccessibleButton_kind_link.mx_AccessibleButton_disabled {
-    opacity: 0.4;
-}
+    &.mx_AccessibleButton_kind_secondary {
+        color: $accent;
+    }
 
-.mx_AccessibleButton_kind_link_inline {
-    color: $accent;
-    font-size: inherit;
-    padding: 0 2px;
-}
+    &.mx_AccessibleButton_kind_danger {
+        color: $button-danger-fg-color;
+        background-color: $alert;
 
-.mx_AccessibleButton_kind_link_inline.mx_AccessibleButton_disabled {
-    opacity: 0.4;
-}
+        &.mx_AccessibleButton_disabled {
+            color: $button-danger-disabled-fg-color;
+            background-color: $button-danger-disabled-bg-color;
+        }
+    }
 
-.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_link_sm {
-    padding: 5px 12px;
-    color: $accent;
-}
+    &.mx_AccessibleButton_kind_danger_outline {
+        color: $alert;
+        background-color: transparent;
+        border: 1px solid $alert;
 
-.mx_AccessibleButton_kind_link_sm.mx_AccessibleButton_disabled {
-    opacity: 0.4;
-}
+        &.mx_AccessibleButton_disabled {
+            color: $button-danger-disabled-bg-color;
+            border-color: $button-danger-disabled-bg-color;
+        }
+    }
 
-.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_confirm_sm {
-    background-color: $accent;
+    &.mx_AccessibleButton_kind_danger_sm {
+        &.mx_AccessibleButton_disabled {
+            color: $button-danger-disabled-fg-color;
+            background-color: $button-danger-disabled-bg-color;
+        }
+    }
 
-    &::before {
-        mask-image: url('$(res)/img/feather-customised/check.svg');
+    &.mx_AccessibleButton_kind_link,
+    &.mx_AccessibleButton_kind_link_inline {
+        color: $accent;
+        font-size: inherit;
+        font-weight: normal;
+        line-height: inherit;
     }
-}
 
-.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_cancel_sm {
-    background-color: $alert;
+    &.mx_AccessibleButton_kind_link {
+        padding: 0;
+    }
 
-    &::before {
-        mask-image: url('$(res)/img/feather-customised/x.svg');
+    &.mx_AccessibleButton_kind_link_inline {
+        display: inline;
+        padding: 0 2px;
     }
-}
 
-.mx_AccessibleButton_kind_confirm_sm,
-.mx_AccessibleButton_kind_cancel_sm {
-    padding: 0px;
-    width: 16px;
-    height: 16px;
-    border-radius: 100%;
-    position: relative;
-    display: block;
-
-    &::before {
-        content: "";
+    &.mx_AccessibleButton_kind_confirm_sm,
+    &.mx_AccessibleButton_kind_cancel_sm {
+        padding: 0px;
+        width: 16px;
+        height: 16px;
+        border-radius: 100%;
+        position: relative;
         display: block;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: #ffffff;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 80%;
+
+        &::before {
+            content: "";
+            display: block;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background-color: #ffffff;
+            mask-repeat: no-repeat;
+            mask-position: center;
+            mask-size: 80%;
+        }
     }
 }
diff --git a/res/css/views/elements/_CopyableText.scss b/res/css/views/elements/_CopyableText.scss
index a08306b66a4..ceafd422730 100644
--- a/res/css/views/elements/_CopyableText.scss
+++ b/res/css/views/elements/_CopyableText.scss
@@ -18,14 +18,17 @@ limitations under the License.
 .mx_CopyableText {
     display: flex;
     justify-content: space-between;
-    border-radius: 5px;
-    border: solid 1px $light-fg-color;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    padding: 10px;
     width: max-content;
     max-width: 100%;
 
+    &.mx_CopyableText_border {
+        border-radius: 5px;
+        border: solid 1px $light-fg-color;
+        margin-bottom: 10px;
+        margin-top: 10px;
+        padding: 10px;
+    }
+
     .mx_CopyableText_copyButton {
         flex-shrink: 0;
         width: 20px;
diff --git a/res/css/views/elements/_FacePile.scss b/res/css/views/elements/_FacePile.scss
index 875e0e34d57..90f1c590a14 100644
--- a/res/css/views/elements/_FacePile.scss
+++ b/res/css/views/elements/_FacePile.scss
@@ -20,7 +20,8 @@ limitations under the License.
         flex-direction: row-reverse;
         vertical-align: middle;
 
-        > .mx_FacePile_face + .mx_FacePile_face {
+        // Overlap the children
+        > * + * {
             margin-right: -8px;
         }
 
@@ -37,7 +38,7 @@ limitations under the License.
             border-radius: 100%;
             width: 30px;
             height: 30px;
-            background-color: $groupFilterPanel-bg-color;
+            background-color: $spacePanel-bg-color;
 
             &::before {
                 content: "";
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 852097762ed..4615f5da23f 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -4,7 +4,6 @@
 
 .mx_UserPill,
 .mx_RoomPill,
-.mx_GroupPill,
 .mx_AtRoomPill {
     display: inline-flex;
     align-items: center;
@@ -28,13 +27,6 @@ a.mx_Pill {
     line-height: $font-17px;
 }
 
-/* More specific to override `.markdown-body a` color */
-.mx_EventTile_content .markdown-body a.mx_GroupPill,
-.mx_GroupPill {
-    color: $accent-fg-color;
-    background-color: $rte-room-pill-color;
-}
-
 /* More specific to override `.markdown-body a` text-decoration */
 .mx_EventTile_content .markdown-body a.mx_Pill {
     text-decoration: none;
@@ -62,22 +54,18 @@ a.mx_Pill {
 
 /* More specific to override `.markdown-body a` color */
 .mx_EventTile_content .markdown-body a.mx_RoomPill,
-.mx_EventTile_content .markdown-body a.mx_GroupPill,
-.mx_RoomPill,
-.mx_GroupPill {
+.mx_RoomPill {
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
 }
 
 .mx_EventTile_body .mx_UserPill,
-.mx_EventTile_body .mx_RoomPill,
-.mx_EventTile_body .mx_GroupPill {
+.mx_EventTile_body .mx_RoomPill {
     cursor: pointer;
 }
 
 .mx_UserPill .mx_BaseAvatar,
 .mx_RoomPill .mx_BaseAvatar,
-.mx_GroupPill .mx_BaseAvatar,
 .mx_AtRoomPill .mx_BaseAvatar {
     position: relative;
     display: inline-flex;
@@ -88,7 +76,9 @@ a.mx_Pill {
 }
 
 .mx_Emoji {
-    font-size: 1.8rem;
+    // Should be 1.8rem for our default 1.4rem message bodies,
+    // and scale with the size of the surrounding text
+    font-size: calc(18 / 14 * 1em);
     vertical-align: bottom;
 }
 
diff --git a/res/css/views/elements/_SettingsFlag.scss b/res/css/views/elements/_SettingsFlag.scss
index 533487d98cf..c6f4cf6ec5c 100644
--- a/res/css/views/elements/_SettingsFlag.scss
+++ b/res/css/views/elements/_SettingsFlag.scss
@@ -41,4 +41,10 @@ limitations under the License.
     font-size: $font-12px;
     line-height: $font-15px;
     color: $secondary-content;
+
+    // Support code/pre elements in settings flag descriptions
+    pre, code {
+        font-family: $monospace-font-family !important;
+        background-color: $rte-code-bg-color;
+    }
 }
diff --git a/res/css/views/elements/_TagComposer.scss b/res/css/views/elements/_TagComposer.scss
index f5bdb8d2d58..7efe83281f5 100644
--- a/res/css/views/elements/_TagComposer.scss
+++ b/res/css/views/elements/_TagComposer.scss
@@ -29,7 +29,9 @@ limitations under the License.
             margin-left: 16px; // distance from <Field>
         }
 
-        .mx_Field, .mx_Field input, .mx_AccessibleButton {
+        .mx_Field,
+        .mx_Field input,
+        .mx_AccessibleButton {
             // So they look related to each other by feeling the same
             border-radius: 8px;
         }
@@ -39,39 +41,48 @@ limitations under the License.
         display: flex;
         flex-wrap: wrap;
         margin-top: 12px; // this plus 12px from the tags makes 24px from the input
+    }
 
-        .mx_TagComposer_tag {
-            padding: 6px 8px 8px 12px;
-            position: relative;
-            margin-right: 12px;
-            margin-top: 12px;
-
-            // Cheaty way to get an opacified variable colour background
-            &::before {
-                content: '';
-                border-radius: 20px;
-                background-color: $tertiary-content;
-                opacity: 0.15;
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-
-                // Pass through the pointer otherwise we have effectively put a whole div
-                // on top of the component, which makes it hard to interact with buttons.
-                pointer-events: none;
-            }
-        }
+    .mx_Tag {
+        margin-right: 12px;
+        margin-top: 12px;
+    }
+}
 
-        .mx_AccessibleButton {
-            background-image: url('$(res)/img/subtract.svg');
-            width: 16px;
-            height: 16px;
-            margin-left: 8px;
-            display: inline-block;
+.mx_Tag {
+
+    font-size: $font-15px;
+
+    display: inline-flex;
+    align-items: center;
+
+    gap: 8px;
+    padding: 8px;
+    border-radius: 8px;
+
+    color: $primary-content;
+    background: $quinary-content;
+
+    >svg:first-child {
+        width: 1em;
+        color: $secondary-content;
+        transform: scale(1.25);
+        transform-origin: center;
+    }
+
+    .mx_Tag_delete {
+        border-radius: 50%;
+        text-align: center;
+        width: 1.066666em; // 16px;
+        height: 1.066666em;
+        line-height: 1em;
+        color: $secondary-content;
+        background: $system;
+        position: relative;
+
+        svg {
+            width: .5em;
             vertical-align: middle;
-            cursor: pointer;
         }
     }
 }
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index 93ee6912b4f..c89c654178f 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -16,13 +16,23 @@ limitations under the License.
 */
 
 @keyframes mx_fadein {
-    from { opacity: 0; }
-    to { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+
+    to {
+        opacity: 1;
+    }
 }
 
 @keyframes mx_fadeout {
-    from { opacity: 1; }
-    to { opacity: 0; }
+    from {
+        opacity: 1;
+    }
+
+    to {
+        opacity: 0;
+    }
 }
 
 .mx_Tooltip_chevron {
@@ -58,7 +68,7 @@ limitations under the License.
     line-height: $font-14px;
     font-size: $font-12px;
     font-weight: 500;
-    max-width: 200px;
+    max-width: 300px;
     word-break: break-word;
     margin-left: 6px;
     margin-right: 6px;
diff --git a/res/css/views/location/_LocationPicker.scss b/res/css/views/location/_LocationPicker.scss
index 76e56eedd9f..9b513a1fb59 100644
--- a/res/css/views/location/_LocationPicker.scss
+++ b/res/css/views/location/_LocationPicker.scss
@@ -19,21 +19,33 @@ limitations under the License.
 
     height: 100%;
     position: relative;
+    display: flex;
+    flex-direction: column;
+
+    // when there are errors loading the map
+    // the canvas is still inserted
+    // and can overlap error message/close buttons
+    // hide it
+    &.mx_LocationPicker_hasError {
+        .maplibregl-canvas-container, .maplibregl-control-container {
+            display: none;
+        }
+    }
 
     #mx_LocationPicker_map {
-        height: 100%;
-        border-radius: 8px;
+        border-top-left-radius: inherit;
+        border-top-right-radius: inherit;
+        flex: 1;
+
+        .maplibregl-ctrl.maplibregl-ctrl-group,
+        .maplibregl-ctrl.maplibregl-ctrl-attrib {
+            margin-right: $spacing-16;
+        }
 
         .maplibregl-ctrl.maplibregl-ctrl-group {
             // place below the close button
             // padding-16 + 24px close button + padding-10
             margin-top: 50px;
-            margin-right: $spacing-16;
-        }
-
-        .maplibregl-ctrl-bottom-right {
-            bottom: 68px;
-            margin-right: $spacing-16;
         }
 
         .maplibregl-user-location-accuracy-circle {
@@ -43,63 +55,45 @@ limitations under the License.
         .maplibregl-user-location-dot {
             display: none;
         }
-
-        .mx_MLocationBody_markerBorder {
-            width: 31px;
-            height: 31px;
-            border-radius: 50%;
-            background-color: $accent;
-            filter: drop-shadow(0px 3px 5px rgba(0, 0, 0, 0.2));
-
-            .mx_BaseAvatar {
-                margin-top: 2px;
-                margin-left: 2px;
-            }
-        }
-
-        .mx_MLocationBody_pointer {
-            position: absolute;
-            bottom: -3px;
-            left: 11px;
-            width: 9px;
-            height: 5px;
-
-            &::before {
-                mask-image: url('$(res)/img/location/pointer.svg');
-                mask-position: center;
-                mask-repeat: no-repeat;
-                mask-size: 9px;
-                content: '';
-                display: inline-block;
-                width: 9px;
-                height: 5px;
-                position: absolute;
-                background-color: $accent;
-            }
-        }
     }
 
     .mx_LocationPicker_footer {
-        position: absolute;
-        bottom: 0px;
+        flex: 0;
         width: 100%;
+        box-sizing: border-box;
+        padding: $spacing-16;
+        display: flex;
+        flex-direction: column;
+        justify-content: stretch;
 
-        .mx_Dialog_buttons {
-            text-align: center;
-
-            /* Note the `button` prefix and `not()` clauses are needed to make
-               these selectors more specific than those in _common.scss. */
+        border-bottom-left-radius: inherit;
+        border-bottom-right-radius: inherit;
 
-            button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton) {
-                margin: 0px 0px 16px 0px;
-                min-width: 328px;
-                min-height: 48px;
-            }
-        }
+        background-color: $header-panel-bg-color;
     }
+}
+
+.mx_LocationPicker_pinText {
+    position: absolute;
+    top: $spacing-16;
+    width: 100%;
+    box-sizing: border-box;
+    text-align: center;
+    height: 0;
+    pointer-events: none;
+
+    span {
+        box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.15);
+        border-radius: 8px;
+        padding: $spacing-8;
+        background-color: $background;
+        color: $primary-content;
 
-    .mx_LocationPicker_error {
-        color: red;
-        margin: auto;
+        font-size: $font-12px;
     }
 }
+
+.mx_LocationPicker_submitButton {
+    width: 100%;
+    height: 48px;
+}
diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
index 2587e73e50d..b0b117efded 100644
--- a/res/css/views/messages/_CallEvent.scss
+++ b/res/css/views/messages/_CallEvent.scss
@@ -19,22 +19,24 @@ limitations under the License.
     width: 100%;
 
     .mx_CallEvent {
-        position: relative;
         display: flex;
         flex-direction: row;
+        flex-wrap: wrap;
         align-items: center;
         justify-content: space-between;
+        gap: $spacing-4 0;
 
+        position: relative;
+        margin: $spacing-4 0;
+        padding: $spacing-12 $spacing-24;
+        box-sizing: border-box;
         background-color: $dark-panel-bg-color;
         border-radius: 8px;
         width: 65%;
-        box-sizing: border-box;
-        height: 60px;
-        margin: 4px 0;
+        height: fit-content;
 
         .mx_CallEvent_iconButton {
             display: inline-flex;
-            margin-right: 8px;
 
             &::before {
                 content: '';
@@ -62,6 +64,13 @@ limitations under the License.
             .mx_CallEvent_content_button_answer span::before {
                 mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
             }
+
+            &.mx_CallEvent_rejected,
+            &.mx_CallEvent_noAnswer {
+                .mx_CallEvent_type_icon::before {
+                    mask-image: url('$(res)/img/voip/declined-voice.svg');
+                }
+            }
         }
 
         &.mx_CallEvent_video {
@@ -70,44 +79,49 @@ limitations under the License.
             .mx_CallEvent_content_button_answer span::before {
                 mask-image: url('$(res)/img/element-icons/call/video-call.svg');
             }
-        }
-
-        &.mx_CallEvent_voice.mx_CallEvent_missed .mx_CallEvent_type_icon::before {
-            mask-image: url('$(res)/img/voip/missed-voice.svg');
-        }
 
-        &.mx_CallEvent_video.mx_CallEvent_missed .mx_CallEvent_type_icon::before {
-            mask-image: url('$(res)/img/voip/missed-video.svg');
+            &.mx_CallEvent_rejected,
+            &.mx_CallEvent_noAnswer {
+                .mx_CallEvent_type_icon::before {
+                    mask-image: url('$(res)/img/voip/declined-video.svg');
+                }
+            }
         }
 
-        &.mx_CallEvent_voice.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
-        &.mx_CallEvent_voice.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
-            mask-image: url('$(res)/img/voip/declined-voice.svg');
-        }
+        &.mx_CallEvent_missed {
+            &.mx_CallEvent_voice {
+                .mx_CallEvent_type_icon::before {
+                    mask-image: url('$(res)/img/voip/missed-voice.svg');
+                }
+            }
 
-        &.mx_CallEvent_video.mx_CallEvent_rejected .mx_CallEvent_type_icon::before,
-        &.mx_CallEvent_video.mx_CallEvent_noAnswer .mx_CallEvent_type_icon::before {
-            mask-image: url('$(res)/img/voip/declined-video.svg');
+            &.mx_CallEvent_video {
+                .mx_CallEvent_type_icon::before {
+                    mask-image: url('$(res)/img/voip/missed-video.svg');
+                }
+            }
         }
 
         .mx_CallEvent_info {
             display: flex;
             flex-direction: row;
             align-items: center;
-            margin-left: 12px;
-            min-width: 0;
+            width: fit-content;
+            max-width: 100%;
 
             .mx_CallEvent_info_basic {
                 display: flex;
                 flex-direction: column;
+                gap: $spacing-4;
                 margin-left: 10px; // To match mx_CallEvent
+                margin-right: 10px;
                 min-width: 0;
 
                 .mx_CallEvent_sender {
                     font-weight: 600;
                     font-size: 1.5rem;
                     line-height: 1.8rem;
-                    margin-bottom: 3px;
+                    margin-bottom: $spacing-4;
 
                     overflow: hidden;
                     white-space: nowrap;
@@ -115,12 +129,12 @@ limitations under the License.
                 }
 
                 .mx_CallEvent_type {
+                    display: flex;
+                    align-items: center;
                     font-weight: 400;
                     color: $secondary-content;
                     font-size: 1.2rem;
                     line-height: $font-13px;
-                    display: flex;
-                    align-items: center;
 
                     .mx_CallEvent_type_icon {
                         height: 13px;
@@ -143,39 +157,30 @@ limitations under the License.
 
         .mx_CallEvent_content {
             display: flex;
-            flex-direction: row;
+            flex-wrap: wrap;
             align-items: center;
             color: $secondary-content;
-            margin-right: 16px;
-            gap: 8px;
-            min-width: max-content;
+            gap: $spacing-12; // See mx_IncomingCallToast_buttons
+            margin-inline-start: 42px; // avatar (32px) + mx_CallEvent_info_basic margin (10px)
+            word-break: break-word;
+            max-width: fit-content;
 
             .mx_CallEvent_content_button {
-                padding: 0px 12px;
-
-                span {
-                    padding: 1px 0;
-                    display: flex;
-                    align-items: center;
-
-                    &::before {
-                        content: '';
-                        display: inline-block;
-                        background-color: $button-fg-color;
-                        mask-position: center;
-                        mask-repeat: no-repeat;
-                        mask-size: 16px;
-                        width: 16px;
-                        height: 16px;
-                        margin-right: 8px;
-
-                        flex-shrink: 0;
-                    }
+                @mixin CallButton;
+                padding: 0 $spacing-12;
+
+                span::before {
+                    mask-size: 16px;
+                    width: 16px;
+                    height: 16px;
+                    flex-shrink: 0;
                 }
             }
 
-            .mx_CallEvent_content_button_reject span::before {
-                mask-image: url('$(res)/img/element-icons/call/hangup.svg');
+            .mx_CallEvent_content_button_reject {
+                span::before {
+                    mask-image: url('$(res)/img/element-icons/call/hangup.svg');
+                }
             }
 
             .mx_CallEvent_content_tooltip {
@@ -183,16 +188,12 @@ limitations under the License.
             }
         }
 
-        .mx_MessageTimestamp {
-            margin-left: 16px;
-        }
-
         &.mx_CallEvent_narrow {
-            height: unset;
-            width: 290px;
             flex-direction: column;
             align-items: unset;
-            gap: 16px;
+            gap: $spacing-4 $spacing-16;
+            height: unset;
+            min-width: 290px;
 
             .mx_CallEvent_iconButton {
                 position: absolute;
@@ -206,18 +207,36 @@ limitations under the License.
 
             .mx_CallEvent_info {
                 align-items: unset;
-                margin-top: 12px;
-                margin-right: 12px;
-
-                .mx_CallEvent_sender {
-                    margin-bottom: 8px;
-                }
             }
+        }
+    }
+}
+
+.mx_EventTile[data-layout="bubble"] {
+    .mx_EventTile_e2eIcon + .mx_CallEvent_wrapper {
+        .mx_CallEvent {
+            position: relative;
 
-            .mx_CallEvent_content {
-                margin-left: 54px; // mx_CallEvent margin (12px) + avatar (32px) + mx_CallEvent_info_basic margin (10px)
-                margin-bottom: 16px;
+            // 5px (gap) + 14px (e2e icon size * mask-size) + 9px (margin-left of e2e icon)
+            right: calc(5px + 14px + 9px);
+        }
+    }
+}
+
+.mx_EventTile_leftAlignedBubble {
+    .mx_CallEvent_wrapper {
+        .mx_CallEvent {
+            &.mx_CallEvent_narrow {
+                gap: $spacing-8 $spacing-4;
             }
         }
     }
 }
+
+.mx_IRCLayout {
+    .mx_CallEvent_wrapper {
+        .mx_CallEvent {
+            margin-inline-start: $spacing-4; // display green line
+        }
+    }
+}
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/views/messages/_DisambiguatedProfile.scss
similarity index 58%
rename from res/css/structures/_CreateRoom.scss
rename to res/css/views/messages/_DisambiguatedProfile.scss
index 78e6881b108..caef2fa4ad3 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/views/messages/_DisambiguatedProfile.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,23 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_CreateRoom {
-    width: 960px;
-    margin-left: auto;
-    margin-right: auto;
-    color: $primary-content;
-}
+.mx_DisambiguatedProfile {
+    overflow: hidden;
+    text-overflow: ellipsis;
 
-.mx_CreateRoom input,
-.mx_CreateRoom textarea {
-    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
-    font-weight: 300;
-    font-size: $font-13px;
-    padding: 9px;
-    margin-top: 6px;
-}
+    .mx_DisambiguatedProfile_displayName {
+        font-weight: 600;
+    }
 
-.mx_CreateRoom_description {
-    width: 330px;
+    .mx_DisambiguatedProfile_mxid {
+        font-weight: 600;
+        font-size: 1.1rem;
+        margin-left: 5px;
+        opacity: 0.5; // Match mx_TextualEvent
+        color: $primary-content;
+    }
 }
diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index e155afcbf39..eb3d287eaab 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -17,40 +17,48 @@ limitations under the License.
 
 $timeline-image-border-radius: 8px;
 
-.mx_MImageBody_thumbnail--blurhash {
+.mx_MImageBody_placeholder {
+    // Position the placeholder on top of the thumbnail, so that the reveal animation can work
     position: absolute;
     left: 0;
     top: 0;
-}
-
-.mx_MImageBody_thumbnail {
-    object-fit: contain;
-    border-radius: $timeline-image-border-radius;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
     height: 100%;
     width: 100%;
 
-    // this is needed so that the Blurhash can get have rounded corners without beeing the correct size during loading.
-    overflow: hidden;
+    background-color: $background;
+
     .mx_Blurhash > canvas {
         animation: mx--anim-pulse 1.75s infinite cubic-bezier(.4, 0, .6, 1);
     }
-
-    .mx_no-image-placeholder {
-        background-color: $primary-content;
-    }
 }
 
 .mx_MImageBody_thumbnail_container {
-    // Prevent the padding-bottom (added inline in MImageBody.js) from
-    // affecting elements below the container.
+    border-radius: $timeline-image-border-radius;
+
+    // Necessary for the border radius to apply correctly to the placeholder
     overflow: hidden;
+    contain: paint;
+
+    min-height: $font-44px;
+    min-width: $font-44px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.mx_MImageBody_thumbnail {
+    display: block;
 
-    // Make sure the _thumbnail is positioned relative to the _container
-    position: relative;
+    // Force the image to be the full size of the container, even if the
+    // pixel size is smaller. The problem here is that we don't know what
+    // thumbnail size the HS is going to give us, but we have to commit to
+    // a container size immediately and not change it when the image loads
+    // or we'll get a scroll jump (or have to leave blank space).
+    // This will obviously result in an upscaled image which will be a bit
+    // blurry. The best fix would be for the HS to advertise what size thumbnails
+    // it guarantees to produce.
+    height: 100%;
+    width: 100%;
 }
 
 .mx_MImageBody_gifLabel {
diff --git a/res/css/views/messages/_MLocationBody.scss b/res/css/views/messages/_MLocationBody.scss
index e4135d46d44..72202ca6e1b 100644
--- a/res/css/views/messages/_MLocationBody.scss
+++ b/res/css/views/messages/_MLocationBody.scss
@@ -21,51 +21,7 @@ limitations under the License.
         z-index: 0; // keeps the entire map under the message action bar
 
         border-radius: $timeline-image-border-radius;
-    }
-
-    .mx_MLocationBody_markerBorder {
-        width: 31px;
-        height: 31px;
-        border-radius: 50%;
-        background-color: $accent;
-        filter: drop-shadow(0px 3px 5px rgba(0, 0, 0, 0.2));
-
-        .mx_BaseAvatar {
-            margin-top: 2px;
-            margin-left: 2px;
-        }
-    }
-
-    .mx_MLocationBody_pointer {
-        position: absolute;
-        bottom: -3px;
-        left: 11px;
-        width: 9px;
-        height: 5px;
-
-        &::before {
-            mask-image: url('$(res)/img/location/pointer.svg');
-            mask-position: center;
-            mask-repeat: no-repeat;
-            mask-size: 9px;
-            content: '';
-            display: inline-block;
-            width: 9px;
-            height: 5px;
-            position: absolute;
-            background-color: $accent;
-        }
-    }
-
-    .mx_MLocationBody_markerContents {
-        background-color: $location-marker-color;
-        margin: 0;
-        width: 31px;
-        height: 31px;
-        mask-repeat: no-repeat;
-        mask-size: 16px;
-        mask-position: center;
-        mask-image: url('$(res)/img/element-icons/location.svg');
+        cursor: pointer;
     }
 }
 
diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss
index 165dcd8208c..12cd7c6f39b 100644
--- a/res/css/views/messages/_MStickerBody.scss
+++ b/res/css/views/messages/_MStickerBody.scss
@@ -33,3 +33,10 @@ limitations under the License.
     align-items: center;
     justify-content: center;
 }
+
+.mx_MStickerBody_placeholder {
+    // centering
+    position: absolute;
+    left: calc(50% - 40px);
+    top: calc(50% - 40px);
+}
diff --git a/res/css/views/messages/_MVideoBody.scss b/res/css/views/messages/_MVideoBody.scss
index ac4db004d78..b4cd545bf07 100644
--- a/res/css/views/messages/_MVideoBody.scss
+++ b/res/css/views/messages/_MVideoBody.scss
@@ -15,9 +15,15 @@ limitations under the License.
 */
 
 span.mx_MVideoBody {
-    video.mx_MVideoBody {
-        max-width: 100%;
-        height: auto;
+    overflow: hidden;
+
+    .mx_MVideoBody_container {
         border-radius: $timeline-image-border-radius;
+        overflow: hidden;
+
+        video {
+            height: 100%;
+            width: 100%;
+        }
     }
 }
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index a9c6e3b39c7..75318757a73 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -48,7 +48,7 @@ limitations under the License.
         cursor: initial;
     }
 
-    > * {
+    >* {
         white-space: nowrap;
         display: inline-block;
         position: relative;
@@ -65,6 +65,12 @@ limitations under the License.
 .mx_MessageActionBar_maskButton {
     width: 28px;
     height: 28px;
+
+    &:disabled,
+    &[disabled] {
+        cursor: not-allowed;
+        opacity: .75;
+    }
 }
 
 .mx_MessageActionBar_maskButton::after {
@@ -96,6 +102,11 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/message/thread.svg');
 }
 
+.mx_MessageActionBar_threadButton .mx_Indicator {
+    background: $links;
+    animation-iteration-count: infinite;
+}
+
 .mx_MessageActionBar_editButton::after {
     mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
 }
diff --git a/res/css/views/right_panel/_RoomSummaryCard.scss b/res/css/views/right_panel/_RoomSummaryCard.scss
index 14e5dc654fe..f340883d484 100644
--- a/res/css/views/right_panel/_RoomSummaryCard.scss
+++ b/res/css/views/right_panel/_RoomSummaryCard.scss
@@ -235,7 +235,6 @@ limitations under the License.
     }
 
     .mx_AccessibleButton_kind_link {
-        padding: 0;
         margin-top: 12px;
         margin-bottom: 12px;
         font-size: $font-13px;
diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
index cb438c47068..9e9c59d2cbb 100644
--- a/res/css/views/right_panel/_ThreadPanel.scss
+++ b/res/css/views/right_panel/_ThreadPanel.scss
@@ -17,17 +17,22 @@ limitations under the License.
 .mx_ThreadPanel {
     display: flex;
     flex-direction: column;
+    height: 100px;
+    overflow: visible;
 
     .mx_BaseCard_header {
         margin-bottom: 12px;
+
         .mx_BaseCard_close,
         .mx_BaseCard_back {
             width: 24px;
             height: 24px;
         }
+
         .mx_BaseCard_back {
             left: -4px;
         }
+
         .mx_BaseCard_close {
             right: -4px;
         }
@@ -39,7 +44,7 @@ limitations under the License.
     }
 
     .mx_ThreadPanel__header {
-        width: calc(100% - 30px);
+        width: calc(100% - 38px);
         height: 24px;
         display: flex;
         flex: 1;
@@ -66,6 +71,7 @@ limitations under the License.
             --size: 24px;
             width: var(--size);
             height: var(--size);
+
             &::after {
                 mask-size: var(--size);
                 mask-image: url("$(res)/img/element-icons/message/overflow-large.svg");
@@ -99,18 +105,39 @@ limitations under the License.
     }
 
     .mx_AutoHideScrollbar {
-        background: #fff;
         background-color: $background;
         border-radius: 8px;
-        width: calc(100% - 16px);
-        padding-right: 16px;
+        padding-inline-end: 0;
+        overflow-y: scroll; // set gap between the thread tile and the right border
+    }
+
+    // Override _GroupLayout.scss for the thread panel
+    .mx_GroupLayout {
+        .mx_EventTile {
+            .mx_MessageActionBar {
+                right: 0;
+                top: -36px; // 2px above EventTile
+                z-index: 10; // See _EventTile.scss
+            }
+
+            &[data-shape=ThreadsList] {
+                > .mx_DisambiguatedProfile {
+                    margin-inline-start: 0;
+                }
+
+                .mx_MessageTimestamp {
+                    position: initial;
+                    width: auto;
+                }
+
+                .mx_EventTile_line {
+                    padding-bottom: 0; // Override mx_EventTile_line on _GroupLayout.scss
+                }
+            }
+        }
     }
 
     &.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
-        /* the scrollbar is 8px wide, and we want a 12px gap with the side of the
-        panel. Hence the magic number, 8+4=12 */
-        width: calc(100% - 4px);
-        padding-right: 4px;
         position: relative;
         min-height: 0; // don't displace the composer
         flex-grow: 1;
@@ -120,18 +147,27 @@ limitations under the License.
         }
     }
 
+    .mx_RoomView_messagePanel { // To avoid the rule from being applied to .mx_ThreadPanel_empty
+        .mx_RoomView_messageListWrapper {
+            width: calc(100% + 6px); // 8px - 2px
+        }
+    }
+
     .mx_RoomView_MessageList {
-        padding-left: 12px;
-        padding-right: 0;
+        padding-inline-start: $spacing-8;
+        padding-inline-end: $spacing-8;
+        content-visibility: visible;
     }
 
-    .mx_EventTile, .mx_GenericEventListSummary {
+    .mx_EventTile,
+    .mx_GenericEventListSummary {
         // Account for scrollbar when hovering
         padding-top: 0;
 
-        .mx_ThreadInfo {
+        .mx_ThreadSummary {
             position: relative;
             padding-right: 11px;
+
             &::after {
                 content: '';
                 display: block;
@@ -153,10 +189,18 @@ limitations under the License.
         }
     }
 
+    .mx_GenericEventListSummary > .mx_EventTile_line {
+        padding-left: 30px !important; // Override main timeline styling - align summary text with message text
+    }
+
     .mx_EventTile:not([data-layout=bubble]) {
         .mx_EventTile_e2eIcon {
             left: 8px;
         }
+
+        &:hover .mx_EventTile_line {
+            box-shadow: unset !important; // don't show the verification left stroke in the thread list
+        }
     }
 
     .mx_MessageComposer {
@@ -168,7 +212,7 @@ limitations under the License.
     }
 
     .mx_ThreadPanel_dropdown {
-        padding: 3px 8px;
+        padding: 3px 4px 3px 8px;
         border-radius: 4px;
         line-height: 1.5;
         user-select: none;
@@ -190,29 +234,27 @@ limitations under the License.
         float: right;
     }
 
-    .mx_ThreadPanel_dropdown[aria-expanded=true]::before {
-        transform: rotate(180deg);
-    }
-
     .mx_MessageTimestamp {
         font-size: $font-12px;
         color: $secondary-content;
     }
 
     // handling for hidden events (e.g reactions) in the thread view
-    &.mx_ThreadView .mx_GenericEventListSummary_unstyledList .mx_EventTile_info {
+    &.mx_ThreadView .mx_EventTile_info {
+        padding-top: 0 !important; // override main timeline padding
+
         .mx_EventTile_line {
             padding-left: 0 !important; // override main timeline padding
 
             .mx_EventTile_content {
-                margin-left: 54px; // align with text
-                width: calc(100% - 54px - 8px); // match width of parent
+                margin-left: 48px; // align with text
+                width: calc(100% - 48px - 8px); // match width of parent
             }
         }
 
         .mx_EventTile_avatar {
             position: absolute;
-            left: 36px !important; // override main timeline positioning
+            left: 30px !important; // override main timeline positioning
             z-index: 9; // position above the hover styling
         }
 
@@ -220,32 +262,33 @@ limitations under the License.
             display: none; // hide the hidden event expand button, not enough space, view source can still be used
         }
     }
+
+    .mx_BaseCard_footer {
+        text-align: left;
+        font-size: $font-12px;
+        align-items: center;
+        justify-content: flex-end;
+        gap: 4px;
+        position: relative;
+        top: 2px;
+        padding-right: 8px;
+
+        .mx_AccessibleButton_kind_link_inline {
+            color: $secondary-content;
+        }
+    }
 }
 
 .mx_ThreadPanel_replies {
-    margin-top: 8px;
-}
+    margin-top: $spacing-8;
+    display: flex;
+    align-items: center;
+    position: relative;
 
-.mx_ThreadPanel_repliesSummary {
-    &::before {
-        content: "";
-        mask-image: url('$(res)/img/element-icons/thread-summary.svg');
-        mask-position: center;
-        display: inline-block;
-        height: 18px;
-        min-width: 18px;
-        background-color: currentColor;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        margin-right: 8px;
-        vertical-align: middle;
+    .mx_ThreadPanel_ThreadsAmount {
+        @mixin ThreadsAmount;
+        font-size: $font-12px; // Same font size as the counter on the main panel
     }
-
-    color: $secondary-content;
-    font-weight: 600;
-    float: left;
-    margin-right: 12px;
-    font-size: $font-12px;
 }
 
 .mx_ThreadPanel_viewInRoom::before {
@@ -264,27 +307,30 @@ limitations under the License.
     align-items: center;
     justify-content: center;
     position: absolute;
-    top: 48px;
-    bottom: 8px;
-    left: 8px;
-    right: 8px;
+    top: 0;
+    bottom: 0;
+    left: 0;
     padding: 20px;
 
     h2 {
         color: $primary-content;
-        font-weight: 600;
+        font-weight: $font-semi-bold;
         font-size: $font-18px;
+        margin-top: 24px;
+        margin-bottom: 10px;
     }
 
     p {
         font-size: $font-15px;
         color: $secondary-content;
+        margin: 10px 0;
     }
 
     button {
         border: none;
         background: none;
         color: $accent;
+        font-size: $font-15px;
 
         &:hover,
         &:active {
@@ -292,6 +338,15 @@ limitations under the License.
             cursor: pointer;
         }
     }
+
+    .mx_ThreadPanel_empty_tip {
+        font-size: $font-12px;
+        line-height: $font-15px;
+
+        >b {
+            font-weight: $font-semi-bold;
+        }
+    }
 }
 
 .mx_ThreadPanel_largeIcon {
@@ -317,6 +372,7 @@ limitations under the License.
 .mx_ContextualMenu_wrapper.mx_ThreadPanel__header {
     .mx_ContextualMenu {
         position: initial;
+
         span:first-of-type {
             font-weight: $font-semi-bold;
             font-size: inherit;
@@ -336,6 +392,7 @@ limitations under the License.
         left: auto;
         right: 22px;
         border-bottom-color: $quinary-content;
+
         &::after {
             content: "";
             border: inherit;
@@ -357,10 +414,12 @@ limitations under the License.
         &:hover {
             background-color: $event-selected-color;
         }
+
         &[aria-checked="true"] {
             :first-child {
                 margin-left: -20px;
             }
+
             :first-child::before {
                 content: "";
                 width: 12px;
diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index 07227c1b9af..5a121a8f61c 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,9 +35,11 @@ limitations under the License.
         }
     }
 
-    .mx_AutoHideScrollbar {
-        padding-right: 10px;
-        width: calc(100% - 10px);
+    .mx_TimelineCard_timeline {
+        overflow: hidden;
+        position: relative; // offset parent for jump to bottom button
+        flex: 1;
+        border-radius: 8px;
     }
 
     .mx_NewRoomIntro {
@@ -48,29 +50,61 @@ limitations under the License.
         margin-right: 0;
     }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_line {
-        padding-left: 36px;
-        padding-right: 36px;
-    }
+    .mx_EventTile:not([data-layout="bubble"]) {
+        .mx_EventTile_line {
+            padding-left: 36px;
+            padding-right: 36px;
+        }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_ReactionsRow {
-        padding-left: 36px;
-        padding-right: 36px;
-    }
+        .mx_ReactionsRow {
+            padding: 0;
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_ThreadInfo {
-        margin-left: 36px;
-        margin-right: 0;
-        max-width: min(calc(100% - 36px), 600px);
-    }
+            // See margin setting of ReactionsRow on _EventTile.scss
+            margin-left: 36px;
+            margin-right: 8px;
+        }
 
-    .mx_GroupLayout .mx_EventTile > .mx_SenderProfile {
-        margin-left: 36px;
+        .mx_ThreadSummary {
+            margin-left: 36px;
+            margin-right: 0;
+            max-width: min(calc(100% - 36px), 600px);
+        }
+
+        .mx_EventTile_avatar {
+            top: 12px;
+            left: -3px;
+        }
+
+        .mx_MessageTimestamp {
+            right: -4px;
+            left: auto;
+        }
+
+        .mx_EventTile_msgOption {
+            margin-right: 2px;
+        }
+
+        &.mx_EventTile_info {
+            .mx_EventTile_line {
+                padding-left: 36px;
+            }
+
+            .mx_EventTile_avatar {
+                left: 18px;
+            }
+        }
     }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_avatar {
-        top: 12px;
-        left: -3px;
+    .mx_GroupLayout {
+        .mx_EventTile {
+            > .mx_DisambiguatedProfile {
+                margin-left: 36px;
+            }
+
+            .mx_EventTile_line {
+                padding-bottom: 8px;
+            }
+        }
     }
 
     .mx_CallEvent_wrapper {
@@ -81,34 +115,13 @@ limitations under the License.
         }
     }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_MessageTimestamp {
-        right: -4px;
-        left: auto;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_msgOption {
-        margin-right: 2px;
-    }
-
     .mx_GenericEventListSummary:not([data-layout=bubble]) .mx_EventTile_line,
     .mx_GenericEventListSummary:not([data-layout=bubble]) > .mx_GenericEventListSummary_unstyledList > .mx_EventTile_info .mx_EventTile_avatar ~ .mx_EventTile_line {
         padding-left: 36px;
     }
 
-    .mx_GroupLayout .mx_EventTile .mx_EventTile_line {
-        padding-bottom: 8px;
-    }
-
-    .mx_EventTile_readAvatars {
-        top: -10px;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_line {
-        padding-left: 36px;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_avatar {
-        left: 18px;
+    .mx_ReadReceiptGroup {
+        top: -6px;
     }
 
     .mx_WhoIsTypingTile {
@@ -118,9 +131,12 @@ limitations under the License.
     .mx_WhoIsTypingTile_avatars {
         flex-basis: 48px; // 12 (padding on message list) + 36 (padding on event lines)
     }
-}
 
-.mx_TimelineCard_timeline {
-    overflow: hidden;
-    position: relative; // offset parent for jump to bottom button
+    &.mx_BaseCard {
+        // For a chat timeline on the right panel when the widget is maximised
+        // TODO: rename ThreadPanel
+        &.mx_ThreadPanel {
+            padding-right: 8px; // .mx_RightPanel padding
+        }
+    }
 }
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index a172270de6e..3b7a51797f9 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -64,7 +64,7 @@ limitations under the License.
         margin-bottom: 8px;
     }
 
-    .mx_RoomTile_nameContainer {
+    .mx_RoomTile_titleContainer {
         width: 154px;
     }
 
@@ -72,7 +72,7 @@ limitations under the License.
         display: none;
     }
 
-    .mx_RoomTile_name {
+    .mx_RoomTile_title {
         width: 160px;
     }
 
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 1b008d76aa0..47aa9a9d2ab 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -148,8 +148,6 @@ $MinWidth: 240px;
     width: 50%;
     min-width: $MinWidth;
     border: $container-border-width solid $widget-menu-bar-bg-color;
-    border-left-width: 5px;
-    border-right-width: 5px;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 10c8799413d..b8d71a4cc09 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -61,8 +61,7 @@ limitations under the License.
     width: 26px;
 }
 
-.mx_EntityTile_avatar,
-.mx_GroupRoomTile_avatar {
+.mx_EntityTile_avatar {
     padding-left: 3px;
     padding-right: 12px;
     padding-top: 4px;
@@ -70,8 +69,7 @@ limitations under the License.
     position: relative;
 }
 
-.mx_EntityTile_name,
-.mx_GroupRoomTile_name {
+.mx_EntityTile_name {
     flex: 1 1 0;
     overflow: hidden;
     font-size: $font-14px;
diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 3472b656bf3..4104ae42733 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -37,7 +37,7 @@ limitations under the License.
     margin-left: 49px;
     font-size: $font-14px;
 
-    .mx_ThreadInfo {
+    .mx_ThreadSummary {
         clear: both;
         width: fit-content;
     }
@@ -88,7 +88,7 @@ limitations under the License.
         }
     }
 
-    .mx_SenderProfile,
+    .mx_DisambiguatedProfile,
     .mx_EventTile_line {
         width: fit-content;
         max-width: 70%;
@@ -96,7 +96,7 @@ limitations under the License.
         line-height: $font-18px;
     }
 
-    > .mx_SenderProfile {
+    > .mx_DisambiguatedProfile {
         position: relative;
         top: -2px;
         left: 2px;
@@ -114,6 +114,11 @@ limitations under the License.
         padding-right: 48px;
     }
 
+    .mx_MImageBody_thumbnail_container {
+        min-height: calc(1.8rem + var(--gutterSize) + var(--gutterSize));
+        min-width: calc(1.8rem + var(--gutterSize) + var(--gutterSize));
+    }
+
     .mx_CallEvent {
         background-color: unset;
 
@@ -126,10 +131,12 @@ limitations under the License.
         .mx_EventTile_line {
             border-bottom-right-radius: var(--cornerRadius);
 
-            .mx_MImageBody .mx_MImageBody_thumbnail,
+            .mx_MImageBody .mx_MImageBody_thumbnail_container,
             .mx_MImageBody::before,
+            .mx_MVideoBody .mx_MVideoBody_container,
             .mx_MediaBody,
-            .mx_MLocationBody_map {
+            .mx_MLocationBody_map,
+            .mx_MBeaconBody {
                 border-bottom-right-radius: var(--cornerRadius) !important;
             }
         }
@@ -147,13 +154,15 @@ limitations under the License.
 
     &[data-self=true] {
         .mx_EventTile_line {
-            float: right;
+            margin-inline-start: auto;
             border-bottom-left-radius: var(--cornerRadius);
 
-            .mx_MImageBody .mx_MImageBody_thumbnail,
+            .mx_MImageBody .mx_MImageBody_thumbnail_container,
             .mx_MImageBody::before,
+            .mx_MVideoBody .mx_MVideoBody_container,
             .mx_MediaBody,
-            .mx_MLocationBody_map {
+            .mx_MLocationBody_map,
+            .mx_MBeaconBody {
                 border-bottom-left-radius: var(--cornerRadius) !important;
             }
         }
@@ -163,16 +172,16 @@ limitations under the License.
             margin-right: 32px;
         }
 
-        .mx_ThreadInfo {
+        .mx_ThreadSummary {
             float: right;
             margin-right: calc(-1 * var(--gutterSize));
         }
 
-        .mx_SenderProfile {
+        .mx_DisambiguatedProfile {
             display: none;
         }
 
-        .mx_ReplyTile .mx_SenderProfile {
+        .mx_ReplyTile .mx_DisambiguatedProfile {
             display: block;
         }
 
@@ -266,7 +275,8 @@ limitations under the License.
         }
 
         //noinspection CssReplaceWithShorthandSafely
-        .mx_MImageBody .mx_MImageBody_thumbnail,
+        .mx_MImageBody .mx_MImageBody_thumbnail_container,
+        .mx_MVideoBody .mx_MVideoBody_container,
         .mx_MediaBody {
             border-radius: unset;
             border-top-left-radius: var(--cornerRadius);
@@ -293,20 +303,24 @@ limitations under the License.
     &.mx_EventTile_continuation[data-self=false] .mx_EventTile_line {
         border-top-left-radius: 0;
 
-        .mx_MImageBody .mx_MImageBody_thumbnail,
+        .mx_MImageBody .mx_MImageBody_thumbnail_container,
+        .mx_MVideoBody .mx_MVideoBody_container,
         .mx_MImageBody::before,
         .mx_MediaBody,
-        .mx_MLocationBody_map {
+        .mx_MLocationBody_map,
+        .mx_MBeaconBody {
             border-top-left-radius: 0;
         }
     }
     &.mx_EventTile_lastInSection[data-self=false] .mx_EventTile_line {
         border-bottom-left-radius: var(--cornerRadius);
 
-        .mx_MImageBody .mx_MImageBody_thumbnail,
+        .mx_MImageBody .mx_MImageBody_thumbnail_container,
+        .mx_MVideoBody .mx_MVideoBody_container,
         .mx_MImageBody::before,
         .mx_MediaBody,
-        .mx_MLocationBody_map {
+        .mx_MLocationBody_map,
+        .mx_MBeaconBody {
             border-bottom-left-radius: var(--cornerRadius);
         }
     }
@@ -314,20 +328,24 @@ limitations under the License.
     &.mx_EventTile_continuation[data-self=true] .mx_EventTile_line {
         border-top-right-radius: 0;
 
-        .mx_MImageBody .mx_MImageBody_thumbnail,
+        .mx_MImageBody .mx_MImageBody_thumbnail_container,
+        .mx_MVideoBody .mx_MVideoBody_container,
         .mx_MImageBody::before,
         .mx_MediaBody,
-        .mx_MLocationBody_map {
+        .mx_MLocationBody_map,
+        .mx_MBeaconBody {
             border-top-right-radius: 0;
         }
     }
     &.mx_EventTile_lastInSection[data-self=true] .mx_EventTile_line {
         border-bottom-right-radius: var(--cornerRadius);
 
-        .mx_MImageBody .mx_MImageBody_thumbnail,
+        .mx_MImageBody .mx_MImageBody_thumbnail_container,
+        .mx_MVideoBody .mx_MVideoBody_container,
         .mx_MImageBody::before,
         .mx_MediaBody,
-        .mx_MLocationBody_map {
+        .mx_MLocationBody_map,
+        .mx_MBeaconBody {
             border-bottom-right-radius: var(--cornerRadius);
         }
     }
@@ -379,7 +397,7 @@ limitations under the License.
                 .mx_EventTile_avatar {
                     position: static;
                 }
-                .mx_SenderProfile {
+                .mx_DisambiguatedProfile {
                     display: none;
                 }
             }
@@ -429,10 +447,13 @@ limitations under the License.
         }
     }
 
-    .mx_EventTile_readAvatars {
+    .mx_ReadReceiptGroup {
         position: absolute;
-        right: -78px; // as close to right gutter without clipping as possible
-        bottom: 0;
+        // as close to right gutter without clipping as possible
+        right: -78px;
+        // (EventTileLine.line-height - ReadReceiptGroup.height) / 2
+        // this centers the ReadReceiptGroup if we’ve got a single line
+        bottom: calc(($font-18px - 24px) / 2);
         top: auto;
     }
 
@@ -541,6 +562,17 @@ limitations under the License.
         padding-top: 0;
     }
 
+    .mx_EventTile {
+        &.mx_EventTile_info {
+            .mx_EventTile_line {
+                // Avoid overflow of event info by cancelling width settings
+                width: 100%;
+                min-width: 0;
+                max-width: 100%;
+            }
+        }
+    }
+
     &::after {
         content: "";
         clear: both;
@@ -564,10 +596,10 @@ limitations under the License.
         margin-right: 0;
 
         .mx_MessageActionBar {
-            right: 127px; // align with that of right-column bubbles
+            right: 48px; // align with that of right-column bubbles
         }
 
-        .mx_EventTile_readAvatars {
+        .mx_ReadReceiptGroup {
             right: -18px; // match alignment to RRs of chat bubbles
         }
 
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 586865cb3d0..a849c5fedb1 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -16,26 +16,25 @@ limitations under the License.
 */
 
 $left-gutter: 64px;
+$threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
 
 .mx_EventTile {
     flex-shrink: 0;
 
     .mx_EventTile_receiptSent,
     .mx_EventTile_receiptSending {
-        // Give it some dimensions so the tooltip can position properly
+        position: relative;
         display: inline-block;
-        width: 14px;
-        height: 14px;
-        // We don't use `position: relative` on the element because then it won't line
-        // up with the other read receipts
+        width: 16px;
+        height: 16px;
 
         &::before {
             background-color: $tertiary-content;
             mask-repeat: no-repeat;
             mask-position: center;
-            mask-size: 14px;
-            width: 14px;
-            height: 14px;
+            mask-size: 16px;
+            width: 16px;
+            height: 16px;
             content: '';
             position: absolute;
             top: 0;
@@ -43,9 +42,11 @@ $left-gutter: 64px;
             right: 0;
         }
     }
+
     .mx_EventTile_receiptSent::before {
         mask-image: url('$(res)/img/element-icons/circle-sent.svg');
     }
+
     .mx_EventTile_receiptSending::before {
         mask-image: url('$(res)/img/element-icons/circle-sending.svg');
     }
@@ -61,25 +62,24 @@ $left-gutter: 64px;
     &[data-shape=ThreadsList][data-notification]::before {
         content: "";
         position: absolute;
-        width: 8px;
-        height: 8px;
+        width: 10px;
+        height: 10px;
         border-radius: 50%;
-        right: -16px;
-        top: 6px;
+        right: -25px; // center it in the gutter (16px margin + 4px padding + half 10px width)
+        top: 4px;
         left: auto;
     }
 
     &[data-shape=ThreadsList][data-notification=total]::before {
-        background-color: $roomtile-default-badge-bg-color;
+        background-color: $room-icon-unread-color;
     }
 
     &[data-shape=ThreadsList][data-notification=highlight]::before {
         background-color: $alert;
     }
 
-    .mx_ThreadInfo,
+    .mx_ThreadSummary,
     .mx_ThreadSummaryIcon {
-        margin-right: 110px;
         margin-left: 64px;
     }
 
@@ -112,10 +112,11 @@ $left-gutter: 64px;
         background-color: $header-panel-bg-color;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         color: $primary-content;
         font-size: $font-14px;
-        display: inline-block; /* anti-zalgo, with overflow hidden */
+        display: inline-block;
+        /* anti-zalgo, with overflow hidden */
         overflow: hidden;
         padding-bottom: 0px;
         padding-top: 0px;
@@ -126,21 +127,6 @@ $left-gutter: 64px;
         max-width: calc(100% - $left-gutter);
     }
 
-    .mx_SenderProfile .mx_Flair {
-        opacity: 0.7;
-        margin-left: 5px;
-        display: inline-block;
-        vertical-align: top;
-        overflow: hidden;
-        user-select: none;
-
-        img {
-            vertical-align: -2px;
-            margin-right: 2px;
-            border-radius: 8px;
-        }
-    }
-
     &.mx_EventTile_isEditing .mx_MessageTimestamp {
         visibility: hidden;
     }
@@ -157,7 +143,8 @@ $left-gutter: 64px;
         clear: both;
     }
 
-    .mx_EventTile_line, .mx_EventTile_reply {
+    .mx_EventTile_line,
+    .mx_EventTile_reply {
         position: relative;
         padding-left: $left-gutter;
         border-radius: 8px;
@@ -235,12 +222,6 @@ $left-gutter: 64px;
         overflow-y: hidden;
     }
 
-    &.mx_EventTile_selected .mx_EventTile_line,
-    &:hover .mx_EventTile_line {
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
-    }
-
     &:hover.mx_EventTile_verified .mx_EventTile_line {
         box-shadow: inset calc(50px + $selected-message-border-width) 0 0 -50px $e2e-verified-color;
     }
@@ -323,15 +304,24 @@ $left-gutter: 64px;
 
 .mx_RoomView_timeline_rr_enabled {
     .mx_EventTile[data-layout=group] {
+
+        .mx_ThreadSummary,
+        .mx_ThreadSummaryIcon,
         .mx_EventTile_line {
             /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
             margin-right: 110px;
+            min-height: $font-14px;
+        }
+
+        .mx_ThreadSummary {
+            max-width: min(calc(100% - $left-gutter - 110px), 600px); // leave space on both left & right gutters
         }
     }
+
     // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
 }
 
-.mx_SenderProfile {
+.mx_DisambiguatedProfile {
     cursor: pointer;
 }
 
@@ -358,36 +348,6 @@ $left-gutter: 64px;
     }
 }
 
-.mx_EventTile_readAvatars {
-    position: relative;
-    display: inline-block;
-    width: 14px;
-    height: 14px;
-    // This aligns the avatar with the last line of the
-    // message. We want to move it one line up - 2.2rem
-    top: -2.2rem;
-    user-select: none;
-    z-index: 1;
-}
-
-.mx_EventTile_readAvatars .mx_BaseAvatar {
-    position: absolute;
-    display: inline-block;
-    height: $font-14px;
-    width: $font-14px;
-
-    will-change: left, top;
-    transition:
-        left var(--transition-short) ease-out,
-        top var(--transition-standard) ease-out;
-}
-
-.mx_EventTile_readAvatarRemainder {
-    color: $event-timestamp-color;
-    font-size: $font-11px;
-    position: absolute;
-}
-
 .mx_EventTile_bigEmoji {
     font-size: 48px;
     line-height: 57px;
@@ -423,7 +383,8 @@ $left-gutter: 64px;
     background-repeat: no-repeat;
     background-size: contain;
 
-    &::before, &::after {
+    &::before,
+    &::after {
         content: "";
         display: block;
         position: absolute;
@@ -448,6 +409,7 @@ $left-gutter: 64px;
         mask-image: url('$(res)/img/e2e/warning.svg');
         background-color: $alert;
     }
+
     opacity: 1;
 }
 
@@ -456,6 +418,7 @@ $left-gutter: 64px;
         mask-image: url('$(res)/img/e2e/normal.svg');
         background-color: $header-panel-text-primary-color;
     }
+
     opacity: 1;
 }
 
@@ -494,7 +457,8 @@ $left-gutter: 64px;
     color: inherit; // inherit the colour from the dark or light theme by default (but not for code blocks)
     font-size: $font-14px;
 
-    pre, code {
+    pre,
+    code {
         font-family: $monospace-font-family !important;
         background-color: $codeblock-background-color;
     }
@@ -507,7 +471,7 @@ $left-gutter: 64px;
     pre code {
         white-space: pre; // we want code blocks to be scrollable and not wrap
 
-        > * {
+        >* {
             display: inline;
         }
     }
@@ -529,6 +493,7 @@ $left-gutter: 64px;
     float: left;
     margin: 0 0.5em 0 -1.5em;
     color: gray;
+
     & span {
         text-align: right;
         display: block;
@@ -562,18 +527,22 @@ $left-gutter: 64px;
     height: 19px;
     background-color: $message-action-bar-fg-color;
 }
+
 .mx_EventTile_buttonBottom {
     top: 33px;
 }
+
 .mx_EventTile_copyButton {
     mask-image: url($copy-button-url);
 }
+
 .mx_EventTile_collapseButton {
     mask-size: 75%;
     mask-position: center;
     mask-repeat: no-repeat;
     mask-image: url("$(res)/img/element-icons/minimise-collapse.svg");
 }
+
 .mx_EventTile_expandButton {
     mask-size: 75%;
     mask-position: center;
@@ -688,146 +657,87 @@ $left-gutter: 64px;
     visibility: visible;
 }
 
+// Inverse of the above to *disable* the animation on any indicators. This approach
+// is less pretty, but is easier to target because otherwise we need to define the
+// animation for when it's shown which means duplicating the style definition in
+// multiple places.
+.mx_EventTile:not(:hover):not(.mx_EventTile_actionBarFocused):not([data-whatinput='keyboard'] :focus-within):not(.focus-visible:focus-within) {
+    .mx_MessageActionBar .mx_Indicator {
+        animation: none;
+    }
+}
+
 @media only screen and (max-width: 480px) {
-    .mx_EventTile_line, .mx_EventTile_reply {
+
+    .mx_EventTile_line,
+    .mx_EventTile_reply {
         padding-left: 0;
         margin-right: 0;
     }
+
     .mx_EventTile_content {
         margin-top: 10px;
         margin-right: 0;
     }
 }
 
+.mx_ThreadPanel_replies::before,
 .mx_ThreadSummaryIcon::before,
-.mx_ThreadInfo::before {
-    content: "";
-    display: inline-block;
-    mask-image: url('$(res)/img/element-icons/thread-summary.svg');
-    mask-position: center;
-    height: 18px;
-    min-width: 18px;
-    background-color: $secondary-content;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+.mx_ThreadSummary::before {
+    @mixin ThreadInfoIcon;
+    background-color: $secondary-content !important;
 }
 
 .mx_ThreadSummaryIcon {
+    display: inline-block;
     font-size: $font-12px;
-    color: $secondary-content;
-    &::before {
-        vertical-align: middle;
-        margin-left: 8px;
-    }
-}
-
-.mx_ThreadInfo {
-    min-width: 267px;
-    max-width: min(calc(100% - 64px), 600px);
-    width: fit-content;
-    height: 40px;
-    position: relative;
-    background-color: $system;
-    padding-left: 12px;
-    display: flex;
-    align-items: center;
-    border-radius: 8px;
-    padding-right: 16px;
+    color: $secondary-content !important;
     margin-top: 8px;
-    font-size: $font-12px;
-    color: $secondary-content;
-    box-sizing: border-box;
-    justify-content: flex-start;
-    clear: both;
-    overflow: hidden;
-
-    &:hover {
-        cursor: pointer;
-        border: 1px solid $quinary-content;
-        padding-top: 7px;
-        padding-bottom: 7px;
-        padding-left: 11px;
-        padding-right: 15px;
-    }
-
-    &::after {
-        content: "›";
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        width: 60px;
-        padding: 0 10px;
-        font-size: 15px;
-        line-height: 39px;
-        box-sizing: border-box;
-
-        text-align: right;
-        font-weight: 600;
-
-        background: linear-gradient(270deg, $system 52.6%, transparent 100%);
+    margin-bottom: 8px;
 
-        opacity: 0;
-        transform: translateX(20px);
-        transition: all .1s ease-in-out;
-    }
-
-    &:hover::after {
-        opacity: 1;
-        transform: translateX(0);
+    &::before {
+        vertical-align: middle;
+        margin-right: 8px;
+        margin-top: -2px;
     }
 }
 
-.mx_MessagePanel_narrow .mx_ThreadInfo {
+.mx_MessagePanel_narrow .mx_ThreadSummary {
     min-width: initial;
     max-width: initial;
     width: initial;
 }
 
-.mx_ThreadInfo_content {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    padding-left: 8px;
-    font-size: $font-12px;
-    line-height: calc(2 * $font-12px);
-    color: $secondary-content;
-}
-
-.mx_ThreadInfo_avatar {
-    float: left;
-}
-
-.mx_ThreadInfo_threads-amount {
-    font-weight: 600;
-    position: relative;
-    padding: 0 12px 0 8px;
-    white-space: nowrap;
-}
-
 .mx_EventTile[data-shape=ThreadsList] {
-    --topOffset: 20px;
-    --leftOffset: 46px;
+    --topOffset: $spacing-12;
+    --leftOffset: 48px;
+    $borderRadius: 8px;
+    $padding: $spacing-8;
+    $hrHeight: 1px;
 
-    margin: var(--topOffset) 16px var(--topOffset) 0;
-    border-radius: 8px;
+    margin: calc(var(--topOffset) + $hrHeight) 0 var(--topOffset); // include the height of horizontal line
+    padding: $padding $spacing-24 $padding $padding;
+    border-radius: $borderRadius;
 
     display: flex;
     flex-flow: wrap;
     align-items: center;
 
-    &:hover {
+    &:hover,
+    // To cancel "&.mx_EventTile:hover .mx_EventTile_line"
+    &:not([data-layout=bubble]):hover .mx_EventTile_line {
         background-color: $system;
     }
 
     &::after {
         content: "";
         position: absolute;
-        left: var(--leftOffset);
-        right: 0;
-        height: 1px;
-        bottom: calc(-1 * var(--topOffset));
+        left: calc(var(--leftOffset) + $padding);
+        right: $spacing-24; // 24px: 32px - 8px (right padding)
+        height: $hrHeight;
+        bottom: calc(-1 * var(--topOffset) - $hrHeight); // exclude the height of horizontal line
         background-color: $quinary-content;
+        pointer-events: none; // disable the message action bar on hover
     }
 
     &::before {
@@ -845,6 +755,7 @@ $left-gutter: 64px;
         &::after {
             content: unset;
         }
+
         margin-bottom: 0;
     }
 
@@ -852,57 +763,54 @@ $left-gutter: 64px;
         margin-top: 0;
     }
 
-    padding-top: 0;
-
     .mx_EventTile_avatar {
-        top: -4px;
-        left: 0;
+        top: $padding;
+        left: $padding;
     }
 
-    .mx_SenderProfile {
-        margin-left: var(--leftOffset) !important;
-        flex: 1;
+    .mx_DisambiguatedProfile {
         margin-right: 12px;
-
         display: inline-flex;
-        // not a fan of the magic number here, but I just tweaked
-        // the hardcoded value of the current implementation
-        max-width: calc(100% - 96px);
+        flex: 1;
     }
 
-    .mx_SenderProfile_displayName,
-    .mx_SenderProfile_mxid {
+    .mx_DisambiguatedProfile_displayName,
+    .mx_DisambiguatedProfile_mxid {
         display: block;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 
-    .mx_SenderProfile_displayName {
+    .mx_DisambiguatedProfile_displayName {
         flex: none;
         max-width: 100%;
     }
 
-    .mx_SenderProfile_mxid {
+    .mx_DisambiguatedProfile_mxid {
         flex: 1;
     }
 
     .mx_EventTile_line {
         width: 100%;
         box-sizing: border-box;
-        padding-left: var(--leftOffset) !important;
-        padding-bottom: 0;
+        border-radius: $borderRadius !important; // override 4px
+    }
+
+    .mx_DisambiguatedProfile,
+    .mx_EventTile_line {
+        padding-inline-start: var(--leftOffset);
     }
 
     .mx_MessageTimestamp {
-        position: initial !important;
         max-width: 80px;
-        width: auto !important;
+        width: auto;
     }
 }
 
 .mx_ThreadView {
     display: flex;
     flex-direction: column;
+    max-height: 100%;
 
     .mx_ThreadView_List {
         flex: 1;
@@ -916,9 +824,10 @@ $left-gutter: 64px;
     .mx_EventTile {
         display: flex;
         flex-direction: column;
-        padding-top: 0;
 
         .mx_EventTile_line {
+            padding-top: 2px;
+            padding-bottom: 2px;
             padding-left: 0;
             order: 10 !important;
         }
@@ -932,6 +841,16 @@ $left-gutter: 64px;
             padding-left: 0;
             padding-right: 0;
         }
+
+        .mx_ReplyChain {
+            .mx_MLocationBody {
+                margin-top: 6px; // See: https://github.com/matrix-org/matrix-react-sdk/pull/8442
+            }
+        }
+
+        &:not([data-layout=bubble]) {
+            padding-top: $spacing-16;
+        }
     }
 
     .mx_EventTile[data-layout=bubble] {
@@ -963,13 +882,19 @@ $left-gutter: 64px;
     }
 
     .mx_EventTile[data-layout=group] {
+        $spacing-start: 56px; // 56px: 64px - 8px (padding)
         width: 100%;
 
         .mx_EventTile_content,
+        .mx_EventTile_body,
         .mx_HiddenBody,
         .mx_RedactedBody,
-        .mx_ReplyChain_wrapper {
-            margin-left: 36px;
+        .mx_UnknownBody,
+        .mx_MPollBody,
+        .mx_MLocationBody,
+        .mx_ReplyChain_wrapper,
+        .mx_ReactionsRow {
+            margin-left: $spacing-start;
             margin-right: 8px;
 
             .mx_EventTile_content,
@@ -980,37 +905,44 @@ $left-gutter: 64px;
             }
         }
 
-        .mx_ReactionsRow {
-            margin-left: 36px;
-            margin-right: 8px;
+        .mx_ReplyChain_wrapper {
+            .mx_MLocationBody {
+                margin-inline-start: 0;
+                margin-inline-end: 0;
+            }
         }
 
         .mx_MessageTimestamp {
-            top: 2px !important;
-            width: auto;
+            top: 2px; // Align with mx_EventTile_content
         }
 
         .mx_EventTile_senderDetails {
             display: flex;
             align-items: center;
-            gap: calc(6px + $selected-message-border-width);
+            gap: $spacing-16; // gap between the avatar and the sender ID
+            padding-inline-start: $spacing-8;
 
             a {
                 flex: 1;
-                min-width: none;
+                min-width: unset;
                 max-width: 100%;
                 display: flex;
                 align-items: center;
 
-                .mx_SenderProfile {
+                .mx_DisambiguatedProfile {
+                    margin-left: 8px;
                     flex: 1;
                 }
             }
         }
+
+        .mx_EventTile_mediaLine {
+            padding-inline-start: $spacing-start;
+        }
     }
 
     .mx_EventTile_mediaLine {
-        padding-left: 36px !important;
+        padding-left: 36px;
         padding-right: 50px;
 
         .mx_MImageBody {
@@ -1022,4 +954,22 @@ $left-gutter: 64px;
     .mx_MessageComposer_sendMessage {
         margin-right: 0;
     }
+
+    .mx_EditMessageComposer {
+        margin-left: 30px !important; // align start of first letter with that of the event body
+    }
+
+    .mx_EditMessageComposer_buttons {
+        padding-right: 11px; // align with right edge of input
+        margin-right: 0; // align with right edge of background
+    }
+
+    .mx_GroupLayout {
+        .mx_EventTile {
+            .mx_EventTile_line {
+                padding-top: 2px;
+                padding-bottom: 2px;
+            }
+        }
+    }
 }
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index ebb7f99e45e..b1d6e8b535b 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -19,7 +19,7 @@ $left-gutter: 64px;
 
 .mx_GroupLayout {
     .mx_EventTile {
-        > .mx_SenderProfile {
+        > .mx_DisambiguatedProfile {
             line-height: $font-20px;
             margin-left: $left-gutter;
         }
@@ -65,7 +65,7 @@ $left-gutter: 64px;
             }
         }
 
-        .mx_SenderProfile {
+        .mx_DisambiguatedProfile {
             font-size: $font-13px;
         }
 
@@ -97,7 +97,7 @@ $left-gutter: 64px;
             top: 3px;
         }
 
-        .mx_EventTile_readAvatars {
+        .mx_ReadReceiptGroup {
             // This aligns the avatar with the last line of the
             // message. We want to move it one line up - 2rem
             top: -2rem;
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 14b1c4ad60a..c09ee476767 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -40,7 +40,7 @@ $irc-line-height: $font-18px;
             margin-right: $right-padding;
         }
 
-        .mx_ThreadInfo {
+        .mx_ThreadSummary {
             margin-right: 0;
             margin-left: 0;
         }
@@ -49,8 +49,8 @@ $irc-line-height: $font-18px;
             order: 5;
             flex-shrink: 0;
 
-            .mx_EventTile_readAvatars {
-                top: 0.2rem; // ($irc-line-height - avatar height) / 2
+            .mx_ReadReceiptGroup {
+                top: -0.3rem; // ($irc-line-height - avatar height) / 2
             }
         }
 
@@ -173,7 +173,7 @@ $irc-line-height: $font-18px;
         border-left: 0;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         width: var(--name-width);
         display: flex;
         order: 2;
@@ -181,14 +181,14 @@ $irc-line-height: $font-18px;
         justify-content: flex-start;
         align-items: center;
 
-        > .mx_SenderProfile_displayName {
+        > .mx_DisambiguatedProfile_displayName {
             width: 100%;
             text-align: end;
             overflow: hidden;
             text-overflow: ellipsis;
         }
 
-        > .mx_SenderProfile_mxid {
+        > .mx_DisambiguatedProfile_mxid {
             visibility: collapse;
             // Override the inherited margin.
             margin-left: 0;
@@ -196,11 +196,11 @@ $irc-line-height: $font-18px;
         }
     }
 
-    .mx_SenderProfile:hover {
+    .mx_DisambiguatedProfile:hover {
         overflow: visible;
         z-index: 10;
 
-        > .mx_SenderProfile_displayName {
+        > .mx_DisambiguatedProfile_displayName {
             overflow: visible;
             display: inline;
             background-color: $event-selected-color;
@@ -208,7 +208,7 @@ $irc-line-height: $font-18px;
             padding-right: 8px;
         }
 
-        > .mx_SenderProfile_mxid {
+        > .mx_DisambiguatedProfile_mxid {
             visibility: visible;
             opacity: 1;
             background-color: $event-selected-color;
@@ -217,7 +217,7 @@ $irc-line-height: $font-18px;
 
     .mx_ReplyChain {
         margin: 0;
-        .mx_SenderProfile {
+        .mx_DisambiguatedProfile {
             order: unset;
             max-width: unset;
             width: unset;
@@ -252,10 +252,4 @@ $irc-line-height: $font-18px;
         cursor: col-resize;
         z-index: 100;
     }
-
-    // Need to use important to override the js provided height and width values.
-    .mx_Flair > img {
-        height: $font-14px !important;
-        width: $font-14px !important;
-    }
 }
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index b0583ee94ec..c29bb28689d 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -58,7 +58,7 @@ limitations under the License.
     margin: 0 16px 16px 16px;
 }
 
-.mx_MemberInfo .mx_RoomTile_nameContainer {
+.mx_MemberInfo .mx_RoomTile_titleContainer {
     width: 154px;
 }
 
@@ -66,12 +66,12 @@ limitations under the License.
     display: none;
 }
 
-.mx_MemberInfo .mx_RoomTile_name {
+.mx_MemberInfo .mx_RoomTile_title {
     width: 160px;
 }
 
 .mx_MemberInfo_avatar {
-    background: $groupFilterPanel-bg-color;
+    background: $spacePanel-bg-color;
     margin-bottom: 16px;
 }
 
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index b84beea89be..41f394ff845 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MemberList,
-.mx_GroupMemberList,
-.mx_GroupRoomList {
+.mx_MemberList {
     flex: 1;
     display: flex;
     flex-direction: column;
@@ -52,11 +50,6 @@ limitations under the License.
     }
 }
 
-.mx_GroupMemberList_query,
-.mx_GroupRoomList_query {
-    flex: 0 0 auto;
-}
-
 .mx_MemberList_chevron {
     position: absolute;
     right: 35px;
@@ -117,11 +110,3 @@ limitations under the License.
         margin-right: 5px;
     }
 }
-
-.mx_MemberList_inviteCommunity span::before {
-    mask-image: url('$(res)/img/icon-invite-people.svg');
-}
-
-.mx_MemberList_addRoomToCommunity span::before {
-    mask-image: url('$(res)/img/icons-room-add.svg');
-}
diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
index f0e471d3844..1b7e298ef6b 100644
--- a/res/css/views/rooms/_NewRoomIntro.scss
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -23,22 +23,16 @@ limitations under the License.
         }
     }
 
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-        font-size: inherit;
-    }
-
     .mx_NewRoomIntro_buttons {
         margin-top: 28px;
+        display: flex;
+        flex-flow: wrap;
+        gap: 14px 12px;
 
         .mx_AccessibleButton {
             line-height: $font-24px;
             display: inline-block;
 
-            & + .mx_AccessibleButton {
-                margin-left: 12px;
-            }
-
             &:not(.mx_AccessibleButton_kind_primary_outline)::before {
                 content: '';
                 display: inline-block;
diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss
index 07978a8f655..d31b1cbcda4 100644
--- a/res/css/views/rooms/_PinnedEventTile.scss
+++ b/res/css/views/rooms/_PinnedEventTile.scss
@@ -91,10 +91,7 @@ limitations under the License.
         }
 
         .mx_AccessibleButton_kind_link {
-            padding: 0;
             margin-left: 12px;
-            font-size: inherit;
-            line-height: inherit;
         }
     }
 
diff --git a/res/css/views/rooms/_ReadReceiptGroup.scss b/res/css/views/rooms/_ReadReceiptGroup.scss
new file mode 100644
index 00000000000..fe40b1263f3
--- /dev/null
+++ b/res/css/views/rooms/_ReadReceiptGroup.scss
@@ -0,0 +1,146 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_ReadReceiptGroup {
+    position: relative;
+    display: inline-block;
+    // This aligns the avatar with the last line of the
+    // message. We want to move it one line up
+    // See .mx_GroupLayout .mx_EventTile .mx_EventTile_line in _GroupLayout.scss
+    top: calc(-$font-22px - 3px);
+    user-select: none;
+    z-index: 1;
+
+    .mx_ReadReceiptGroup_button {
+        display: inline-flex;
+        flex-direction: row;
+        height: 16px;
+        padding: 4px;
+        border-radius: 6px;
+
+        &.mx_AccessibleButton {
+            &:hover {
+                background: $event-selected-color;
+            }
+        }
+    }
+
+    .mx_ReadReceiptGroup_remainder {
+        color: $secondary-content;
+        font-size: $font-11px;
+        line-height: $font-16px;
+        margin-right: 4px;
+    }
+
+    .mx_ReadReceiptGroup_container {
+        position: relative;
+        display: block;
+        height: 100%;
+
+        .mx_BaseAvatar {
+            position: absolute;
+            display: inline-block;
+            height: 14px;
+            width: 14px;
+            border: 1px solid $background;
+            border-radius: 100%;
+
+            will-change: left, top;
+            transition:
+                left var(--transition-short) ease-out,
+                top var(--transition-standard) ease-out;
+        }
+    }
+}
+
+.mx_ReadReceiptGroup_popup {
+    max-height: 300px;
+    width: 220px;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+    font-size: 12px;
+    line-height: 15px;
+
+    right: 0;
+
+    &.mx_ContextualMenu_top {
+        top: 8px;
+    }
+
+    &.mx_ContextualMenu_bottom {
+        bottom: 8px;
+    }
+
+    .mx_ReadReceiptGroup_title {
+        font-size: 12px;
+        line-height: 15px;
+        margin: 16px 16px 8px;
+        font-weight: 600;
+        // shouldn’t be actually focusable
+        outline: none;
+    }
+
+    .mx_AutoHideScrollbar {
+        .mx_ReadReceiptGroup_person {
+            display: flex;
+            flex-direction: row;
+            padding: 4px;
+            margin: 0 12px;
+            border-radius: 8px;
+
+            &:hover {
+                background: $menu-selected-color;
+            }
+
+            &:last-child {
+                margin-bottom: 8px;
+            }
+
+            .mx_BaseAvatar {
+                margin: 6px 8px;
+                align-self: center;
+                justify-self: center;
+            }
+
+            .mx_ReadReceiptGroup_name {
+                display: flex;
+                flex-direction: column;
+                flex-grow: 1;
+                flex-shrink: 1;
+                overflow: hidden;
+
+                p {
+                    margin: 2px 0;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    white-space: nowrap;
+                }
+
+                .mx_ReadReceiptGroup_secondary {
+                    color: $secondary-content;
+                }
+            }
+        }
+    }
+}
+
+.mx_ReadReceiptGroup_person--tooltip {
+    overflow-y: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
index c2f19eff2d1..ca8f886737e 100644
--- a/res/css/views/rooms/_ReplyTile.scss
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -104,7 +104,7 @@ limitations under the License.
         padding-top: 0;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         font-size: $font-14px;
         line-height: $font-17px;
 
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 20369830c64..85c139402be 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -84,27 +84,6 @@ limitations under the License.
     align-items: center;
 }
 
-.mx_RoomHeader_simpleHeader {
-    line-height: $font-52px;
-    color: $primary-content;
-    font-size: $font-18px;
-    font-weight: $font-semi-bold;
-    overflow: hidden;
-    margin-left: 63px;
-    text-overflow: ellipsis;
-    width: 100%;
-
-    .mx_RoomHeader_cancelButton {
-        float: right;
-    }
-
-    .mx_RoomHeader_icon {
-        margin-left: 14px;
-        margin-right: 24px;
-        vertical-align: -4px;
-    }
-}
-
 .mx_RoomHeader_name {
     flex: 0 1 auto;
     overflow: hidden;
@@ -162,17 +141,24 @@ limitations under the License.
 }
 
 .mx_RoomHeader_topic {
+    $lineHeight: $font-16px;
+    $lines: 2;
+
     flex: 1;
     color: $roomtopic-color;
     font-weight: 400;
     font-size: $font-13px;
+    line-height: $lineHeight;
+    max-height: calc($lineHeight * $lines);
+    border-bottom: 1px solid transparent;
+
     // to align baseline of topic with room name
     margin: 4px 7px 0;
+
     overflow: hidden;
-    text-overflow: ellipsis;
-    border-bottom: 1px solid transparent;
-    line-height: 1.2em;
-    max-height: 2.4em;
+    -webkit-line-clamp: $lines; // See: https://drafts.csswg.org/css-overflow-3/#webkit-line-clamp
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
 }
 
 .mx_RoomHeader_avatar {
@@ -231,6 +217,10 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
 }
 
+.mx_RoomHeader_inviteButton::before {
+    mask-image: url('$(res)/img/element-icons/room/invite.svg');
+}
+
 .mx_RoomHeader_voiceCallButton::before {
     mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
 
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 029c5b6cdbb..bbac00e0e60 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -21,9 +21,12 @@ limitations under the License.
 .mx_RoomList_iconPlus::before {
     mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
 }
-.mx_RoomList_iconCreateNewRoom::before {
+.mx_RoomList_iconNewRoom::before {
     mask-image: url('$(res)/img/element-icons/roomlist/hash-plus.svg');
 }
+.mx_RoomList_iconNewVideoRoom::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/hash-video.svg');
+}
 .mx_RoomList_iconAddExistingRoom::before {
     mask-image: url('$(res)/img/element-icons/roomlist/hash.svg');
 }
diff --git a/res/css/views/rooms/_RoomListHeader.scss b/res/css/views/rooms/_RoomListHeader.scss
index 442456ff0e2..7f5d06d5499 100644
--- a/res/css/views/rooms/_RoomListHeader.scss
+++ b/res/css/views/rooms/_RoomListHeader.scss
@@ -103,9 +103,12 @@ limitations under the License.
 .mx_RoomListHeader_iconStartChat::before {
     mask-image: url('$(res)/img/element-icons/roomlist/member-plus.svg');
 }
-.mx_RoomListHeader_iconCreateRoom::before {
+.mx_RoomListHeader_iconNewRoom::before {
     mask-image: url('$(res)/img/element-icons/roomlist/hash-plus.svg');
 }
+.mx_RoomListHeader_iconNewVideoRoom::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/hash-video.svg');
+}
 .mx_RoomListHeader_iconExplore::before {
     mask-image: url('$(res)/img/element-icons/roomlist/hash-search.svg');
 }
diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 8e4a9ee5756..7cce08c7896 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2015 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -98,6 +98,14 @@ limitations under the License.
     }
 }
 
+// With maximised widgets, the panel fits in better when rounded
+.mx_MainSplit_maximisedWidget .mx_RoomPreviewBar_panel {
+    margin: $container-gap-width;
+    margin-right: calc($container-gap-width / 2); // Shared with right panel
+    margin-top: 0; // Already covered by apps drawer
+    border-radius: 8px;
+}
+
 .mx_RoomPreviewBar_dialog {
     margin: auto;
     box-sizing: content;
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index d5b28d07e2e..c00ac227cf5 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -50,6 +50,10 @@ limitations under the License.
         height: 24px;
         color: $tertiary-content;
 
+        .mx_RoomSublist_stickableContainer {
+            width: 100%;
+        }
+
         .mx_RoomSublist_stickable {
             flex: 1;
             max-width: 100%;
@@ -176,6 +180,14 @@ limitations under the License.
         }
     }
 
+    // In the general case, we reserve space for each sublist header to prevent
+    // scroll jumps when they become sticky. However, that leaves a gap when
+    // scrolled to the top above the first sublist (whose header can only ever
+    // stick to top), so we make sure to exclude the first visible sublist.
+    &:not(.mx_RoomSublist_hidden) ~ .mx_RoomSublist .mx_RoomSublist_stickableContainer {
+        height: 24px;
+    }
+
     .mx_RoomSublist_resizeBox {
         position: relative;
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 9253a25e327..23fb4f1e9af 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -19,12 +19,12 @@ limitations under the License.
     margin-bottom: 4px;
     padding: 4px;
 
+    // The tile is also a flexbox row itself
+    display: flex;
     contain: content; // Not strict as it will break when resizing a sublist vertically
-    height: 40px;
     box-sizing: border-box;
 
-    // The tile is also a flexbox row itself
-    display: flex;
+    font-size: $font-13px;
 
     &.mx_RoomTile_selected,
     &:hover,
@@ -35,22 +35,22 @@ limitations under the License.
     }
 
     .mx_DecoratedRoomAvatar, .mx_RoomTile_avatarContainer {
-        margin-right: 8px;
+        margin-right: 10px;
     }
 
-    .mx_RoomTile_nameContainer {
+    .mx_RoomTile_titleContainer {
+        height: 32px;
+        min-width: 0;
+        flex-basis: 0;
         flex-grow: 1;
-        min-width: 0; // allow flex to shrink it
         margin-right: 8px; // spacing to buttons/badges
 
-        // Create a new column layout flexbox for the name parts
+        // Create a new column layout flexbox for the title parts
         display: flex;
         flex-direction: column;
         justify-content: center;
 
-        .mx_RoomTile_name,
-        .mx_RoomTile_messagePreview {
-            margin: 0 2px;
+        .mx_RoomTile_title, .mx_RoomTile_subtitle {
             width: 100%;
 
             // Ellipsize any text overflow
@@ -59,23 +59,56 @@ limitations under the License.
             white-space: nowrap;
         }
 
-        .mx_RoomTile_name {
+        .mx_RoomTile_title {
             font-size: $font-14px;
             line-height: $font-18px;
-        }
 
-        .mx_RoomTile_name.mx_RoomTile_nameHasUnreadEvents {
-            font-weight: 600;
+            &.mx_RoomTile_titleHasUnreadEvents {
+                font-weight: 600;
+            }
         }
 
-        .mx_RoomTile_messagePreview {
-            font-size: $font-13px;
+        .mx_RoomTile_subtitle {
             line-height: $font-18px;
             color: $secondary-content;
+
+            .mx_RoomTile_videoIndicator {
+                &::before {
+                    display: inline-block;
+                    vertical-align: text-bottom;
+                    content: '';
+                    background-color: $secondary-content;
+                    mask-image: url('$(res)/img/element-icons/call/video-call.svg');
+                    mask-size: 16px;
+                    width: 16px;
+                    height: 16px;
+                    margin-right: 4px;
+                }
+
+                &.mx_RoomTile_videoIndicator_active {
+                    color: $accent;
+
+                    &::before {
+                        background-color: $accent;
+                    }
+                }
+            }
+
+            .mx_RoomTile_videoParticipants::before {
+                display: inline-block;
+                vertical-align: text-bottom;
+                content: '';
+                background-color: $secondary-content;
+                mask-image: url('$(res)/img/element-icons/group-members.svg');
+                mask-size: 16px;
+                width: 16px;
+                height: 16px;
+                margin-right: 2px;
+            }
         }
 
-        .mx_RoomTile_nameWithPreview {
-            margin-top: -4px; // shift the name up a bit more
+        .mx_RoomTile_titleWithSubtitle {
+            margin-top: -3px; // shift the title up a bit more
         }
     }
 
@@ -229,6 +262,10 @@ limitations under the License.
         mask-image: url('$(res)/img/element-icons/export.svg');
     }
 
+    .mx_RoomTile_iconDeveloperTools::before {
+        mask-image: url('$(res)/img/element-icons/settings/flask.svg');
+    }
+
     .mx_RoomTile_iconCopyLink::before {
         mask-image: url('$(res)/img/element-icons/link.svg');
     }
diff --git a/res/css/views/rooms/_ThreadSummary.scss b/res/css/views/rooms/_ThreadSummary.scss
new file mode 100644
index 00000000000..11ff6cdbbe3
--- /dev/null
+++ b/res/css/views/rooms/_ThreadSummary.scss
@@ -0,0 +1,113 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+$left-gutter: 64px; // From _EventTile.scss
+$threadSummaryLineHeight: calc(2 * $font-12px);
+
+.mx_ThreadSummary {
+    min-width: 267px;
+    max-width: min(calc(100% - $left-gutter), 600px); // leave space on both left & right gutters
+    width: fit-content;
+    height: 40px;
+    position: relative;
+    background-color: $system;
+    padding-left: $spacing-12;
+    display: flex;
+    align-items: center;
+    border-radius: 8px;
+    padding-right: $spacing-16;
+    margin-top: $spacing-8;
+    font-size: $font-12px;
+    color: $secondary-content;
+    box-sizing: border-box;
+    justify-content: flex-start;
+    clear: both;
+    overflow: hidden;
+    border: 1px solid $system; // always render a border so the hover effect doesn't require a re-layout
+
+    .mx_ThreadSummary_chevron {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        width: 60px;
+        box-sizing: border-box;
+        // XXX: We use `$system-transparent` instead of `transparent` to work around a Safari <15.4 bug
+        background: linear-gradient(270deg, $system 50%, $system-transparent 100%);
+
+        opacity: 0;
+        transform: translateX(60px);
+        transition: all .1s ease-in-out;
+
+        &::before {
+            content: '';
+            position: absolute;
+            top: 50%;
+            right: $spacing-12;
+            transform: translateY(-50%);
+            width: 12px;
+            height: 12px;
+            mask-image: url('$(res)/img/compound/chevron-right-12px.svg');
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background-color: $secondary-content;
+        }
+    }
+
+    &:hover,
+    &:focus {
+        cursor: pointer;
+        border-color: $quinary-content;
+
+        .mx_ThreadSummary_chevron {
+            opacity: 1;
+            transform: translateX(0);
+        }
+    }
+
+    &::before {
+        align-self: center; // v-align the threads icon
+    }
+}
+
+// XXX: these classes are re-used outside of the component
+.mx_ThreadSummary_ThreadsAmount {
+    @mixin ThreadsAmount;
+}
+
+.mx_ThreadSummary_sender {
+    font-weight: $font-semi-bold;
+    line-height: $threadSummaryLineHeight;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.mx_ThreadSummary_content {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    margin-left: $spacing-4;
+    font-size: $font-12px;
+    line-height: $threadSummaryLineHeight;
+    color: $secondary-content;
+    flex: 1;
+}
+
+.mx_ThreadSummary_avatar {
+    margin-inline-end: $spacing-8;
+}
diff --git a/res/css/views/settings/_KeyboardShortcut.scss b/res/css/views/settings/_KeyboardShortcut.scss
new file mode 100644
index 00000000000..d3ca6cc9435
--- /dev/null
+++ b/res/css/views/settings/_KeyboardShortcut.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_KeyboardShortcut {
+    kbd {
+        padding: 5px;
+        border-radius: 4px;
+        background-color: $header-panel-bg-color;
+        margin-right: 5px;
+        min-width: 20px;
+        text-align: center;
+        display: inline-block;
+        border: 1px solid $kbd-border-color;
+        box-shadow: 0 2px $kbd-border-color;
+        margin-bottom: 4px;
+        text-transform: capitalize;
+
+        & + kbd {
+            margin-left: 5px;
+        }
+    }
+}
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
index 09509f7d9eb..ae77a432e0a 100644
--- a/res/css/views/settings/_ProfileSettings.scss
+++ b/res/css/views/settings/_ProfileSettings.scss
@@ -61,8 +61,7 @@ limitations under the License.
     margin-bottom: 28px;
 
     > .mx_AccessibleButton_kind_link {
-        padding-left: 0; // to align with left side
-        padding-right: 0;
+        font-size: $font-14px;
         margin-right: 10px;
     }
 }
diff --git a/res/css/views/settings/tabs/room/_NotificationSettingsTab.scss b/res/css/views/settings/tabs/room/_NotificationSettingsTab.scss
index 97b807863f9..036a3a5389f 100644
--- a/res/css/views/settings/tabs/room/_NotificationSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_NotificationSettingsTab.scss
@@ -50,11 +50,6 @@ limitations under the License.
             font-size: $font-12px;
             line-height: $font-15px;
             margin-right: 32px;
-
-            .mx_AccessibleButton_kind_link {
-                padding: 0;
-                font-size: inherit;
-            }
         }
     }
 
diff --git a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.scss b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.scss
index 1ace6ec1514..1ba3a8599b8 100644
--- a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.scss
@@ -21,22 +21,4 @@ limitations under the License.
         justify-content: space-between;
         align-items: center;
     }
-
-    kbd {
-        padding: 5px;
-        border-radius: 4px;
-        background-color: $header-panel-bg-color;
-        margin-right: 5px;
-        min-width: 20px;
-        text-align: center;
-        display: inline-block;
-        border: 1px solid $kbd-border-color;
-        box-shadow: 0 2px $kbd-border-color;
-        margin-bottom: 4px;
-        text-transform: capitalize;
-
-        & + kbd {
-            margin-left: 5px;
-        }
-    }
 }
diff --git a/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss b/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
index 023c75c1866..6fa751a96f1 100644
--- a/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
@@ -15,18 +15,18 @@ limitations under the License.
 */
 
 .mx_LabsUserSettingsTab {
-    .mx_SettingsTab_section {
-        margin-top: 32px;
+    .mx_SettingsTab_subsectionText, .mx_SettingsTab_section {
+        margin-bottom: 30px;
+    }
 
-        .mx_SettingsFlag {
-            margin-right: 0; // remove right margin to align with beta cards
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
+    .mx_SettingsTab_section .mx_SettingsFlag {
+        margin-right: 0; // remove right margin to align with beta cards
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
 
-            .mx_ToggleSwitch {
-                float: unset;
-            }
+        .mx_ToggleSwitch {
+            float: unset;
         }
     }
 }
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index b5791560c7d..ea979ac074c 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -32,31 +32,5 @@ limitations under the License.
                 margin-top: 20px;
             }
         }
-
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-            font-size: inherit;
-        }
-    }
-
-    .mx_PreferencesUserSettingsTab_CommunityMigrator {
-        margin-right: 200px;
-
-        > div {
-            font-weight: $font-semi-bold;
-            font-size: $font-15px;
-            line-height: $font-18px;
-            color: $primary-content;
-            margin: 16px 0;
-
-            .mx_BaseAvatar {
-                margin-right: 12px;
-                vertical-align: middle;
-            }
-
-            .mx_AccessibleButton {
-                float: right;
-            }
-        }
     }
 }
diff --git a/res/css/views/spaces/_SpaceBasicSettings.scss b/res/css/views/spaces/_SpaceBasicSettings.scss
index a8e0e0e2f25..5ed772fa85f 100644
--- a/res/css/views/spaces/_SpaceBasicSettings.scss
+++ b/res/css/views/spaces/_SpaceBasicSettings.scss
@@ -63,9 +63,9 @@ limitations under the License.
 
         > .mx_AccessibleButton_kind_link {
             display: inline-block;
-            padding: 0;
-            margin: auto 16px;
+            margin: auto 18px;
             color: #368bd6;
+            font-size: $font-14px; // See _SpaceSettingsDialog.scss
         }
 
         > .mx_SpaceBasicSettings_avatar_remove {
@@ -74,7 +74,6 @@ limitations under the License.
     }
 
     .mx_AccessibleButton_hasKind {
-        padding: 8px 22px;
         margin-left: auto;
         display: block;
         width: min-content;
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index 80c1c39da22..2b24b9a2dcf 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -43,6 +43,7 @@ $spacePanelWidth: 68px;
                 color: $secondary-content;
             }
 
+            // XXX: Temporary for the Spaces release only
             .mx_SpaceFeedbackPrompt {
                 border-top: 1px solid $input-border-color;
                 padding-top: 12px;
@@ -92,11 +93,6 @@ $spacePanelWidth: 68px;
             width: min-content;
         }
 
-        .mx_AccessibleButton_kind_link {
-            padding: 0;
-            font-size: inherit;
-        }
-
         .mx_AccessibleButton_disabled {
             cursor: not-allowed;
         }
@@ -112,15 +108,11 @@ $spacePanelWidth: 68px;
         position: relative;
         font-size: inherit;
         line-height: inherit;
-        margin-right: auto;
+        margin-right: 8px;
     }
 
     .mx_AccessibleButton_kind_link {
         color: $accent;
         position: relative;
-        padding: 0;
-        margin-left: 8px;
-        font-size: inherit;
-        line-height: inherit;
     }
 }
diff --git a/res/css/views/toasts/_IncomingCallToast.scss b/res/css/views/toasts/_IncomingCallToast.scss
index cb05b1a977b..5fd244c2778 100644
--- a/res/css/views/toasts/_IncomingCallToast.scss
+++ b/res/css/views/toasts/_IncomingCallToast.scss
@@ -90,27 +90,14 @@ limitations under the License.
             gap: 12px;
 
             .mx_IncomingCallToast_button {
-                height: 24px;
+                @mixin CallButton;
                 padding: 0px 8px;
                 flex-shrink: 0;
                 flex-grow: 1;
-                margin-right: 0;
                 font-size: $font-15px;
-                line-height: $font-24px;
 
                 span {
                     padding: 8px 0;
-                    display: flex;
-                    align-items: center;
-
-                    &::before {
-                        content: '';
-                        display: inline-block;
-                        background-color: $button-fg-color;
-                        mask-position: center;
-                        mask-repeat: no-repeat;
-                        margin-right: 8px;
-                    }
                 }
 
                 &.mx_IncomingCallToast_button_accept span::before {
diff --git a/res/css/views/typography/_Heading.scss b/res/css/views/typography/_Heading.scss
index 9b7ddeaef3f..84a008c18f8 100644
--- a/res/css/views/typography/_Heading.scss
+++ b/res/css/views/typography/_Heading.scss
@@ -37,3 +37,11 @@ limitations under the License.
     margin-inline: unset;
     margin-block: unset;
 }
+
+.mx_Heading_h4 {
+    font-size: $font-15px;
+    font-weight: $font-semi-bold;
+    line-height: $font-20px;
+    margin-inline: unset;
+    margin-block: unset;
+}
diff --git a/res/css/views/voip/_VideoLobby.scss b/res/css/views/voip/_VideoLobby.scss
new file mode 100644
index 00000000000..a708e79c90e
--- /dev/null
+++ b/res/css/views/voip/_VideoLobby.scss
@@ -0,0 +1,174 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_VideoLobby {
+    min-height: 0;
+    flex-grow: 1;
+    padding: $spacing-12;
+    color: $video-lobby-primary-content;
+    background-color: $video-lobby-background;
+    border-radius: 8px;
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: $spacing-32;
+
+    .mx_FacePile {
+        width: fit-content;
+        margin: $spacing-8 auto 0;
+
+        .mx_FacePile_faces .mx_BaseAvatar_image {
+            border-color: $video-lobby-background;
+        }
+    }
+
+    .mx_VideoLobby_preview {
+        position: relative;
+        width: 100%;
+        max-width: 800px;
+        aspect-ratio: 1.5;
+        background-color: $video-lobby-system;
+
+        border-radius: 20px;
+        overflow: hidden;
+
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .mx_BaseAvatar {
+            margin: $spacing-20;
+
+            // Override the explicit dimensions on the element so that this gets sized responsively
+            width: unset !important;
+            height: unset !important;
+            min-width: 0;
+            min-height: 0;
+            flex: 0 1 200px;
+        }
+
+        video {
+            position: absolute;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            display: block;
+            transform: scaleX(-1); // flip the image
+            background-color: black;
+        }
+
+        .mx_VideoLobby_controls {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+
+            background-color: rgba($video-lobby-background, 0.9);
+
+            display: flex;
+            justify-content: center;
+            gap: $spacing-24;
+
+            .mx_VideoLobby_deviceButtonWrapper {
+                position: relative;
+                margin: 6px 0 10px;
+
+                .mx_VideoLobby_deviceButton {
+                    $size: 50px;
+
+                    width: $size;
+                    height: $size;
+
+                    background-color: $video-lobby-primary-content;
+                    border-radius: calc($size / 2);
+
+                    &::before {
+                        content: '';
+                        display: inline-block;
+                        mask-repeat: no-repeat;
+                        mask-size: 20px;
+                        mask-position: center;
+                        background-color: $video-lobby-system;
+                        height: 100%;
+                        width: 100%;
+                    }
+
+                    &.mx_VideoLobby_deviceButton_audio::before {
+                        mask-image: url('$(res)/img/voip/call-view/mic-off.svg');
+                    }
+
+                    &.mx_VideoLobby_deviceButton_video::before {
+                        mask-image: url('$(res)/img/voip/call-view/cam-off.svg');
+                    }
+                }
+
+                .mx_VideoLobby_deviceListButton {
+                    $size: 15px;
+
+                    position: absolute;
+                    bottom: 0;
+                    right: -2.5px;
+                    width: $size;
+                    height: $size;
+
+                    background-color: $video-lobby-primary-content;
+                    border-radius: calc($size / 2);
+
+                    &::before {
+                        content: '';
+                        display: inline-block;
+                        mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+                        mask-size: $size;
+                        mask-position: center;
+                        background-color: $video-lobby-system;
+                        height: 100%;
+                        width: 100%;
+                    }
+                }
+
+                &.mx_VideoLobby_deviceButtonWrapper_active {
+                    .mx_VideoLobby_deviceButton,
+                    .mx_VideoLobby_deviceListButton {
+                        background-color: $video-lobby-system;
+
+                        &::before {
+                            background-color: $video-lobby-primary-content;
+                        }
+                    }
+
+                    .mx_VideoLobby_deviceButton {
+                        &.mx_VideoLobby_deviceButton_audio::before {
+                            mask-image: url('$(res)/img/voip/call-view/mic-on.svg');
+                        }
+
+                        &.mx_VideoLobby_deviceButton_video::before {
+                            mask-image: url('$(res)/img/voip/call-view/cam-on.svg');
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .mx_VideoLobby_joinButton {
+        padding-left: 50px;
+        padding-right: 50px;
+    }
+}
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
index 128aac8139b..b3b20e9aa38 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 differ
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
index a95e89c0942..48f66733aa3 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 differ
diff --git a/res/img/betas/threads.png b/res/img/betas/threads.png
new file mode 100644
index 00000000000..f34fb5f8958
Binary files /dev/null and b/res/img/betas/threads.png differ
diff --git a/res/img/compound/chevron-right-12px.svg b/res/img/compound/chevron-right-12px.svg
new file mode 100644
index 00000000000..02f61f36ff3
--- /dev/null
+++ b/res/img/compound/chevron-right-12px.svg
@@ -0,0 +1,10 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1692_80)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.96967 10.7197C3.67678 10.4268 3.67601 9.95114 3.96795 9.6573L7.66823 5.933L3.95592 2.22069C3.66303 1.92779 3.66226 1.45215 3.9542 1.15831C4.24615 0.864473 4.72025 0.863706 5.01315 1.1566L9.25579 5.39924C9.54868 5.69213 9.54945 6.16777 9.2575 6.46161L5.02861 10.718C4.73667 11.0118 4.26256 11.0126 3.96967 10.7197Z" fill="#737D8C"/>
+</g>
+<defs>
+<clipPath id="clip0_1692_80">
+<rect width="12" height="12" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/res/img/element-icons/community-members.svg b/res/img/element-icons/group-members.svg
similarity index 100%
rename from res/img/element-icons/community-members.svg
rename to res/img/element-icons/group-members.svg
diff --git a/res/img/element-icons/minus-button.svg b/res/img/element-icons/minus-button.svg
index ca61c23b76b..6e7ea87c0b1 100644
--- a/res/img/element-icons/minus-button.svg
+++ b/res/img/element-icons/minus-button.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.00001C2 7.56779 2.35038 7.21741 2.78261 7.21741L13.2173 7.21741C13.6496 7.21741 13.9999 7.56779 13.9999 8.00001C13.9999 8.43223 13.6496 8.78262 13.2173 8.78262L2.78261 8.78262C2.35038 8.78262 2 8.43223 2 8.00001Z" fill="#17191C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8.00001C2 7.56779 2.35038 7.21741 2.78261 7.21741L13.2173 7.21741C13.6496 7.21741 13.9999 7.56779 13.9999 8.00001C13.9999 8.43223 13.6496 8.78262 13.2173 8.78262L2.78261 8.78262C2.35038 8.78262 2 8.43223 2 8.00001Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/plus-button.svg b/res/img/element-icons/plus-button.svg
index cbc25c4553e..9a14c85ee5e 100644
--- a/res/img/element-icons/plus-button.svg
+++ b/res/img/element-icons/plus-button.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.78269 2.78285C8.78269 2.35063 8.43231 2.00024 8.00009 2.00024C7.56787 2.00024 7.21748 2.35063 7.21748 2.78285V7.21748L2.78285 7.21748C2.35063 7.21748 2.00024 7.56787 2.00024 8.00009C2.00024 8.43231 2.35063 8.78269 2.78285 8.78269L7.21748 8.7827V13.2176C7.21748 13.6498 7.56787 14.0002 8.00009 14.0002C8.43231 14.0002 8.7827 13.6498 8.7827 13.2176V8.7827L13.2176 8.7827C13.6498 8.7827 14.0002 8.43231 14.0002 8.00009C14.0002 7.56787 13.6498 7.21749 13.2176 7.21749L8.78269 7.21748V2.78285Z" fill="#17191C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.78269 2.78285C8.78269 2.35063 8.43231 2.00024 8.00009 2.00024C7.56787 2.00024 7.21748 2.35063 7.21748 2.78285V7.21748L2.78285 7.21748C2.35063 7.21748 2.00024 7.56787 2.00024 8.00009C2.00024 8.43231 2.35063 8.78269 2.78285 8.78269L7.21748 8.7827V13.2176C7.21748 13.6498 7.56787 14.0002 8.00009 14.0002C8.43231 14.0002 8.7827 13.6498 8.7827 13.2176V8.7827L13.2176 8.7827C13.6498 8.7827 14.0002 8.43231 14.0002 8.00009C14.0002 7.56787 13.6498 7.21749 13.2176 7.21749L8.78269 7.21748V2.78285Z" fill="currentColor"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/hash-plus.svg b/res/img/element-icons/roomlist/hash-plus.svg
index 807c42cd809..326716ebe64 100644
--- a/res/img/element-icons/roomlist/hash-plus.svg
+++ b/res/img/element-icons/roomlist/hash-plus.svg
@@ -1,5 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.393 1.00573C11.9421 1.06434 12.3398 1.55703 12.2812 2.1062L12.0245 4.51168H13.8482C14.4005 4.51168 14.8482 4.95939 14.8482 5.51168C14.8482 6.06396 14.4005 6.51168 13.8482 6.51168H13.0089C12.5534 5.89782 11.8231 5.5 11 5.5C10.1769 5.5 9.44663 5.89782 8.9911 6.51168H6.36673L6.05542 9.42868C5.70806 9.85802 5.5 10.4047 5.5 11C5.5 11.4052 5.5964 11.7879 5.76753 12.1264L5.55616 14.107C5.49755 14.6562 5.00485 15.0538 4.45569 14.9952C3.90652 14.9366 3.50884 14.4439 3.56745 13.8948L3.79318 11.7796H2.0005C1.44822 11.7796 1.0005 11.3319 1.0005 10.7796C1.0005 10.2273 1.44822 9.77962 2.0005 9.77962H4.00661L4.35537 6.51168H2.64188C2.0896 6.51168 1.64188 6.06396 1.64188 5.51168C1.64188 4.95939 2.0896 4.51168 2.64188 4.51168H4.56881L4.84817 1.89397C4.90677 1.3448 5.39947 0.947122 5.94864 1.00573C6.49781 1.06434 6.89548 1.55703 6.83688 2.1062L6.58016 4.51168H10.0131L10.2925 1.89397C10.3511 1.3448 10.8438 0.947122 11.393 1.00573Z" fill="#737D8C"/>
-<path d="M8 11H14" stroke="#737D8C" stroke-width="2" stroke-linecap="round"/>
-<path d="M11 8L11 14" stroke="#737D8C" stroke-width="2" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.393 1.00262C11.9421 1.06122 12.3398 1.55392 12.2812 2.10309L12.0245 4.50857H13.8482C14.4004 4.50857 14.8482 4.95628 14.8482 5.50857C14.8482 6.06085 14.4004 6.50857 13.8482 6.50857H13.0598C12.6805 5.45391 11.6713 4.69975 10.486 4.69975C9.30072 4.69975 8.29156 5.45391 7.91221 6.50857H6.36671L6.19745 8.09457C5.28778 8.53869 4.66113 9.47279 4.66113 10.5533C4.66113 11.4255 5.06957 12.2024 5.70563 12.7031L5.55614 14.1039C5.49753 14.6531 5.00484 15.0507 4.45567 14.9921C3.9065 14.9335 3.50883 14.4408 3.56743 13.8917L3.79316 11.7765H2.00049C1.4482 11.7765 1.00049 11.3288 1.00049 10.7765C1.00049 10.2242 1.4482 9.77651 2.00049 9.77651H4.0066L4.35535 6.50857H2.64186C2.08958 6.50857 1.64186 6.06085 1.64186 5.50857C1.64186 4.95628 2.08958 4.50857 2.64186 4.50857H4.56879L4.84815 1.89085C4.90676 1.34169 5.39946 0.94401 5.94862 1.00262C6.49779 1.06122 6.89547 1.55392 6.83686 2.10309L6.58015 4.50857H10.0131L10.2925 1.89085C10.3511 1.34169 10.8438 0.94401 11.393 1.00262Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4108 7.28091C11.4108 6.72863 10.963 6.28091 10.4108 6.28091C9.85847 6.28091 9.41076 6.72863 9.41076 7.28091L9.41076 9.44016H7.28076C6.72848 9.44016 6.28076 9.88787 6.28076 10.4402C6.28076 10.9924 6.72848 11.4402 7.28076 11.4402H9.41076L9.41076 13.5994C9.41076 14.1517 9.85847 14.5994 10.4108 14.5994C10.963 14.5994 11.4108 14.1517 11.4108 13.5994V11.4402H13.539C14.0913 11.4402 14.539 10.9924 14.539 10.4402C14.539 9.88787 14.0913 9.44016 13.539 9.44016H11.4108V7.28091Z" fill="black"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/hash-video.svg b/res/img/element-icons/roomlist/hash-video.svg
new file mode 100644
index 00000000000..b0e1decf686
--- /dev/null
+++ b/res/img/element-icons/roomlist/hash-video.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.393 1.00259C10.9421 1.06119 11.3398 1.55389 11.2812 2.10306L11.0245 4.50854H12.8482C13.4004 4.50854 13.8482 4.95625 13.8482 5.50854C13.8482 6.06082 13.4004 6.50854 12.8482 6.50854H10.811L10.7408 7.16666H8.72946L8.79969 6.50854H5.36671L5.01796 9.77648H6V11.7765H4.80452L4.55614 14.1039C4.49753 14.653 4.00484 15.0507 3.45567 14.9921C2.9065 14.9335 2.50883 14.4408 2.56743 13.8916L2.79316 11.7765H1.00049C0.448204 11.7765 0.000488281 11.3288 0.000488281 10.7765C0.000488281 10.2242 0.448204 9.77648 1.00049 9.77648H3.0066L3.35535 6.50854H1.64186C1.08958 6.50854 0.641865 6.06082 0.641865 5.50854C0.641865 4.95625 1.08958 4.50854 1.64186 4.50854H3.56879L3.84815 1.89082C3.90676 1.34166 4.39946 0.943979 4.94862 1.00259C5.49779 1.06119 5.89547 1.55389 5.83686 2.10306L5.58015 4.50854H9.01313L9.29249 1.89082C9.3511 1.34166 9.8438 0.943979 10.393 1.00259Z" fill="black"/>
+<path d="M7.82868 9.10489C7.37101 9.10489 7 9.4759 7 9.93357V12.6958C7 13.1535 7.37101 13.5245 7.82868 13.5245H10.8672C11.3248 13.5245 11.6959 13.1535 11.6959 12.6958V9.93357C11.6959 9.4759 11.3248 9.10489 10.8672 9.10489H7.82868Z" fill="#17191C"/>
+<path d="M13.1807 9.74015L12.2483 10.486V12.1434L13.1807 12.8893C13.3615 13.034 13.6294 12.9052 13.6294 12.6736V9.95584C13.6294 9.72423 13.3615 9.59546 13.1807 9.74015Z" fill="#17191C"/>
+</svg>
diff --git a/res/img/element-icons/settings/flair.svg b/res/img/element-icons/settings/flair.svg
deleted file mode 100644
index e1ae44f386f..00000000000
--- a/res/img/element-icons/settings/flair.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.99182 17C9.45808 17 9.84254 16.6564 9.90798 16.1738C10.6196 11.1595 11.2986 10.4724 16.1411 9.92434C16.6319 9.86708 17 9.46626 17 9C17 8.52556 16.6401 8.1411 16.1493 8.07566C11.3313 7.44581 10.7096 6.83231 9.90798 1.818C9.82618 1.33538 9.45808 1 8.99182 1C8.53374 1 8.14928 1.33538 8.07566 1.82618C7.37219 6.84049 6.69325 7.52761 1.85072 8.07566C1.35992 8.13292 1 8.52556 1 9C1 9.46626 1.35174 9.8589 1.85072 9.92434C6.66871 10.5951 7.26585 11.1677 8.07566 16.182C8.16564 16.6646 8.54192 17 8.99182 17Z" fill="black"/>
-</svg>
diff --git a/res/img/icons-groups.svg b/res/img/icons-groups.svg
deleted file mode 100644
index 8f89ba83c4c..00000000000
--- a/res/img/icons-groups.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
-<style type="text/css">
-	.st4{fill:none;stroke-miterlimit:10;}
-</style>
-<g id="icons_people" transform="translate(50.000000, 725.000000)">
-	<path id="Oval-1-Copy-7" fill="#76CFA6" d="M-37.5-700c6.9,0,12.5-5.6,12.5-12.5S-30.6-725-37.5-725S-50-719.4-50-712.5
-		S-44.4-700-37.5-700z"/>
-	<g id="g4240_1_" transform="translate(6.945774,9.0366549)">
-		<path id="path4242_1_" class="st4" stroke="#FFFFFF" d="M-38.8-714.1c0-3.2,0-5.7-5.7-5.7s-5.7,2.5-5.7,5.7C-46.2-714.1-43.8-714.1-38.8-714.1z"/>
-		<circle id="circle4244_1_" class="st4" stroke="#FFFFFF" cx="-44.5" cy="-724.7" r="3.2"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-45.8-708.7c0-2.5,0.3-4,4.5-4c0.3,0,0.6,0,0.8,0c-0.3-0.3-0.6-0.6-0.8-1c0,0,0,0-0.1,0
-			c-5.5,0-5.5,2.7-5.5,5.5v0.5h2.7c0.1-0.3,0.1-0.7,0.2-1H-45.8z"/>
-		<path fill="#FFFFFF" d="M-43.6-717.4c0-1.3,1-2.3,2.3-2.3c0.6,0,1.1,0.2,1.5,0.5c0.3-0.2,0.6-0.3,1-0.5c-0.6-0.7-1.5-1.1-2.4-1.1
-			c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.4,3.2,3.2,3.3c-0.1-0.3-0.2-0.7-0.3-1C-42.8-715.3-43.6-716.2-43.6-717.4z"/>
-		<path fill="#FFFFFF" d="M-27.8-708.2c0-2.8,0-5.5-5.5-5.5c-0.2,0-0.3,0-0.5,0c-0.2,0.4-0.5,0.7-0.8,1c0.4,0,0.8-0.1,1.3-0.1
-			c4.2,0,4.5,1.5,4.5,4h-2.4c0.1,0.3,0.2,0.7,0.2,1h3.1V-708.2z"/>
-		<path fill="#FFFFFF" d="M-33.3-719.7c1.3,0,2.3,1,2.3,2.3c0,1.3-1,2.3-2.3,2.3c0,0,0,0,0,0c0,0.3-0.1,0.7-0.3,1c0.1,0,0.2,0,0.3,0
-			c1.8,0,3.3-1.5,3.3-3.3c0-1.8-1.5-3.3-3.3-3.3c-1,0-1.9,0.5-2.5,1.2c0.3,0.1,0.6,0.3,0.9,0.5C-34.6-719.4-34-719.7-33.3-719.7z"/>
-	</g>
-</g>
-</svg>
diff --git a/res/img/location/map.svg b/res/img/location/map.svg
new file mode 100644
index 00000000000..67be3a35ad4
--- /dev/null
+++ b/res/img/location/map.svg
@@ -0,0 +1,9 @@
+<svg width="325" height="220" viewBox="0 0 325 220" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 8.00001C0 3.58173 3.58172 0 8 0H317C321.418 0 325 3.58172 325 8V212C325 216.418 321.418 220 317 220H8.00001C3.58173 220 0 216.418 0 212V8.00001Z" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_1147_54206" transform="translate(0 -0.00652805) scale(0.00163666 0.00241779)"/>
+</pattern>
+<image id="image0_1147_54206" width="611" height="419" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAmMAAAGjCAYAAABgyBJUAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAB2nSURBVHgB7d2LseToWcdhXbqPd42pWkfAEgEmA5OBMwAygAjAGZABJgIgAm8G4AjYDDwFa4/nHKlFf+qjGXXvufRFUkuvnqdqwJddu8prT//Pp0+/zrMzNU3zzR/+8Onv8nLzV02z+2XWZN9k+f4XAMDaNdmHLM+/z4vs+6Zq/rMst999/XX+/Tl/av7eH/B/H59+uf+D/mm/xn6ZAQBwljwvflNk5a/fG2WvjrGPHz9+W2ebfzXCAABukf/L06fNr3/+8/zDi//sS/9gexq2a/7dY0gAgNvtB9f3Rb79m5dOyYrTf+DjY/W3edP81hADABhGk2Xf7pqn3/7w+PiL03/u6GTshx/2f0CR/VcGAMAYPpT59q/7J2SfT8bSHbG8yP49AwBgLN+kE7Lf/775/ATy8xird8U/pyO0DACA0aS9tXl4/Ifu77ePKdsL++meGAAAU/j8uLI9GWs7YgAATOWbavf4d+lv5G1PrCn/JwMAYEofnj5t/7Ko6/KXGQAAU/tm81X1i6Ipml9lAABMr2l+VeRN/hcZAAB30Hyb//DHxyYDAOAe/rvIAAC4izzLvjHGAADuyBgDALgjYwwA4I6MMQCAOzLGAADuqPjpV5tsu7HJAADuocjzPHvYlplRBgAwvc/ryygDAJje5vQf6EZZGmRPdZPV9S7b7UT6AQDGsHntn2hH2Sbf/xFFVu0H2VNllAEADG1z1h9UFu0vowwAYFhnjbHPf/DRKGv2o2yXAQBwvYvG2Oc/qR1lWVbvivakLN0rAwDgcleNsU5Z5Fn5UGZNcxhl6RcAAOcbpGEhiwEAcJ2bTsZOHWUx0uPLXeOyPwDAGwYdY51ulDVNo1UGAPCGUcZYR6sMAOBto46xo38jrTIAgB+ZbIx9/jfsjbLq+REmAMBaTT7GPv8b91pl7TCTxQAAVuhuY6zTtsqKMnvYaJUBAOszmyiYVhkAsEZ3Pxk7pVUGAKzJ7MZYp98qq/ZjrPIGJgAQ0GzHWCeNsm2ZfsliAADxzH6M9WmVAQDRLGqMdbTKAIAoFjnGOv1WWV3LYgAAy7PoMdbpWmVbrTIAYGFCBb20ygCApQlxMnbquFXW7B9juuwPAMxTyDHWOYyyPGuavI3HegMTAJib0GOsk0bZpsxlMQCA2VnFGOvTKgMA5mR1Y6zzZZQ17TDTKgMA7mG1Y6xzeHxZapUBAHex+jHW0SoDAO5BjOuEVhkAMCUnY684apU9f/+ly/4AwNCMsXe0o2yTZ02pVQYADM8YO5NWGQAwBmPsClplAMBQjLEbdKOse3ypVQYAXMoYG0CbxXgos12zPy2TxQAALqDdMKBCFgMAuJDFMAKtMgDgXB5TjkirDAB4jzE2Aa0yAOA1xtiEtMoAgFPG2J1olQEAiTF2Z1plALBuxthMdK2ypinaUaZVBgDroLswM7IYALAuTsZm6iiLsT8lq+pmf2rmXhkARGOMzdyXUdZolQFAQMbYQnStsmzjDUwAiMQYWyBZDACIwxhbsONR1uxHmTcwAWBpjLEADqMsy+pdoVUGAAtjjAWiVQYAy1OoJcSjVQYAy7H545+e2i+v3u6fcxX7kxXiOG2Vpa9cctkfAOalfUyZgqJVXbWPuTabw6Vw4uhGWYrGapUBwLwc3RlLJyf1Y5095btsuzXKotEqIwNgdl68wL/bn6B8MspC0yoDgHl4823K/ijrHl/mrpWF0h9l1fMjTABgOmelLdIoe3yqs2p/gpIu+af7R0ZZLP1WWTvMZDEAYBIXdcbSKNu1l/137Ye3URZP2yoryuxho1UGAFO4Ovp6eKxllEV1msUwygBgHDcX+LtRVj4/vtQqi0WrDADGNdjXIaUP6Y+fqqzYf3h7AzOefqss/bX2BiYADGPw76aUxYgtjbL0jQ2yGAAwjNG+KNwoi0+rDABuN9oY62iVxadVBgDXG32MdbpWWTpBKbXKQuq3yuraG5gAcI7JxlgnXQCvtMpC61plshgA8L7Jx1ifVllsWmUA8L67jrGOVllsx6MspTFc9geAzizGWEerLLbDKMv3j6pzrTIAeDarMdaRxYhNqwwAvpjlGOsYZfFplQGwdrMeYx2tsvi6UdY9vtQqA2AtFjHGOl2rLP3yBmZMbRbjodQqA2A1FjXG+mQxYtMqA2AtFjvGOsejrGgvhxOHVhkA0S1+jHW0ymI7GmXP33/psj8AEYQZYx2tstjaUbbJs6bUKgMghnBjrCOLEZtWGQBRhB1jndNRVhayGNFolQGwZOHHWKcbZYVWWVhaZQAs0WrGWEerLL6uVbZr9qdl3sAEYOZWN8b6tMpiK2QxAFiAVY+xTn+UpQ9uWYxYtMoAmDNjrKffKttuyqwsjbJItMoAmCNj7AXpAnj9qFUWVdcqyzbewATg/oyxN2iVxSeLAcC9GWNn0CqLzygD4F6MsQv0W2XpPlm6V2aUxaJVBsDUjLErpFG2qw4f1rIYMXWtsqbxBiYA4zLGbqRVFpssBgBjM8YGolUW2+koq+pmf2rmXhkAtzPGBtZvlXXfgUkcX0ZZo1UGwCCMsZEcWmWyGFFplQEwFGNsZFpl8cliAHALY2wiR6Nsf5pSllpl0fRHWfX8CBMA3mOMTawdZU91VuxPUNIlf29gxnMYZelRdaFVBsC7jLE7aVtl+9MTWYy4tMoAOIcxNgNaZbFplQHwFmNsRr6MssNXLWmVxXI6ytIbty77A2CMzVDVPr6stMqC6kZZisZW+zFWeQMTYNWMsRnTKostjbJtOgWVxQBYNWNsAbTK4tMqA1gvY2xB+qOse3zpsn8sWmUA62OMLVAaZY9PdXvXSKsspn6rrB1m3sAECMsYWzCtsvjaVllRZg+yGABhGWNBaJXFplUGEJcxFkw3ysrnx5daZbFolQHEY4wFlT6kP36qsiLlE7yBGU6/VZb+WnsDE2C5jLHgZDFiS6MsfWODLAbAchljK2GUxadVBrBMxtjKaJXF92WUHd601SoDmDdjbKW6Vln65Q3MmA6PL8u2VVbX3sAEmCtjDFmM4LpWmSwGwDwZY3xmlMWmVQYwT8YYP6JVFtvxKEtpDJf9Ae7JGONVWmWxHUZZnjVNrlUGcEfGGO+SxYhNqwzgvowxznY6yspCFiMarTKA6RljXKwbZYVWWVjdKOseX2qVAYzHGONqWmXxtVmMB60ygDEZYwxCFiM2rTKA8RhjDKo/ytIHtyxGLFplAMMzxhiFVllsR6OsbtpHmC77A1zHGGNUWmWxtaNsk2dNqVUGcC1jjElolcWmVQZwPWOMSWmVxadVBnAZY4y76LfKyv2JynbjDcxotMoAzmOMcVdplO2qw4e1LEZMXats1+xPy7yBCfAjxhizoVUWWyGLAfAiY4zZ0SqLTasM4Jgxxmz1W2XpTlm6W0YcWmUAB8YYs5cugNePWmVRda2ybOMNTGCdjDEWQ6ssPlkMYI2MMRZHqyy+41HW7EeZe2VAXMYYi9VvlRXP34FplMVyGGXpUXWhVQaEZYyxeG2rrG5kMQLrWmVN4w1MIB5jjFC0ymKTxQAiMsYISassttNRVu1PRpvGZX9gmYwxQuu3yjYbb2BG82WUNVplwGIZY6zCoVUmixGVVhmwZMYYq6JVFp9WGbA0xhirdDTK9qcpZalVFk1/lFXPjzAB5sgYY9XaUfZUZ0WlVRaVVhkwd8YYZFpla6BVBsyVMQYntMpi0yoD5sYYg1f0sxjpw1urLJbTUZbeuHXZH7gHYwzekT6kP36qtMqC6kZZisZW+7/WlTcwgYkZY3AmrbLY0ijblumXLAYwLWMMLqRVFp9WGTAlYwyu1B9l3eNLl/1j0SoDpmCMwY3SKHt8qtsTlFKrLKR+q6yuvYEJDMsYg4G0F8C1ykJrW2WFLAYwLGMMRqBVFptWGTAkYwxGpFUWm1YZMARjDCbQtcqKlE/wBmY4/VZZ+mvtDUzgEsYYTEgWI7Y0yjZlLosBXMQYgzswyuLTKgPOZYzBHWmVxfdllB3etNUqA04ZYzADXass/fIGZkyHx5elVhnwI8YYzIwsRmxaZcApYwxm6niUFe3lcOLQKgM6xhjMnFZZbEej7Pn7L132h3UxxmAhtMpia0fZJs+aMtcqg5UxxmBhZDFi0yqD9THGYKFOR1lZyGJEo1UG62CMwcJ1o6zQKgurG2Xd40utMojFGIMgtMria7MYD+X+r/X+tMwbmBCGMQYBaZXFVshiQCjGGATWH2Xpg1sWIxatMojBGIMV0CqLTasMls0YgxXRKotNqwyWyRiDFdIqi02rDJbFGIMV0yqLT6sM5s8YA45aZeX+RGW78QZmNFplMF/GGPBZGmW76vBhLYsRU9cqaxpvYMJcGGPAi7TKYpPFgPkwxoA3aZXFZpTB/RljwFn6rbLuOzCJQ6sM7scYAy6SLoDXshhhda2ybOMNTJiKMQZcRassPlkMmIYxBtxEqyy+41HW7EeZe2UwJGMMGES/VVY8fwemURbLYZSlR9WFVhkMyBgDBtW2yuqmPUX56VdbgywgrTIYlksewChSyd8Qi617A/OnX23atzCB6zgZA0aRvlKJdThtlaU3bl32h/MZY8Dgiv2HcykOuzrdKGv2j6q1yuB8xhgwuPRWJeulVQaXMcaAQR1OxYwxDrTK4H3GGDCowsV9XtAfZdXzI0zgwBgDBvXgrTre0G+VtcNMFgOMMWA46QvEc8dinKFtlRVlO961ylg7P8ICg/H9lFxKqwycjAEDkbPgFlplrJkxBgxCzoIh9Ftl1X6MVd7AZAWMMeBm6VTMI0qGlEbZtky/ZDGIzxgDbla668OItMqIzhgDbpZOMGBsWmVEZYwBN5GzYGr9Vlldy2KwfMYYcBORV+6la5VttcpYOL+LAlcr268+cirGfWmVsXROxoCreYOSOTlulTX7x5gu+7MMxhhwFTkL5uowyvKsafI2HusNTObOGAOuIvLK3OXtDwy5LAazZ4wBV/HVRyyJVhlzZowBF4ues3h6qtOxSvvh7f2EWL6MsqYdZlplzIExBlwses6iar+kepc97kdZ+uBOl8KNslgOjy9LrTJmwRgDLhI9Z5FOS/qPsA61951RFpRWGXNgjAEX2ab0eWCvfRgfjzLfOhDNcRbDKGNaxhhwtpSziHxxf9c+nnz7Ync3ytJ/DunDu/AiQyhHo+z5+y9d9mdsxhhwtug5i0tOQ1K/6uOnqh2o6T8XzbVY2lG2ybOm1CpjfMYYcJbDqVjcwdE0h1OvS+32f+Knxzp7yndGWUBaZUzBGAPOUrQX97Ownqo6u8XpKEvD1bWyWLTKGIsxBpwlcs7icCo2zAdrN8qK/ShLPTatsni6UdY9vtQq41bGGPCu6JHX9IXSTTPsKUcaZalTplUWV5vFeCj3f633p2XewOQGxhjwruj3oMb+ENUqi62QxeBGxhjwpug5i2rCdEF/lKUPblmMWLTKuJYxBrwpes6iqqa/hK1VFptWGZcyxoBXFc9flh1VuiaW7ovdi1ZZbF2rLNt4A5O3GWPAq8rgXwh+a85iKFpl8cli8BZjDHjVtoz7+Cydis3tTo9WWXxGGS8xxoAXhc9ZzLgN1W+VlftBnL6c3SiLRauMPmMMeFHkyGvytIAPvzTKdtXhw1oWI6auVdY03sBcM2MM+JGy/eojOYs50SqLTRZj3Ywx4EfiR16Xe09Hqyy201GWvqZr6G+HYH6MMeBI9JxFOhHb7ZZ/6tBvlXXfgUkcX0ZZo1W2AsYYcCR85DXYRel0AbyWxQhLq2wdjDHgSOSvPppjzmIoWmXxyWLEZYwBn0XPWcwl8jomrbL4jkdZjMfua2eMAZ9Fz1nUKzpJ6LfKiufvwDTKYjmMsvTf60KrbOGMMaAlZxFT2yqrG1mMwLTKls8YA1qp8h6ZDyitsui0ypbLGAPanEXki/uHnIXLzp0vo+zwVUtaZbGcjrLaf/9nzxgDwucsnBC8rGofX1ZaZUF1oyxFY7XK5s0Yg5U7nIrF/RBOOYtobbGhaZXFplU2f8YYrFzRXtzPwlpDzmIoWmXxaZXNkzEGKxc5Z3E4FfNhc6n+KOseX7rsH0t/lFXPjzC5H2MMVix65LXe7XzJ8g3SKHt8qrOq0iqLqt8qa4eZ+5V3YYzBikV/DOXi/jC0yuJrW2VF2Z6Uy2JMzxiDlYqes1hr5HVsWmWxaZXdhzEGKxU9Z1FVhtiYulFWPj++1CqLRatsWsYYrFA6FYv8iDJdE6t9efIk0of0x09V+98pb2DG02+Vpb/W3sAchzEGK1QG/0JwOYvpyWLElrc/wOWyGCMxxmCFtmXcR0rpVMw9l/sxyuLTKhueMQYrEz5noZc0C1pl8WmVDccYg5WJHHlNnnwgzErXKksnKKVWWUj9VlldewPzGsYYrEjZfvWRnAXTSxfAK62y0LpWmSzG5YwxWJH4kVdDbAm0ymLTKrucMQYrET1nsWs7SH7TXxKtstiOR1nT5macXL/MGIOVCB95dVdssbTKYjuMsnz/qDrXKnuFMQYrEfmrj+QsYpDFiE2r7HXGGKxA9JyFyGssp6OsLGQxotEqO2aMwQpEz1nUfroOqRtlhVZZWN0o6x5frrVVZoxBcHIWLF3XKku/vIEZU5vFeChX2yozxiC4baoxBuau2LrIYsS21laZMQaBpbfTIl/cP+QsnIqt0fEoi30nco3W1iozxiCw6DkLp2JolcV2NMqev/8y4g9gxhgEdTgVizvGUs5CW4yOVlls7Sjb5FlTxmyVGWMQVNFe3M/CkrPgJVplsUVtlRljEFTknMXhVMxdMV6nVRZfpFaZMQYBRY+8pu+4axpjjPdplcUXoVVmjEFA0R/NuLjPpbTK4utaZbtmf1q2sDcwjTEIJnrOQuSVW2mVxVYsMIthjEEw0XMWVWWIMYz+KEsf3LIYsSypVWaMQSBFnod+RJmuiaX7YjCkfqssfWNF+gox4lhCq8wYg0DK4F8ILmfBmNIF8PpRqyyqrlWWbeb3BqYxBoFsA/9En07FXNxnClpl8c0ti2GMQRDhcxZq+0xMqyy+uYwyYwyCiBx5TZ6MMe6k3yornr8D0yiL5d6tMmMMAijbrz6Ss4AxpVG2qxtZjMC6VlnTTPsGpjEGAcSPvBpizItWWWxTZzGMMVi46DmLdCK2k7NgprTKYjsdZek7ccf4KjZjDBYufOTVXTEWoN8q674Dkzi+jLJmlFaZMQYLF/mrj+QsWJpDq0wWI6qxWmXGGCxY9JyFyCtLpVUW35BZDGMMFix6zqL2BiULdzTK9v97LUutsmj6o6x6foR58b9GBiySnAUsRzvKnuqsqLTKojqMsvRDZHFxq8wYg4VKX2gcmbtiRKRVFt81rTJjDBYo5SwiX9w/5CycihGbVllsl7TKjDFYoOg5C6dirMmXUZa3J95aZbGcjrL6hR82jTFYmMOpWNwxlnIW2mKsUdU+vqy0yoLqRlmKxlb7MVb13sA0xmBhivbifhaWnAVrp1UWWxpl23QK+jmL0RhjsDSRcxaHUzF3xSDRKouvewPTGIMFiR55rXe7Ub73DZasP8q6x5cu+8dijMGCRP/J2MV9eF0aZY9PdXvXSKssFmMMFiJ6zkLkFc6jVRaPMQYLET1nUVWGGFxKqywGYwwWIJ2KRX5Ema6JpftiwHW6UVY+P77UKlsWYwwWoAz+heByFjCMlMX4+Klqf4DzBuZyGGOwAKlJE1U6FXNxH4Yli7EsxhjMXPScRWWIwWiMsmUwxmDmIkdek8pdMRidVtm8GWMwY2X71UdyFsAwulZZ+uUNzPkwxmDGRF6BschizIcxBjMVPWeRTsScisH9GWX3Z4zBTIWPvNZOxWBOtMruxxiDmYr81UdyFjBfWmXTM8ZghqLnLEReYf5kMaZjjMEMRc9Z1O6KwWKcjrKykMUYmjEGMyNnAcxRN8oKrbLBGWMwM9tNmUXmrhgsm1bZ8IwxmJF0YTbyxX05C4hFFmMYxhjMSPScxeOTUzGIqD/KtvtHmLIYlzHGYCaiR15TzqL2PZQQmlbZdYwxmImijP2blpwFrIdW2WWMMZiJyDkLkVdYJ62y8xhjMAPRI68eT8K6aZW9zRiDGYj+06JTMSDpt8pSUzGlfIwyYwzuLnrOQuQVOJVG2a5q2h/UZDGMMbi76DmLqjLEgNdplRljcFdyFgAHa26VGWNwR2XwLwSXswAu1W+VpTtlZfDsT2KMwR1tA/8mI2cB3CK1yurHdbTKjDG4k+g5i8oQAwawhlaZMQZ3EjnymlTuigEDitwqM8bgDtIdiNCnYnIWwEj6rbLi+Tswl/7bqTEGdyDyCnCbtlVWNyGyGMYYTCx6ziKdiDkVA6a09FaZMQYTCx95rZ2KAffxZZQdshhLaZUZYzCh9NNa5K8+krMA5qBqH19W7e+36c31uT+NMMZgQmUZO2ch8grMyaFVNv8shjEGE4qcs0i3xGp3xYAZmnurzBiDiWyC5yxqOQtg5o5G2f6H48PTiuzujDGYyGZTZpG5KwYsRTvKnuqsqObRKjPGYAIpZxH54n66LOtUDFiaubTKjDGYQPichVMxYOHu2SozxmBk0SOvKWdR+x5KIIhulJXPjy+naJUZYzCyooz7eDKRswAiSm+Hf/w0TavMGIORhc5ZiLwCwU3RKjPGYETpp6nQOQuPJ4GVGLNVZozBiCLfFUucigFr0x9l3ePLW3/mNsZgJOnSZ+ychcgrsF5plD0+1e0PpeWNrTJjDEayDXxXLKkqQwygaZrnLya/PothjMEIoucs0omY+2IAx65tlRljMILwkdfaEAN4zaWtMmMMRhD5rpicBcB5ulZZelry1huYxhgMLHrOwhADuMx7WQxjDAYWOfKauCsGcJ3XRpkxBgMqyzz0qZicBcDt+qOs3A8yYwwGJPIKwLnSKGuqOov9yQETWkPOwqkYwPCMMRiInAUA1zDGYADpmpicBQDXMMZgAGUZPWdRZwCMwxiDAUTOWaRbYrW7YgCjMcbgRpvgOYtazgJgVMYY3GizKbPI3BUDGJcxBjdIOYvIF/erWs4CYGzGGNwgfM7CqRjA6IwxuFL0yGvKWfgeSoDxGWNwpaKM+3gykbMAmIYxBlcKnbMQeQWYjDEGV9hsYkdePZ4EmI4xBleIfFcscSoGMB1jDC5UFNFzFiKvAFMyxuBC28B3xZKqMsQApmSMwQWi5yzSiZj7YgDTMsbgAuEjr7UhBjA1YwwuEPmumJwFwH0YY3Cm6DkLQwzgPowxOFPkyGvirhjAfRhjcIayzEOfislZANyPMQZnEHkFYCzGGLxjDTkLp2IA92OMwTvkLAAYkzEGb0jXxOQsABiTMQZvKMvoOYs6A+C+jDF4Q+ScRbolVrsrBnB3xhi8YhM8Z1HLWQDMgjEGr9hsyiwyd8UA5sEYgxeknEXki/tVLWcBMBfGGLwgfM7CqRjAbBhjcCJ65DXlLHwPJcB8GGNwoijjPp5M5CwA5sUYgxOhcxYirwCzY4xBz2YTO/Lq8STA/Bhj0BP5rljiVAxgfowxeFYU0XMWIq8Ac7P/XflDGmPfZ0C2DXxXLKkqQwxgdvL8Q9Fkze8yWLnoOYt0Iua+GMD8NE3zu/1Dmea7DFYufOS1NsQA5mg/xr4rmrz87wxWLvJdMTkLgPmqHx++K/786+13++eV32WwUtFzFoYYwDzlefGbn/88//D8bKb5twxWKnLkNXFXDGCeiuzp14f/v/ezrx9+43SMNSrLPPSpmJwFwDylU7Gvv/76+/S3vxwJ1M0/7v/vhwxWROQVgKntzwC+707Fks+fRD/72UO6yP/rDFZiDTkLp2IA87PL8r/vTsWSo0+in/304V+apjHIWAU5CwAml2d/37482fOjT6M//7Of/LNBRnTpmpicBQAT+pCGWHtP/8Srn0YfP378dpeVv93/pv5tBsGknMVPtmUW1eNTbYwBzEWef1dm1dGjyb5Xn9OkP+HPvn74y7Ti0kWzDAKJnLNIt8Rqd8UA7q7dT+1p2PZvXhti7R+Xnel//1D9qsjqX+3/lf9q/3d/kcFCbco8+8nDJosq3RX79FhnANzF9/tf/9nk+X+c3g17zVWXZpqm+eZPf8q+qbLq2wwW5qtNekwZd4z98KcqA2A6ed18KMvth6++yj7keX5xJuz/Afyff98rh8nCAAAAAElFTkSuQmCC"/>
+</defs>
+</svg>
diff --git a/res/img/matrix.svg b/res/img/matrix.svg
new file mode 100644
index 00000000000..13adcab25a2
--- /dev/null
+++ b/res/img/matrix.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="793.322px" height="340.809px" viewBox="0 0 793.322 340.809" enable-background="new 0 0 793.322 340.809"
+	 xml:space="preserve">
+<path opacity="0.5" fill="#FFFFFF" d="M34.004,340.809H2c-1.104,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h32.004c1.104,0,2,0.896,2,2
+	v7.71c0,1.104-0.896,2-2,2h-21.13v317.386h21.13c1.104,0,2,0.896,2,2.001v7.712C36.004,339.913,35.108,340.809,34.004,340.809
+	L34.004,340.809z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M10.875,9.711v321.386h23.13v7.711H1.999V2.001h32.006v7.71H10.875z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M252.402,233.711h-32.993c-1.104,0-2-0.896-2-2v-68.073c0-3.949-0.154-7.722-0.457-11.213
+	c-0.289-3.282-1.074-6.153-2.332-8.53c-1.204-2.276-3.017-4.119-5.384-5.476c-2.393-1.362-5.775-2.056-10.042-2.056
+	c-4.238,0-7.674,0.798-10.213,2.371c-2.565,1.596-4.604,3.701-6.053,6.258c-1.498,2.643-2.51,5.694-3.013,9.067
+	c-0.526,3.513-0.793,7.125-0.793,10.741v66.91c0,1.104-0.896,2-2,2h-32.991c-1.104,0-2-0.896-2-2v-67.373
+	c0-3.435-0.078-6.964-0.228-10.485c-0.148-3.251-0.767-6.278-1.841-8.995c-1.018-2.571-2.667-4.584-5.047-6.153
+	c-2.372-1.552-6.029-2.341-10.865-2.341c-1.372,0-3.265,0.328-5.629,0.976c-2.28,0.624-4.536,1.826-6.705,3.577
+	c-2.152,1.732-4.036,4.306-5.605,7.655c-1.569,3.356-2.367,7.877-2.367,13.438v69.701c0,1.104-0.895,2-2,2H68.857
+	c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h31.13c1.104,0,2,0.896,2,1.999v11.007
+	c3.834-4.499,8.248-8.152,13.173-10.896c6.396-3.559,13.799-5.362,22.002-5.362c7.846,0,15.127,1.548,21.642,4.604
+	c5.794,2.722,10.424,7.26,13.791,13.52c3.449-4.362,7.833-8.306,13.071-11.752c6.422-4.228,14.102-6.371,22.824-6.371
+	c6.499,0,12.625,0.807,18.209,2.399c5.686,1.628,10.635,4.271,14.712,7.857c4.088,3.605,7.318,8.357,9.601,14.123
+	c2.25,5.719,3.391,12.649,3.391,20.604v80.384C254.402,232.815,253.507,233.711,252.402,233.711L252.402,233.711z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M99.988,111.595v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406
+	c6.117-3.402,13.129-5.11,21.027-5.11c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567
+	c3.56-5.265,8.4-9.913,14.521-13.94c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325
+	c5.418,1.549,10.065,4.027,13.938,7.434c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385H219.41
+	v-68.074c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
+	c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
+	c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
+	c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
+	c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
+	c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V111.595H99.988z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M304.909,236.733c-5.883,0-11.46-0.729-16.574-2.163c-5.192-1.464-9.806-3.774-13.713-6.871
+	c-3.944-3.117-7.068-7.111-9.282-11.871c-2.205-4.733-3.324-10.412-3.324-16.876c0-7.13,1.293-13.117,3.846-17.797
+	c2.542-4.674,5.877-8.464,9.912-11.263c3.97-2.752,8.556-4.842,13.63-6.209c4.901-1.322,9.937-2.394,14.961-3.184
+	c4.986-0.775,9.949-1.404,14.754-1.872c4.679-0.452,8.88-1.139,12.489-2.039c3.412-0.854,6.118-2.09,8.042-3.672
+	c1.666-1.37,2.416-3.384,2.292-6.151c-0.002-3.289-0.502-5.816-1.492-7.595c-0.998-1.798-2.283-3.15-3.927-4.138
+	c-1.703-1.02-3.725-1.713-6.012-2.062c-2.47-0.37-5.146-0.557-7.947-0.557c-6.034,0-10.789,1.271-14.135,3.783
+	c-3.233,2.424-5.155,6.64-5.714,12.527c-0.098,1.026-0.961,1.812-1.992,1.812h-32.992c-0.552,0-1.079-0.229-1.457-0.629
+	c-0.376-0.402-0.572-0.941-0.54-1.491c0.485-8.073,2.55-14.894,6.142-20.272c3.548-5.331,8.147-9.682,13.661-12.931
+	c5.424-3.191,11.612-5.498,18.392-6.857c6.684-1.335,13.5-2.013,20.26-2.013c6.096,0,12.365,0.437,18.626,1.296
+	c6.377,0.88,12.285,2.622,17.562,5.177c5.376,2.604,9.845,6.29,13.282,10.951c3.498,4.744,5.271,11.048,5.271,18.731v62.494
+	c0,5.307,0.306,10.462,0.915,15.319c0.576,4.64,1.572,8.116,2.963,10.338c0.385,0.616,0.407,1.395,0.055,2.031
+	c-0.353,0.635-1.022,1.03-1.75,1.03h-33.457c-0.861,0-1.624-0.55-1.898-1.367c-0.646-1.941-1.176-3.939-1.572-5.936
+	c-0.141-0.696-0.267-1.402-0.38-2.12c-4.825,4.184-10.349,7.24-16.474,9.105C320.033,235.609,312.489,236.733,304.909,236.733
+	L304.909,236.733z M341.941,176.661c-0.809,0.409-1.676,0.768-2.596,1.074c-2.161,0.72-4.511,1.326-6.988,1.807
+	c-2.442,0.475-5.033,0.872-7.699,1.186c-2.631,0.311-5.251,0.697-7.784,1.146c-2.329,0.433-4.705,1.035-7.051,1.792
+	c-2.194,0.711-4.114,1.667-5.699,2.842c-1.531,1.128-2.785,2.587-3.731,4.335c-0.917,1.709-1.385,3.97-1.385,6.719
+	c0,2.598,0.465,4.778,1.385,6.481c0.928,1.722,2.142,3.035,3.716,4.018c1.644,1.026,3.601,1.757,5.816,2.17
+	c2.344,0.439,4.799,0.663,7.297,0.663c6.105,0,10.836-0.996,14.063-2.961c3.244-1.973,5.666-4.349,7.199-7.062
+	c1.568-2.78,2.542-5.62,2.892-8.436c0.376-3.019,0.565-5.436,0.565-7.187V176.661L341.941,176.661z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M273.544,129.255c3.405-5.113,7.744-9.215,13.012-12.316
+	c5.264-3.097,11.186-5.303,17.771-6.621c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277
+	c6.195,0.855,11.85,2.522,16.962,4.997c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494
+	c0,5.428,0.31,10.611,0.931,15.567c0.615,4.959,1.701,8.676,3.251,11.153H347.66c-0.621-1.86-1.126-3.755-1.511-5.693
+	c-0.39-1.933-0.661-3.908-0.813-5.923c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251
+	c-5.733,0-11.077-0.698-16.033-2.09c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147
+	s-3.138-9.84-3.138-16.033c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575
+	c3.793-2.632,8.129-4.607,13.01-5.923c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857
+	c4.801-0.466,9.062-1.164,12.779-2.093c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785
+	c0-3.56-0.58-6.389-1.742-8.479c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325
+	c-2.557-0.382-5.309-0.58-8.248-0.58c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991
+	C268.199,140.794,270.132,134.363,273.544,129.255z M338.713,175.838c-2.09,0.696-4.337,1.275-6.736,1.741
+	c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163c-2.48,0.461-4.919,1.086-7.317,1.857
+	c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994c-1.085,2.014-1.626,4.571-1.626,7.668
+	c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698
+	c6.505,0,11.537-1.082,15.103-3.253c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174
+	c0.384-3.097,0.58-5.576,0.58-7.434v-12.316C342.547,174.173,340.805,175.14,338.713,175.838z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M444.542,234.874c-5.187,0-10.173-0.361-14.823-1.069c-4.802-0.732-9.104-2.183-12.779-4.313
+	c-3.789-2.185-6.821-5.341-9.006-9.375c-2.163-3.986-3.26-9.232-3.26-15.59v-68.859h-17.981c-1.104,0-2-0.896-2-1.999v-22.073
+	c0-1.104,0.896-1.999,2-1.999h17.981V75.582c0-1.104,0.896-2,2-2h32.992c1.104,0,2,0.896,2,2v34.014h22.162c1.104,0,2,0.896,2,1.999
+	v22.073c0,1.104-0.896,1.999-2,1.999h-22.162v57.479c0,6.229,1.198,8.731,2.202,9.733c1.004,1.007,3.506,2.205,9.738,2.205
+	c1.804,0,3.542-0.076,5.161-0.225c1.604-0.144,3.174-0.367,4.669-0.665c0.13-0.026,0.261-0.039,0.391-0.039
+	c0.458,0,0.907,0.159,1.27,0.454c0.463,0.379,0.73,0.946,0.73,1.546v25.555c0,0.979-0.707,1.813-1.672,1.974
+	c-2.834,0.472-6.041,0.794-9.527,0.957C451.015,234.798,447.718,234.874,444.542,234.874L444.542,234.874z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M463.825,111.595v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149
+	c1.856,1.859,5.576,2.788,11.152,2.788c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557
+	c-2.788,0.465-5.887,0.773-9.293,0.931c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048
+	c-4.571-0.695-8.597-2.047-12.081-4.063c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98
+	v-22.072h19.98V75.583h32.992v36.012H463.825z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M512.613,233.711h-32.991c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h31.366
+	c1.104,0,2,0.896,2,1.999v15.069c0.967-1.516,2.034-2.978,3.199-4.382c2.754-3.312,5.949-6.182,9.496-8.522
+	c3.545-2.332,7.385-4.169,11.415-5.462c4.056-1.298,8.327-1.954,12.691-1.954c2.341,0,4.953,0.418,7.766,1.243
+	c0.852,0.25,1.437,1.032,1.437,1.92v30.67c0,0.6-0.269,1.167-0.732,1.547c-0.361,0.296-0.808,0.452-1.265,0.452
+	c-0.133,0-0.265-0.013-0.398-0.039c-1.484-0.3-3.299-0.565-5.392-0.787c-2.098-0.224-4.136-0.339-6.062-0.339
+	c-5.706,0-10.572,0.95-14.467,2.823c-3.862,1.86-7.012,4.428-9.361,7.629c-2.389,3.263-4.115,7.12-5.127,11.47
+	c-1.043,4.479-1.574,9.409-1.574,14.647v54.132C514.613,232.815,513.717,233.711,512.613,233.711L512.613,233.711z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M510.988,111.595V133.9h0.465c1.546-3.72,3.636-7.163,6.272-10.341
+	c2.634-3.172,5.652-5.885,9.06-8.131c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859
+	c2.168,0,4.566,0.39,7.202,1.163v30.67c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35
+	c-6.041,0-11.152,1.01-15.332,3.021c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198
+	c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991V111.595H510.988z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M603.923,233.711H570.93c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h32.994
+	c1.104,0,2,0.896,2,1.999v120.117C605.923,232.815,605.027,233.711,603.923,233.711L603.923,233.711z M603.923,95.006H570.93
+	c-1.104,0-2-0.896-2-1.999V65.825c0-1.104,0.896-2,2-2h32.994c1.104,0,2,0.896,2,2v27.182
+	C605.923,94.11,605.027,95.006,603.923,95.006L603.923,95.006z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M570.93,93.007V65.824h32.994v27.183H570.93z M603.924,111.595v120.117H570.93V111.595
+	H603.924z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M742.163,233.711h-37.64c-0.671,0-1.297-0.335-1.667-0.896l-23.426-35.352l-23.426,35.352
+	c-0.369,0.561-0.995,0.896-1.667,0.896h-36.938c-0.741,0-1.424-0.411-1.77-1.067c-0.345-0.654-0.3-1.449,0.118-2.061l42.435-62.055
+	l-38.71-55.793c-0.424-0.613-0.474-1.408-0.128-2.069c0.343-0.658,1.028-1.071,1.771-1.071h37.636c0.665,0,1.287,0.33,1.658,0.882
+	l19.477,28.893l19.255-28.884c0.372-0.556,0.996-0.891,1.665-0.891h36.475c0.746,0,1.43,0.415,1.776,1.078
+	c0.343,0.66,0.289,1.46-0.139,2.071l-38.69,55.082l43.578,62.744c0.424,0.61,0.474,1.408,0.128,2.066
+	C743.591,233.298,742.908,233.711,742.163,233.711L742.163,233.711z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M621.115,111.595h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892
+	h-37.64l-25.093-37.87l-25.094,37.87h-36.938l43.213-63.193L621.115,111.595z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M791.322,340.809h-32.008c-1.105,0-2-0.896-2-2v-7.712c0-1.105,0.896-2.001,2-2.001h21.13
+	V11.71h-21.13c-1.105,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h32.008c1.104,0,2,0.896,2,2v336.809
+	C793.322,339.913,792.426,340.809,791.322,340.809L791.322,340.809z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M782.443,331.097V9.711h-23.13v-7.71h32.008v336.807h-32.008v-7.711H782.443z"/>
+<path d="M10.875,9.711v321.386h23.13v7.711H1.999V2.001h32.006v7.71H10.875z"/>
+<path d="M99.988,111.595v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406c6.117-3.402,13.129-5.11,21.027-5.11
+	c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567c3.56-5.265,8.4-9.913,14.521-13.94
+	c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325c5.418,1.549,10.065,4.027,13.938,7.434
+	c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385H219.41v-68.074
+	c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
+	c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
+	c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
+	c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
+	c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
+	c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V111.595H99.988z"/>
+<path d="M273.544,129.255c3.405-5.113,7.744-9.215,13.012-12.316c5.264-3.097,11.186-5.303,17.771-6.621
+	c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277c6.195,0.855,11.85,2.522,16.962,4.997
+	c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494c0,5.428,0.31,10.611,0.931,15.567
+	c0.615,4.959,1.701,8.676,3.251,11.153H347.66c-0.621-1.86-1.126-3.755-1.511-5.693c-0.39-1.933-0.661-3.908-0.813-5.923
+	c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251c-5.733,0-11.077-0.698-16.033-2.09
+	c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147s-3.138-9.84-3.138-16.033
+	c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575c3.793-2.632,8.129-4.607,13.01-5.923
+	c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857c4.801-0.466,9.062-1.164,12.779-2.093
+	c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785c0-3.56-0.58-6.389-1.742-8.479
+	c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325c-2.557-0.382-5.309-0.58-8.248-0.58
+	c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991
+	C268.199,140.794,270.132,134.363,273.544,129.255z M338.713,175.838c-2.09,0.696-4.337,1.275-6.736,1.741
+	c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163c-2.48,0.461-4.919,1.086-7.317,1.857
+	c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994c-1.085,2.014-1.626,4.571-1.626,7.668
+	c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698
+	c6.505,0,11.537-1.082,15.103-3.253c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174
+	c0.384-3.097,0.58-5.576,0.58-7.434v-12.316C342.547,174.173,340.805,175.14,338.713,175.838z"/>
+<path d="M463.825,111.595v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149c1.856,1.859,5.576,2.788,11.152,2.788
+	c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557c-2.788,0.465-5.887,0.773-9.293,0.931
+	c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048c-4.571-0.695-8.597-2.047-12.081-4.063
+	c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98v-22.072h19.98V75.583h32.992v36.012
+	H463.825z"/>
+<path d="M510.988,111.595V133.9h0.465c1.546-3.72,3.636-7.163,6.272-10.341c2.634-3.172,5.652-5.885,9.06-8.131
+	c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859c2.168,0,4.566,0.39,7.202,1.163v30.67
+	c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35c-6.041,0-11.152,1.01-15.332,3.021
+	c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991
+	V111.595H510.988z"/>
+<path d="M570.93,93.007V65.824h32.994v27.183H570.93z M603.924,111.595v120.117H570.93V111.595H603.924z"/>
+<path d="M621.115,111.595h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892h-37.64l-25.093-37.87
+	l-25.094,37.87h-36.938l43.213-63.193L621.115,111.595z"/>
+<path d="M782.443,331.097V9.711h-23.13v-7.71h32.008v336.807h-32.008v-7.711H782.443z"/>
+</svg>
diff --git a/res/img/voip/signal-bars.svg b/res/img/voip/signal-bars.svg
new file mode 100644
index 00000000000..6802ba2d34b
--- /dev/null
+++ b/res/img/voip/signal-bars.svg
@@ -0,0 +1,5 @@
+<svg width="11" height="12" viewBox="0 0 11 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect y="0.5" width="2.2" height="11" fill="#0DBD8B"/>
+<rect x="4.40015" y="2.70001" width="2.2" height="8.8" fill="#0DBD8B"/>
+<rect x="8.79993" y="7.10004" width="2.2" height="4.4" fill="#0DBD8B"/>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index bc64bca3889..ce187345942 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -7,7 +7,9 @@ $quaternary-content: #6F7882;
 $quinary-content: #394049;
 
 $system: #21262C;
+$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
 $background: #15191E;
+$overlay-background: rgba($background, 0.85);
 
 $panel-base: #8D97A5; // This color is not intended for use in the app
 $panels: rgba($system, 0.9);
@@ -45,7 +47,7 @@ $info-plinth-bg-color: $header-panel-bg-color;
 $event-selected-color: $system;
 $topleftmenu-color: $primary-content;
 $roomtopic-color: $text-secondary-color;
-$groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
+$spacePanel-bg-color: rgba(38, 39, 43, 0.82);
 $panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1);
 $h3-color: $primary-content;
 $event-highlight-bg-color: #25271F;
@@ -54,7 +56,7 @@ $header-panel-text-primary-color: $text-secondary-color;
 
 // Tooltip
 // ********************
-$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
+$tooltip-timeline-bg-color: $spacePanel-bg-color;
 $tooltip-timeline-fg-color: $primary-content;
 // ********************
 
@@ -79,6 +81,11 @@ $settings-profile-button-bg-color: #e7e7e7;
 $settings-subsection-fg-color: $text-secondary-color;
 // ********************
 
+// Room
+// ********************
+$room-icon-unread-color: #fff;
+// ********************
+
 // RoomHeader
 // ********************
 $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
@@ -181,11 +188,16 @@ $call-view-button-off-background: $primary-content;
 $call-view-content-background: $quinary-content;
 
 $video-feed-secondary-background: $system;
+
+$video-lobby-system: $system;
+$video-lobby-background: $background;
+$video-lobby-primary-content: $primary-content;
 // ********************
 
 // Location sharing
 // ********************
 $location-live-color: #5c56f5;
+$location-live-secondary-color: #deddfd;
 // ********************
 
 // Location sharing
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 04ecb32ecb7..9ee07c09685 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -1,5 +1,6 @@
 // Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A741
 $system: #21262C;
+$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
 
 // unified palette
 // try to use these colors when possible
@@ -33,8 +34,8 @@ $rte-room-pill-color: $room-highlight-color;
 $info-plinth-bg-color: $header-panel-bg-color;
 $info-plinth-fg-color: #888;
 
-$groupFilterPanel-bg-color: $base-color;
-$inverted-bg-color: $groupFilterPanel-bg-color;
+$spacePanel-bg-color: $base-color;
+$inverted-bg-color: $spacePanel-bg-color;
 
 // used by AddressSelector
 $selected-color: $room-highlight-color;
@@ -85,6 +86,7 @@ $roomheader-addroom-bg-color: #3c4556;
 $roomheader-addroom-fg-color: $text-primary-color;
 $icon-button-color: $header-panel-text-primary-color;
 $roomtopic-color: $text-secondary-color;
+$room-icon-unread-color: #fff;
 
 // Legacy theme backports
 $accent: #0DBD8B;
@@ -96,7 +98,10 @@ $tertiary-content: $tertiary-fg-color;
 $quaternary-content: #6F7882;
 $quinary-content: $quaternary-content;
 $system: #21262C;
+$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
 $background: $primary-bg-color;
+$overlay-background: rgba($background, 0.85);
+
 $panels: rgba($system, 0.9);
 $panel-base: #8D97A5; // This color is not intended for use in the app
 $panel-selected: rgba($panel-base, 0.3);
@@ -116,12 +121,16 @@ $call-view-content-background: $quinary-content;
 
 $video-feed-secondary-background: $system;
 
+$video-lobby-system: $system;
+$video-lobby-background: $background;
+$video-lobby-primary-content: $primary-content;
+
 $roomlist-filter-active-bg-color: $panel-actions;
 $roomlist-bg-color: $header-panel-bg-color;
 
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
-$groupFilterPanel-divider-color: $tertiary-content;
+$spacePanel-divider-color: $tertiary-content;
 
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: #1A1D23;
@@ -167,7 +176,7 @@ $reaction-row-button-selected-bg-color: #1f6954;
 
 $kbd-border-color: #000000;
 
-$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
+$tooltip-timeline-bg-color: $spacePanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
 $breadcrumb-placeholder-bg-color: #272c35;
@@ -193,6 +202,7 @@ $eventbubble-reply-color: #C1C6CD;
 // ********************
 $location-marker-color: #ffffff;
 $location-live-color: #5c56f5;
+$location-live-secondary-color: #deddfd;
 // ********************
 
 // ***** Mixins! *****
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index a12b13d0b8f..e1c475fc636 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -46,8 +46,8 @@ $info-plinth-fg-color: #888;
 // left-panel style muted accent color
 $secondary-accent-color: #f2f5f8;
 
-$groupFilterPanel-bg-color: #27303a;
-$inverted-bg-color: $groupFilterPanel-bg-color;
+$spacePanel-bg-color: #27303a;
+$inverted-bg-color: $spacePanel-bg-color;
 
 // used by RoomDropTarget
 $droptarget-bg-color: rgba(255, 255, 255, 0.5);
@@ -127,6 +127,7 @@ $roomheader-addroom-bg-color: #91a1c0;
 $roomheader-addroom-fg-color: $accent-fg-color;
 $icon-button-color: #91a1c0;
 $roomtopic-color: #9e9e9e;
+$room-icon-unread-color: #737D8C;
 
 // ********************
 
@@ -137,6 +138,7 @@ $roomtile-selected-bg-color: #fff;
 
 $presence-away: #d9b072;
 $presence-offline: #e3e8f0;
+$presence-busy: #FF5B55;
 
 // Legacy theme backports
 $accent: #0DBD8B;
@@ -148,7 +150,10 @@ $tertiary-content: $tertiary-fg-color;
 $quaternary-content: #6F7882;
 $quinary-content: $quaternary-content;
 $system: #F4F6FA;
+$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
 $background: $primary-bg-color;
+$overlay-background: rgba($background, 0.85);
+
 $panels: rgba($system, 0.9);
 $panel-base: #8D97A5; // This color is not intended for use in the app
 $panel-selected: rgba($tertiary-content, 0.3);
@@ -174,6 +179,11 @@ $call-view-content-background: #21262C;
 
 $video-feed-secondary-background: #394049; // XXX: Color from dark theme
 
+// All of these are from dark theme
+$video-lobby-system: #21262C;
+$video-lobby-background: #15191E;
+$video-lobby-primary-content: #FFFFFF;
+
 $username-variant1-color: #368bd6;
 $username-variant2-color: #ac3ba8;
 $username-variant3-color: #03b381;
@@ -255,7 +265,7 @@ $reaction-row-button-selected-bg-color: #e9fff9;
 
 $kbd-border-color: $message-action-bar-border-color;
 
-$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
+$tooltip-timeline-bg-color: $spacePanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
 $breadcrumb-placeholder-bg-color: #e8eef5;
@@ -282,12 +292,13 @@ $eventbubble-reply-color: #C1C6CD;
 // pinned events indicator
 $pinned-color: $tertiary-content;
 
-$groupFilterPanel-divider-color: $tertiary-content;
+$spacePanel-divider-color: $tertiary-content;
 
 // Location sharing
 // ********************
 $location-marker-color: #ffffff;
 $location-live-color: #5c56f5;
+$location-live-secondary-color: #deddfd;
 // ********************
 
 // ***** Mixins! *****
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 81b7fa62b87..e2d4fef8fe1 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -26,6 +26,8 @@ $secondary-content: var(--secondary-content, $secondary-content);
 $tertiary-content: var(--tertiary-content, $tertiary-content);
 $quaternary-content: var(--quaternary-content, $quaternary-content);
 $quinary-content: var(--quinary-content, $quinary-content);
+// XXX: workaround for Safari 15.3 linear-gradient bug https://github.com/vector-im/element-web/issues/21670
+$system-transparent: var(--system-transparent, rgba($system, 0.0));
 $system: var(--system, $system);
 $background: var(--background, $background);
 $panels: rgba($system, 0.9);
@@ -55,7 +57,7 @@ $roomheader-bg-color: var(--timeline-background-color);
 $panel-actions: var(--roomlist-highlights-color);
 //
 // --sidebar-color
-$groupFilterPanel-bg-color: var(--sidebar-color);
+$spacePanel-bg-color: var(--sidebar-color);
 $tooltip-timeline-bg-color: var(--sidebar-color);
 $dialog-backdrop-color: var(--sidebar-color-50pct);
 //
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 09c98ac8d41..3d09e400819 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -8,9 +8,22 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: 'Inter', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Arial', 'Helvetica', sans-serif, 'Noto Color Emoji';
-
-$monospace-font-family: 'Inconsolata', 'Twemoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Courier', monospace, 'Noto Color Emoji';
+$font-family: 'Inter',
+'Twemoji',
+'Apple Color Emoji',
+'Segoe UI Emoji',
+'Arial',
+'Helvetica',
+sans-serif,
+'Noto Color Emoji';
+
+$monospace-font-family: 'Inconsolata',
+'Twemoji',
+'Apple Color Emoji',
+'Segoe UI Emoji',
+'Courier',
+monospace,
+'Noto Color Emoji';
 
 // Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A120
 // ********************
@@ -21,7 +34,9 @@ $quaternary-content: #c1c6cd;
 $quinary-content: #E3E8F0;
 
 $system: #F4F6FA;
+$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
 $background: #ffffff;
+$overlay-background: rgba($background, 0.85);
 
 $panels: rgba($system, 0.9);
 $panel-selected: rgba($tertiary-content, 0.3);
@@ -57,7 +72,7 @@ $icon-button-color: $quaternary-content;
 // Colors that aren't in Figma and are theme specific - we need to get rid of these
 // ********************
 $selection-fg-color: $background;
-$yellow-background:  #fff8e3;
+$yellow-background: #fff8e3;
 $secondary-accent-color: #f2f5f8;
 $button-fg-color: $background;
 $neutral-badge-color: #dbdbdb;
@@ -78,8 +93,9 @@ $info-plinth-bg-color: #f7f7f7;
 $event-selected-color: #f6f7f8;
 $topleftmenu-color: #212121;
 $roomtopic-color: #9e9e9e;
-$groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77);
-$panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
+$spacePanel-bg-color: rgba(232, 232, 232, 0.77);
+$panel-gradient: rgba(242, 245, 248, 0),
+rgba(242, 245, 248, 1);
 $h3-color: #3d3b39;
 $event-highlight-bg-color: $yellow-background;
 $header-panel-text-primary-color: #91A1C0;
@@ -118,6 +134,11 @@ $settings-profile-button-bg-color: $menu-border-color;
 $settings-subsection-fg-color: $muted-fg-color;
 // ********************
 
+// Room
+// ********************
+$room-icon-unread-color: $secondary-content;
+// ********************
+
 // RoomHeader
 // ********************
 $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
@@ -136,6 +157,7 @@ $rte-code-bg-color: rgba(0, 0, 0, 0.04);
 // ********************
 $presence-away: #d9b072;
 $presence-offline: $quinary-content;
+$presence-busy: $alert;
 // ********************
 
 // Inputs
@@ -259,6 +281,11 @@ $call-view-content-background: #21262C;
 
 $video-feed-secondary-background: #394049; // XXX: Color from dark theme
 $voipcall-plinth-color: $system;
+
+// All of these are from dark theme
+$video-lobby-system: #21262C;
+$video-lobby-background: #15191E;
+$video-lobby-primary-content: #FFFFFF;
 // ********************
 
 // One-off colors
@@ -291,6 +318,7 @@ $focus-brightness: 105%;
 :root {
     --lp-background-blur: 40px;
 }
+
 // ********************
 
 // Icon URLs
@@ -302,6 +330,7 @@ $copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
 // ********************
 $location-marker-color: #ffffff;
 $location-live-color: #5c56f5;
+$location-live-secondary-color: #deddfd;
 // ********************
 
 // Mixins
@@ -324,8 +353,7 @@ $location-live-color: #5c56f5;
     outline: none;
 }
 
-@define-mixin mx_DialogButton_hover {
-}
+@define-mixin mx_DialogButton_hover {}
 
 @define-mixin mx_DialogButton_danger {
     background-color: $accent;
@@ -349,6 +377,7 @@ $location-live-color: #5c56f5;
     color: $accent;
     text-decoration: none;
 }
+
 // ********************
 
 // diff highlight colors
@@ -360,4 +389,5 @@ $location-live-color: #5c56f5;
 .hljs-deletion {
     background: #fdd;
 }
+
 // ********************
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile
index 447ed09b7c9..08c9153578b 100644
--- a/scripts/ci/Dockerfile
+++ b/scripts/ci/Dockerfile
@@ -1,3 +1,5 @@
+# Docker file for end-to-end tests
+
 # Update on docker hub with the following commands in the directory of this file:
 # If you're on linux amd64
 #   docker build -t vectorim/element-web-ci-e2etests-env:latest .
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
index 0741ad2ab34..c10884361e9 100755
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# This installs other Matrix dependencies that are often
+# developed in parallel with react-sdk, using fetchdep.sh
+# for branch matching.
+# This will set up a working react-sdk environment, so is
+# used for running react-sdk standalone tests. To set up a
+# build of element-web, use layered.sh
+
 set -ex
 
 scripts/fetchdep.sh matrix-org matrix-js-sdk
diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh
index 3e30cc808f7..e66eddf9aa4 100755
--- a/scripts/ci/layered.sh
+++ b/scripts/ci/layered.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # Creates a layered environment with the full repo for the app and SDKs cloned
-# and linked.
+# and linked. This gives an element-web dev environment ready to build with
+# the current react-sdk branch and any matching branches of react-sdk's dependencies
+# so that changes can be tested in element-web.
 
 # Note that this style is different from the recommended developer setup: this
 # file nests js-sdk and element-web inside react-sdk, while the local
@@ -16,7 +18,8 @@ yarn link
 yarn install --pure-lockfile
 popd
 
-# Set up the js-sdk first
+# Also set up matrix-analytics-events so we get the latest from
+# the main branch or a branch with matching name
 scripts/fetchdep.sh matrix-org matrix-analytics-events main
 pushd matrix-analytics-events
 yarn link
@@ -28,7 +31,6 @@ yarn link matrix-js-sdk
 yarn link matrix-analytics-events
 yarn link
 yarn install --pure-lockfile
-yarn reskindex
 
 # Finally, set up element-web
 scripts/fetchdep.sh vector-im element-web
diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index 15e998ddbed..737e87844f5 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -29,7 +29,7 @@ getPRInfo() {
     if [ -n "$number" ]; then
         echo "Getting info about a PR with number $number"
 
-        apiEndpoint="https://api.github.com/repos/matrix-org/matrix-react-sdk/pulls/"
+        apiEndpoint="https://api.github.com/repos/${REPOSITORY:-"matrix-org/matrix-react-sdk"}/pulls/"
         apiEndpoint+=$number
 
         head=$(curl $apiEndpoint | jq -r '.head.label')
@@ -57,15 +57,18 @@ BRANCH_ARRAY=(${head//:/ })
 TRY_ORG=$deforg
 TRY_BRANCH=${BRANCH_ARRAY[0]}
 if [[ "$head" == *":"* ]]; then
-    TRY_ORG=${BRANCH_ARRAY[0]}
+    # ... but only match that fork if it's a real fork
+    if [ "${BRANCH_ARRAY[0]}" != "matrix-org" ]; then
+        TRY_ORG=${BRANCH_ARRAY[0]}
+    fi
     TRY_BRANCH=${BRANCH_ARRAY[1]}
 fi
 clone ${TRY_ORG} $defrepo ${TRY_BRANCH}
 
 # Try the target branch of the push or PR.
-if [ -n $GITHUB_BASE_REF ]; then
+if [ -n "$GITHUB_BASE_REF" ]; then
     clone $deforg $defrepo $GITHUB_BASE_REF
-elif [ -n $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]; then
+elif [ -n "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" ]; then
     clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
 fi
 
diff --git a/scripts/make-react-component.js b/scripts/make-react-component.js
index 063914fafec..56616c33508 100755
--- a/scripts/make-react-component.js
+++ b/scripts/make-react-component.js
@@ -6,7 +6,7 @@ const path = require('path');
  * Unsophisticated script to create a styled, unit-tested react component.
  * -filePath / -f : path to the component to be created, including new component name, excluding extension, relative to src
  * -withStyle / -s : optional, flag to create a style file for the component. Defaults to false.
- * 
+ *
  * eg:
  * ```
  * node srcipts/make-react-component.js -f components/toasts/NewToast -s
@@ -15,7 +15,7 @@ const path = require('path');
  * - src/components/toasts/NewToast.tsx
  * - test/components/toasts/NewToast-test.tsx
  * - res/css/components/toasts/_NewToast.scss
- * 
+ *
  */
 
 const TEMPLATES = {
@@ -34,7 +34,6 @@ export default %%ComponentName%%;
 import React from 'react';
 import { mount } from 'enzyme';
 
-import '%%SkinnedSdkPath%%';
 import %%ComponentName%% from '%%RelativeComponentPath%%';
 
 describe('<%%ComponentName%% />', () => {
@@ -85,10 +84,8 @@ const makeFile = async ({
     const relativePathToComponent = path.parse(path.relative(path.dirname(newFilePath), componentFilePath || ''));
     const importComponentPath = path.join(relativePathToComponent.dir, relativePathToComponent.name);
 
-    const skinnedSdkPath = path.relative(path.dirname(newFilePath), 'test/skinned-sdk')
-
     try {
-        await fs.writeFile(newFilePath, fillTemplate(template, componentName, importComponentPath, skinnedSdkPath), { flag: 'wx' });
+        await fs.writeFile(newFilePath, fillTemplate(template, componentName, importComponentPath), { flag: 'wx' });
         console.log(`Created ${path.relative(process.cwd(), newFilePath)}`);
         return newFilePath;
     } catch (error) {
@@ -104,7 +101,6 @@ const makeFile = async ({
 const fillTemplate = (template, componentName, relativeComponentFilePath, skinnedSdkPath) =>
     template.replace(/%%ComponentName%%/g, componentName)
         .replace(/%%RelativeComponentPath%%/g, relativeComponentFilePath)
-        .replace(/%%SkinnedSdkPath%%/g, skinnedSdkPath)
 
 
 const makeReactComponent = async () => {
diff --git a/scripts/reskindex.js b/scripts/reskindex.js
deleted file mode 100755
index 5eaec4d1d5e..00000000000
--- a/scripts/reskindex.js
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const { promises: fsp } = fs;
-const path = require('path');
-const glob = require('glob');
-const util = require('util');
-const args = require('minimist')(process.argv);
-const chokidar = require('chokidar');
-
-const componentIndex = path.join('src', 'component-index.js');
-const componentIndexTmp = componentIndex+".tmp";
-const componentsDir = path.join('src', 'components');
-const componentJsGlob = '**/*.js';
-const componentTsGlob = '**/*.tsx';
-let prevFiles = [];
-
-async function reskindex() {
-    const jsFiles = glob.sync(componentJsGlob, {cwd: componentsDir}).sort();
-    const tsFiles = glob.sync(componentTsGlob, {cwd: componentsDir}).sort();
-    const files = [...tsFiles, ...jsFiles];
-    if (!filesHaveChanged(files, prevFiles)) {
-        return;
-    }
-    prevFiles = files;
-
-    const header = args.h || args.header;
-
-    const strm = fs.createWriteStream(componentIndexTmp);
-    // Wait for the open event to ensure the file descriptor is set
-    await new Promise(resolve => strm.once("open", resolve));
-
-    if (header) {
-       strm.write(fs.readFileSync(header));
-       strm.write('\n');
-    }
-
-    strm.write("/*\n");
-    strm.write(" * THIS FILE IS AUTO-GENERATED\n");
-    strm.write(" * You can edit it you like, but your changes will be overwritten,\n");
-    strm.write(" * so you'd just be trying to swim upstream like a salmon.\n");
-    strm.write(" * You are not a salmon.\n");
-    strm.write(" */\n\n");
-    strm.write("let components = {};\n");
-
-    for (let i = 0; i < files.length; ++i) {
-        const file = files[i].replace('.js', '').replace('.tsx', '');
-
-        const moduleName = (file.replace(/\//g, '.'));
-        const importName = moduleName.replace(/\./g, "$");
-
-        strm.write("import " + importName + " from './components/" + file + "';\n");
-        strm.write(importName + " && (components['"+moduleName+"'] = " + importName + ");");
-        strm.write('\n');
-        strm.uncork();
-    }
-
-    strm.write("export {components};\n");
-    // Ensure the file has been fully written to disk before proceeding
-    await util.promisify(fs.fsync)(strm.fd);
-    await util.promisify(strm.end);
-    await fsp.rename(componentIndexTmp, componentIndex);
-}
-
-// Expects both arrays of file names to be sorted
-function filesHaveChanged(files, prevFiles) {
-    if (files.length !== prevFiles.length) {
-        return true;
-    }
-    // Check for name changes
-    for (let i = 0; i < files.length; i++) {
-        if (prevFiles[i] !== files[i]) {
-            return true;
-        }
-    }
-    return false;
-}
-
-// Wrapper since await at the top level is not well supported yet
-function run() {
-    (async function() {
-        await reskindex();
-        console.log("Reskindex completed");
-    })();
-}
-
-// -w indicates watch mode where any FS events will trigger reskindex
-if (!args.w) {
-    run();
-    return;
-}
-
-let watchDebouncer = null;
-chokidar.watch(path.join(componentsDir, componentJsGlob)).on('all', (event, path) => {
-    if (path === componentIndex) return;
-    if (watchDebouncer) clearTimeout(watchDebouncer);
-    watchDebouncer = setTimeout(run, 1000);
-});
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000000..afeecf737be
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,16 @@
+sonar.projectKey=matrix-react-sdk
+sonar.organization=matrix-org
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=matrix-react-sdk
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+sonar.sources=src,res
+sonar.tests=test,cypress
+sonar.exclusions=__mocks__,docs
diff --git a/src/@types/browser-encrypt-attachment.ts b/src/@types/browser-encrypt-attachment.ts
deleted file mode 100644
index a8249ab3505..00000000000
--- a/src/@types/browser-encrypt-attachment.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-declare module "browser-encrypt-attachment" {
-    interface IInfo {
-        v: string;
-        key: {
-            alg: string;
-            key_ops: string[]; // eslint-disable-line camelcase
-            kty: string;
-            k: string;
-            ext: boolean;
-        };
-        iv: string;
-        hashes: {[alg: string]: string};
-    }
-
-    interface IEncryptedAttachment {
-        data: ArrayBuffer;
-        info: IInfo;
-    }
-
-    export function encryptAttachment(plaintextBuffer: ArrayBuffer): Promise<IEncryptedAttachment>;
-    export function decryptAttachment(ciphertextBuffer: ArrayBuffer, info: IInfo): Promise<ArrayBuffer>;
-}
diff --git a/src/@types/common.ts b/src/@types/common.ts
index 991cfb7e085..b4d01a75a54 100644
--- a/src/@types/common.ts
+++ b/src/@types/common.ts
@@ -34,3 +34,18 @@ type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...0[]];
 
 export type Leaves<T, D extends number = 5> = [D] extends [never] ? never : T extends object ?
     { [K in keyof T]-?: Join<K, Leaves<T[K], Prev[D]>> }[keyof T] : "";
+
+export type RecursivePartial<T> = {
+    [P in keyof T]?:
+    T[P] extends (infer U)[] ? RecursivePartial<U>[] :
+        T[P] extends object ? RecursivePartial<T[P]> :
+            T[P];
+};
+
+// Inspired by https://stackoverflow.com/a/60206860
+export type KeysWithObjectShape<Input> = {
+    [P in keyof Input]: Input[P] extends object
+        // Arrays are counted as objects - exclude them
+        ? (Input[P] extends Array<unknown> ? never : P)
+        : never;
+}[keyof Input];
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 6ac72a2dd61..d0f266470c9 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -29,7 +29,6 @@ import RoomListLayoutStore from "../stores/room-list/RoomListLayoutStore";
 import { IntegrationManagers } from "../integrations/IntegrationManagers";
 import { ModalManager } from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
-import { ActiveRoomObserver } from "../ActiveRoomObserver";
 import { Notifier } from "../Notifier";
 import type { Renderer } from "react-dom";
 import RightPanelStore from "../stores/right-panel/RightPanelStore";
@@ -50,9 +49,8 @@ import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
 import { RoomScrollStateStore } from "../stores/RoomScrollStateStore";
 import { ConsoleLogger, IndexedDBLogStore } from "../rageshake/rageshake";
 import ActiveWidgetStore from "../stores/ActiveWidgetStore";
-import { Skinner } from "../Skinner";
 import AutoRageshakeStore from "../stores/AutoRageshakeStore";
-import { ConfigOptions } from "../SdkConfig";
+import { IConfigOptions } from "../IConfigOptions";
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
@@ -63,7 +61,7 @@ declare global {
         Olm: {
             init: () => Promise<void>;
         };
-        mxReactSdkConfig: ConfigOptions;
+        mxReactSdkConfig: IConfigOptions;
 
         // Needed for Safari, unknown to TypeScript
         webkitAudioContext: typeof AudioContext;
@@ -83,7 +81,6 @@ declare global {
         mxDeviceListener: DeviceListener;
         mxRoomListStore: RoomListStoreClass;
         mxRoomListLayoutStore: RoomListLayoutStore;
-        mxActiveRoomObserver: ActiveRoomObserver;
         mxPlatformPeg: PlatformPeg;
         mxIntegrationManagers: typeof IntegrationManagers;
         singletonModalManager: ModalManager;
@@ -107,7 +104,6 @@ declare global {
         mxSetupEncryptionStore?: SetupEncryptionStore;
         mxRoomScrollStateStore?: RoomScrollStateStore;
         mxActiveWidgetStore?: ActiveWidgetStore;
-        mxSkinner?: Skinner;
         mxOnRecaptchaLoaded?: () => void;
         electron?: Electron;
         mxSendSentryReport: (userText: string, issueUrl: string, error: Error) => Promise<void>;
diff --git a/src/@types/groups.ts b/src/@types/groups.ts
deleted file mode 100644
index d3a7455e2fc..00000000000
--- a/src/@types/groups.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-export const CreateEventField = "io.element.migrated_from_community";
-
-export interface IGroupRoom {
-    displayname: string;
-    name?: string;
-    roomId: string;
-    canonicalAlias?: string;
-    avatarUrl?: string;
-    topic?: string;
-    numJoinedMembers?: number;
-    worldReadable?: boolean;
-    guestCanJoin?: boolean;
-    isPublic?: boolean;
-}
-
-/* eslint-disable camelcase */
-export interface IGroupSummary {
-    profile: {
-        avatar_url?: string;
-        is_openly_joinable?: boolean;
-        is_public?: boolean;
-        long_description: string;
-        name: string;
-        short_description: string;
-    };
-    rooms_section: {
-        rooms: unknown[];
-        categories: Record<string, unknown>;
-        total_room_count_estimate: number;
-    };
-    user: {
-        is_privileged: boolean;
-        is_public: boolean;
-        is_publicised: boolean;
-        membership: string;
-    };
-    users_section: {
-        users: unknown[];
-        roles: Record<string, unknown>;
-        total_user_count_estimate: number;
-    };
-}
-/* eslint-enable camelcase */
diff --git a/src/ActiveRoomObserver.ts b/src/ActiveRoomObserver.ts
deleted file mode 100644
index 4da0a6eac3a..00000000000
--- a/src/ActiveRoomObserver.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { EventSubscription } from 'fbemitter';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import RoomViewStore from './stores/RoomViewStore';
-
-type Listener = (isActive: boolean) => void;
-
-/**
- * Consumes changes from the RoomViewStore and notifies specific things
- * about when the active room changes. Unlike listening for RoomViewStore
- * changes, you can subscribe to only changes relevant to a particular
- * room.
- *
- * TODO: If we introduce an observer for something else, factor out
- * the adding / removing of listeners & emitting into a common class.
- */
-export class ActiveRoomObserver {
-    private listeners: {[key: string]: Listener[]} = {};
-    private _activeRoomId = RoomViewStore.getRoomId();
-    private readonly roomStoreToken: EventSubscription;
-
-    constructor() {
-        // TODO: We could self-destruct when the last listener goes away, or at least stop listening.
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
-    }
-
-    public get activeRoomId(): string {
-        return this._activeRoomId;
-    }
-
-    public addListener(roomId, listener) {
-        if (!this.listeners[roomId]) this.listeners[roomId] = [];
-        this.listeners[roomId].push(listener);
-    }
-
-    public removeListener(roomId, listener) {
-        if (this.listeners[roomId]) {
-            const i = this.listeners[roomId].indexOf(listener);
-            if (i > -1) {
-                this.listeners[roomId].splice(i, 1);
-            }
-        } else {
-            logger.warn("Unregistering unrecognised listener (roomId=" + roomId + ")");
-        }
-    }
-
-    private emit(roomId, isActive: boolean) {
-        if (!this.listeners[roomId]) return;
-
-        for (const l of this.listeners[roomId]) {
-            l.call(null, isActive);
-        }
-    }
-
-    private onRoomViewStoreUpdate = () => {
-        // emit for the old room ID
-        if (this._activeRoomId) this.emit(this._activeRoomId, false);
-
-        // update our cache
-        this._activeRoomId = RoomViewStore.getRoomId();
-
-        // and emit for the new one
-        if (this._activeRoomId) this.emit(this._activeRoomId, true);
-    };
-}
-
-if (window.mxActiveRoomObserver === undefined) {
-    window.mxActiveRoomObserver = new ActiveRoomObserver();
-}
-export default window.mxActiveRoomObserver;
diff --git a/src/Analytics.tsx b/src/Analytics.tsx
index 09cb78d980b..639950574df 100644
--- a/src/Analytics.tsx
+++ b/src/Analytics.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,13 +17,17 @@ limitations under the License.
 
 import React from 'react';
 import { logger } from "matrix-js-sdk/src/logger";
+import { Optional } from "matrix-events-sdk";
 
 import { getCurrentLanguage, _t, _td, IVariables } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';
 import Modal from './Modal';
-import * as sdk from './index';
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+import { SnakedObject } from "./utils/SnakedObject";
+import { IConfigOptions } from "./IConfigOptions";
 
+// Note: we keep the analytics redaction on groups in case people have old links.
 const hashRegex = /#\/(groups?|room|user|settings|register|login|forgot_password|home|directory)/;
 const hashVarRegex = /#\/(group|room|user)\/.*$/;
 
@@ -166,7 +170,6 @@ const HEARTBEAT_INTERVAL = 30 * 1000; // seconds
 
 export class Analytics {
     private baseUrl: URL = null;
-    private siteId: string = null;
     private visitVariables: Record<number, [string, string]> = {}; // {[id: number]: [name: string, value: string]}
     private firstPage = true;
     private heartbeatIntervalID: number = null;
@@ -194,8 +197,12 @@ export class Analytics {
     }
 
     public canEnable() {
-        const config = SdkConfig.get();
-        return navigator.doNotTrack !== "1" && config && config.piwik && config.piwik.url && config.piwik.siteId;
+        const piwikConfig = SdkConfig.get("piwik");
+        let piwik: Optional<SnakedObject<Extract<IConfigOptions["piwik"], object>>>;
+        if (typeof piwikConfig === 'object') {
+            piwik = new SnakedObject(piwikConfig);
+        }
+        return navigator.doNotTrack !== "1" && piwik?.get("site_id");
     }
 
     /**
@@ -205,12 +212,16 @@ export class Analytics {
     public async enable() {
         if (!this.disabled) return;
         if (!this.canEnable()) return;
-        const config = SdkConfig.get();
+        const piwikConfig = SdkConfig.get("piwik");
+        let piwik: Optional<SnakedObject<Extract<IConfigOptions["piwik"], object>>>;
+        if (typeof piwikConfig === 'object') {
+            piwik = new SnakedObject(piwikConfig);
+        }
 
-        this.baseUrl = new URL("piwik.php", config.piwik.url);
+        this.baseUrl = new URL("piwik.php", piwik.get("url"));
         // set constants
         this.baseUrl.searchParams.set("rec", "1"); // rec is required for tracking
-        this.baseUrl.searchParams.set("idsite", config.piwik.siteId); // rec is required for tracking
+        this.baseUrl.searchParams.set("idsite", piwik.get("site_id")); // idsite is required for tracking
         this.baseUrl.searchParams.set("apiv", "1"); // API version to use
         this.baseUrl.searchParams.set("send_image", "0"); // we want a 204, not a tiny GIF
         // set user parameters
@@ -348,10 +359,14 @@ export class Analytics {
     public setLoggedIn(isGuest: boolean, homeserverUrl: string) {
         if (this.disabled) return;
 
-        const config = SdkConfig.get();
-        if (!config.piwik) return;
+        const piwikConfig = SdkConfig.get("piwik");
+        let piwik: Optional<SnakedObject<Extract<IConfigOptions["piwik"], object>>>;
+        if (typeof piwikConfig === 'object') {
+            piwik = new SnakedObject(piwikConfig);
+        }
+        if (!piwik) return;
 
-        const whitelistedHSUrls = config.piwik.whitelistedHSUrls || [];
+        const whitelistedHSUrls = piwik.get("whitelisted_hs_urls", "whitelistedHSUrls") || [];
 
         this.setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
         this.setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
@@ -391,9 +406,12 @@ export class Analytics {
             { expl: _td('Your device resolution'), value: resolution },
         ];
 
-        // FIXME: Using an import will result in test failures
-        const cookiePolicyUrl = SdkConfig.get().piwik?.policyUrl;
-        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+        const piwikConfig = SdkConfig.get("piwik");
+        let piwik: Optional<SnakedObject<Extract<IConfigOptions["piwik"], object>>>;
+        if (typeof piwikConfig === 'object') {
+            piwik = new SnakedObject(piwikConfig);
+        }
+        const cookiePolicyUrl = piwik?.get("policy_url");
         const cookiePolicyLink = _t(
             "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.",
             {},
@@ -428,7 +446,7 @@ export class Analytics {
                 </table>
                 <div>
                     { _t('Where this page includes identifiable information, such as a room, '
-                        + 'user or group ID, that data is removed before being sent to the server.') }
+                        + 'user ID, that data is removed before being sent to the server.') }
                 </div>
             </div>,
         });
diff --git a/src/AsyncWrapper.tsx b/src/AsyncWrapper.tsx
index 166e4f21e39..07a06f20d44 100644
--- a/src/AsyncWrapper.tsx
+++ b/src/AsyncWrapper.tsx
@@ -17,9 +17,11 @@ limitations under the License.
 import React, { ComponentType } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import * as sdk from './index';
 import { _t } from './languageHandler';
 import { IDialogProps } from "./components/views/dialogs/IDialogProps";
+import BaseDialog from "./components/views/dialogs/BaseDialog";
+import DialogButtons from "./components/views/elements/DialogButtons";
+import Spinner from "./components/views/elements/Spinner";
 
 type AsyncImport<T> = { default: T };
 
@@ -78,9 +80,6 @@ export default class AsyncWrapper extends React.Component<IProps, IState> {
             const Component = this.state.component;
             return <Component {...this.props} />;
         } else if (this.state.error) {
-            // FIXME: Using an import will result in test failures
-            const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             return <BaseDialog onFinished={this.props.onFinished} title={_t("Error")}>
                 { _t("Unable to load! Check your network connectivity and try again.") }
                 <DialogButtons primaryButton={_t("Dismiss")}
@@ -90,7 +89,6 @@ export default class AsyncWrapper extends React.Component<IProps, IState> {
             </BaseDialog>;
         } else {
             // show a spinner until the component is loaded.
-            const Spinner = sdk.getComponent("elements.Spinner");
             return <Spinner />;
         }
     }
diff --git a/src/Avatar.ts b/src/Avatar.ts
index 310fec5f4c9..86560713aed 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -22,7 +22,6 @@ import { split } from "lodash";
 
 import DMRoomMap from './utils/DMRoomMap';
 import { mediaFromMxc } from "./customisations/Media";
-import SpaceStore from "./stores/spaces/SpaceStore";
 
 // Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(
@@ -58,7 +57,7 @@ function isValidHexColor(color: string): boolean {
     return typeof color === "string" &&
         (color.length === 7 || color.length === 9) &&
         color.charAt(0) === "#" &&
-        !color.substr(1).split("").some(c => isNaN(parseInt(c, 16)));
+        !color.slice(1).split("").some(c => isNaN(parseInt(c, 16)));
 }
 
 function urlForColor(color: string): string {
@@ -140,7 +139,7 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
     }
 
     // space rooms cannot be DMs so skip the rest
-    if (SpaceStore.spacesEnabled && room.isSpaceRoom()) return null;
+    if (room.isSpaceRoom()) return null;
 
     // If the room is not a DM don't fallback to a member avatar
     if (!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) return null;
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 40ac9d11996..b7f52d38952 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -32,6 +32,7 @@ import { hideToast as hideUpdateToast } from "./toasts/UpdateToast";
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import { idbLoad, idbSave, idbDelete } from "./utils/StorageManager";
 import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
+import { IConfigOptions } from "./IConfigOptions";
 
 export const SSO_HOMESERVER_URL_KEY = "mx_sso_hs_url";
 export const SSO_ID_SERVER_URL_KEY = "mx_sso_is_url";
@@ -62,7 +63,7 @@ export default abstract class BasePlatform {
         this.startUpdateCheck = this.startUpdateCheck.bind(this);
     }
 
-    abstract getConfig(): Promise<{}>;
+    abstract getConfig(): Promise<IConfigOptions>;
 
     abstract getDefaultDeviceDisplayName(): string;
 
@@ -144,6 +145,13 @@ export default abstract class BasePlatform {
         return false;
     }
 
+    /**
+     * Returns true if platform allows overriding native context menus
+     */
+    public allowOverridingNativeContextMenus(): boolean {
+        return false;
+    }
+
     /**
      * Returns true if the platform supports displaying
      * notifications, otherwise false.
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 60094262edb..2b934251b72 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017, 2018 New Vector Ltd
-Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import { base32 } from "rfc4648";
 import {
     CallError,
     CallErrorCode,
@@ -29,7 +28,6 @@ import {
     MatrixCall,
 } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from 'matrix-js-sdk/src/logger';
-import { randomLowercaseString, randomUppercaseString } from "matrix-js-sdk/src/randomstring";
 import EventEmitter from 'events';
 import { RuleId, TweakName, Tweaks } from "matrix-js-sdk/src/@types/PushRules";
 import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor';
@@ -42,12 +40,10 @@ import { _t } from './languageHandler';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import SettingsStore from './settings/SettingsStore';
-import { Jitsi } from "./widgets/Jitsi";
 import { WidgetType } from "./widgets/WidgetType";
 import { SettingLevel } from "./settings/SettingLevel";
 import QuestionDialog from "./components/views/dialogs/QuestionDialog";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
-import InviteDialog, { KIND_CALL_TRANSFER } from "./components/views/dialogs/InviteDialog";
 import WidgetStore from "./stores/WidgetStore";
 import { WidgetMessagingStore } from "./stores/widgets/WidgetMessagingStore";
 import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
@@ -57,12 +53,15 @@ import { Action } from './dispatcher/actions';
 import VoipUserMapper from './VoipUserMapper';
 import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from './widgets/ManagedHybrid';
 import SdkConfig from './SdkConfig';
-import { ensureDMExists, findDMForUser } from './createRoom';
+import { ensureDMExists } from './createRoom';
 import { Container, WidgetLayoutStore } from './stores/widgets/WidgetLayoutStore';
 import IncomingCallToast, { getIncomingCallToastKey } from './toasts/IncomingCallToast';
 import ToastStore from './stores/ToastStore';
 import Resend from './Resend';
 import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
+import { findDMForUser } from "./utils/direct-messages";
+import { KIND_CALL_TRANSFER } from "./components/views/dialogs/InviteDialogTypes";
+import { OpenInviteDialogPayload } from "./dispatcher/payloads/OpenInviteDialogPayload";
 
 export const PROTOCOL_PSTN = 'm.protocol.pstn';
 export const PROTOCOL_PSTN_PREFIXED = 'im.vector.protocol.pstn';
@@ -70,9 +69,6 @@ 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;
-// 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';
 
 enum AudioID {
     Ring = 'ringAudio',
@@ -125,10 +121,6 @@ export default class CallHandler extends EventEmitter {
     private supportsPstnProtocol = null;
     private pstnSupportPrefixed = null; // True if the server only support the prefixed pstn protocol
     private supportsSipNativeVirtual = null; // im.vector.protocol.sip_virtual and im.vector.protocol.sip_native
-    private pstnSupportCheckTimer: number;
-    // For rooms we've been invited to, true if they're from virtual user, false if we've checked and they aren't.
-    private invitedRoomsAreVirtual = new Map<string, boolean>();
-    private invitedRoomCheckInProgress = false;
 
     // 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
@@ -255,7 +247,7 @@ export default class CallHandler extends EventEmitter {
                 logger.log("Failed to check for protocol support and no retries remain: assuming no support", e);
             } else {
                 logger.log("Failed to check for protocol support: will retry", e);
-                this.pstnSupportCheckTimer = setTimeout(() => {
+                setTimeout(() => {
                     this.checkProtocols(maxTries - 1);
                 }, 10000);
             }
@@ -263,7 +255,7 @@ export default class CallHandler extends EventEmitter {
     }
 
     private shouldObeyAssertedfIdentity(): boolean {
-        return SdkConfig.get()['voip']?.obeyAssertedIdentity;
+        return SdkConfig.getObject("voip")?.get("obey_asserted_identity");
     }
 
     public getSupportsPstnProtocol(): boolean {
@@ -1027,65 +1019,26 @@ export default class CallHandler extends EventEmitter {
         return false;
     }
 
-    private async placeJitsiCall(roomId: string, type: string): Promise<void> {
-        logger.info("Place conference call in " + roomId);
+    private async placeJitsiCall(roomId: string, type: CallType): Promise<void> {
+        const client = MatrixClientPeg.get();
+        logger.info(`Place conference call in ${roomId}`);
         Analytics.trackEvent('voip', 'placeConferenceCall');
 
-        dis.dispatch({
-            action: 'appsDrawer',
-            show: true,
-        });
+        dis.dispatch({ action: 'appsDrawer', show: true });
 
-        // prevent double clicking the call button
-        const room = MatrixClientPeg.get().getRoom(roomId);
-        const jitsiWidget = WidgetStore.instance.getApps(roomId).find((app) => WidgetType.JITSI.matches(app.type));
-        if (jitsiWidget) {
-            // If there already is a Jitsi widget pin it
-            WidgetLayoutStore.instance.moveToContainer(room, jitsiWidget, Container.Top);
+        // Prevent double clicking the call button
+        const widget = WidgetStore.instance.getApps(roomId).find(app => WidgetType.JITSI.matches(app.type));
+        if (widget) {
+            // If there already is a Jitsi widget, pin it
+            WidgetLayoutStore.instance.moveToContainer(client.getRoom(roomId), widget, Container.Top);
             return;
         }
 
-        const jitsiDomain = Jitsi.getInstance().preferredDomain;
-        const jitsiAuth = await Jitsi.getInstance().getJitsiAuth();
-        let confId;
-        if (jitsiAuth === 'openidtoken-jwt') {
-            // Create conference ID from room ID
-            // For compatibility with Jitsi, use base32 without padding.
-            // More details here:
-            // https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
-            confId = base32.stringify(Buffer.from(roomId), { pad: false });
-        } else {
-            // Create a random conference ID
-            const random = randomUppercaseString(1) + randomLowercaseString(23);
-            confId = 'Jitsi' + random;
-        }
-
-        let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({ auth: jitsiAuth });
-
-        // TODO: Remove URL hacks when the mobile clients eventually support v2 widgets
-        const parsedUrl = new URL(widgetUrl);
-        parsedUrl.search = ''; // set to empty string to make the URL class use searchParams instead
-        parsedUrl.searchParams.set('confId', confId);
-        widgetUrl = parsedUrl.toString();
-
-        const widgetData = {
-            conferenceId: confId,
-            isAudioOnly: type === 'voice',
-            domain: jitsiDomain,
-            auth: jitsiAuth,
-            roomName: room.name,
-        };
-
-        const widgetId = (
-            'jitsi_' +
-            MatrixClientPeg.get().credentials.userId +
-            '_' +
-            Date.now()
-        );
-
-        WidgetUtils.setRoomWidget(roomId, widgetId, WidgetType.JITSI, widgetUrl, 'Jitsi', widgetData).then(() => {
+        try {
+            const userId = client.credentials.userId;
+            await WidgetUtils.addJitsiWidget(roomId, type, 'Jitsi', `jitsi_${userId}_${Date.now()}`);
             logger.log('Jitsi widget added');
-        }).catch((e) => {
+        } catch (e) {
             if (e.errcode === 'M_FORBIDDEN') {
                 Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
                     title: _t('Permission Required'),
@@ -1093,7 +1046,7 @@ export default class CallHandler extends EventEmitter {
                 });
             }
             logger.error(e);
-        });
+        }
     }
 
     public terminateCallApp(roomId: string): void {
@@ -1127,7 +1080,7 @@ export default class CallHandler extends EventEmitter {
 
         const jitsiWidgets = roomInfo.widgets.filter(w => WidgetType.JITSI.matches(w.type));
         jitsiWidgets.forEach(w => {
-            const messaging = WidgetMessagingStore.instance.getMessagingForId(w.id);
+            const messaging = WidgetMessagingStore.instance.getMessagingForUid(WidgetUtils.getWidgetUid(w));
             if (!messaging) return; // more "should never happen" words
 
             messaging.transport.send(ElementWidgetActions.HangupCall, {});
@@ -1140,14 +1093,17 @@ export default class CallHandler extends EventEmitter {
      */
     public showTransferDialog(call: MatrixCall): void {
         call.setRemoteOnHold(true);
-        const { finished } = Modal.createTrackedDialog(
-            'Transfer Call', '', InviteDialog, { kind: KIND_CALL_TRANSFER, call },
-            /*className=*/"mx_InviteDialog_transferWrapper", /*isPriority=*/false, /*isStatic=*/true,
-        );
-        finished.then((results: boolean[]) => {
-            if (results.length === 0 || results[0] === false) {
-                call.setRemoteOnHold(false);
-            }
+        dis.dispatch<OpenInviteDialogPayload>({
+            action: Action.OpenInviteDialog,
+            kind: KIND_CALL_TRANSFER,
+            call,
+            analyticsName: "Transfer Call",
+            className: "mx_InviteDialog_transferWrapper",
+            onFinishedCallback: (results) => {
+                if (results.length === 0 || results[0] === false) {
+                    call.setRemoteOnHold(false);
+                }
+            },
         });
     }
 
diff --git a/src/ContentMessages.tsx b/src/ContentMessages.ts
similarity index 78%
rename from src/ContentMessages.tsx
rename to src/ContentMessages.ts
index 8b0ddc83688..1d54b1adc3a 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.ts
@@ -16,22 +16,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { IUploadOpts } from "matrix-js-sdk/src/@types/requests";
-import { MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
-import encrypt from "browser-encrypt-attachment";
+import { MsgType } from "matrix-js-sdk/src/@types/event";
+import encrypt from "matrix-encrypt-attachment";
 import extractPngChunks from "png-chunks-extract";
 import { IAbortablePromise, IImageInfo } from "matrix-js-sdk/src/@types/partials";
 import { logger } from "matrix-js-sdk/src/logger";
-import { IEventRelation, ISendEventResponse } from "matrix-js-sdk/src/matrix";
+import { IEventRelation, ISendEventResponse, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { IEncryptedFile, IMediaEventInfo } from "./customisations/models/IMediaEventContent";
 import dis from './dispatcher/dispatcher';
-import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
-import RoomViewStore from './stores/RoomViewStore';
 import Spinner from "./components/views/elements/Spinner";
 import { Action } from "./dispatcher/actions";
 import {
@@ -42,24 +40,23 @@ import {
     UploadStartedPayload,
 } from "./dispatcher/payloads/UploadPayload";
 import { IUpload } from "./models/IUpload";
-import { BlurhashEncoder } from "./BlurhashEncoder";
 import SettingsStore from "./settings/SettingsStore";
 import { decorateStartSendingTime, sendRoundTripMetric } from "./sendTimePerformanceMetrics";
 import { TimelineRenderingType } from "./contexts/RoomContext";
-
-const MAX_WIDTH = 800;
-const MAX_HEIGHT = 600;
+import { RoomViewStore } from "./stores/RoomViewStore";
+import { addReplyToMessageContent } from "./utils/Reply";
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+import UploadFailureDialog from "./components/views/dialogs/UploadFailureDialog";
+import UploadConfirmDialog from "./components/views/dialogs/UploadConfirmDialog";
+import { createThumbnail } from "./utils/image-media";
+import { attachRelation } from "./components/views/rooms/SendMessageComposer";
 
 // scraped out of a macOS hidpi (5660ppm) screenshot png
 //                  5669 px (x-axis)      , 5669 px (y-axis)      , per metre
 const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
 
-export const BLURHASH_FIELD = "xyz.amorgan.blurhash"; // MSC2448
-
 export class UploadCanceledError extends Error {}
 
-type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
-
 interface IMediaConfig {
     "m.upload.size"?: number;
 }
@@ -75,101 +72,6 @@ interface IContent {
     url?: string;
 }
 
-interface IThumbnail {
-    info: {
-        // eslint-disable-next-line camelcase
-        thumbnail_info: {
-            w: number;
-            h: number;
-            mimetype: string;
-            size: number;
-        };
-        w: number;
-        h: number;
-        [BLURHASH_FIELD]: string;
-    };
-    thumbnail: Blob;
-}
-
-/**
- * Create a thumbnail for a image DOM element.
- * The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
- * The thumbnail will have the same aspect ratio as the original.
- * Draws the element into a canvas using CanvasRenderingContext2D.drawImage
- * Then calls Canvas.toBlob to get a blob object for the image data.
- *
- * Since it needs to calculate the dimensions of the source image and the
- * thumbnailed image it returns an info object filled out with information
- * about the original image and the thumbnail.
- *
- * @param {HTMLElement} element The element to thumbnail.
- * @param {number} inputWidth The width of the image in the input element.
- * @param {number} inputHeight the width of the image in the input element.
- * @param {String} mimeType The mimeType to save the blob as.
- * @return {Promise} A promise that resolves with an object with an info key
- *  and a thumbnail key.
- */
-async function createThumbnail(
-    element: ThumbnailableElement,
-    inputWidth: number,
-    inputHeight: number,
-    mimeType: string,
-): Promise<IThumbnail> {
-    let targetWidth = inputWidth;
-    let targetHeight = inputHeight;
-    if (targetHeight > MAX_HEIGHT) {
-        targetWidth = Math.floor(targetWidth * (MAX_HEIGHT / targetHeight));
-        targetHeight = MAX_HEIGHT;
-    }
-    if (targetWidth > MAX_WIDTH) {
-        targetHeight = Math.floor(targetHeight * (MAX_WIDTH / targetWidth));
-        targetWidth = MAX_WIDTH;
-    }
-
-    let canvas: HTMLCanvasElement | OffscreenCanvas;
-    let context: CanvasRenderingContext2D;
-    try {
-        canvas = new window.OffscreenCanvas(targetWidth, targetHeight);
-        context = canvas.getContext("2d");
-    } catch (e) {
-        // Fallback support for other browsers (Safari and Firefox for now)
-        canvas = document.createElement("canvas");
-        (canvas as HTMLCanvasElement).width = targetWidth;
-        (canvas as HTMLCanvasElement).height = targetHeight;
-        context = canvas.getContext("2d");
-    }
-
-    context.drawImage(element, 0, 0, targetWidth, targetHeight);
-
-    let thumbnailPromise: Promise<Blob>;
-
-    if (window.OffscreenCanvas) {
-        thumbnailPromise = (canvas as OffscreenCanvas).convertToBlob({ type: mimeType });
-    } else {
-        thumbnailPromise = new Promise<Blob>(resolve => (canvas as HTMLCanvasElement).toBlob(resolve, mimeType));
-    }
-
-    const imageData = context.getImageData(0, 0, targetWidth, targetHeight);
-    // thumbnailPromise and blurhash promise are being awaited concurrently
-    const blurhash = await BlurhashEncoder.instance.getBlurhash(imageData);
-    const thumbnail = await thumbnailPromise;
-
-    return {
-        info: {
-            thumbnail_info: {
-                w: targetWidth,
-                h: targetHeight,
-                mimetype: thumbnail.type,
-                size: thumbnail.size,
-            },
-            w: inputWidth,
-            h: inputHeight,
-            [BLURHASH_FIELD]: blurhash,
-        },
-        thumbnail,
-    };
-}
-
 /**
  * Load a file into a newly created image element.
  *
@@ -246,15 +148,20 @@ async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imag
     const result = await createThumbnail(imageElement.img, imageElement.width, imageElement.height, thumbnailType);
     const imageInfo = result.info;
 
-    // we do all sizing checks here because we still rely on thumbnail generation for making a blurhash from.
-    const sizeDifference = imageFile.size - imageInfo.thumbnail_info.size;
-    if (
-        imageFile.size <= IMAGE_SIZE_THRESHOLD_THUMBNAIL || // image is small enough already
-        (sizeDifference <= IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE && // thumbnail is not sufficiently smaller than original
-            sizeDifference <= (imageFile.size * IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT))
-    ) {
-        delete imageInfo["thumbnail_info"];
-        return imageInfo;
+    // For lesser supported image types, always include the thumbnail even if it is larger
+    if (!["image/avif", "image/webp"].includes(imageFile.type)) {
+        // we do all sizing checks here because we still rely on thumbnail generation for making a blurhash from.
+        const sizeDifference = imageFile.size - imageInfo.thumbnail_info.size;
+        if (
+            // image is small enough already
+            imageFile.size <= IMAGE_SIZE_THRESHOLD_THUMBNAIL ||
+            // thumbnail is not sufficiently smaller than original
+            (sizeDifference <= IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE &&
+                sizeDifference <= (imageFile.size * IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT))
+        ) {
+            delete imageInfo["thumbnail_info"];
+            return imageInfo;
+        }
     }
 
     const uploadResult = await uploadFile(matrixClient, roomId, result.thumbnail);
@@ -291,7 +198,14 @@ function loadVideoElement(videoFile): Promise<HTMLVideoElement> {
                 reject(e);
             };
 
-            video.src = ev.target.result as string;
+            let dataUrl = ev.target.result as string;
+            // Chrome chokes on quicktime but likes mp4, and `file.type` is
+            // read only, so do this horrible hack to unbreak quicktime
+            if (dataUrl.startsWith("data:video/quicktime;")) {
+                dataUrl = dataUrl.replace("data:video/quicktime;", "data:video/mp4;");
+            }
+
+            video.src = dataUrl;
             video.load();
             video.play();
         };
@@ -456,25 +370,7 @@ export default class ContentMessages {
             return;
         }
 
-        const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
-        if (isQuoting) {
-            // FIXME: Using an import will result in Element crashing
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const { finished } = Modal.createTrackedDialog<[boolean]>('Upload Reply Warning', '', QuestionDialog, {
-                title: _t('Replying With Files'),
-                description: (
-                    <div>{ _t(
-                        'At this time it is not possible to reply with a file. ' +
-                        'Would you like to upload this file without replying?',
-                    ) }</div>
-                ),
-                hasCancelButton: true,
-                button: _t("Continue"),
-            });
-            const [shouldUpload] = await finished;
-            if (!shouldUpload) return;
-        }
-
+        const replyToEvent = RoomViewStore.instance.getQuotingEvent();
         if (!this.mediaConfig) { // hot-path optimization to not flash a spinner if we don't need to
             const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
             await this.ensureMediaConfigFetched(matrixClient);
@@ -493,8 +389,6 @@ export default class ContentMessages {
         }
 
         if (tooBigFiles.length > 0) {
-            // FIXME: Using an import will result in Element crashing
-            const UploadFailureDialog = sdk.getComponent("dialogs.UploadFailureDialog");
             const { finished } = Modal.createTrackedDialog<[boolean]>('Upload Failure', '', UploadFailureDialog, {
                 badFiles: tooBigFiles,
                 totalFiles: files.length,
@@ -511,8 +405,6 @@ export default class ContentMessages {
         for (let i = 0; i < okFiles.length; ++i) {
             const file = okFiles[i];
             if (!uploadAll) {
-                // FIXME: Using an import will result in Element crashing
-                const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
                 const { finished } = Modal.createTrackedDialog<[boolean, boolean]>('Upload Files confirmation',
                     '', UploadConfirmDialog, {
                         file,
@@ -527,7 +419,16 @@ export default class ContentMessages {
                 }
             }
 
-            promBefore = this.sendContentToRoom(file, roomId, relation, matrixClient, promBefore);
+            promBefore = this.sendContentToRoom(file, roomId, relation, matrixClient, replyToEvent, promBefore);
+        }
+
+        if (replyToEvent) {
+            // Clear event being replied to
+            dis.dispatch({
+                action: "reply_to_event",
+                event: null,
+                context,
+            });
         }
 
         // Focus the correct composer
@@ -568,6 +469,7 @@ export default class ContentMessages {
         roomId: string,
         relation: IEventRelation | undefined,
         matrixClient: MatrixClient,
+        replyToEvent: MatrixEvent | undefined,
         promBefore: Promise<any>,
     ) {
         const content: IContent = {
@@ -578,8 +480,11 @@ export default class ContentMessages {
             msgtype: "", // set later
         };
 
-        if (relation) {
-            content["m.relates_to"] = relation;
+        attachRelation(content, relation);
+        if (replyToEvent) {
+            addReplyToMessageContent(content, replyToEvent, {
+                includeLegacyFallback: false,
+            });
         }
 
         if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {
@@ -658,7 +563,7 @@ export default class ContentMessages {
             return promBefore;
         }).then(function() {
             if (upload.canceled) throw new UploadCanceledError();
-            const threadId = relation?.rel_type === RelationType.Thread
+            const threadId = relation?.rel_type === THREAD_RELATION_TYPE.name
                 ? relation.event_id
                 : null;
             const prom = matrixClient.sendMessage(roomId, threadId, content);
@@ -678,8 +583,6 @@ export default class ContentMessages {
                         { fileName: upload.fileName },
                     );
                 }
-                // FIXME: Using an import will result in Element crashing
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
                     title: _t('Upload Failed'),
                     description: desc,
diff --git a/src/DateUtils.ts b/src/DateUtils.ts
index c9f33b2eee7..20227354f02 100644
--- a/src/DateUtils.ts
+++ b/src/DateUtils.ts
@@ -201,3 +201,25 @@ export function formatRelativeTime(date: Date, showTwelveHour = false): string {
         return relativeDate;
     }
 }
+
+/**
+ * Formats duration in ms to human readable string
+ * Returns value in biggest possible unit (day, hour, min, second)
+ * Rounds values up until unit threshold
+ * ie. 23:13:57 -> 23h, 24:13:57 -> 1d, 44:56:56 -> 2d
+ */
+const MINUTE_MS = 60000;
+const HOUR_MS = MINUTE_MS * 60;
+const DAY_MS = HOUR_MS * 24;
+export function formatDuration(durationMs: number): string {
+    if (durationMs >= DAY_MS) {
+        return _t('%(value)sd', { value: Math.round(durationMs / DAY_MS) });
+    }
+    if (durationMs >= HOUR_MS) {
+        return _t('%(value)sh', { value: Math.round(durationMs / HOUR_MS) });
+    }
+    if (durationMs >= MINUTE_MS) {
+        return _t('%(value)sm', { value: Math.round(durationMs / MINUTE_MS) });
+    }
+    return _t('%(value)ss', { value: Math.round(durationMs / 1000) });
+}
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 05f86453f1f..adba51d1352 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -36,9 +36,9 @@ import {
 } from "./toasts/UnverifiedSessionToast";
 import { accessSecretStorage, isSecretStorageBeingAccessed } from "./SecurityManager";
 import { isSecureBackupRequired } from './utils/WellKnownUtils';
-import { isLoggedIn } from './components/structures/MatrixChat';
 import { ActionPayload } from "./dispatcher/payloads";
 import { Action } from "./dispatcher/actions";
+import { isLoggedIn } from "./utils/login";
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 
diff --git a/src/Editing.ts b/src/Editing.ts
new file mode 100644
index 00000000000..57e58cc2a75
--- /dev/null
+++ b/src/Editing.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { TimelineRenderingType } from "./contexts/RoomContext";
+
+export const editorRoomKey = (roomId: string, context: TimelineRenderingType) => `mx_edit_room_${roomId}_${context}`;
+export const editorStateKey = (eventId: string) => `mx_edit_state_${eventId}`;
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
deleted file mode 100644
index 6430090819d..00000000000
--- a/src/GroupAddressPicker.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import Modal from './Modal';
-import * as sdk from './';
-import MultiInviter from './utils/MultiInviter';
-import { _t } from './languageHandler';
-import { MatrixClientPeg } from './MatrixClientPeg';
-import GroupStore from './stores/GroupStore';
-import StyledCheckbox from './components/views/elements/StyledCheckbox';
-
-export function showGroupInviteDialog(groupId) {
-    return new Promise((resolve, reject) => {
-        const description = <div>
-            <div>{ _t("Who would you like to add to this community?") }</div>
-            <div className="warning">
-                { _t(
-                    "Warning: any person you add to a community will be publicly "+
-                    "visible to anyone who knows the community ID",
-                ) }
-            </div>
-        </div>;
-
-        const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-        Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, {
-            title: _t("Invite new community members"),
-            description: description,
-            placeholder: _t("Name or Matrix ID"),
-            button: _t("Invite to Community"),
-            validAddressTypes: ['mx-user-id'],
-            onFinished: (success, addrs) => {
-                if (!success) return;
-
-                _onGroupInviteFinished(groupId, addrs).then(resolve, reject);
-            },
-        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-    });
-}
-
-export function showGroupAddRoomDialog(groupId) {
-    return new Promise((resolve, reject) => {
-        let addRoomsPublicly = false;
-        const onCheckboxClicked = (e) => {
-            addRoomsPublicly = e.target.checked;
-        };
-        const description = <div>
-            <div>{ _t("Which rooms would you like to add to this community?") }</div>
-        </div>;
-
-        const checkboxContainer = <StyledCheckbox
-            className="mx_GroupAddressPicker_checkboxContainer"
-            onChange={onCheckboxClicked}
-        >
-            { _t("Show these rooms to non-members on the community page and room list?") }
-        </StyledCheckbox>;
-
-        const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-        Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, {
-            title: _t("Add rooms to the community"),
-            description: description,
-            extraNode: checkboxContainer,
-            placeholder: _t("Room name or address"),
-            button: _t("Add to community"),
-            pickerType: 'room',
-            validAddressTypes: ['mx-room-id'],
-            onFinished: (success, addrs) => {
-                if (!success) return;
-
-                _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly).then(resolve, reject);
-            },
-        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-    });
-}
-
-function _onGroupInviteFinished(groupId, addrs) {
-    const multiInviter = new MultiInviter(groupId);
-
-    const addrTexts = addrs.map((addr) => addr.address);
-
-    return multiInviter.invite(addrTexts).then((completionStates) => {
-        // Show user any errors
-        const errorList = [];
-        for (const addr of Object.keys(completionStates)) {
-            if (addrs[addr] === "error") {
-                errorList.push(addr);
-            }
-        }
-
-        if (errorList.length > 0) {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to invite the following users to the group', '', ErrorDialog, {
-                title: _t("Failed to invite the following users to %(groupId)s:", { groupId: groupId }),
-                description: errorList.join(", "),
-            });
-        }
-    }).catch((err) => {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        Modal.createTrackedDialog('Failed to invite users to group', '', ErrorDialog, {
-            title: _t("Failed to invite users to community"),
-            description: _t("Failed to invite users to %(groupId)s", { groupId: groupId }),
-        });
-    });
-}
-
-function _onGroupAddRoomFinished(groupId, addrs, addRoomsPublicly) {
-    const matrixClient = MatrixClientPeg.get();
-    const errorList = [];
-    return Promise.allSettled(addrs.map((addr) => {
-        return GroupStore
-            .addRoomToGroup(groupId, addr.address, addRoomsPublicly)
-            .catch(() => { errorList.push(addr.address); })
-            .then(() => {
-                const roomId = addr.address;
-                const room = matrixClient.getRoom(roomId);
-                // Can the user change related groups?
-                if (!room || !room.currentState.mayClientSendStateEvent("m.room.related_groups", matrixClient)) {
-                    return;
-                }
-                // Get the related groups
-                const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
-                const groups = relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [];
-
-                // Add this group as related
-                if (!groups.includes(groupId)) {
-                    groups.push(groupId);
-                    return MatrixClientPeg.get().sendStateEvent(roomId, 'm.room.related_groups', { groups }, '');
-                }
-            });
-    })).then(() => {
-        if (errorList.length === 0) {
-            return;
-        }
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        Modal.createTrackedDialog(
-            'Failed to add the following room to the group',
-            '',
-            ErrorDialog,
-            {
-                title: _t(
-                    "Failed to add the following rooms to %(groupId)s:",
-                    { groupId },
-                ),
-                description: errorList.join(", "),
-            },
-        );
-    });
-}
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 2f574351c94..ac26eccc718 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -182,7 +182,11 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
             ) {
                 delete attribs.target;
             }
+        } else {
+            // Delete the href attrib if it is falsey
+            delete attribs.href;
         }
+
         attribs.rel = 'noreferrer noopener'; // https://mathiasbynens.github.io/rel-noopener/
         return { tagName, attribs };
     },
@@ -236,6 +240,7 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
         }
         return { tagName, attribs };
     },
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     '*': function(tagName: string, attribs: sanitizeHtml.Attributes) {
         // Delete any style previously assigned, style is an allowedTag for font, span & img,
         // because attributes are stripped after transforming.
diff --git a/src/IConfigOptions.ts b/src/IConfigOptions.ts
new file mode 100644
index 00000000000..cfaeecb75ea
--- /dev/null
+++ b/src/IConfigOptions.ts
@@ -0,0 +1,189 @@
+/*
+Copyright 2016 OpenMarket Ltd
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { IClientWellKnown } from "matrix-js-sdk/src/matrix";
+
+import { ValidatedServerConfig } from "./utils/AutoDiscoveryUtils";
+
+// Convention decision: All config options are lower_snake_case
+// We use an isolated file for the interface so we can mess around with the eslint options.
+
+/* eslint-disable camelcase */
+/* eslint @typescript-eslint/naming-convention: ["error", { "selector": "property", "format": ["snake_case"] } ] */
+
+// see element-web config.md for non-developer docs
+export interface IConfigOptions {
+    // dev note: while true that this is arbitrary JSON, it's valuable to enforce that all
+    // config options are documented for "find all usages" sort of searching.
+    // [key: string]: any;
+
+    // Properties of this interface are roughly grouped by their subject matter, such as
+    // "instance customisation", "login stuff", "branding", etc. Use blank lines to denote
+    // a logical separation of properties, but keep similar ones near each other.
+
+    // Exactly one of the following must be supplied
+    default_server_config?: IClientWellKnown; // copy/paste of client well-known
+    default_server_name?: string; // domain to do well-known lookup on
+    default_hs_url?: string; // http url
+
+    default_is_url?: string; // used in combination with default_hs_url, but for the identity server
+
+    // This is intended to be overridden by app startup and not specified by the user
+    // This is also why it's allowed to have an interface that isn't snake_case
+    validated_server_config?: ValidatedServerConfig;
+
+    fallback_hs_url?: string;
+
+    disable_custom_urls?: boolean;
+    disable_guests?: boolean;
+    disable_login_language_selector?: boolean;
+    disable_3pid_login?: boolean;
+
+    brand: string;
+    branding?: {
+        welcome_background_url?: string | string[]; // chosen at random if array
+        auth_header_logo_url?: string;
+        auth_footer_links?: {text: string, url: string}[];
+    };
+
+    map_style_url?: string; // for location-shared maps
+
+    embedded_pages?: {
+        welcome_url?: string;
+        home_url?: string;
+        login_for_welcome?: boolean;
+    };
+
+    permalink_prefix?: string;
+
+    update_base_url?: string;
+    desktop_builds?: {
+        available: boolean;
+        logo: string; // url
+        url: string; // download url
+    };
+    mobile_builds?: {
+        ios?: string; // download url
+        android?: string; // download url
+        fdroid?: string; // download url
+    };
+
+    mobile_guide_toast?: boolean;
+
+    default_theme?: "light" | "dark" | string; // custom themes are strings
+    default_country_code?: string; // ISO 3166 alpha2 country code
+    default_federate?: boolean;
+    default_device_display_name?: string; // for device naming on login+registration
+
+    setting_defaults?: Record<string, any>; // <SettingName, Value>
+
+    integrations_ui_url?: string;
+    integrations_rest_url?: string;
+    integrations_widgets_urls?: string[];
+
+    show_labs_settings?: boolean;
+    features?: Record<string, boolean>; // <FeatureName, EnabledBool>
+
+    bug_report_endpoint_url?: string; // omission disables bug reporting
+    uisi_autorageshake_app?: string;
+    sentry?: {
+        dsn: string;
+        environment?: string; // "production", etc
+    };
+
+    widget_build_url?: string; // url called to replace jitsi/call widget creation
+    audio_stream_url?: string;
+    jitsi?: {
+        preferred_domain: string;
+    };
+    jitsi_widget?: {
+        skip_built_in_welcome_screen?: boolean;
+    };
+    voip?: {
+        obey_asserted_identity?: boolean; // MSC3086
+    };
+
+    logout_redirect_url?: string;
+
+    // sso_immediate_redirect is deprecated in favour of sso_redirect_options.immediate
+    sso_immediate_redirect?: boolean;
+    sso_redirect_options?: ISsoRedirectOptions;
+
+    custom_translations_url?: string;
+
+    report_event?: {
+        admin_message_md: string; // message for how to contact the server owner when reporting an event
+    };
+
+    welcome_user_id?: string;
+
+    room_directory?: {
+        servers: string[];
+    };
+
+    // piwik (matomo) is deprecated in favour of posthog
+    piwik?: false | {
+        url: string; // piwik instance
+        site_id: string;
+        policy_url: string; // cookie policy
+        whitelisted_hs_urls: string[];
+    };
+    posthog?: {
+        project_api_key: string;
+        api_host: string; // hostname
+    };
+    analytics_owner?: string; // defaults to `brand`
+
+    // Server hosting upsell options
+    hosting_signup_link?: string; // slightly different from `host_signup`
+    host_signup?: {
+        brand?: string; // acts as the enabled flag too (truthy == show)
+
+        // Required-ness denotes when `brand` is truthy
+        cookie_policy_url: string;
+        privacy_policy_url: string;
+        terms_of_service_url: string;
+        url: string;
+        domains?: string[];
+    };
+
+    enable_presence_by_hs_url?: Record<string, boolean>; // <HomeserverName, Enabled>
+
+    terms_and_conditions_links?: { url: string, text: string }[];
+
+    latex_maths_delims?: {
+        inline?: {
+            left?: string;
+            right?: string;
+        };
+        display?: {
+            left?: string;
+            right?: string;
+        };
+    };
+
+    sync_timeline_limit?: number;
+    dangerously_allow_unsafe_and_insecure_passwords?: boolean; // developer option
+
+    // XXX: Undocumented URL for the "Learn more about spaces" link in the "Communities don't exist" messaging.
+    spaces_learn_more_url?: string;
+}
+
+export interface ISsoRedirectOptions {
+    immediate?: boolean;
+    on_welcome_page?: boolean;
+}
diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts
index 5870f6451ea..d4f4ffc6811 100644
--- a/src/KeyBindingsDefaults.ts
+++ b/src/KeyBindingsDefaults.ts
@@ -26,9 +26,9 @@ import {
 import {
     CATEGORIES,
     CategoryName,
-    getKeyboardShortcuts,
     KeyBindingAction,
 } from "./accessibility/KeyboardShortcuts";
+import { getKeyboardShortcuts } from "./accessibility/KeyboardShortcutUtils";
 
 export const getBindingsByCategory = (category: CategoryName): KeyBinding[] => {
     return CATEGORIES[category].settingNames.reduce((bindings, name) => {
@@ -161,7 +161,7 @@ const callBindings = (): KeyBinding[] => {
 };
 
 const labsBindings = (): KeyBinding[] => {
-    if (!SdkConfig.get()['showLabsSettings']) return [];
+    if (!SdkConfig.get("show_labs_settings")) return [];
 
     return getBindingsByCategory(CategoryName.LABS);
 };
diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index 7040898872e..8d7d39fc190 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -45,6 +45,7 @@ export const Key = {
     SLASH: "/",
     SQUARE_BRACKET_LEFT: "[",
     SQUARE_BRACKET_RIGHT: "]",
+    SEMICOLON: ";",
     A: "a",
     B: "b",
     C: "c",
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 85f05358516..f91158c38aa 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -59,10 +59,19 @@ import SessionRestoreErrorDialog from "./components/views/dialogs/SessionRestore
 import StorageEvictedDialog from "./components/views/dialogs/StorageEvictedDialog";
 import { setSentryUser } from "./sentry";
 import SdkConfig from "./SdkConfig";
+import { DialogOpener } from "./utils/DialogOpener";
+import { Action } from "./dispatcher/actions";
 
 const HOMESERVER_URL_KEY = "mx_hs_url";
 const ID_SERVER_URL_KEY = "mx_is_url";
 
+dis.register((payload) => {
+    if (payload.action === Action.TriggerLogout) {
+        // noinspection JSIgnoredPromiseFromCall - we don't care if it fails
+        onLoggedOut();
+    }
+});
+
 interface ILoadSessionOpts {
     enableGuest?: boolean;
     guestHsUrl?: string;
@@ -790,6 +799,7 @@ async function startMatrixClient(startSyncing = true): Promise<void> {
     TypingStore.sharedInstance().reset();
     ToastStore.sharedInstance().reset();
 
+    DialogOpener.instance.prepare();
     Notifier.start();
     UserActivity.sharedInstance().start();
     DMRoomMap.makeShared().start();
@@ -863,8 +873,9 @@ async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void
     Analytics.disable();
 
     if (window.localStorage) {
-        // try to save any 3pid invites from being obliterated
+        // try to save any 3pid invites from being obliterated and registration time
         const pendingInvites = ThreepidInviteStore.instance.getWireInvites();
+        const registrationTime = window.localStorage.getItem("mx_registration_time");
 
         window.localStorage.clear();
 
@@ -874,13 +885,17 @@ async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void
             logger.error("idbDelete failed for account:mx_access_token", e);
         }
 
-        // now restore those invites
+        // now restore those invites and registration time
         if (!opts?.deleteEverything) {
             pendingInvites.forEach(i => {
                 const roomId = i.roomId;
                 delete i.roomId; // delete to avoid confusing the store
                 ThreepidInviteStore.instance.storeInvite(roomId, i);
             });
+
+            if (registrationTime) {
+                window.localStorage.setItem("mx_registration_time", registrationTime);
+            }
         }
     }
 
diff --git a/src/Livestream.ts b/src/Livestream.ts
index b136fbeaea8..ed7b61dd6c7 100644
--- a/src/Livestream.ts
+++ b/src/Livestream.ts
@@ -21,7 +21,7 @@ import SdkConfig from "./SdkConfig";
 import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
 
 export function getConfigLivestreamUrl() {
-    return SdkConfig.get()["audioStreamUrl"];
+    return SdkConfig.get("audio_stream_url");
 }
 
 // Dummy rtmp URL used to signal that we want a special audio-only stream
diff --git a/src/Markdown.ts b/src/Markdown.ts
index e24c9b72870..9f88fbe41f1 100644
--- a/src/Markdown.ts
+++ b/src/Markdown.ts
@@ -153,10 +153,27 @@ export default class Markdown {
                     (node.type === 'text' && node.literal === ' ')
                 ) {
                     text = '';
+                    continue;
                 }
+
+                // Break up text nodes on spaces, so that we don't shoot past them without resetting
                 if (node.type === 'text') {
-                    text += node.literal;
+                    const [thisPart, ...nextParts] = node.literal.split(/( )/);
+                    node.literal = thisPart;
+                    text += thisPart;
+
+                    // Add the remaining parts as siblings
+                    nextParts.reverse().forEach(part => {
+                        if (part) {
+                            const nextNode = new commonmark.Node('text');
+                            nextNode.literal = part;
+                            node.insertAfter(nextNode);
+                            // Make the iterator aware of the newly inserted node
+                            walker.resumeAt(nextNode, true);
+                        }
+                    });
                 }
+
                 // We should not do this if previous node was not a textnode, as we can't combine it then.
                 if ((node.type === 'emph' || node.type === 'strong') && previousNode.type === 'text') {
                     if (event.entering) {
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index c8502b0795e..46d599b156d 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -27,7 +27,6 @@ import { verificationMethods } from 'matrix-js-sdk/src/crypto';
 import { SHOW_QR_CODE_METHOD } from "matrix-js-sdk/src/crypto/verification/QRCode";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
@@ -37,6 +36,7 @@ import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks, tryToUnlockSecretStorageWithDehydrationKey } from './SecurityManager';
 import SecurityCustomisations from "./customisations/Security";
+import CryptoStoreTooNewDialog from "./components/views/dialogs/CryptoStoreTooNewDialog";
 
 export interface IMatrixClientCreds {
     homeserverUrl: string;
@@ -72,11 +72,11 @@ export interface IMatrixClientPeg {
      * If we've registered a user ID we set this to the ID of the
      * user we've just registered. If they then go & log in, we
      * can send them to the welcome user (obviously this doesn't
-     * guarentee they'll get a chat with the welcome user).
+     * guarantee they'll get a chat with the welcome user).
      *
      * @param {string} uid The user ID of the user we've just registered
      */
-    setJustRegisteredUserId(uid: string): void;
+    setJustRegisteredUserId(uid: string | null): void;
 
     /**
      * Returns true if the current user has just been registered by this
@@ -117,7 +117,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
     };
 
     private matrixClient: MatrixClient = null;
-    private justRegisteredUserId: string;
+    private justRegisteredUserId: string | null = null;
 
     // the credentials used to init the current client object.
     // used if we tear it down & recreate it with a different store
@@ -136,10 +136,11 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         MatrixActionCreators.stop();
     }
 
-    public setJustRegisteredUserId(uid: string): void {
+    public setJustRegisteredUserId(uid: string | null): void {
         this.justRegisteredUserId = uid;
         if (uid) {
-            window.localStorage.setItem("mx_registration_time", String(new Date().getTime()));
+            const registrationTime = Date.now().toString();
+            window.localStorage.setItem("mx_registration_time", registrationTime);
         }
     }
 
@@ -151,9 +152,14 @@ class MatrixClientPegClass implements IMatrixClientPeg {
     }
 
     public userRegisteredWithinLastHours(hours: number): boolean {
+        if (hours <= 0) {
+            return false;
+        }
+
         try {
-            const date = new Date(window.localStorage.getItem("mx_registration_time"));
-            return ((new Date().getTime() - date.getTime()) / 36e5) <= hours;
+            const registrationTime = parseInt(window.localStorage.getItem("mx_registration_time"), 10);
+            const diff = Date.now() - registrationTime;
+            return (diff / 36e5) <= hours;
         } catch (e) {
             return false;
         }
@@ -200,9 +206,6 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         } catch (e) {
             if (e && e.name === 'InvalidCryptoStoreError') {
                 // The js-sdk found a crypto DB too new for it to use
-                // FIXME: Using an import will result in test failures
-                const CryptoStoreTooNewDialog =
-                    sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
                 Modal.createDialog(CryptoStoreTooNewDialog);
             }
             // this can happen for a number of reasons, the most likely being
diff --git a/src/Notifier.ts b/src/Notifier.ts
index c5383488f2f..62e2f093703 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -22,7 +22,7 @@ import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
 import { ClientEvent } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
 import { MsgType } from "matrix-js-sdk/src/@types/event";
-import { LOCATION_EVENT_TYPE } from "matrix-js-sdk/src/@types/location";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import SdkConfig from './SdkConfig';
@@ -37,7 +37,7 @@ import SettingsStore from "./settings/SettingsStore";
 import { hideToast as hideNotificationsToast } from "./toasts/DesktopNotificationsToast";
 import { SettingLevel } from "./settings/SettingLevel";
 import { isPushNotifyDisabled } from "./settings/controllers/NotificationControllers";
-import RoomViewStore from "./stores/RoomViewStore";
+import { RoomViewStore } from "./stores/RoomViewStore";
 import UserActivity from "./UserActivity";
 import { mediaFromMxc } from "./customisations/Media";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
@@ -64,10 +64,10 @@ const msgTypeHandlers = {
         const name = (event.sender || {}).name;
         return _t("%(name)s is requesting verification", { name });
     },
-    [LOCATION_EVENT_TYPE.name]: (event: MatrixEvent) => {
+    [M_LOCATION.name]: (event: MatrixEvent) => {
         return TextForEvent.textForLocationEvent(event)();
     },
-    [LOCATION_EVENT_TYPE.altName]: (event: MatrixEvent) => {
+    [M_LOCATION.altName]: (event: MatrixEvent) => {
         return TextForEvent.textForLocationEvent(event)();
     },
 };
@@ -401,7 +401,7 @@ export const Notifier = {
 
         const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
         if (actions?.notify) {
-            if (RoomViewStore.getRoomId() === room.roomId &&
+            if (RoomViewStore.instance.getRoomId() === room.roomId &&
                 UserActivity.sharedInstance().userActiveRecently() &&
                 !Modal.hasDialogs()
             ) {
diff --git a/src/PageTypes.ts b/src/PageTypes.ts
index 0e4944efc95..fb0424f6e05 100644
--- a/src/PageTypes.ts
+++ b/src/PageTypes.ts
@@ -20,8 +20,7 @@ enum PageType {
     HomePage = "home_page",
     RoomView = "room_view",
     UserView = "user_view",
-    GroupView = "group_view",
-    MyGroups = "my_groups",
+    LegacyGroupView = "legacy_group_view",
 }
 
 export default PageType;
diff --git a/src/PasswordReset.ts b/src/PasswordReset.ts
index 7b0b6f9f846..df812bafb2c 100644
--- a/src/PasswordReset.ts
+++ b/src/PasswordReset.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@ import { _t } from './languageHandler';
 export default class PasswordReset {
     private client: MatrixClient;
     private clientSecret: string;
-    private identityServerDomain: string;
     private password: string;
     private sessionId: string;
+    private logoutDevices: boolean;
 
     /**
      * Configure the endpoints for password resetting.
@@ -44,7 +44,6 @@ export default class PasswordReset {
             idBaseUrl: identityUrl,
         });
         this.clientSecret = this.client.generateClientSecret();
-        this.identityServerDomain = identityUrl ? identityUrl.split("://")[1] : null;
     }
 
     /**
@@ -52,10 +51,16 @@ export default class PasswordReset {
      * sending an email to the provided email address.
      * @param {string} emailAddress The email address
      * @param {string} newPassword The new password for the account.
+     * @param {boolean} logoutDevices Should all devices be signed out after the reset? Defaults to `true`.
      * @return {Promise} Resolves when the email has been sent. Then call checkEmailLinkClicked().
      */
-    public resetPassword(emailAddress: string, newPassword: string): Promise<IRequestTokenResponse> {
+    public resetPassword(
+        emailAddress: string,
+        newPassword: string,
+        logoutDevices = true,
+    ): Promise<IRequestTokenResponse> {
         this.password = newPassword;
+        this.logoutDevices = logoutDevices;
         return this.client.requestPasswordEmailToken(emailAddress, this.clientSecret, 1).then((res) => {
             this.sessionId = res.sid;
             return res;
@@ -92,7 +97,7 @@ export default class PasswordReset {
                 // See https://github.com/matrix-org/matrix-doc/issues/2220
                 threepid_creds: creds,
                 threepidCreds: creds,
-            }, this.password);
+            }, this.password, this.logoutDevices);
         } catch (err) {
             if (err.httpStatus === 401) {
                 err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
diff --git a/src/PosthogAnalytics.ts b/src/PosthogAnalytics.ts
index 3b2ae009aec..3ce8707d1c2 100644
--- a/src/PosthogAnalytics.ts
+++ b/src/PosthogAnalytics.ts
@@ -18,6 +18,7 @@ import posthog, { PostHog } from 'posthog-js';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
 import { UserProperties } from "matrix-analytics-events/types/typescript/UserProperties";
+import { Signup } from 'matrix-analytics-events/types/typescript/Signup';
 
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';
@@ -41,7 +42,7 @@ import { ScreenName } from "./PosthogTrackers";
  * - If both flags are false or not set, events are not sent.
  */
 
-interface IEvent {
+export interface IPosthogEvent {
     // The event name that will be used by PostHog. Event names should use camelCase.
     eventName: string;
 
@@ -50,6 +51,10 @@ interface IEvent {
     "$set_once"?: void;
 }
 
+export interface IPostHogEventOptions {
+    timestamp?: Date;
+}
+
 export enum Anonymity {
     Disabled,
     Anonymous,
@@ -58,7 +63,7 @@ export enum Anonymity {
 
 const whitelistedScreens = new Set([
     "register", "login", "forgot_password", "soft_logout", "new", "settings", "welcome", "home", "start", "directory",
-    "start_sso", "start_cas", "groups", "complete_security", "post_registration", "room", "user", "group",
+    "start_sso", "start_cas", "complete_security", "post_registration", "room", "user",
 ]);
 
 export function getRedactedCurrentLocation(
@@ -117,6 +122,7 @@ export class PosthogAnalytics {
     private static ANALYTICS_EVENT_TYPE = "im.vector.analytics";
     private propertiesForNextEvent: Partial<Record<"$set" | "$set_once", UserProperties>> = {};
     private userPropertyCache: UserProperties = {};
+    private authenticationType: Signup["authenticationType"] = "Other";
 
     public static get instance(): PosthogAnalytics {
         if (!this._instance) {
@@ -126,10 +132,10 @@ export class PosthogAnalytics {
     }
 
     constructor(private readonly posthog: PostHog) {
-        const posthogConfig = SdkConfig.get()["posthog"];
+        const posthogConfig = SdkConfig.getObject("posthog");
         if (posthogConfig) {
-            this.posthog.init(posthogConfig.projectApiKey, {
-                api_host: posthogConfig.apiHost,
+            this.posthog.init(posthogConfig.get("project_api_key"), {
+                api_host: posthogConfig.get("api_host"),
                 autocapture: false,
                 mask_all_text: true,
                 mask_all_element_attributes: true,
@@ -200,16 +206,20 @@ export class PosthogAnalytics {
         };
     }
 
-    private capture(eventName: string, properties: posthog.Properties) {
+    // eslint-disable-nextline no-unused-varsx
+    private capture(eventName: string, properties: posthog.Properties, options?: IPostHogEventOptions) {
         if (!this.enabled) {
             return;
         }
         const { origin, hash, pathname } = window.location;
         properties["redactedCurrentUrl"] = getRedactedCurrentLocation(origin, hash, pathname);
-        this.posthog.capture(eventName, {
-            ...this.propertiesForNextEvent,
-            ...properties,
-        });
+        this.posthog.capture(
+            eventName,
+            { ...this.propertiesForNextEvent, ...properties },
+            // TODO: Uncomment below once https://github.com/PostHog/posthog-js/pull/391
+            // gets merged
+            /* options as any, */ // No proper type definition in the posthog library
+        );
         this.propertiesForNextEvent = {};
     }
 
@@ -272,9 +282,12 @@ export class PosthogAnalytics {
         this.setAnonymity(Anonymity.Disabled);
     }
 
-    public trackEvent<E extends IEvent>({ eventName, ...properties }: E): void {
+    public trackEvent<E extends IPosthogEvent>(
+        { eventName, ...properties }: E,
+        options?: IPostHogEventOptions,
+    ): void {
         if (this.anonymity == Anonymity.Disabled || this.anonymity == Anonymity.Anonymous) return;
-        this.capture(eventName, properties);
+        this.capture(eventName, properties, options);
     }
 
     public setProperty<K extends keyof UserProperties>(key: K, value: UserProperties[K]): void {
@@ -313,6 +326,9 @@ export class PosthogAnalytics {
         this.setAnonymity(anonymity);
         if (anonymity === Anonymity.Pseudonymous) {
             await this.identifyUser(MatrixClientPeg.get(), PosthogAnalytics.getRandomAnalyticsId);
+            if (MatrixClientPeg.currentUserIsJustRegistered()) {
+                this.trackNewUserEvent();
+            }
         }
 
         if (anonymity !== Anonymity.Disabled) {
@@ -334,4 +350,25 @@ export class PosthogAnalytics {
                 this.updateAnonymityFromSettings(!!newValue);
             });
     }
+
+    public setAuthenticationType(authenticationType: Signup["authenticationType"]): void {
+        this.authenticationType = authenticationType;
+    }
+
+    private trackNewUserEvent(): void {
+        // This is the only event that could have occured before analytics opt-in
+        // that we want to accumulate before the user has given consent
+        // All other scenarios should not track a user before they have given
+        // explicit consent that they are ok with their analytics data being collected
+        const options: IPostHogEventOptions = {};
+        const registrationTime = parseInt(window.localStorage.getItem("mx_registration_time"), 10);
+        if (!isNaN(registrationTime)) {
+            options.timestamp = new Date(registrationTime);
+        }
+
+        return this.trackEvent<Signup>({
+            eventName: "Signup",
+            authenticationType: this.authenticationType,
+        }, options);
+    }
 }
diff --git a/src/PosthogTrackers.ts b/src/PosthogTrackers.ts
index b07ba5569c8..434d142c8cd 100644
--- a/src/PosthogTrackers.ts
+++ b/src/PosthogTrackers.ts
@@ -40,8 +40,7 @@ const loggedInPageTypeMap: Record<PageType, ScreenName> = {
     [PageType.HomePage]: "Home",
     [PageType.RoomView]: "Room",
     [PageType.UserView]: "User",
-    [PageType.GroupView]: "Group",
-    [PageType.MyGroups]: "MyGroups",
+    [PageType.LegacyGroupView]: "Group",
 };
 
 export default class PosthogTrackers {
diff --git a/src/RoomInvite.tsx b/src/RoomInvite.tsx
index a6eefaeb81c..200da2f7cf8 100644
--- a/src/RoomInvite.tsx
+++ b/src/RoomInvite.tsx
@@ -24,12 +24,12 @@ import { MatrixClientPeg } from './MatrixClientPeg';
 import MultiInviter, { CompletionStates } from './utils/MultiInviter';
 import Modal from './Modal';
 import { _t } from './languageHandler';
-import InviteDialog, { KIND_DM, KIND_INVITE, Member } from "./components/views/dialogs/InviteDialog";
-import CommunityPrototypeInviteDialog from "./components/views/dialogs/CommunityPrototypeInviteDialog";
-import { CommunityPrototypeStore } from "./stores/CommunityPrototypeStore";
+import InviteDialog from "./components/views/dialogs/InviteDialog";
 import BaseAvatar from "./components/views/avatars/BaseAvatar";
 import { mediaFromMxc } from "./customisations/Media";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+import { KIND_DM, KIND_INVITE } from "./components/views/dialogs/InviteDialogTypes";
+import { Member } from "./utils/direct-messages";
 
 export interface IInviteResult {
     states: CompletionStates;
@@ -78,23 +78,6 @@ export function showRoomInviteDialog(roomId: string, initialText = ""): void {
     );
 }
 
-export function showCommunityRoomInviteDialog(roomId: string, communityName: string): void {
-    Modal.createTrackedDialog(
-        'Invite Users to Community', '', CommunityPrototypeInviteDialog, { communityName, roomId },
-        /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
-    );
-}
-
-export function showCommunityInviteDialog(communityId: string): void {
-    const chat = CommunityPrototypeStore.instance.getGeneralChat(communityId);
-    if (chat) {
-        const name = CommunityPrototypeStore.instance.getCommunityName(communityId);
-        showCommunityRoomInviteDialog(chat.roomId, name);
-    } else {
-        throw new Error("Failed to locate appropriate room to start an invite in");
-    }
-}
-
 /**
  * Checks if the given MatrixEvent is a valid 3rd party user invite.
  * @param {MatrixEvent} event The event to check
@@ -144,7 +127,7 @@ export function showAnyInviteErrors(
         // user. This usually means that no other users were attempted, making it
         // pointless for us to list who failed exactly.
         Modal.createTrackedDialog('Failed to invite users to the room', '', ErrorDialog, {
-            title: _t("Failed to invite users to the room:", { roomName: room.name }),
+            title: _t("Failed to invite users to %(roomName)s", { roomName: room.name }),
             description: inviter.getErrorText(failedUsers[0]),
         });
         return false;
diff --git a/src/Rooms.ts b/src/Rooms.ts
index 9bb43c3d8c5..32419080acf 100644
--- a/src/Rooms.ts
+++ b/src/Rooms.ts
@@ -19,9 +19,6 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import AliasCustomisations from './customisations/Alias';
-import DMRoomMap from "./utils/DMRoomMap";
-import SpaceStore from "./stores/spaces/SpaceStore";
-import { _t } from "./languageHandler";
 
 /**
  * Given a room object, return the alias we should use for it,
@@ -157,48 +154,3 @@ function guessDMRoomTargetId(room: Room, myUserId: string): string {
     if (oldestUser === undefined) return myUserId;
     return oldestUser.userId;
 }
-
-export function spaceContextDetailsText(space: Room): string {
-    if (!space.isSpaceRoom()) return undefined;
-
-    const [parent, secondParent, ...otherParents] = SpaceStore.instance.getKnownParents(space.roomId);
-    if (secondParent && !otherParents?.length) {
-        // exactly 2 edge case for improved i18n
-        return _t("%(space1Name)s and %(space2Name)s", {
-            space1Name: space.client.getRoom(parent)?.name,
-            space2Name: space.client.getRoom(secondParent)?.name,
-        });
-    } else if (parent) {
-        return _t("%(spaceName)s and %(count)s others", {
-            spaceName: space.client.getRoom(parent)?.name,
-            count: otherParents.length,
-        });
-    }
-
-    return space.getCanonicalAlias();
-}
-
-export function roomContextDetailsText(room: Room): string {
-    if (room.isSpaceRoom()) return undefined;
-
-    const dmPartner = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
-    if (dmPartner) {
-        return dmPartner;
-    }
-
-    const [parent, secondParent, ...otherParents] = SpaceStore.instance.getKnownParents(room.roomId);
-    if (secondParent && !otherParents?.length) {
-        // exactly 2 edge case for improved i18n
-        return _t("%(space1Name)s and %(space2Name)s", {
-            space1Name: room.client.getRoom(parent)?.name,
-            space2Name: room.client.getRoom(secondParent)?.name,
-        });
-    } else if (parent) {
-        return _t("%(spaceName)s and %(count)s others", {
-            spaceName: room.client.getRoom(parent)?.name,
-            count: otherParents.length,
-        });
-    }
-
-    return room.getCanonicalAlias();
-}
diff --git a/src/ScalarAuthClient.ts b/src/ScalarAuthClient.ts
index 9d71bf5b053..b1fb6e44f4d 100644
--- a/src/ScalarAuthClient.ts
+++ b/src/ScalarAuthClient.ts
@@ -44,8 +44,8 @@ export default class ScalarAuthClient {
 
         // We try and store the token on a per-manager basis, but need a fallback
         // for the default manager.
-        const configApiUrl = SdkConfig.get()['integrations_rest_url'];
-        const configUiUrl = SdkConfig.get()['integrations_ui_url'];
+        const configApiUrl = SdkConfig.get("integrations_rest_url");
+        const configUiUrl = SdkConfig.get("integrations_ui_url");
         this.isDefaultManager = apiUrl === configApiUrl && configUiUrl === uiUrl;
     }
 
diff --git a/src/ScalarMessaging.ts b/src/ScalarMessaging.ts
index b0b8b3a0d4e..a380c760b56 100644
--- a/src/ScalarMessaging.ts
+++ b/src/ScalarMessaging.ts
@@ -241,7 +241,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
-import RoomViewStore from './stores/RoomViewStore';
+import { RoomViewStore } from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 import { IntegrationManagers } from "./integrations/IntegrationManagers";
 import { WidgetType } from "./widgets/WidgetType";
@@ -638,7 +638,7 @@ const onMessage = function(event: MessageEvent<any>): void {
         }
     }
 
-    if (roomId !== RoomViewStore.getRoomId()) {
+    if (roomId !== RoomViewStore.instance.getRoomId()) {
         sendError(event, _t('Room %(roomId)s not visible', { roomId: roomId }));
         return;
     }
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index c4387d1f237..93b89a92eac 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,61 +15,71 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export interface ISsoRedirectOptions {
-    immediate?: boolean;
-    on_welcome_page?: boolean; // eslint-disable-line camelcase
-}
-
-/* eslint-disable camelcase */
-export interface ConfigOptions {
-    [key: string]: any;
-
-    logout_redirect_url?: string;
+import { Optional } from "matrix-events-sdk";
 
-    // sso_immediate_redirect is deprecated in favour of sso_redirect_options.immediate
-    sso_immediate_redirect?: boolean;
-    sso_redirect_options?: ISsoRedirectOptions;
+import { SnakedObject } from "./utils/SnakedObject";
+import { IConfigOptions, ISsoRedirectOptions } from "./IConfigOptions";
+import { KeysWithObjectShape } from "./@types/common";
 
-    custom_translations_url?: string;
-}
-/* eslint-enable camelcase*/
-
-export const DEFAULTS: ConfigOptions = {
-    // Brand name of the app
+// see element-web config.md for docs, or the IConfigOptions interface for dev docs
+export const DEFAULTS: IConfigOptions = {
     brand: "Element",
-    // URL to a page we show in an iframe to configure integrations
     integrations_ui_url: "https://scalar.vector.im/",
-    // Base URL to the REST interface of the integrations server
     integrations_rest_url: "https://scalar.vector.im/api",
-    // Where to send bug reports. If not specified, bugs cannot be sent.
     bug_report_endpoint_url: null,
-    // Jitsi conference options
     jitsi: {
-        // Default conference domain
-        preferredDomain: "meet.element.io",
+        preferred_domain: "meet.element.io",
     },
+
+    // @ts-ignore - we deliberately use the camelCase version here so we trigger
+    // the fallback behaviour. If we used the snake_case version then we'd break
+    // everyone's config which has the camelCase property because our default would
+    // be preferred over their config.
     desktopBuilds: {
         available: true,
         logo: require("../res/img/element-desktop-logo.svg").default,
         url: "https://element.io/get-started",
     },
+    spaces_learn_more_url: "https://element.io/blog/spaces-blast-out-of-beta/",
 };
 
 export default class SdkConfig {
-    private static instance: ConfigOptions;
+    private static instance: IConfigOptions;
+    private static fallback: SnakedObject<IConfigOptions>;
 
-    private static setInstance(i: ConfigOptions) {
+    private static setInstance(i: IConfigOptions) {
         SdkConfig.instance = i;
+        SdkConfig.fallback = new SnakedObject(i);
 
         // For debugging purposes
         window.mxReactSdkConfig = i;
     }
 
-    public static get() {
-        return SdkConfig.instance || {};
+    public static get(): IConfigOptions;
+    public static get<K extends keyof IConfigOptions>(key: K, altCaseName?: string): IConfigOptions[K];
+    public static get<K extends keyof IConfigOptions = never>(
+        key?: K, altCaseName?: string,
+    ): IConfigOptions | IConfigOptions[K] {
+        if (key === undefined) {
+            // safe to cast as a fallback - we want to break the runtime contract in this case
+            return SdkConfig.instance || <IConfigOptions>{};
+        }
+        return SdkConfig.fallback.get(key, altCaseName);
+    }
+
+    public static getObject<K extends KeysWithObjectShape<IConfigOptions>>(
+        key: K, altCaseName?: string,
+    ): Optional<SnakedObject<IConfigOptions[K]>> {
+        const val = SdkConfig.get(key, altCaseName);
+        if (val !== null && val !== undefined) {
+            return new SnakedObject(val);
+        }
+
+        // return the same type for sensitive callers (some want `undefined` specifically)
+        return val === undefined ? undefined : null;
     }
 
-    public static put(cfg: ConfigOptions) {
+    public static put(cfg: IConfigOptions) {
         const defaultKeys = Object.keys(DEFAULTS);
         for (let i = 0; i < defaultKeys.length; ++i) {
             if (cfg[defaultKeys[i]] === undefined) {
@@ -79,18 +89,21 @@ export default class SdkConfig {
         SdkConfig.setInstance(cfg);
     }
 
+    /**
+     * Resets the config to be completely empty.
+     */
     public static unset() {
-        SdkConfig.setInstance({});
+        SdkConfig.setInstance(<IConfigOptions>{}); // safe to cast - defaults will be applied
     }
 
-    public static add(cfg: ConfigOptions) {
+    public static add(cfg: Partial<IConfigOptions>) {
         const liveConfig = SdkConfig.get();
         const newConfig = Object.assign({}, liveConfig, cfg);
         SdkConfig.put(newConfig);
     }
 }
 
-export function parseSsoRedirectOptions(config: ConfigOptions): ISsoRedirectOptions {
+export function parseSsoRedirectOptions(config: IConfigOptions): ISsoRedirectOptions {
     // Ignore deprecated options if the config is using new ones
     if (config.sso_redirect_options) return config.sso_redirect_options;
 
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index 0383b50fc41..f3d254d0590 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -25,7 +25,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { ComponentType } from "react";
 
 import Modal from './Modal';
-import * as sdk from './index';
 import { MatrixClientPeg } from './MatrixClientPeg';
 import { _t } from './languageHandler';
 import { isSecureBackupRequired } from './utils/WellKnownUtils';
@@ -34,6 +33,7 @@ import RestoreKeyBackupDialog from './components/views/dialogs/security/RestoreK
 import SettingsStore from "./settings/SettingsStore";
 import SecurityCustomisations from "./customisations/Security";
 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
 // only meant to act as a cache to avoid prompting the user multiple times
@@ -360,8 +360,6 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
                 throw new Error("Secret storage creation canceled");
             }
         } else {
-            // FIXME: Using an import will result in test failures
-            const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
             await cli.bootstrapCrossSigning({
                 authUploadDeviceSigningKeys: async (makeRequest) => {
                     const { finished } = Modal.createTrackedDialog(
diff --git a/src/Skinner.ts b/src/Skinner.ts
deleted file mode 100644
index 6b20781b598..00000000000
--- a/src/Skinner.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-
-export interface IComponents {
-    [key: string]: React.Component;
-}
-
-export interface ISkinObject {
-    components: IComponents;
-}
-
-export class Skinner {
-    public components: IComponents = null;
-
-    public getComponent(name: string): React.Component {
-        if (!name) throw new Error(`Invalid component name: ${name}`);
-        if (this.components === null) {
-            throw new Error(
-                `Attempted to get a component (${name}) before a skin has been loaded.`+
-                " This is probably because either:"+
-                " a) Your app has not called sdk.loadSkin(), or"+
-                " b) A component has called getComponent at the root level",
-            );
-        }
-
-        const doLookup = (components: IComponents): React.Component => {
-            if (!components) return null;
-            let comp = components[name];
-            // XXX: Temporarily also try 'views.' as we're currently
-            // leaving the 'views.' off views.
-            if (!comp) {
-                comp = components['views.' + name];
-            }
-            return comp;
-        };
-
-        // Check the skin first
-        const comp = doLookup(this.components);
-
-        // Just return nothing instead of erroring - the consumer should be smart enough to
-        // handle this at this point.
-        if (!comp) {
-            return null;
-        }
-
-        // components have to be functions or forwardRef objects with a render function.
-        const validType = typeof comp === 'function' || comp.render;
-        if (!validType) {
-            throw new Error(`Not a valid component: ${name} (type = ${typeof(comp)}).`);
-        }
-        return comp;
-    }
-
-    public load(skinObject: ISkinObject): void {
-        if (this.components !== null) {
-            throw new Error(
-                "Attempted to load a skin while a skin is already loaded"+
-                "If you want to change the active skin, call resetSkin first");
-        }
-        this.components = {};
-        const compKeys = Object.keys(skinObject.components);
-        for (let i = 0; i < compKeys.length; ++i) {
-            const comp = skinObject.components[compKeys[i]];
-            this.addComponent(compKeys[i], comp);
-        }
-
-        // Now that we have a skin, load our components too
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const idx = require("./component-index");
-        if (!idx || !idx.components) throw new Error("Invalid react-sdk component index");
-        for (const c in idx.components) {
-            if (!this.components[c]) this.components[c] = idx.components[c];
-        }
-    }
-
-    public addComponent(name: string, comp: any) {
-        let slot = name;
-        if (comp.replaces !== undefined) {
-            if (comp.replaces.indexOf('.') > -1) {
-                slot = comp.replaces;
-            } else {
-                slot = name.substr(0, name.lastIndexOf('.') + 1) + comp.replaces.split('.').pop();
-            }
-        }
-        this.components[slot] = comp;
-    }
-
-    public reset(): void {
-        this.components = null;
-    }
-}
-
-// We define one Skinner globally, because the intention is
-// very much that it is a singleton. Relying on there only being one
-// copy of the module can be dicey and not work as browserify's
-// behaviour with multiple copies of files etc. is erratic at best.
-// XXX: We can still end up with the same file twice in the resulting
-// JS bundle which is nonideal.
-// See https://derickbailey.com/2016/03/09/creating-a-true-singleton-in-node-js-with-es6-symbols/
-// or https://nodejs.org/api/modules.html#modules_module_caching_caveats
-// ("Modules are cached based on their resolved filename")
-if (window.mxSkinner === undefined) {
-    window.mxSkinner = new Skinner();
-}
-export default window.mxSkinner;
-
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 9bb90e607a5..4227577d203 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -46,7 +46,7 @@ import BugReportDialog from "./components/views/dialogs/BugReportDialog";
 import { ensureDMExists } from "./createRoom";
 import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload";
 import { Action } from "./dispatcher/actions";
-import { EffectiveMembership, getEffectiveMembership, leaveRoomBehaviour } from "./utils/membership";
+import { EffectiveMembership, getEffectiveMembership } from "./utils/membership";
 import SdkConfig from "./SdkConfig";
 import SettingsStore from "./settings/SettingsStore";
 import { UIComponent, UIFeature } from "./settings/UIFeature";
@@ -61,11 +61,12 @@ import InfoDialog from "./components/views/dialogs/InfoDialog";
 import SlashCommandHelpDialog from "./components/views/dialogs/SlashCommandHelpDialog";
 import { shouldShowComponent } from "./customisations/helpers/UIComponents";
 import { TimelineRenderingType } from './contexts/RoomContext';
-import RoomViewStore from "./stores/RoomViewStore";
+import { RoomViewStore } from "./stores/RoomViewStore";
 import { XOR } from "./@types/common";
 import { PosthogAnalytics } from "./PosthogAnalytics";
 import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
 import VoipUserMapper from './VoipUserMapper';
+import { leaveRoomBehaviour } from "./utils/leave-behaviour";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -153,13 +154,11 @@ export class Command {
     public run(roomId: string, threadId: string, args: string): RunResult {
         // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
         if (!this.runFn) {
-            reject(
+            return reject(
                 newTranslatableError(
                     "Command error: Unable to handle slash command.",
                 ),
             );
-
-            return;
         }
 
         const renderingType = threadId
@@ -322,8 +321,8 @@ export const Commands = [
     }),
     new Command({
         command: 'jumptodate',
-        args: '<date>',
-        description: _td('Jump to the given date in the timeline (YYYY-MM-DD)'),
+        args: '<YYYY-MM-DD>',
+        description: _td('Jump to the given date in the timeline'),
         isEnabled: () => SettingsStore.getValue("feature_jump_to_date"),
         runFn: function(roomId, args) {
             if (args) {
@@ -641,7 +640,7 @@ export const Commands = [
                         return reject(this.getUsage());
                     }
 
-                    // If for some reason someone wanted to join a group or user, we should
+                    // If for some reason someone wanted to join a user, we should
                     // stop them now.
                     if (!permalinkParts.roomIdOrAlias) {
                         return reject(this.getUsage());
@@ -853,7 +852,7 @@ export const Commands = [
         description: _td('Define the power level of a user'),
         isEnabled(): boolean {
             const cli = MatrixClientPeg.get();
-            const room = cli.getRoom(RoomViewStore.getRoomId());
+            const room = cli.getRoom(RoomViewStore.instance.getRoomId());
             return room?.currentState.maySendStateEvent(EventType.RoomPowerLevels, cli.getUserId());
         },
         runFn: function(roomId, args) {
@@ -893,7 +892,7 @@ export const Commands = [
         description: _td('Deops user with given id'),
         isEnabled(): boolean {
             const cli = MatrixClientPeg.get();
-            const room = cli.getRoom(RoomViewStore.getRoomId());
+            const room = cli.getRoom(RoomViewStore.instance.getRoomId());
             return room?.currentState.maySendStateEvent(EventType.RoomPowerLevels, cli.getUserId());
         },
         runFn: function(roomId, args) {
@@ -924,7 +923,7 @@ export const Commands = [
         command: 'devtools',
         description: _td('Opens the Developer Tools dialog'),
         runFn: function(roomId) {
-            Modal.createDialog(DevtoolsDialog, { roomId });
+            Modal.createDialog(DevtoolsDialog, { roomId }, "mx_DevtoolsDialog_wrapper");
             return success();
         },
         category: CommandCategories.advanced,
diff --git a/src/Terms.ts b/src/Terms.ts
index 4b1480f536a..aa94309ae35 100644
--- a/src/Terms.ts
+++ b/src/Terms.ts
@@ -19,8 +19,8 @@ import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
-import * as sdk from '.';
 import Modal from './Modal';
+import TermsDialog from "./components/views/dialogs/TermsDialog";
 
 export class TermsNotSignedError extends Error {}
 
@@ -189,8 +189,6 @@ export async function dialogTermsInteractionCallback(
     extraClassNames?: string,
 ): Promise<string[]> {
     logger.log("Terms that need agreement", policiesAndServicePairs);
-    // FIXME: Using an import will result in test failures
-    const TermsDialog = sdk.getComponent("views.dialogs.TermsDialog");
 
     const { finished } = Modal.createTrackedDialog<[boolean, string[]]>('Terms of Service', '', TermsDialog, {
         policiesAndServicePairs,
diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
index 49da76b8b85..bb6d9eab3c7 100644
--- a/src/TextForEvent.tsx
+++ b/src/TextForEvent.tsx
@@ -29,7 +29,7 @@ import {
     M_POLL_END,
     PollStartEvent,
 } from "matrix-events-sdk";
-import { LOCATION_EVENT_TYPE } from "matrix-js-sdk/src/@types/location";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 
 import { _t } from './languageHandler';
 import * as Roles from './Roles';
@@ -274,36 +274,6 @@ function textForGuestAccessEvent(ev: MatrixEvent): () => string | null {
     }
 }
 
-function textForRelatedGroupsEvent(ev: MatrixEvent): () => string | null {
-    const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const groups = ev.getContent().groups || [];
-    const prevGroups = ev.getPrevContent().groups || [];
-    const added = groups.filter((g) => !prevGroups.includes(g));
-    const removed = prevGroups.filter((g) => !groups.includes(g));
-
-    if (added.length && !removed.length) {
-        return () => _t('%(senderDisplayName)s enabled flair for %(groups)s in this room.', {
-            senderDisplayName,
-            groups: added.join(', '),
-        });
-    } else if (!added.length && removed.length) {
-        return () => _t('%(senderDisplayName)s disabled flair for %(groups)s in this room.', {
-            senderDisplayName,
-            groups: removed.join(', '),
-        });
-    } else if (added.length && removed.length) {
-        return () => _t('%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for ' +
-            '%(oldGroups)s in this room.', {
-            senderDisplayName,
-            newGroups: added.join(', '),
-            oldGroups: removed.join(', '),
-        });
-    } else {
-        // Don't bother rendering this change (because there were no changes)
-        return null;
-    }
-}
-
 function textForServerACLEvent(ev: MatrixEvent): () => string | null {
     const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const prevContent = ev.getPrevContent();
@@ -339,7 +309,7 @@ function textForMessageEvent(ev: MatrixEvent): () => string | null {
     const content = ev.getContent();
     const msgtype = content.msgtype;
 
-    if (LOCATION_EVENT_TYPE.matches(type) || LOCATION_EVENT_TYPE.matches(msgtype)) {
+    if (M_LOCATION.matches(type) || M_LOCATION.matches(msgtype)) {
         return textForLocationEvent(ev);
     }
 
@@ -347,16 +317,7 @@ function textForMessageEvent(ev: MatrixEvent): () => string | null {
         const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
         let message = ev.getContent().body;
         if (ev.isRedacted()) {
-            message = _t("Message deleted");
-            const unsigned = ev.getUnsigned();
-            const redactedBecauseUserId = unsigned?.redacted_because?.sender;
-            if (redactedBecauseUserId && redactedBecauseUserId !== ev.getSender()) {
-                const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
-                const sender = room?.getMember(redactedBecauseUserId);
-                message = _t("Message deleted by %(name)s", {
-                    name: sender?.name || redactedBecauseUserId,
-                });
-            }
+            message = textForRedactedPollAndMessageEvent(ev);
         }
 
         if (SettingsStore.isEnabled("feature_extensible_events")) {
@@ -757,11 +718,38 @@ export function textForLocationEvent(event: MatrixEvent): () => string | null {
     });
 }
 
+function textForRedactedPollAndMessageEvent(ev: MatrixEvent): string {
+    let message = _t("Message deleted");
+    const unsigned = ev.getUnsigned();
+    const redactedBecauseUserId = unsigned?.redacted_because?.sender;
+    if (redactedBecauseUserId && redactedBecauseUserId !== ev.getSender()) {
+        const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
+        const sender = room?.getMember(redactedBecauseUserId);
+        message = _t("Message deleted by %(name)s", {
+            name: sender?.name || redactedBecauseUserId,
+        });
+    }
+
+    return message;
+}
+
 function textForPollStartEvent(event: MatrixEvent): () => string | null {
-    return () => _t("%(senderName)s has started a poll - %(pollQuestion)s", {
-        senderName: getSenderName(event),
-        pollQuestion: (event.unstableExtensibleEvent as PollStartEvent)?.question?.text,
-    });
+    return () => {
+        let message = '';
+
+        if (event.isRedacted()) {
+            message = textForRedactedPollAndMessageEvent(event);
+            const senderDisplayName = event.sender?.name ?? event.getSender();
+            message = senderDisplayName + ': ' + message;
+        } else {
+            message = _t("%(senderName)s has started a poll - %(pollQuestion)s", {
+                senderName: getSenderName(event),
+                pollQuestion: (event.unstableExtensibleEvent as PollStartEvent)?.question?.text,
+            });
+        }
+
+        return message;
+    };
 }
 
 function textForPollEndEvent(event: MatrixEvent): () => string | null {
@@ -800,7 +788,6 @@ const stateHandlers: IHandlers = {
     [EventType.RoomTombstone]: textForTombstoneEvent,
     [EventType.RoomJoinRules]: textForJoinRulesEvent,
     [EventType.RoomGuestAccess]: textForGuestAccessEvent,
-    'm.room.related_groups': textForRelatedGroupsEvent,
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': textForWidgetEvent,
diff --git a/src/Unread.ts b/src/Unread.ts
index 905798eb038..7deafef9678 100644
--- a/src/Unread.ts
+++ b/src/Unread.ts
@@ -20,10 +20,12 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
-import { haveTileForEvent } from "./components/views/rooms/EventTile";
+import { haveRendererForEvent } from "./events/EventTileFactory";
+import SettingsStore from "./settings/SettingsStore";
+import { RoomNotificationStateStore } from "./stores/notifications/RoomNotificationStateStore";
 
 /**
- * Returns true iff this event arriving in a room should affect the room's
+ * Returns true if this event arriving in a room should affect the room's
  * count of unread messages
  *
  * @param {Object} ev The event
@@ -46,7 +48,7 @@ export function eventTriggersUnreadCount(ev: MatrixEvent): boolean {
     }
 
     if (ev.isRedacted()) return false;
-    return haveTileForEvent(ev);
+    return haveRendererForEvent(ev, false /* hidden messages should never trigger unread counts anyways */);
 }
 
 export function doesRoomHaveUnreadMessages(room: Room): boolean {
@@ -57,14 +59,21 @@ export function doesRoomHaveUnreadMessages(room: Room): boolean {
     // despite the name of the method :((
     const readUpToId = room.getEventReadUpTo(myUserId);
 
-    // as we don't send RRs for our own messages, make sure we special case that
-    // if *we* sent the last message into the room, we consider it not unread!
-    // Should fix: https://github.com/vector-im/element-web/issues/3263
-    //             https://github.com/vector-im/element-web/issues/2427
-    // ...and possibly some of the others at
-    //             https://github.com/vector-im/element-web/issues/3363
-    if (room.timeline.length && room.timeline[room.timeline.length - 1].getSender() === myUserId) {
-        return false;
+    if (!SettingsStore.getValue("feature_thread")) {
+        // as we don't send RRs for our own messages, make sure we special case that
+        // if *we* sent the last message into the room, we consider it not unread!
+        // Should fix: https://github.com/vector-im/element-web/issues/3263
+        //             https://github.com/vector-im/element-web/issues/2427
+        // ...and possibly some of the others at
+        //             https://github.com/vector-im/element-web/issues/3363
+        if (room.timeline.length && room.timeline[room.timeline.length - 1].getSender() === myUserId) {
+            return false;
+        }
+    } else {
+        const threadState = RoomNotificationStateStore.instance.getThreadsRoomState(room);
+        if (threadState.color > 0) {
+            return true;
+        }
     }
 
     // if the read receipt relates to an event is that part of a thread
diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts
index cb39d9affb4..f7026da394e 100644
--- a/src/VoipUserMapper.ts
+++ b/src/VoipUserMapper.ts
@@ -18,10 +18,12 @@ import { Room } from 'matrix-js-sdk/src/models/room';
 import { logger } from "matrix-js-sdk/src/logger";
 import { EventType } from 'matrix-js-sdk/src/@types/event';
 
-import { ensureVirtualRoomExists, findDMForUser } from './createRoom';
+import { ensureVirtualRoomExists } from './createRoom';
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import DMRoomMap from "./utils/DMRoomMap";
-import CallHandler, { VIRTUAL_ROOM_EVENT_TYPE } from './CallHandler';
+import CallHandler from './CallHandler';
+import { VIRTUAL_ROOM_EVENT_TYPE } from "./call-types";
+import { findDMForUser } from "./utils/direct-messages";
 
 // Functions for mapping virtual users & rooms. Currently the only lookup
 // is sip virtual: there could be others in the future.
diff --git a/src/accessibility/KeyboardShortcutUtils.ts b/src/accessibility/KeyboardShortcutUtils.ts
new file mode 100644
index 00000000000..434116d4303
--- /dev/null
+++ b/src/accessibility/KeyboardShortcutUtils.ts
@@ -0,0 +1,131 @@
+/*
+Copyright 2022 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { KeyCombo } from "../KeyBindingsManager";
+import { isMac, Key } from "../Keyboard";
+import { _t, _td } from "../languageHandler";
+import PlatformPeg from "../PlatformPeg";
+import SettingsStore from "../settings/SettingsStore";
+import {
+    DESKTOP_SHORTCUTS,
+    DIGITS,
+    IKeyboardShortcuts,
+    KeyBindingAction,
+    KEYBOARD_SHORTCUTS,
+    MAC_ONLY_SHORTCUTS,
+} from "./KeyboardShortcuts";
+
+/**
+ * This function gets the keyboard shortcuts that should be presented in the UI
+ * but they shouldn't be consumed by KeyBindingDefaults. That means that these
+ * have to be manually mirrored in KeyBindingDefaults.
+ */
+const getUIOnlyShortcuts = (): IKeyboardShortcuts => {
+    const ctrlEnterToSend = SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
+
+    const keyboardShortcuts: IKeyboardShortcuts = {
+        [KeyBindingAction.SendMessage]: {
+            default: {
+                key: Key.ENTER,
+                ctrlOrCmdKey: ctrlEnterToSend,
+            },
+            displayName: _td("Send message"),
+        },
+        [KeyBindingAction.NewLine]: {
+            default: {
+                key: Key.ENTER,
+                shiftKey: !ctrlEnterToSend,
+            },
+            displayName: _td("New line"),
+        },
+        [KeyBindingAction.CompleteAutocomplete]: {
+            default: {
+                key: Key.ENTER,
+            },
+            displayName: _td("Complete"),
+        },
+        [KeyBindingAction.ForceCompleteAutocomplete]: {
+            default: {
+                key: Key.TAB,
+            },
+            displayName: _td("Force complete"),
+        },
+        [KeyBindingAction.SearchInRoom]: {
+            default: {
+                ctrlOrCmdKey: true,
+                key: Key.F,
+            },
+            displayName: _td("Search (must be enabled)"),
+        },
+    };
+
+    if (PlatformPeg.get().overrideBrowserShortcuts()) {
+        // XXX: This keyboard shortcut isn't manually added to
+        // KeyBindingDefaults as it can't be easily handled by the
+        // KeyBindingManager
+        keyboardShortcuts[KeyBindingAction.SwitchToSpaceByNumber] = {
+            default: {
+                ctrlOrCmdKey: true,
+                key: DIGITS,
+            },
+            displayName: _td("Switch to space by number"),
+        };
+    }
+
+    return keyboardShortcuts;
+};
+
+/**
+ * This function gets keyboard shortcuts that can be consumed by the KeyBindingDefaults.
+ */
+export const getKeyboardShortcuts = (): IKeyboardShortcuts => {
+    const overrideBrowserShortcuts = PlatformPeg.get().overrideBrowserShortcuts();
+
+    return Object.keys(KEYBOARD_SHORTCUTS).filter((k: KeyBindingAction) => {
+        if (KEYBOARD_SHORTCUTS[k]?.controller?.settingDisabled) return false;
+        if (MAC_ONLY_SHORTCUTS.includes(k) && !isMac) return false;
+        if (DESKTOP_SHORTCUTS.includes(k) && !overrideBrowserShortcuts) return false;
+
+        return true;
+    }).reduce((o, key) => {
+        o[key] = KEYBOARD_SHORTCUTS[key];
+        return o;
+    }, {} as IKeyboardShortcuts);
+};
+
+/**
+ * Gets keyboard shortcuts that should be presented to the user in the UI.
+ */
+export const getKeyboardShortcutsForUI = (): IKeyboardShortcuts => {
+    const entries = [
+        ...Object.entries(getUIOnlyShortcuts()),
+        ...Object.entries(getKeyboardShortcuts()),
+    ];
+
+    return entries.reduce((acc, [key, value]) => {
+        acc[key] = value;
+        return acc;
+    }, {} as IKeyboardShortcuts);
+};
+
+export const getKeyboardShortcutValue = (name: string): KeyCombo => {
+    return getKeyboardShortcutsForUI()[name]?.default;
+};
+
+export const getKeyboardShortcutDisplayName = (name: string): string | null => {
+    const keyboardShortcutDisplayName = getKeyboardShortcutsForUI()[name]?.displayName;
+    return keyboardShortcutDisplayName && _t(keyboardShortcutDisplayName);
+};
diff --git a/src/accessibility/KeyboardShortcuts.ts b/src/accessibility/KeyboardShortcuts.ts
index c7f4ef68bbd..97e428d2a0f 100644
--- a/src/accessibility/KeyboardShortcuts.ts
+++ b/src/accessibility/KeyboardShortcuts.ts
@@ -18,9 +18,8 @@ limitations under the License.
 import { _td } from "../languageHandler";
 import { isMac, Key } from "../Keyboard";
 import { IBaseSetting } from "../settings/Settings";
-import SettingsStore from "../settings/SettingsStore";
 import IncompatibleController from "../settings/controllers/IncompatibleController";
-import PlatformPeg from "../PlatformPeg";
+import { KeyCombo } from "../KeyBindingsManager";
 
 export enum KeyBindingAction {
     /** Send a message */
@@ -35,11 +34,17 @@ export enum KeyBindingAction {
     EditNextMessage = 'KeyBinding.editNextMessage',
     /** Cancel editing a message or cancel replying to a message */
     CancelReplyOrEdit = 'KeyBinding.cancelReplyInComposer',
+    /** Show the sticker picker */
+    ShowStickerPicker = 'KeyBinding.showStickerPicker',
 
     /** Set bold format the current selection */
     FormatBold = 'KeyBinding.toggleBoldInComposer',
     /** Set italics format the current selection */
     FormatItalics = 'KeyBinding.toggleItalicsInComposer',
+    /** Insert link for current selection */
+    FormatLink = 'KeyBinding.FormatLink',
+    /** Set code format for current selection */
+    FormatCode = 'KeyBinding.FormatCode',
     /** Format the current selection as quote */
     FormatQuote = 'KeyBinding.toggleQuoteInComposer',
     /** Undo the last editing */
@@ -121,9 +126,9 @@ export enum KeyBindingAction {
     /** Opens user settings */
     OpenUserSettings = "KeyBinding.openUserSettings",
     /** Navigates backward */
-    PreviousVisitedRoomOrCommunity = "KeyBinding.previousVisitedRoomOrCommunity",
+    PreviousVisitedRoomOrSpace = "KeyBinding.PreviousVisitedRoomOrSpace",
     /** Navigates forward */
-    NextVisitedRoomOrCommunity = "KeyBinding.nextVisitedRoomOrCommunity",
+    NextVisitedRoomOrSpace = "KeyBinding.NextVisitedRoomOrSpace",
 
     /** Toggles microphone while on a call */
     ToggleMicInCall = "KeyBinding.toggleMicInCall",
@@ -149,18 +154,9 @@ export enum KeyBindingAction {
     ToggleHiddenEventVisibility = 'KeyBinding.toggleHiddenEventVisibility',
 }
 
-export type KeyBindingConfig = {
-    key: string;
-    ctrlOrCmdKey?: boolean;
-    ctrlKey?: boolean;
-    altKey?: boolean;
-    shiftKey?: boolean;
-    metaKey?: boolean;
-};
-
-type KeyboardShortcutSetting = IBaseSetting<KeyBindingConfig>;
+type KeyboardShortcutSetting = IBaseSetting<KeyCombo>;
 
-type IKeyboardShortcuts = {
+export type IKeyboardShortcuts = {
     // TODO: We should figure out what to do with the keyboard shortcuts that are not handled by KeybindingManager
     [k in (KeyBindingAction)]?: KeyboardShortcutSetting;
 };
@@ -218,6 +214,8 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
             KeyBindingAction.FormatBold,
             KeyBindingAction.FormatItalics,
             KeyBindingAction.FormatQuote,
+            KeyBindingAction.FormatLink,
+            KeyBindingAction.FormatCode,
             KeyBindingAction.EditUndo,
             KeyBindingAction.EditRedo,
             KeyBindingAction.MoveCursorToStart,
@@ -227,6 +225,7 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
             KeyBindingAction.EditPrevMessage,
             KeyBindingAction.SelectNextSendHistory,
             KeyBindingAction.SelectPrevSendHistory,
+            KeyBindingAction.ShowStickerPicker,
         ],
     }, [CategoryName.CALLS]: {
         categoryLabel: _td("Calls"),
@@ -287,8 +286,8 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
             KeyBindingAction.SelectPrevRoom,
             KeyBindingAction.OpenUserSettings,
             KeyBindingAction.SwitchToSpaceByNumber,
-            KeyBindingAction.PreviousVisitedRoomOrCommunity,
-            KeyBindingAction.NextVisitedRoomOrCommunity,
+            KeyBindingAction.PreviousVisitedRoomOrSpace,
+            KeyBindingAction.NextVisitedRoomOrSpace,
         ],
     }, [CategoryName.AUTOCOMPLETE]: {
         categoryLabel: _td("Autocomplete"),
@@ -307,14 +306,14 @@ export const CATEGORIES: Record<CategoryName, ICategory> = {
     },
 };
 
-const DESKTOP_SHORTCUTS = [
+export const DESKTOP_SHORTCUTS = [
     KeyBindingAction.OpenUserSettings,
     KeyBindingAction.SwitchToSpaceByNumber,
-    KeyBindingAction.PreviousVisitedRoomOrCommunity,
-    KeyBindingAction.NextVisitedRoomOrCommunity,
+    KeyBindingAction.PreviousVisitedRoomOrSpace,
+    KeyBindingAction.NextVisitedRoomOrSpace,
 ];
 
-const MAC_ONLY_SHORTCUTS = [
+export const MAC_ONLY_SHORTCUTS = [
     KeyBindingAction.OpenUserSettings,
 ];
 
@@ -344,6 +343,21 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
         },
         displayName: _td("Toggle Quote"),
     },
+    [KeyBindingAction.FormatCode]: {
+        default: {
+            ctrlOrCmdKey: true,
+            key: Key.E,
+        },
+        displayName: _td("Toggle Code Block"),
+    },
+    [KeyBindingAction.FormatLink]: {
+        default: {
+            ctrlOrCmdKey: true,
+            shiftKey: true,
+            key: Key.L,
+        },
+        displayName: _td("Toggle Link"),
+    },
     [KeyBindingAction.CancelReplyOrEdit]: {
         default: {
             key: Key.ESCAPE,
@@ -392,6 +406,13 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
         },
         displayName: _td("Navigate to previous message in composer history"),
     },
+    [KeyBindingAction.ShowStickerPicker]: {
+        default: {
+            ctrlOrCmdKey: true,
+            key: Key.SEMICOLON,
+        },
+        displayName: _td("Send a sticker"),
+    },
     [KeyBindingAction.ToggleMicInCall]: {
         default: {
             ctrlOrCmdKey: true,
@@ -606,21 +627,21 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
         },
         displayName: _td("Redo edit"),
     },
-    [KeyBindingAction.PreviousVisitedRoomOrCommunity]: {
+    [KeyBindingAction.PreviousVisitedRoomOrSpace]: {
         default: {
             metaKey: isMac,
             altKey: !isMac,
             key: isMac ? Key.SQUARE_BRACKET_LEFT : Key.ARROW_LEFT,
         },
-        displayName: _td("Previous recently visited room or community"),
+        displayName: _td("Previous recently visited room or space"),
     },
-    [KeyBindingAction.NextVisitedRoomOrCommunity]: {
+    [KeyBindingAction.NextVisitedRoomOrSpace]: {
         default: {
             metaKey: isMac,
             altKey: !isMac,
             key: isMac ? Key.SQUARE_BRACKET_RIGHT : Key.ARROW_RIGHT,
         },
-        displayName: _td("Next recently visited room or community"),
+        displayName: _td("Next recently visited room or space"),
     },
     [KeyBindingAction.SwitchToSpaceByNumber]: {
         default: {
@@ -700,99 +721,6 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
     },
 };
 
-/**
- * This function gets the keyboard shortcuts that should be presented in the UI
- * but they shouldn't be consumed by KeyBindingDefaults. That means that these
- * have to be manually mirrored in KeyBindingDefaults.
- */
-const getUIOnlyShortcuts = (): IKeyboardShortcuts => {
-    const ctrlEnterToSend = SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
-
-    const keyboardShortcuts: IKeyboardShortcuts = {
-        [KeyBindingAction.SendMessage]: {
-            default: {
-                key: Key.ENTER,
-                ctrlOrCmdKey: ctrlEnterToSend,
-            },
-            displayName: _td("Send message"),
-        },
-        [KeyBindingAction.NewLine]: {
-            default: {
-                key: Key.ENTER,
-                shiftKey: !ctrlEnterToSend,
-            },
-            displayName: _td("New line"),
-        },
-        [KeyBindingAction.CompleteAutocomplete]: {
-            default: {
-                key: Key.ENTER,
-            },
-            displayName: _td("Complete"),
-        },
-        [KeyBindingAction.ForceCompleteAutocomplete]: {
-            default: {
-                key: Key.TAB,
-            },
-            displayName: _td("Force complete"),
-        },
-        [KeyBindingAction.SearchInRoom]: {
-            default: {
-                ctrlOrCmdKey: true,
-                key: Key.F,
-            },
-            displayName: _td("Search (must be enabled)"),
-        },
-    };
-
-    if (PlatformPeg.get().overrideBrowserShortcuts()) {
-        // XXX: This keyboard shortcut isn't manually added to
-        // KeyBindingDefaults as it can't be easily handled by the
-        // KeyBindingManager
-        keyboardShortcuts[KeyBindingAction.SwitchToSpaceByNumber] = {
-            default: {
-                ctrlOrCmdKey: true,
-                key: DIGITS,
-            },
-            displayName: _td("Switch to space by number"),
-        };
-    }
-
-    return keyboardShortcuts;
-};
-
-/**
- * This function gets keyboard shortcuts that can be consumed by the KeyBindingDefaults.
- */
-export const getKeyboardShortcuts = (): IKeyboardShortcuts => {
-    const overrideBrowserShortcuts = PlatformPeg.get().overrideBrowserShortcuts();
-
-    return Object.keys(KEYBOARD_SHORTCUTS).filter((k: KeyBindingAction) => {
-        if (KEYBOARD_SHORTCUTS[k]?.controller?.settingDisabled) return false;
-        if (MAC_ONLY_SHORTCUTS.includes(k) && !isMac) return false;
-        if (DESKTOP_SHORTCUTS.includes(k) && !overrideBrowserShortcuts) return false;
-
-        return true;
-    }).reduce((o, key) => {
-        o[key] = KEYBOARD_SHORTCUTS[key];
-        return o;
-    }, {} as IKeyboardShortcuts);
-};
-
-/**
- * Gets keyboard shortcuts that should be presented to the user in the UI.
- */
-export const getKeyboardShortcutsForUI = (): IKeyboardShortcuts => {
-    const entries = [
-        ...Object.entries(getUIOnlyShortcuts()),
-        ...Object.entries(getKeyboardShortcuts()),
-    ];
-
-    return entries.reduce((acc, [key, value]) => {
-        acc[key] = value;
-        return acc;
-    }, {} as IKeyboardShortcuts);
-};
-
 // For tests
 export function mock({ keyboardShortcuts, macOnlyShortcuts, desktopShortcuts }): void {
     Object.keys(KEYBOARD_SHORTCUTS).forEach((k) => delete KEYBOARD_SHORTCUTS[k]);
diff --git a/src/accessibility/roving/RovingAccessibleButton.tsx b/src/accessibility/roving/RovingAccessibleButton.tsx
index f9ce87db6a7..0d9025dd59f 100644
--- a/src/accessibility/roving/RovingAccessibleButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleButton.tsx
@@ -20,13 +20,21 @@ import AccessibleButton from "../../components/views/elements/AccessibleButton";
 import { useRovingTabIndex } from "../RovingTabIndex";
 import { Ref } from "./types";
 
-interface IProps extends Omit<React.ComponentProps<typeof AccessibleButton>, "onFocus" | "inputRef" | "tabIndex"> {
+interface IProps extends Omit<React.ComponentProps<typeof AccessibleButton>, "inputRef" | "tabIndex"> {
     inputRef?: Ref;
 }
 
 // Wrapper to allow use of useRovingTabIndex for simple AccessibleButtons outside of React Functional Components.
-export const RovingAccessibleButton: React.FC<IProps> = ({ inputRef, ...props }) => {
-    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
-    return <AccessibleButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
+export const RovingAccessibleButton: React.FC<IProps> = ({ inputRef, onFocus, ...props }) => {
+    const [onFocusInternal, isActive, ref] = useRovingTabIndex(inputRef);
+    return <AccessibleButton
+        {...props}
+        onFocus={event => {
+            onFocusInternal();
+            onFocus?.(event);
+        }}
+        inputRef={ref}
+        tabIndex={isActive ? 0 : -1}
+    />;
 };
 
diff --git a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
index d9e393d7282..432e8880173 100644
--- a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
@@ -21,13 +21,21 @@ import { useRovingTabIndex } from "../RovingTabIndex";
 import { Ref } from "./types";
 
 type ATBProps = React.ComponentProps<typeof AccessibleTooltipButton>;
-interface IProps extends Omit<ATBProps, "onFocus" | "inputRef" | "tabIndex"> {
+interface IProps extends Omit<ATBProps, "inputRef" | "tabIndex"> {
     inputRef?: Ref;
 }
 
 // Wrapper to allow use of useRovingTabIndex for simple AccessibleTooltipButtons outside of React Functional Components.
-export const RovingAccessibleTooltipButton: React.FC<IProps> = ({ inputRef, ...props }) => {
-    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
-    return <AccessibleTooltipButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
+export const RovingAccessibleTooltipButton: React.FC<IProps> = ({ inputRef, onFocus, ...props }) => {
+    const [onFocusInternal, isActive, ref] = useRovingTabIndex(inputRef);
+    return <AccessibleTooltipButton
+        {...props}
+        onFocus={event => {
+            onFocusInternal();
+            onFocus?.(event);
+        }}
+        inputRef={ref}
+        tabIndex={isActive ? 0 : -1}
+    />;
 };
 
diff --git a/src/actions/GroupActions.ts b/src/actions/GroupActions.ts
deleted file mode 100644
index 44776f0a253..00000000000
--- a/src/actions/GroupActions.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { MatrixClient } from "matrix-js-sdk/src/client";
-
-import { asyncAction } from './actionCreators';
-import { AsyncActionPayload } from "../dispatcher/payloads";
-
-export default class GroupActions {
-    /**
-     * Creates an action thunk that will do an asynchronous request to fetch
-     * the groups to which a user is joined.
-     *
-     * @param {MatrixClient} matrixClient the matrix client to query.
-     * @returns {AsyncActionPayload} An async action payload.
-     * @see asyncAction
-     */
-    public static fetchJoinedGroups(matrixClient: MatrixClient): AsyncActionPayload {
-        return asyncAction('GroupActions.fetchJoinedGroups', () => matrixClient.getJoinedGroups(), null);
-    }
-}
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
deleted file mode 100644
index 4ae600472ed..00000000000
--- a/src/actions/TagOrderActions.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { MatrixClient } from "matrix-js-sdk/src/client";
-
-import Analytics from '../Analytics';
-import { asyncAction } from './actionCreators';
-import GroupFilterOrderStore from '../stores/GroupFilterOrderStore';
-import { AsyncActionPayload } from "../dispatcher/payloads";
-
-export default class TagOrderActions {
-    /**
-     * Creates an action thunk that will do an asynchronous request to
-     * move a tag in GroupFilterOrderStore to destinationIx.
-     *
-     * @param {MatrixClient} matrixClient the matrix client to set the
-     * account data on.
-     * @param {string} tag the tag to move.
-     * @param {number} destinationIx the new position of the tag.
-     * @returns {AsyncActionPayload} an async action payload that will
-     * dispatch actions indicating the status of the request.
-     * @see asyncAction
-     */
-    public static moveTag(matrixClient: MatrixClient, tag: string, destinationIx: number): AsyncActionPayload {
-        // Only commit tags if the state is ready, i.e. not null
-        let tags = GroupFilterOrderStore.getOrderedTags();
-        let removedTags = GroupFilterOrderStore.getRemovedTagsAccountData() || [];
-        if (!tags) {
-            return;
-        }
-
-        tags = tags.filter((t) => t !== tag);
-        tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
-
-        removedTags = removedTags.filter((t) => t !== tag);
-
-        const storeId = GroupFilterOrderStore.getStoreId();
-
-        return asyncAction('TagOrderActions.moveTag', () => {
-            Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
-            return matrixClient.setAccountData(
-                'im.vector.web.tag_ordering',
-                { tags, removedTags, _storeId: storeId },
-            );
-        }, () => {
-            // For an optimistic update
-            return { tags, removedTags };
-        });
-    }
-
-    /**
-     * Creates an action thunk that will do an asynchronous request to
-     * label a tag as removed in im.vector.web.tag_ordering account data.
-     *
-     * The reason this is implemented with new state `removedTags` is that
-     * we incrementally and initially populate `tags` with groups that
-     * have been joined. If we remove a group from `tags`, it will just
-     * get added (as it looks like a group we've recently joined).
-     *
-     * NB: If we ever support adding of tags (which is planned), we should
-     * take special care to remove the tag from `removedTags` when we add
-     * it.
-     *
-     * @param {MatrixClient} matrixClient the matrix client to set the
-     * account data on.
-     * @param {string} tag the tag to remove.
-     * @returns {function} an async action payload that will dispatch
-     * actions indicating the status of the request.
-     * @see asyncAction
-     */
-    public static removeTag(matrixClient: MatrixClient, tag: string): AsyncActionPayload {
-        // Don't change tags, just removedTags
-        const tags = GroupFilterOrderStore.getOrderedTags();
-        const removedTags = GroupFilterOrderStore.getRemovedTagsAccountData() || [];
-
-        if (removedTags.includes(tag)) {
-            // Return a thunk that doesn't do anything, we don't even need
-            // an asynchronous action here, the tag is already removed.
-            return new AsyncActionPayload(() => {});
-        }
-
-        removedTags.push(tag);
-
-        const storeId = GroupFilterOrderStore.getStoreId();
-
-        return asyncAction('TagOrderActions.removeTag', () => {
-            Analytics.trackEvent('TagOrderActions', 'removeTag');
-            return matrixClient.setAccountData(
-                'im.vector.web.tag_ordering',
-                { tags, removedTags, _storeId: storeId },
-            );
-        }, () => {
-            // For an optimistic update
-            return { removedTags };
-        });
-    }
-}
diff --git a/src/audio/PlaybackQueue.ts b/src/audio/PlaybackQueue.ts
index 3b1b001bb91..72ed8cf1691 100644
--- a/src/audio/PlaybackQueue.ts
+++ b/src/audio/PlaybackQueue.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient } from "matrix-js-sdk/src/client";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { EventType } from "matrix-js-sdk/src/@types/event";
@@ -26,7 +25,7 @@ import { MatrixClientPeg } from "../MatrixClientPeg";
 import { arrayFastClone } from "../utils/arrays";
 import { PlaybackManager } from "./PlaybackManager";
 import { isVoiceMessage } from "../utils/EventUtils";
-import RoomViewStore from "../stores/RoomViewStore";
+import { RoomViewStore } from "../stores/RoomViewStore";
 
 /**
  * Audio playback queue management for a given room. This keeps track of where the user
@@ -49,18 +48,18 @@ export class PlaybackQueue {
     private currentPlaybackId: string; // event ID, broken out from above for ease of use
     private recentFullPlays = new Set<string>(); // event IDs
 
-    constructor(private client: MatrixClient, private room: Room) {
+    constructor(private room: Room) {
         this.loadClocks();
 
-        RoomViewStore.addListener(() => {
-            if (RoomViewStore.getRoomId() === this.room.roomId) {
-                // Reset the state of the playbacks before they start mounting and enqueuing updates.
-                // We reset the entirety of the queue, including order, to ensure the user isn't left
-                // confused with what order the messages are playing in.
-                this.currentPlaybackId = null; // this in particular stops autoplay when the room is switched to
-                this.recentFullPlays = new Set<string>();
-                this.playbackIdOrder = [];
-            }
+        RoomViewStore.instance.addRoomListener(this.room.roomId, (isActive) => {
+            if (!isActive) return;
+
+            // Reset the state of the playbacks before they start mounting and enqueuing updates.
+            // We reset the entirety of the queue, including order, to ensure the user isn't left
+            // confused with what order the messages are playing in.
+            this.currentPlaybackId = null; // this in particular stops autoplay when the room is switched to
+            this.recentFullPlays = new Set<string>();
+            this.playbackIdOrder = [];
         });
     }
 
@@ -71,7 +70,7 @@ export class PlaybackQueue {
         if (PlaybackQueue.queues.has(room.roomId)) {
             return PlaybackQueue.queues.get(room.roomId);
         }
-        const queue = new PlaybackQueue(cli, room);
+        const queue = new PlaybackQueue(room);
         PlaybackQueue.queues.set(room.roomId, queue);
         return queue;
     }
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index aeee335e04d..880f4e68732 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.ts
@@ -19,7 +19,6 @@ import { ReactElement } from 'react';
 import { Room } from 'matrix-js-sdk/src/models/room';
 
 import CommandProvider from './CommandProvider';
-import CommunityProvider from './CommunityProvider';
 import RoomProvider from './RoomProvider';
 import UserProvider from './UserProvider';
 import EmojiProvider from './EmojiProvider';
@@ -27,7 +26,6 @@ import NotifProvider from './NotifProvider';
 import { timeout } from "../utils/promise";
 import AutocompleteProvider, { ICommand } from "./AutocompleteProvider";
 import SpaceProvider from "./SpaceProvider";
-import SpaceStore from "../stores/spaces/SpaceStore";
 import { TimelineRenderingType } from '../contexts/RoomContext';
 
 export interface ISelectionRange {
@@ -55,14 +53,9 @@ const PROVIDERS = [
     EmojiProvider,
     NotifProvider,
     CommandProvider,
+    SpaceProvider,
 ];
 
-if (SpaceStore.spacesEnabled) {
-    PROVIDERS.push(SpaceProvider);
-} else {
-    PROVIDERS.push(CommunityProvider);
-}
-
 // Providers will get rejected if they take longer than this.
 const PROVIDER_COMPLETION_TIMEOUT = 3000;
 
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
index 23b31407a86..e9ef2e946d7 100644
--- a/src/autocomplete/CommandProvider.tsx
+++ b/src/autocomplete/CommandProvider.tsx
@@ -55,7 +55,7 @@ export default class CommandProvider extends AutocompleteProvider {
         // check if the full match differs from the first word (i.e. returns false if the command has args)
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
-            const name = command[1].substr(1); // strip leading `/`
+            const name = command[1].slice(1); // strip leading `/`
             if (CommandMap.has(name) && CommandMap.get(name).isEnabled()) {
                 // some commands, namely `me` don't suit having the usage shown whilst typing their arguments
                 if (CommandMap.get(name).hideCompletionAfterSpace) return [];
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
deleted file mode 100644
index b3a4079f94d..00000000000
--- a/src/autocomplete/CommunityProvider.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import Group from "matrix-js-sdk/src/models/group";
-import { sortBy } from "lodash";
-import { Room } from 'matrix-js-sdk/src/models/room';
-
-import { _t } from '../languageHandler';
-import AutocompleteProvider from './AutocompleteProvider';
-import { MatrixClientPeg } from '../MatrixClientPeg';
-import QueryMatcher from './QueryMatcher';
-import { PillCompletion } from './Components';
-import { makeGroupPermalink } from "../utils/permalinks/Permalinks";
-import { ICompletion, ISelectionRange } from "./Autocompleter";
-import FlairStore from "../stores/FlairStore";
-import { mediaFromMxc } from "../customisations/Media";
-import BaseAvatar from '../components/views/avatars/BaseAvatar';
-import { TimelineRenderingType } from '../contexts/RoomContext';
-
-const COMMUNITY_REGEX = /\B\+\S*/g;
-
-function score(query, space) {
-    const index = space.indexOf(query);
-    if (index === -1) {
-        return Infinity;
-    } else {
-        return index;
-    }
-}
-
-export default class CommunityProvider extends AutocompleteProvider {
-    matcher: QueryMatcher<Group>;
-
-    constructor(room: Room, renderingType?: TimelineRenderingType) {
-        super({ commandRegex: COMMUNITY_REGEX, renderingType });
-        this.matcher = new QueryMatcher([], {
-            keys: ['groupId', 'name', 'shortDescription'],
-        });
-    }
-
-    async getCompletions(
-        query: string,
-        selection: ISelectionRange,
-        force = false,
-        limit = -1,
-    ): Promise<ICompletion[]> {
-        // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/element-web/issues/4762)
-        if (/^(\/join|\/leave)/.test(query)) {
-            return [];
-        }
-
-        const cli = MatrixClientPeg.get();
-        let completions = [];
-        const { command, range } = this.getCurrentCommand(query, selection, force);
-        if (command) {
-            const joinedGroups = cli.getGroups().filter(({ myMembership }) => myMembership === 'join');
-
-            const groups = (await Promise.all(joinedGroups.map(async ({ groupId }) => {
-                try {
-                    return FlairStore.getGroupProfileCached(cli, groupId);
-                } catch (e) { // if FlairStore failed, fall back to just groupId
-                    return Promise.resolve({
-                        name: '',
-                        groupId,
-                        avatarUrl: '',
-                        shortDescription: '',
-                    });
-                }
-            })));
-
-            this.matcher.setObjects(groups);
-
-            const matchedString = command[0];
-            completions = this.matcher.match(matchedString, limit);
-            completions = sortBy(completions, [
-                (c) => score(matchedString, c.groupId),
-                (c) => c.groupId.length,
-            ]).map(({ avatarUrl, groupId, name }) => ({
-                completion: groupId,
-                suffix: ' ',
-                type: "community",
-                href: makeGroupPermalink(groupId),
-                component: (
-                    <PillCompletion title={name} description={groupId}>
-                        <BaseAvatar
-                            name={name || groupId}
-                            width={24}
-                            height={24}
-                            url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(24) : null} />
-                    </PillCompletion>
-                ),
-                range,
-            })).slice(0, 4);
-        }
-        return completions;
-    }
-
-    getName() {
-        return '💬 ' + _t('Communities');
-    }
-
-    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
-        return (
-            <div
-                className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
-                role="presentation"
-                aria-label={_t("Community Autocomplete")}
-            >
-                { completions }
-            </div>
-        );
-    }
-}
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index 960b0f9475c..4c051a71269 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -3,6 +3,7 @@ Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
 Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2022 Ryan Browne <code@commonlawfeature.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -62,6 +63,13 @@ function score(query, space) {
     }
 }
 
+function colonsTrimmed(str: string): string {
+    // Trim off leading and potentially trailing `:` to correctly match the emoji data as they exist in emojibase.
+    // Notes: The regex is pinned to the start and end of the string so that we can use the lazy-capturing `*?` matcher.
+    // It needs to be lazy so that the trailing `:` is not captured in the replacement group, if it exists.
+    return str.replace(/^:(.*?):?$/, "$1");
+}
+
 export default class EmojiProvider extends AutocompleteProvider {
     matcher: QueryMatcher<ISortedEmoji>;
     nameMatcher: QueryMatcher<ISortedEmoji>;
@@ -75,7 +83,7 @@ export default class EmojiProvider extends AutocompleteProvider {
             shouldMatchWordsOnly: false,
         });
         this.nameMatcher = new QueryMatcher(SORTED_EMOJI, {
-            keys: ['emoji.annotation'],
+            keys: ['emoji.label'],
             // For removing punctuation
             shouldMatchWordsOnly: true,
         });
@@ -108,8 +116,9 @@ export default class EmojiProvider extends AutocompleteProvider {
             // then sort by score (Infinity if matchedString not in shortcode)
             sorters.push(c => score(matchedString, c.emoji.shortcodes[0]));
             // then sort by max score of all shortcodes, trim off the `:`
+            const trimmedMatch = colonsTrimmed(matchedString);
             sorters.push(c => Math.min(
-                ...c.emoji.shortcodes.map(s => score(matchedString.substring(1), s)),
+                ...c.emoji.shortcodes.map(s => score(trimmedMatch, s)),
             ));
             // If the matchedString is not empty, sort by length of shortcode. Example:
             //  matchedString = ":bookmark"
diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx
index 1879c85fe3f..cac3531813b 100644
--- a/src/autocomplete/RoomProvider.tsx
+++ b/src/autocomplete/RoomProvider.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { uniqBy, sortBy } from "lodash";
+import { sortBy, uniqBy } from "lodash";
 import { Room } from "matrix-js-sdk/src/models/room";
 
 import { _t } from '../languageHandler';
@@ -28,7 +28,6 @@ import { PillCompletion } from './Components';
 import { makeRoomPermalink } from "../utils/permalinks/Permalinks";
 import { ICompletion, ISelectionRange } from "./Autocompleter";
 import RoomAvatar from '../components/views/avatars/RoomAvatar';
-import SpaceStore from "../stores/spaces/SpaceStore";
 import { TimelineRenderingType } from "../contexts/RoomContext";
 
 const ROOM_REGEX = /\B#\S*/g;
@@ -58,14 +57,9 @@ export default class RoomProvider extends AutocompleteProvider {
 
     protected getRooms() {
         const cli = MatrixClientPeg.get();
-        let rooms = cli.getVisibleRooms();
 
-        // if spaces are enabled then filter them out here as they get their own autocomplete provider
-        if (SpaceStore.spacesEnabled) {
-            rooms = rooms.filter(r => !r.isSpaceRoom());
-        }
-
-        return rooms;
+        // filter out spaces here as they get their own autocomplete provider
+        return cli.getVisibleRooms().filter(r => !r.isSpaceRoom());
     }
 
     async getCompletions(
diff --git a/src/call-types.ts b/src/call-types.ts
new file mode 100644
index 00000000000..c12491e102e
--- /dev/null
+++ b/src/call-types.ts
@@ -0,0 +1,19 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// 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';
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index 22316189940..187e55cc392 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -22,7 +22,6 @@ import classNames from "classnames";
 import FocusLock from "react-focus-lock";
 
 import { Writeable } from "../../@types/common";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import UIStore from "../../stores/UIStore";
 import { checkInputableElement, RovingTabIndexProvider } from "../../accessibility/RovingTabIndex";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
@@ -83,6 +82,7 @@ export interface IProps extends IPosition {
     // whether this context menu should be focus managed. If false it must handle itself
     managed?: boolean;
     wrapperClassName?: string;
+    menuClassName?: string;
 
     // If true, this context menu will be mounted as a child to the parent container. Otherwise
     // it will be mounted to a container at the root of the DOM.
@@ -105,7 +105,6 @@ interface IState {
 // Generic ContextMenu Portal wrapper
 // all options inside the menu should be of role=menuitem/menuitemcheckbox/menuitemradiobutton and have tabIndex={-1}
 // this will allow the ContextMenu to manage its own focus using arrow keys as per the ARIA guidelines.
-@replaceableComponent("structures.ContextMenu")
 export default class ContextMenu extends React.PureComponent<IProps, IState> {
     private readonly initialFocus: HTMLElement;
 
@@ -321,7 +320,7 @@ export default class ContextMenu extends React.PureComponent<IProps, IState> {
             'mx_ContextualMenu_withChevron_bottom': chevronFace === ChevronFace.Bottom,
             'mx_ContextualMenu_rightAligned': this.props.rightAligned === true,
             'mx_ContextualMenu_bottomAligned': this.props.bottomAligned === true,
-        });
+        }, this.props.menuClassName);
 
         const menuStyle: CSSProperties = {};
         if (props.menuWidth) {
@@ -431,7 +430,7 @@ export type AboveLeftOf = IPosition & {
 // Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect,
 // and either above or below: wherever there is more space (maybe this should be aboveOrBelowLeftOf?)
 export const aboveLeftOf = (
-    elementRect: DOMRect,
+    elementRect: Pick<DOMRect, "right" | "top" | "bottom">,
     chevronFace = ChevronFace.None,
     vPadding = 0,
 ): AboveLeftOf => {
@@ -452,9 +451,37 @@ export const aboveLeftOf = (
     return menuOptions;
 };
 
+// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the right of elementRect,
+// and either above or below: wherever there is more space (maybe this should be aboveOrBelowRightOf?)
+export const aboveRightOf = (
+    elementRect: Pick<DOMRect, "left" | "top" | "bottom">,
+    chevronFace = ChevronFace.None,
+    vPadding = 0,
+): AboveLeftOf => {
+    const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
+
+    const buttonLeft = elementRect.left + window.pageXOffset;
+    const buttonBottom = elementRect.bottom + window.pageYOffset;
+    const buttonTop = elementRect.top + window.pageYOffset;
+    // Align the left edge of the menu to the left edge of the button
+    menuOptions.left = buttonLeft;
+    // Align the menu vertically on whichever side of the button has more space available.
+    if (buttonBottom < UIStore.instance.windowHeight / 2) {
+        menuOptions.top = buttonBottom + vPadding;
+    } else {
+        menuOptions.bottom = (UIStore.instance.windowHeight - buttonTop) + vPadding;
+    }
+
+    return menuOptions;
+};
+
 // Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect
 // and always above elementRect
-export const alwaysAboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+export const alwaysAboveLeftOf = (
+    elementRect: Pick<DOMRect, "right" | "bottom" | "top">,
+    chevronFace = ChevronFace.None,
+    vPadding = 0,
+) => {
     const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
 
     const buttonRight = elementRect.right + window.pageXOffset;
@@ -474,7 +501,11 @@ export const alwaysAboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFac
 
 // Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the right of elementRect
 // and always above elementRect
-export const alwaysAboveRightOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+export const alwaysAboveRightOf = (
+    elementRect: Pick<DOMRect, "left" | "top">,
+    chevronFace = ChevronFace.None,
+    vPadding = 0,
+) => {
     const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
 
     const buttonLeft = elementRect.left + window.pageXOffset;
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
deleted file mode 100644
index 365b30bb0ec..00000000000
--- a/src/components/structures/CustomRoomTagPanel.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import classNames from 'classnames';
-
-import CustomRoomTagStore from '../../stores/CustomRoomTagStore';
-import AutoHideScrollbar from './AutoHideScrollbar';
-import * as sdk from '../../index';
-import dis from '../../dispatcher/dispatcher';
-import * as FormattingUtils from '../../utils/FormattingUtils';
-import { replaceableComponent } from "../../utils/replaceableComponent";
-
-@replaceableComponent("structures.CustomRoomTagPanel")
-class CustomRoomTagPanel extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            tags: CustomRoomTagStore.getSortedTags(),
-        };
-    }
-
-    componentDidMount() {
-        this._tagStoreToken = CustomRoomTagStore.addListener(() => {
-            this.setState({ tags: CustomRoomTagStore.getSortedTags() });
-        });
-    }
-
-    componentWillUnmount() {
-        if (this._tagStoreToken) {
-            this._tagStoreToken.remove();
-        }
-    }
-
-    render() {
-        const tags = this.state.tags.map((tag) => {
-            return (<CustomRoomTagTile tag={tag} key={tag.name} />);
-        });
-
-        const classes = classNames('mx_CustomRoomTagPanel', {
-            mx_CustomRoomTagPanel_empty: this.state.tags.length === 0,
-        });
-
-        return (<div className={classes}>
-            <div className="mx_CustomRoomTagPanel_divider" />
-            <AutoHideScrollbar className="mx_CustomRoomTagPanel_scroller">
-                { tags }
-            </AutoHideScrollbar>
-        </div>);
-    }
-}
-
-class CustomRoomTagTile extends React.Component {
-    onClick = () => {
-        dis.dispatch({ action: 'select_custom_room_tag', tag: this.props.tag.name });
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton');
-
-        const tag = this.props.tag;
-        const avatarHeight = 40;
-        const className = classNames({
-            "CustomRoomTagPanel_tileSelected": tag.selected,
-        });
-        const name = tag.name;
-        const badgeNotifState = tag.badgeNotifState;
-        let badgeElement;
-        if (badgeNotifState) {
-            const badgeClasses = classNames({
-                "mx_TagTile_badge": true,
-                "mx_TagTile_badgeHighlight": badgeNotifState.hasMentions,
-            });
-            badgeElement = (<div className={badgeClasses}>{ FormattingUtils.formatCount(badgeNotifState.count) }</div>);
-        }
-
-        return (
-            <AccessibleTooltipButton className={className} onClick={this.onClick} title={name}>
-                <div className="mx_TagTile_avatar">
-                    <BaseAvatar
-                        name={tag.avatarLetter}
-                        idName={name}
-                        width={avatarHeight}
-                        height={avatarHeight}
-                    />
-                    { badgeElement }
-                </div>
-            </AccessibleTooltipButton>
-        );
-    }
-}
-
-export default CustomRoomTagPanel;
diff --git a/src/components/structures/EmbeddedPage.tsx b/src/components/structures/EmbeddedPage.tsx
index 4b309a1838c..2053140ba43 100644
--- a/src/components/structures/EmbeddedPage.tsx
+++ b/src/components/structures/EmbeddedPage.tsx
@@ -37,7 +37,7 @@ interface IProps {
     // Whether to wrap the page in a scrollbar
     scrollbar?: boolean;
     // Map of keys to replace with values, e.g {$placeholder: "value"}
-    replaceMap?: Map<string, string>;
+    replaceMap?: Record<string, string>;
 }
 
 interface IState {
@@ -57,8 +57,7 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
         };
     }
 
-    protected translate(s: string): string {
-        // default implementation - skins may wish to extend this
+    private translate(s: string): string {
         return sanitizeHtml(_t(s));
     }
 
diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx
index 8466c26bacc..d248c6556fd 100644
--- a/src/components/structures/FilePanel.tsx
+++ b/src/components/structures/FilePanel.tsx
@@ -29,7 +29,6 @@ import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 import DesktopBuildsNotice, { WarningKind } from "../views/elements/DesktopBuildsNotice";
 import BaseCard from "../views/right_panel/BaseCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
@@ -51,7 +50,6 @@ interface IState {
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
-@replaceableComponent("structures.FilePanel")
 class FilePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
 
diff --git a/src/components/structures/GenericErrorPage.tsx b/src/components/structures/GenericErrorPage.tsx
index 25892f46df4..f9a68753a07 100644
--- a/src/components/structures/GenericErrorPage.tsx
+++ b/src/components/structures/GenericErrorPage.tsx
@@ -16,14 +16,11 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../utils/replaceableComponent";
-
 interface IProps {
     title: React.ReactNode;
     message: React.ReactNode;
 }
 
-@replaceableComponent("structures.GenericErrorPage")
 export default class GenericErrorPage extends React.PureComponent<IProps> {
     render() {
         return <div className='mx_GenericErrorPage'>
diff --git a/src/components/structures/GroupFilterPanel.tsx b/src/components/structures/GroupFilterPanel.tsx
deleted file mode 100644
index c86e243fa90..00000000000
--- a/src/components/structures/GroupFilterPanel.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-Copyright 2017, 2018 New Vector Ltd.
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import classNames from 'classnames';
-import { ClientEvent } from "matrix-js-sdk/src/client";
-
-import type { EventSubscription } from "fbemitter";
-import GroupFilterOrderStore from '../../stores/GroupFilterOrderStore';
-import GroupActions from '../../actions/GroupActions';
-import dis from '../../dispatcher/dispatcher';
-import { _t } from '../../languageHandler';
-import MatrixClientContext from "../../contexts/MatrixClientContext";
-import AutoHideScrollbar from "./AutoHideScrollbar";
-import SettingsStore from "../../settings/SettingsStore";
-import UserTagTile from "../views/elements/UserTagTile";
-import { replaceableComponent } from "../../utils/replaceableComponent";
-import UIStore from "../../stores/UIStore";
-import DNDTagTile from "../views/elements/DNDTagTile";
-import ActionButton from "../views/elements/ActionButton";
-
-interface IGroupFilterPanelProps {
-
-}
-
-// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
-type OrderedTagsTemporaryType = Array<{}>;
-// FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
-type SelectedTagsTemporaryType = Array<{}>;
-
-interface IGroupFilterPanelState {
-    // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
-    orderedTags: OrderedTagsTemporaryType;
-    // FIXME: Properly type this after migrating GroupFilterOrderStore.js to Typescript
-    selectedTags: SelectedTagsTemporaryType;
-}
-
-@replaceableComponent("structures.GroupFilterPanel")
-class GroupFilterPanel extends React.Component<IGroupFilterPanelProps, IGroupFilterPanelState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public state = {
-        orderedTags: [],
-        selectedTags: [],
-    };
-
-    private ref = React.createRef<HTMLDivElement>();
-    private unmounted = false;
-    private groupFilterOrderStoreToken?: EventSubscription;
-
-    public componentDidMount() {
-        this.unmounted = false;
-        this.context.on(ClientEvent.GroupMyMembership, this.onGroupMyMembership);
-        this.context.on(ClientEvent.Sync, this.onClientSync);
-
-        this.groupFilterOrderStoreToken = GroupFilterOrderStore.addListener(() => {
-            if (this.unmounted) {
-                return;
-            }
-            this.setState({
-                orderedTags: GroupFilterOrderStore.getOrderedTags() || [],
-                selectedTags: GroupFilterOrderStore.getSelectedTags(),
-            });
-        });
-        // This could be done by anything with a matrix client
-        dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
-        UIStore.instance.trackElementDimensions("GroupPanel", this.ref.current);
-    }
-
-    public componentWillUnmount() {
-        this.unmounted = true;
-        this.context.removeListener(ClientEvent.GroupMyMembership, this.onGroupMyMembership);
-        this.context.removeListener(ClientEvent.Sync, this.onClientSync);
-        if (this.groupFilterOrderStoreToken) {
-            this.groupFilterOrderStoreToken.remove();
-        }
-        UIStore.instance.stopTrackingElementDimensions("GroupPanel");
-    }
-
-    private onGroupMyMembership = () => {
-        if (this.unmounted) return;
-        dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
-    };
-
-    private onClientSync = (syncState, prevState) => {
-        // Consider the client reconnected if there is no error with syncing.
-        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
-        const reconnected = syncState !== "ERROR" && prevState !== syncState;
-        if (reconnected) {
-            // Load joined groups
-            dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
-        }
-    };
-
-    private onClick = e => {
-        // only dispatch if its not a no-op
-        if (this.state.selectedTags.length > 0) {
-            dis.dispatch({ action: 'deselect_tags' });
-        }
-    };
-
-    private onClearFilterClick = ev => {
-        dis.dispatch({ action: 'deselect_tags' });
-    };
-
-    private renderGlobalIcon() {
-        if (!SettingsStore.getValue("feature_communities_v2_prototypes")) return null;
-
-        return (
-            <div>
-                <UserTagTile />
-                <hr className="mx_GroupFilterPanel_divider" />
-            </div>
-        );
-    }
-
-    public render() {
-        const tags = this.state.orderedTags.map((tag, index) => {
-            return <DNDTagTile
-                key={tag}
-                tag={tag}
-                index={index}
-                selected={this.state.selectedTags.includes(tag)}
-            />;
-        });
-
-        const itemsSelected = this.state.selectedTags.length > 0;
-        const classes = classNames('mx_GroupFilterPanel', {
-            mx_GroupFilterPanel_items_selected: itemsSelected,
-        });
-
-        let createButton = (
-            <ActionButton
-                tooltip
-                label={_t("Communities")}
-                action="toggle_my_groups"
-                className="mx_TagTile mx_TagTile_plus"
-            />
-        );
-
-        if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
-            createButton = (
-                <ActionButton
-                    tooltip
-                    label={_t("Create community")}
-                    action="view_create_group"
-                    className="mx_TagTile mx_TagTile_plus" />
-            );
-        }
-
-        return <div className={classes} onClick={this.onClearFilterClick} ref={this.ref}>
-            <AutoHideScrollbar
-                className="mx_GroupFilterPanel_scroller"
-                onClick={this.onClick}
-            >
-                <div className="mx_GroupFilterPanel_tagTileContainer">
-                    { this.renderGlobalIcon() }
-                    { tags }
-                    <div>
-                        { createButton }
-                    </div>
-                </div>
-            </AutoHideScrollbar>
-        </div>;
-    }
-}
-export default GroupFilterPanel;
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
deleted file mode 100644
index d5da40b86a9..00000000000
--- a/src/components/structures/GroupView.js
+++ /dev/null
@@ -1,1424 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd.
-Copyright 2017, 2018 New Vector Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { Group } from "matrix-js-sdk/src/models/group";
-import { sleep } from "matrix-js-sdk/src/utils";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { MatrixClientPeg } from '../../MatrixClientPeg';
-import * as sdk from '../../index';
-import dis from '../../dispatcher/dispatcher';
-import { getHostingLink } from '../../utils/HostingLink';
-import { sanitizedHtmlNode } from '../../HtmlUtils';
-import { _t, _td } from '../../languageHandler';
-import AccessibleButton from '../views/elements/AccessibleButton';
-import GroupHeaderButtons from '../views/right_panel/GroupHeaderButtons';
-import MainSplit from './MainSplit';
-import RightPanel from './RightPanel';
-import Modal from '../../Modal';
-import GroupStore from '../../stores/GroupStore';
-import FlairStore from '../../stores/FlairStore';
-import { showGroupAddRoomDialog } from '../../GroupAddressPicker';
-import { makeGroupPermalink, makeUserPermalink } from "../../utils/permalinks/Permalinks";
-import RightPanelStore from "../../stores/right-panel/RightPanelStore";
-import AutoHideScrollbar from "./AutoHideScrollbar";
-import { mediaFromMxc } from "../../customisations/Media";
-import { replaceableComponent } from "../../utils/replaceableComponent";
-import { createSpaceFromCommunity } from "../../utils/space";
-import { Action } from "../../dispatcher/actions";
-import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
-import { UPDATE_EVENT } from "../../stores/AsyncStore";
-
-const LONG_DESC_PLACEHOLDER = _td(
-    `<h1>HTML for your community's page</h1>
-<p>
-    Use the long description to introduce new members to the community, or distribute
-    some important <a href="foo">links</a>
-</p>
-<p>
-    You can even add images with Matrix URLs <img src="mxc://url" />
-</p>
-`);
-
-const RoomSummaryType = PropTypes.shape({
-    room_id: PropTypes.string.isRequired,
-    profile: PropTypes.shape({
-        name: PropTypes.string,
-        avatar_url: PropTypes.string,
-        canonical_alias: PropTypes.string,
-    }).isRequired,
-});
-
-const UserSummaryType = PropTypes.shape({
-    summaryInfo: PropTypes.shape({
-        user_id: PropTypes.string.isRequired,
-        role_id: PropTypes.string,
-        avatar_url: PropTypes.string,
-        displayname: PropTypes.string,
-    }).isRequired,
-});
-
-class CategoryRoomList extends React.Component {
-    static propTypes = {
-        rooms: PropTypes.arrayOf(RoomSummaryType).isRequired,
-        category: PropTypes.shape({
-            profile: PropTypes.shape({
-                name: PropTypes.string,
-            }).isRequired,
-        }),
-        groupId: PropTypes.string.isRequired,
-
-        // Whether the list should be editable
-        editing: PropTypes.bool.isRequired,
-    };
-
-    onAddRoomsToSummaryClicked = (ev) => {
-        ev.preventDefault();
-        const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-        Modal.createTrackedDialog('Add Rooms to Group Summary', '', AddressPickerDialog, {
-            title: _t('Add rooms to the community summary'),
-            description: _t("Which rooms would you like to add to this summary?"),
-            placeholder: _t("Room name or address"),
-            button: _t("Add to summary"),
-            pickerType: 'room',
-            validAddressTypes: ['mx-room-id'],
-            groupId: this.props.groupId,
-            onFinished: (success, addrs) => {
-                if (!success) return;
-                const errorList = [];
-                Promise.allSettled(addrs.map((addr) => {
-                    return GroupStore
-                        .addRoomToGroupSummary(this.props.groupId, addr.address)
-                        .catch(() => { errorList.push(addr.address); });
-                })).then(() => {
-                    if (errorList.length === 0) {
-                        return;
-                    }
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog(
-                        'Failed to add the following room to the group summary',
-                        '',
-                        ErrorDialog,
-                        {
-                            title: _t(
-                                "Failed to add the following rooms to the summary of %(groupId)s:",
-                                { groupId: this.props.groupId },
-                            ),
-                            description: errorList.join(", "),
-                        },
-                    );
-                });
-            },
-        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-    };
-
-    render() {
-        const addButton = this.props.editing ?
-            (<AccessibleButton className="mx_GroupView_featuredThings_addButton"
-                onClick={this.onAddRoomsToSummaryClicked}
-            >
-                <img src={require("../../../res/img/icons-create-room.svg").default} width="64" height="64" />
-                <div className="mx_GroupView_featuredThings_addButton_label">
-                    { _t('Add a Room') }
-                </div>
-            </AccessibleButton>) : <div />;
-
-        const roomNodes = this.props.rooms.map((r) => {
-            return <FeaturedRoom
-                key={r.room_id}
-                groupId={this.props.groupId}
-                editing={this.props.editing}
-                summaryInfo={r} />;
-        });
-
-        let catHeader = <div />;
-        if (this.props.category && this.props.category.profile) {
-            catHeader = <div className="mx_GroupView_featuredThings_category">
-                { this.props.category.profile.name }
-            </div>;
-        }
-        return <div className="mx_GroupView_featuredThings_container">
-            { catHeader }
-            { roomNodes }
-            { addButton }
-        </div>;
-    }
-}
-
-class FeaturedRoom extends React.Component {
-    static propTypes = {
-        summaryInfo: RoomSummaryType.isRequired,
-        editing: PropTypes.bool.isRequired,
-        groupId: PropTypes.string.isRequired,
-    };
-
-    onClick = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        dis.dispatch({
-            action: Action.ViewRoom,
-            room_alias: this.props.summaryInfo.profile.canonical_alias,
-            room_id: this.props.summaryInfo.room_id,
-        });
-    };
-
-    onDeleteClicked = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        GroupStore.removeRoomFromGroupSummary(
-            this.props.groupId,
-            this.props.summaryInfo.room_id,
-        ).catch((err) => {
-            logger.error('Error whilst removing room from group summary', err);
-            const roomName = this.props.summaryInfo.name ||
-                this.props.summaryInfo.canonical_alias ||
-                this.props.summaryInfo.room_id;
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog(
-                'Failed to remove room from group summary',
-                '', ErrorDialog,
-                {
-                    title: _t(
-                        "Failed to remove the room from the summary of %(groupId)s",
-                        { groupId: this.props.groupId },
-                    ),
-                    description: _t("The room '%(roomName)s' could not be removed from the summary.", { roomName }),
-                },
-            );
-        });
-    };
-
-    render() {
-        const RoomAvatar = sdk.getComponent("avatars.RoomAvatar");
-
-        const roomName = this.props.summaryInfo.profile.name ||
-            this.props.summaryInfo.profile.canonical_alias ||
-            _t("Unnamed Room");
-
-        const oobData = {
-            roomId: this.props.summaryInfo.room_id,
-            avatarUrl: this.props.summaryInfo.profile.avatar_url,
-            name: roomName,
-        };
-
-        let permalink = null;
-        if (this.props.summaryInfo.profile && this.props.summaryInfo.profile.canonical_alias) {
-            permalink = makeGroupPermalink(this.props.summaryInfo.profile.canonical_alias);
-        }
-
-        let roomNameNode = null;
-        if (permalink) {
-            roomNameNode = <a href={permalink} onClick={this.onClick}>{ roomName }</a>;
-        } else {
-            roomNameNode = <span>{ roomName }</span>;
-        }
-
-        const deleteButton = this.props.editing ?
-            <img
-                className="mx_GroupView_featuredThing_deleteButton"
-                src={require("../../../res/img/cancel-small.svg").default}
-                width="14"
-                height="14"
-                alt="Delete"
-                onClick={this.onDeleteClicked} />
-            : <div />;
-
-        return <AccessibleButton className="mx_GroupView_featuredThing" onClick={this.onClick}>
-            <RoomAvatar oobData={oobData} width={64} height={64} />
-            <div className="mx_GroupView_featuredThing_name">{ roomNameNode }</div>
-            { deleteButton }
-        </AccessibleButton>;
-    }
-}
-
-class RoleUserList extends React.Component {
-    static propTypes = {
-        users: PropTypes.arrayOf(UserSummaryType).isRequired,
-        role: PropTypes.shape({
-            profile: PropTypes.shape({
-                name: PropTypes.string,
-            }).isRequired,
-        }),
-        groupId: PropTypes.string.isRequired,
-
-        // Whether the list should be editable
-        editing: PropTypes.bool.isRequired,
-    };
-
-    onAddUsersClicked = (ev) => {
-        ev.preventDefault();
-        const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-        Modal.createTrackedDialog('Add Users to Group Summary', '', AddressPickerDialog, {
-            title: _t('Add users to the community summary'),
-            description: _t("Who would you like to add to this summary?"),
-            placeholder: _t("Name or Matrix ID"),
-            button: _t("Add to summary"),
-            validAddressTypes: ['mx-user-id'],
-            groupId: this.props.groupId,
-            shouldOmitSelf: false,
-            onFinished: (success, addrs) => {
-                if (!success) return;
-                const errorList = [];
-                Promise.allSettled(addrs.map((addr) => {
-                    return GroupStore
-                        .addUserToGroupSummary(addr.address)
-                        .catch(() => { errorList.push(addr.address); });
-                })).then(() => {
-                    if (errorList.length === 0) {
-                        return;
-                    }
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog(
-                        'Failed to add the following users to the community summary',
-                        '', ErrorDialog,
-                        {
-                            title: _t(
-                                "Failed to add the following users to the summary of %(groupId)s:",
-                                { groupId: this.props.groupId },
-                            ),
-                            description: errorList.join(", "),
-                        },
-                    );
-                });
-            },
-        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-    };
-
-    render() {
-        const addButton = this.props.editing ?
-            (<AccessibleButton className="mx_GroupView_featuredThings_addButton" onClick={this.onAddUsersClicked}>
-                <img src={require("../../../res/img/icons-create-room.svg").default} width="64" height="64" />
-                <div className="mx_GroupView_featuredThings_addButton_label">
-                    { _t('Add a User') }
-                </div>
-            </AccessibleButton>) : <div />;
-        const userNodes = this.props.users.map((u) => {
-            return <FeaturedUser
-                key={u.user_id}
-                summaryInfo={u}
-                editing={this.props.editing}
-                groupId={this.props.groupId} />;
-        });
-        let roleHeader = <div />;
-        if (this.props.role && this.props.role.profile) {
-            roleHeader = <div className="mx_GroupView_featuredThings_category">{ this.props.role.profile.name }</div>;
-        }
-        return <div className="mx_GroupView_featuredThings_container">
-            { roleHeader }
-            { userNodes }
-            { addButton }
-        </div>;
-    }
-}
-
-class FeaturedUser extends React.Component {
-    static propTypes = {
-        summaryInfo: UserSummaryType.isRequired,
-        editing: PropTypes.bool.isRequired,
-        groupId: PropTypes.string.isRequired,
-    };
-
-    onClick = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        dis.dispatch({
-            action: Action.ViewStartChatOrReuse,
-            user_id: this.props.summaryInfo.user_id,
-        });
-    };
-
-    onDeleteClicked = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        GroupStore.removeUserFromGroupSummary(
-            this.props.groupId,
-            this.props.summaryInfo.user_id,
-        ).catch((err) => {
-            logger.error('Error whilst removing user from group summary', err);
-            const displayName = this.props.summaryInfo.displayname || this.props.summaryInfo.user_id;
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog(
-                'Failed to remove user from community summary',
-                '',
-                ErrorDialog,
-                {
-                    title: _t(
-                        "Failed to remove a user from the summary of %(groupId)s",
-                        { groupId: this.props.groupId },
-                    ),
-                    description: _t(
-                        "The user '%(displayName)s' could not be removed from the summary.",
-                        { displayName },
-                    ),
-                },
-            );
-        });
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        const name = this.props.summaryInfo.displayname || this.props.summaryInfo.user_id;
-
-        const permalink = makeUserPermalink(this.props.summaryInfo.user_id);
-        const userNameNode = <a href={permalink} onClick={this.onClick}>{ name }</a>;
-        const httpUrl = mediaFromMxc(this.props.summaryInfo.avatar_url).getSquareThumbnailHttp(64);
-
-        const deleteButton = this.props.editing ?
-            <img
-                className="mx_GroupView_featuredThing_deleteButton"
-                src={require("../../../res/img/cancel-small.svg").default}
-                width="14"
-                height="14"
-                alt="Delete"
-                onClick={this.onDeleteClicked} />
-            : <div />;
-
-        return <AccessibleButton className="mx_GroupView_featuredThing" onClick={this.onClick}>
-            <BaseAvatar name={name} url={httpUrl} width={64} height={64} />
-            <div className="mx_GroupView_featuredThing_name">{ userNameNode }</div>
-            { deleteButton }
-        </AccessibleButton>;
-    }
-}
-
-const GROUP_JOINPOLICY_OPEN = "open";
-const GROUP_JOINPOLICY_INVITE = "invite";
-
-const UPGRADE_NOTICE_LS_KEY = "mx_hide_community_upgrade_notice";
-
-@replaceableComponent("structures.GroupView")
-export default class GroupView extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-        // Whether this is the first time the group admin is viewing the group
-        groupIsNew: PropTypes.bool,
-    };
-
-    state = {
-        summary: null,
-        isGroupPublicised: null,
-        isUserPrivileged: null,
-        groupRooms: null,
-        groupRoomsLoading: null,
-        error: null,
-        editing: false,
-        saving: false,
-        uploadingAvatar: false,
-        avatarChanged: false,
-        membershipBusy: false,
-        publicityBusy: false,
-        inviterProfile: null,
-        showRightPanel: RightPanelStore.instance.isOpenForGroup,
-        showUpgradeNotice: !localStorage.getItem(UPGRADE_NOTICE_LS_KEY),
-    };
-
-    componentDidMount() {
-        this._unmounted = false;
-        this._matrixClient = MatrixClientPeg.get();
-        this._matrixClient.on("Group.myMembership", this._onGroupMyMembership);
-
-        this._initGroupStore(this.props.groupId, true);
-
-        this._dispatcherRef = dis.register(this._onAction);
-        RightPanelStore.instance.on(UPDATE_EVENT, this._onRightPanelStoreUpdate);
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-        this._matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
-        dis.unregister(this._dispatcherRef);
-
-        RightPanelStore.instance.off(UPDATE_EVENT, this._onRightPanelStoreUpdate);
-    }
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(newProps) {
-        if (this.props.groupId !== newProps.groupId) {
-            this.setState({
-                summary: null,
-                error: null,
-            }, () => {
-                this._initGroupStore(newProps.groupId);
-            });
-        }
-    }
-
-    _onRightPanelStoreUpdate = () => {
-        this.setState({
-            showRightPanel: RightPanelStore.instance.isOpenForGroup,
-        });
-    };
-
-    _onGroupMyMembership = (group) => {
-        if (this._unmounted || group.groupId !== this.props.groupId) return;
-        if (group.myMembership === 'leave') {
-            // Leave settings - the user might have clicked the "Leave" button
-            this._closeSettings();
-        }
-        this.setState({ membershipBusy: false });
-    };
-
-    _initGroupStore(groupId, firstInit) {
-        const group = this._matrixClient.getGroup(groupId);
-        if (group && group.inviter && group.inviter.userId) {
-            this._fetchInviterProfile(group.inviter.userId);
-        }
-        GroupStore.registerListener(groupId, this.onGroupStoreUpdated.bind(this, firstInit));
-        let willDoOnboarding = false;
-        // XXX: This should be more fluxy - let's get the error from GroupStore .getError or something
-        GroupStore.on('error', (err, errorGroupId, stateKey) => {
-            if (this._unmounted || groupId !== errorGroupId) return;
-            if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN' && !willDoOnboarding) {
-                dis.dispatch({
-                    action: Action.DoAfterSyncPrepared,
-                    deferred_action: {
-                        action: 'view_group',
-                        group_id: groupId,
-                    },
-                });
-                dis.dispatch({ action: 'require_registration', screen_after: { screen: `group/${groupId}` } });
-                willDoOnboarding = true;
-            }
-            if (stateKey === GroupStore.STATE_KEY.Summary) {
-                this.setState({
-                    summary: null,
-                    error: err,
-                    editing: false,
-                });
-            }
-        });
-    }
-
-    onGroupStoreUpdated = (firstInit) => {
-        if (this._unmounted) return;
-        const summary = GroupStore.getSummary(this.props.groupId);
-        if (summary.profile) {
-            // Default profile fields should be "" for later sending to the server (which
-            // requires that the fields are strings, not null)
-            ["avatar_url", "long_description", "name", "short_description"].forEach((k) => {
-                summary.profile[k] = summary.profile[k] || "";
-            });
-        }
-        this.setState({
-            summary,
-            summaryLoading: !GroupStore.isStateReady(this.props.groupId, GroupStore.STATE_KEY.Summary),
-            isGroupPublicised: GroupStore.getGroupPublicity(this.props.groupId),
-            isUserPrivileged: GroupStore.isUserPrivileged(this.props.groupId),
-            groupRooms: GroupStore.getGroupRooms(this.props.groupId),
-            groupRoomsLoading: !GroupStore.isStateReady(this.props.groupId, GroupStore.STATE_KEY.GroupRooms),
-            isUserMember: GroupStore.getGroupMembers(this.props.groupId).some(
-                (m) => m.userId === this._matrixClient.credentials.userId,
-            ),
-        });
-        // XXX: This might not work but this.props.groupIsNew unused anyway
-        if (this.props.groupIsNew && firstInit) {
-            this._onEditClick();
-        }
-    };
-
-    _fetchInviterProfile(userId) {
-        this.setState({
-            inviterProfileBusy: true,
-        });
-        this._matrixClient.getProfileInfo(userId).then((resp) => {
-            if (this._unmounted) return;
-            this.setState({
-                inviterProfile: {
-                    avatarUrl: resp.avatar_url,
-                    displayName: resp.displayname,
-                },
-            });
-        }).catch((e) => {
-            logger.error('Error getting group inviter profile', e);
-        }).finally(() => {
-            if (this._unmounted) return;
-            this.setState({
-                inviterProfileBusy: false,
-            });
-        });
-    }
-
-    _onEditClick = () => {
-        this.setState({
-            editing: true,
-            profileForm: Object.assign({}, this.state.summary.profile),
-            joinableForm: {
-                policyType:
-                    this.state.summary.profile.is_openly_joinable ?
-                        GROUP_JOINPOLICY_OPEN :
-                        GROUP_JOINPOLICY_INVITE,
-            },
-        });
-    };
-
-    _onShareClick = () => {
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share community dialog', '', ShareDialog, {
-            target: this._matrixClient.getGroup(this.props.groupId) || new Group(this.props.groupId),
-        });
-    };
-
-    _onCancelClick = () => {
-        this._closeSettings();
-    };
-
-    _onAction = (payload) => {
-        switch (payload.action) {
-            // NOTE: close_settings is an app-wide dispatch; as it is dispatched from MatrixChat
-            case 'close_settings':
-                this.setState({
-                    editing: false,
-                    profileForm: null,
-                });
-                break;
-            default:
-                break;
-        }
-    };
-
-    _closeSettings = () => {
-        dis.dispatch({ action: 'close_settings' });
-    };
-
-    _onNameChange = (value) => {
-        const newProfileForm = Object.assign(this.state.profileForm, { name: value });
-        this.setState({
-            profileForm: newProfileForm,
-        });
-    };
-
-    _onShortDescChange = (value) => {
-        const newProfileForm = Object.assign(this.state.profileForm, { short_description: value });
-        this.setState({
-            profileForm: newProfileForm,
-        });
-    };
-
-    _onLongDescChange = (e) => {
-        const newProfileForm = Object.assign(this.state.profileForm, { long_description: e.target.value });
-        this.setState({
-            profileForm: newProfileForm,
-        });
-    };
-
-    _onAvatarSelected = ev => {
-        const file = ev.target.files[0];
-        if (!file) return;
-
-        this.setState({ uploadingAvatar: true });
-        this._matrixClient.uploadContent(file).then((url) => {
-            const newProfileForm = Object.assign(this.state.profileForm, { avatar_url: url });
-            this.setState({
-                uploadingAvatar: false,
-                profileForm: newProfileForm,
-
-                // Indicate that FlairStore needs to be poked to show this change
-                // in TagTile (GroupFilterPanel), Flair and GroupTile (MyGroups).
-                avatarChanged: true,
-            });
-        }).catch((e) => {
-            this.setState({ uploadingAvatar: false });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            logger.error("Failed to upload avatar image", e);
-            Modal.createTrackedDialog('Failed to upload image', '', ErrorDialog, {
-                title: _t('Error'),
-                description: _t('Failed to upload image'),
-            });
-        });
-    };
-
-    _onJoinableChange = ev => {
-        this.setState({
-            joinableForm: { policyType: ev.target.value },
-        });
-    };
-
-    _onSaveClick = () => {
-        this.setState({ saving: true });
-        const savePromise = this.state.isUserPrivileged ? this._saveGroup() : Promise.resolve();
-        savePromise.then((result) => {
-            this.setState({
-                saving: false,
-                editing: false,
-                summary: null,
-            });
-            this._initGroupStore(this.props.groupId);
-
-            if (this.state.avatarChanged) {
-                // XXX: Evil - poking a store should be done from an async action
-                FlairStore.refreshGroupProfile(this._matrixClient, this.props.groupId);
-            }
-        }).catch((e) => {
-            this.setState({
-                saving: false,
-            });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            logger.error("Failed to save community profile", e);
-            Modal.createTrackedDialog('Failed to update group', '', ErrorDialog, {
-                title: _t('Error'),
-                description: _t('Failed to update community'),
-            });
-        }).finally(() => {
-            this.setState({
-                avatarChanged: false,
-            });
-        });
-    };
-
-    async _saveGroup() {
-        await this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm);
-        await this._matrixClient.setGroupJoinPolicy(this.props.groupId, {
-            type: this.state.joinableForm.policyType,
-        });
-    }
-
-    _onAcceptInviteClick = async () => {
-        this.setState({ membershipBusy: true });
-
-        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
-        // spinner disappearing after we have fetched new group data.
-        await sleep(500);
-
-        GroupStore.acceptGroupInvite(this.props.groupId).then(() => {
-            // don't reset membershipBusy here: wait for the membership change to come down the sync
-        }).catch((e) => {
-            this.setState({ membershipBusy: false });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Error accepting invite', '', ErrorDialog, {
-                title: _t("Error"),
-                description: _t("Unable to accept invite"),
-            });
-        });
-    };
-
-    _onRejectInviteClick = async () => {
-        this.setState({ membershipBusy: true });
-
-        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
-        // spinner disappearing after we have fetched new group data.
-        await sleep(500);
-
-        GroupStore.leaveGroup(this.props.groupId).then(() => {
-            // don't reset membershipBusy here: wait for the membership change to come down the sync
-        }).catch((e) => {
-            this.setState({ membershipBusy: false });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
-                title: _t("Error"),
-                description: _t("Unable to reject invite"),
-            });
-        });
-    };
-
-    _onJoinClick = async () => {
-        if (this._matrixClient.isGuest()) {
-            dis.dispatch({ action: 'require_registration', screen_after: { screen: `group/${this.props.groupId}` } });
-            return;
-        }
-
-        this.setState({ membershipBusy: true });
-
-        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
-        // spinner disappearing after we have fetched new group data.
-        await sleep(500);
-
-        GroupStore.joinGroup(this.props.groupId).then(() => {
-            // don't reset membershipBusy here: wait for the membership change to come down the sync
-        }).catch((e) => {
-            this.setState({ membershipBusy: false });
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Error joining room', '', ErrorDialog, {
-                title: _t("Error"),
-                description: _t("Unable to join community"),
-            });
-        });
-    };
-
-    _leaveGroupWarnings() {
-        const warnings = [];
-
-        if (this.state.isUserPrivileged) {
-            warnings.push((
-                <span className="warning">
-                    { " " /* Whitespace, otherwise the sentences get smashed together */ }
-                    { _t("You are an administrator of this community. You will not be " +
-                         "able to rejoin without an invite from another administrator.") }
-                </span>
-            ));
-        }
-
-        return warnings;
-    }
-
-    _onLeaveClick = () => {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        const warnings = this._leaveGroupWarnings();
-
-        Modal.createTrackedDialog('Leave Group', '', QuestionDialog, {
-            title: _t("Leave Community"),
-            description: (
-                <span>
-                    { _t("Leave %(groupName)s?", { groupName: this.props.groupId }) }
-                    { warnings }
-                </span>
-            ),
-            button: _t("Leave"),
-            danger: this.state.isUserPrivileged,
-            onFinished: async (confirmed) => {
-                if (!confirmed) return;
-
-                this.setState({ membershipBusy: true });
-
-                // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
-                // spinner disappearing after we have fetched new group data.
-                await sleep(500);
-
-                GroupStore.leaveGroup(this.props.groupId).then(() => {
-                    // don't reset membershipBusy here: wait for the membership change to come down the sync
-                }).catch((e) => {
-                    this.setState({ membershipBusy: false });
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Error leaving community', '', ErrorDialog, {
-                        title: _t("Error"),
-                        description: _t("Unable to leave community"),
-                    });
-                });
-            },
-        });
-    };
-
-    _onAddRoomsClick = () => {
-        showGroupAddRoomDialog(this.props.groupId);
-    };
-
-    _dismissUpgradeNotice = () => {
-        localStorage.setItem(UPGRADE_NOTICE_LS_KEY, "true");
-        this.setState({ showUpgradeNotice: false });
-    };
-
-    _onCreateSpaceClick = () => {
-        createSpaceFromCommunity(this._matrixClient, this.props.groupId);
-    };
-
-    _onAdminsLinkClick = () => {
-        RightPanelStore.instance.setCard({ phase: RightPanelPhases.GroupMemberList });
-    };
-
-    _getGroupSection() {
-        const groupSettingsSectionClasses = classnames({
-            "mx_GroupView_group": this.state.editing,
-            "mx_GroupView_group_disabled": this.state.editing && !this.state.isUserPrivileged,
-        });
-
-        const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />;
-
-        const hostingSignupLink = getHostingLink('community-settings');
-        let hostingSignup = null;
-        if (hostingSignupLink && this.state.isUserPrivileged) {
-            hostingSignup = <div className="mx_GroupView_hostingSignup">
-                { _t(
-                    "Want more than a community? <a>Get your own server</a>", {},
-                    {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{ sub }</a>,
-                    },
-                ) }
-                <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">
-                    <img src={require("../../../res/img/external-link.svg").default} width="11" height="10" alt='' />
-                </a>
-            </div>;
-        }
-
-        const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
-            <div className="mx_GroupView_changeDelayWarning">
-                { _t(
-                    'Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> ' +
-                    'might not be seen by other users for up to 30 minutes.',
-                    {},
-                    {
-                        'bold1': (sub) => <b> { sub } </b>,
-                        'bold2': (sub) => <b> { sub } </b>,
-                    },
-                ) }
-            </div> : <div />;
-
-        let communitiesUpgradeNotice;
-        if (this.state.showUpgradeNotice) {
-            let text;
-            if (this.state.isUserPrivileged) {
-                text = _t("You can create a Space from this community <a>here</a>.", {}, {
-                    a: sub => <AccessibleButton onClick={this._onCreateSpaceClick} kind="link">
-                        { sub }
-                    </AccessibleButton>,
-                });
-            } else {
-                text = _t("Ask the <a>admins</a> of this community to make it into a Space " +
-                    "and keep a look out for the invite.", {}, {
-                    a: sub => <AccessibleButton onClick={this._onAdminsLinkClick} kind="link">
-                        { sub }
-                    </AccessibleButton>,
-                });
-            }
-
-            communitiesUpgradeNotice = <div className="mx_GroupView_spaceUpgradePrompt">
-                <h2>{ _t("Communities can now be made into Spaces") }</h2>
-                <p>
-                    { _t("Spaces are a new way to make a community, with new features coming.") }
-                    &nbsp;
-                    { text }
-                    &nbsp;
-                    { _t("Communities won't receive further updates.") }
-                </p>
-                <AccessibleButton
-                    className="mx_GroupView_spaceUpgradePrompt_close"
-                    onClick={this._dismissUpgradeNotice}
-                />
-            </div>;
-        }
-
-        return <div className={groupSettingsSectionClasses}>
-            { header }
-            { hostingSignup }
-            { changeDelayWarning }
-            { communitiesUpgradeNotice }
-            { this._getJoinableNode() }
-            { this._getLongDescriptionNode() }
-            { this._getRoomsNode() }
-        </div>;
-    }
-
-    _getRoomsNode() {
-        const RoomDetailList = sdk.getComponent('rooms.RoomDetailList');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const TooltipButton = sdk.getComponent('elements.TooltipButton');
-
-        const roomsHelpNode = this.state.editing ? <TooltipButton helpText={
-            _t(
-                'These rooms are displayed to community members on the community page. '+
-                'Community members can join the rooms by clicking on them.',
-            )
-        } /> : <div />;
-
-        const addRoomRow = this.state.editing ?
-            (<AccessibleButton className="mx_GroupView_rooms_header_addRow"
-                onClick={this._onAddRoomsClick}
-            >
-                <div className="mx_GroupView_rooms_header_addRow_button">
-                    <img src={require("../../../res/img/icons-room-add.svg").default} width="24" height="24" />
-                </div>
-                <div className="mx_GroupView_rooms_header_addRow_label">
-                    { _t('Add rooms to this community') }
-                </div>
-            </AccessibleButton>) : <div />;
-
-        return <div className="mx_GroupView_rooms">
-            <div className="mx_GroupView_rooms_header">
-                <h3>
-                    { _t('Rooms') }
-                    { roomsHelpNode }
-                </h3>
-                { addRoomRow }
-            </div>
-            { this.state.groupRoomsLoading ?
-                <Spinner /> :
-                <RoomDetailList rooms={this.state.groupRooms} />
-            }
-        </div>;
-    }
-
-    _getFeaturedRoomsNode() {
-        const summary = this.state.summary;
-
-        const defaultCategoryRooms = [];
-        const categoryRooms = {};
-        summary.rooms_section.rooms.forEach((r) => {
-            if (r.category_id === null) {
-                defaultCategoryRooms.push(r);
-            } else {
-                let list = categoryRooms[r.category_id];
-                if (list === undefined) {
-                    list = [];
-                    categoryRooms[r.category_id] = list;
-                }
-                list.push(r);
-            }
-        });
-
-        const defaultCategoryNode = <CategoryRoomList
-            rooms={defaultCategoryRooms}
-            groupId={this.props.groupId}
-            editing={this.state.editing} />;
-        const categoryRoomNodes = Object.keys(categoryRooms).map((catId) => {
-            const cat = summary.rooms_section.categories[catId];
-            return <CategoryRoomList
-                key={catId}
-                rooms={categoryRooms[catId]}
-                category={cat}
-                groupId={this.props.groupId}
-                editing={this.state.editing} />;
-        });
-
-        return <div className="mx_GroupView_featuredThings">
-            <div className="mx_GroupView_featuredThings_header">
-                { _t('Featured Rooms:') }
-            </div>
-            { defaultCategoryNode }
-            { categoryRoomNodes }
-        </div>;
-    }
-
-    _getFeaturedUsersNode() {
-        const summary = this.state.summary;
-
-        const noRoleUsers = [];
-        const roleUsers = {};
-        summary.users_section.users.forEach((u) => {
-            if (u.role_id === null) {
-                noRoleUsers.push(u);
-            } else {
-                let list = roleUsers[u.role_id];
-                if (list === undefined) {
-                    list = [];
-                    roleUsers[u.role_id] = list;
-                }
-                list.push(u);
-            }
-        });
-
-        const noRoleNode = <RoleUserList
-            users={noRoleUsers}
-            groupId={this.props.groupId}
-            editing={this.state.editing} />;
-        const roleUserNodes = Object.keys(roleUsers).map((roleId) => {
-            const role = summary.users_section.roles[roleId];
-            return <RoleUserList
-                key={roleId}
-                users={roleUsers[roleId]}
-                role={role}
-                groupId={this.props.groupId}
-                editing={this.state.editing} />;
-        });
-
-        return <div className="mx_GroupView_featuredThings">
-            <div className="mx_GroupView_featuredThings_header">
-                { _t('Featured Users:') }
-            </div>
-            { noRoleNode }
-            { roleUserNodes }
-        </div>;
-    }
-
-    _getMembershipSection() {
-        const Spinner = sdk.getComponent("elements.Spinner");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-
-        const group = this._matrixClient.getGroup(this.props.groupId);
-
-        if (group && group.myMembership === 'invite') {
-            if (this.state.membershipBusy || this.state.inviterProfileBusy) {
-                return <div className="mx_GroupView_membershipSection">
-                    <Spinner />
-                </div>;
-            }
-            const httpInviterAvatar = this.state.inviterProfile && this.state.inviterProfile.avatarUrl
-                ? mediaFromMxc(this.state.inviterProfile.avatarUrl).getSquareThumbnailHttp(36)
-                : null;
-
-            const inviter = group.inviter || {};
-            let inviterName = inviter.userId;
-            if (this.state.inviterProfile) {
-                inviterName = this.state.inviterProfile.displayName || inviter.userId;
-            }
-            return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited">
-                <div className="mx_GroupView_membershipSubSection">
-                    <div className="mx_GroupView_membershipSection_description">
-                        <BaseAvatar url={httpInviterAvatar}
-                            name={inviterName}
-                            width={36}
-                            height={36}
-                        />
-                        { _t("%(inviter)s has invited you to join this community", {
-                            inviter: inviterName || _t("Someone"),
-                        }) }
-                    </div>
-                    <div className="mx_GroupView_membership_buttonContainer">
-                        <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
-                            onClick={this._onAcceptInviteClick}
-                        >
-                            { _t("Accept") }
-                        </AccessibleButton>
-                        <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
-                            onClick={this._onRejectInviteClick}
-                        >
-                            { _t("Decline") }
-                        </AccessibleButton>
-                    </div>
-                </div>
-            </div>;
-        }
-
-        let membershipContainerExtraClasses;
-        let membershipButtonExtraClasses;
-        let membershipButtonTooltip;
-        let membershipButtonText;
-        let membershipButtonOnClick;
-
-        // User is not in the group
-        if ((!group || group.myMembership === 'leave') &&
-            this.state.summary &&
-            this.state.summary.profile &&
-            Boolean(this.state.summary.profile.is_openly_joinable)
-        ) {
-            membershipButtonText = _t("Join this community");
-            membershipButtonOnClick = this._onJoinClick;
-
-            membershipButtonExtraClasses = 'mx_GroupView_joinButton';
-            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_leave';
-        } else if (
-            group &&
-            group.myMembership === 'join' &&
-            this.state.editing
-        ) {
-            membershipButtonText = _t("Leave this community");
-            membershipButtonOnClick = this._onLeaveClick;
-            membershipButtonTooltip = this.state.isUserPrivileged ?
-                _t("You are an administrator of this community") :
-                _t("You are a member of this community");
-
-            membershipButtonExtraClasses = {
-                'mx_GroupView_leaveButton': true,
-                'mx_RoomHeader_textButton_danger': this.state.isUserPrivileged,
-            };
-            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_joined';
-        } else {
-            return null;
-        }
-
-        const membershipButtonClasses = classnames(
-            [
-                'mx_RoomHeader_textButton',
-                'mx_GroupView_textButton',
-            ],
-            membershipButtonExtraClasses,
-        );
-
-        const membershipContainerClasses = classnames(
-            'mx_GroupView_membershipSection',
-            membershipContainerExtraClasses,
-        );
-
-        return <div className={membershipContainerClasses}>
-            <div className="mx_GroupView_membershipSubSection">
-                { /* The <div /> is for flex alignment */ }
-                { this.state.membershipBusy ? <Spinner /> : <div /> }
-                <div className="mx_GroupView_membership_buttonContainer">
-                    <AccessibleButton
-                        className={membershipButtonClasses}
-                        onClick={membershipButtonOnClick}
-                        title={membershipButtonTooltip}
-                    >
-                        { membershipButtonText }
-                    </AccessibleButton>
-                </div>
-            </div>
-        </div>;
-    }
-
-    _getJoinableNode() {
-        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
-        return this.state.editing ? <div>
-            <h3>
-                { _t('Who can join this community?') }
-                { this.state.groupJoinableLoading ?
-                    <InlineSpinner /> : <div />
-                }
-            </h3>
-            <div>
-                <label>
-                    <input type="radio"
-                        value={GROUP_JOINPOLICY_INVITE}
-                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_INVITE}
-                        onChange={this._onJoinableChange}
-                    />
-                    <div className="mx_GroupView_label_text">
-                        { _t('Only people who have been invited') }
-                    </div>
-                </label>
-            </div>
-            <div>
-                <label>
-                    <input type="radio"
-                        value={GROUP_JOINPOLICY_OPEN}
-                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_OPEN}
-                        onChange={this._onJoinableChange}
-                    />
-                    <div className="mx_GroupView_label_text">
-                        { _t('Everyone') }
-                    </div>
-                </label>
-            </div>
-        </div> : null;
-    }
-
-    _getLongDescriptionNode() {
-        const summary = this.state.summary;
-        let description = null;
-        if (summary.profile && summary.profile.long_description) {
-            description = sanitizedHtmlNode(summary.profile.long_description);
-        } else if (this.state.isUserPrivileged) {
-            description = <div
-                className="mx_GroupView_groupDesc_placeholder"
-                onClick={this._onEditClick}
-            >
-                { _t(
-                    'Your community hasn\'t got a Long Description, a HTML page to show to community members.<br />' +
-                    'Click here to open settings and give it one!',
-                    {},
-                    { 'br': <br /> },
-                ) }
-            </div>;
-        }
-        const groupDescEditingClasses = classnames({
-            "mx_GroupView_groupDesc": true,
-            "mx_GroupView_groupDesc_disabled": !this.state.isUserPrivileged,
-        });
-
-        return this.state.editing ?
-            <div className={groupDescEditingClasses}>
-                <h3> { _t("Long Description (HTML)") } </h3>
-                <textarea
-                    value={this.state.profileForm.long_description}
-                    placeholder={_t(LONG_DESC_PLACEHOLDER)}
-                    onChange={this._onLongDescChange}
-                    tabIndex="4"
-                    key="editLongDesc"
-                />
-            </div> :
-            <div className="mx_GroupView_groupDesc">
-                { description }
-            </div>;
-    }
-
-    render() {
-        const GroupAvatar = sdk.getComponent("avatars.GroupAvatar");
-        const Spinner = sdk.getComponent("elements.Spinner");
-
-        if (this.state.summaryLoading && this.state.error === null || this.state.saving) {
-            return <Spinner />;
-        } else if (this.state.summary && !this.state.error) {
-            const summary = this.state.summary;
-
-            let avatarNode;
-            let nameNode;
-            let shortDescNode;
-            const rightButtons = [];
-            if (this.state.editing && this.state.isUserPrivileged) {
-                let avatarImage;
-                if (this.state.uploadingAvatar) {
-                    avatarImage = <Spinner />;
-                } else {
-                    const GroupAvatar = sdk.getComponent('avatars.GroupAvatar');
-                    avatarImage = <GroupAvatar
-                        groupId={this.props.groupId}
-                        groupName={this.state.profileForm.name}
-                        groupAvatarUrl={this.state.profileForm.avatar_url}
-                        width={28}
-                        height={28}
-                        resizeMethod='crop'
-                    />;
-                }
-
-                avatarNode = (
-                    <div className="mx_GroupView_avatarPicker">
-                        <label htmlFor="avatarInput" className="mx_GroupView_avatarPicker_label">
-                            { avatarImage }
-                        </label>
-                        <div className="mx_GroupView_avatarPicker_edit">
-                            <label htmlFor="avatarInput" className="mx_GroupView_avatarPicker_label">
-                                <img
-                                    src={require("../../../res/img/camera.svg").default}
-                                    alt={_t("Upload avatar")}
-                                    title={_t("Upload avatar")}
-                                    width="17"
-                                    height="15" />
-                            </label>
-                            <input id="avatarInput" className="mx_GroupView_uploadInput" type="file" onChange={this._onAvatarSelected} />
-                        </div>
-                    </div>
-                );
-
-                const EditableText = sdk.getComponent("elements.EditableText");
-
-                nameNode = <EditableText
-                    className="mx_GroupView_editable"
-                    placeholderClassName="mx_GroupView_placeholder"
-                    placeholder={_t('Community Name')}
-                    blurToCancel={false}
-                    initialValue={this.state.profileForm.name}
-                    onValueChanged={this._onNameChange}
-                    tabIndex="0"
-                    dir="auto" />;
-
-                shortDescNode = <EditableText
-                    className="mx_GroupView_editable"
-                    placeholderClassName="mx_GroupView_placeholder"
-                    placeholder={_t("Description")}
-                    blurToCancel={false}
-                    initialValue={this.state.profileForm.short_description}
-                    onValueChanged={this._onShortDescChange}
-                    tabIndex="0"
-                    dir="auto" />;
-            } else {
-                const onGroupHeaderItemClick = this.state.isUserMember ? this._onEditClick : null;
-                const groupAvatarUrl = summary.profile ? summary.profile.avatar_url : null;
-                const groupName = summary.profile ? summary.profile.name : null;
-                avatarNode = <GroupAvatar
-                    groupId={this.props.groupId}
-                    groupAvatarUrl={groupAvatarUrl}
-                    groupName={groupName}
-                    onClick={onGroupHeaderItemClick}
-                    width={28}
-                    height={28}
-                />;
-                if (summary.profile && summary.profile.name) {
-                    nameNode = <div onClick={onGroupHeaderItemClick}>
-                        <span>{ summary.profile.name }</span>
-                        <span className="mx_GroupView_header_groupid">
-                            ({ this.props.groupId })
-                        </span>
-                    </div>;
-                } else {
-                    nameNode = <span onClick={onGroupHeaderItemClick}>{ this.props.groupId }</span>;
-                }
-                if (summary.profile && summary.profile.short_description) {
-                    shortDescNode = <span onClick={onGroupHeaderItemClick}>{ summary.profile.short_description }</span>;
-                }
-            }
-
-            if (this.state.editing) {
-                rightButtons.push(
-                    <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
-                        key="_saveButton"
-                        onClick={this._onSaveClick}
-                    >
-                        { _t('Save') }
-                    </AccessibleButton>,
-                );
-                rightButtons.push(
-                    <AccessibleButton className="mx_RoomHeader_cancelButton"
-                        key="_cancelButton"
-                        onClick={this._onCancelClick}
-                    >
-                        <img
-                            src={require("../../../res/img/cancel.svg").default}
-                            className="mx_filterFlipColor"
-                            width="18"
-                            height="18"
-                            alt={_t("Cancel")} />
-                    </AccessibleButton>,
-                );
-            } else {
-                if (summary.user && summary.user.membership === 'join') {
-                    rightButtons.push(
-                        <AccessibleButton
-                            className="mx_GroupHeader_button mx_GroupHeader_editButton"
-                            key="_editButton"
-                            onClick={this._onEditClick}
-                            title={_t("Community Settings")}
-                        />,
-                    );
-                }
-                rightButtons.push(
-                    <AccessibleButton
-                        className="mx_GroupHeader_button mx_GroupHeader_shareButton"
-                        key="_shareButton"
-                        onClick={this._onShareClick}
-                        title={_t('Share Community')}
-                    />,
-                );
-            }
-
-            const rightPanel = this.state.showRightPanel ? <RightPanel groupId={this.props.groupId} /> : undefined;
-
-            const headerClasses = {
-                "mx_GroupView_header": true,
-                "light-panel": true,
-                "mx_GroupView_header_view": !this.state.editing,
-                "mx_GroupView_header_isUserMember": this.state.isUserMember,
-            };
-
-            return (
-                <main className="mx_GroupView">
-                    <div className={classnames(headerClasses)}>
-                        <div className="mx_GroupView_header_leftCol">
-                            <div className="mx_GroupView_header_avatar">
-                                { avatarNode }
-                            </div>
-                            <div className="mx_GroupView_header_info">
-                                <div className="mx_GroupView_header_name">
-                                    { nameNode }
-                                </div>
-                                <div className="mx_GroupView_header_shortDesc">
-                                    { shortDescNode }
-                                </div>
-                            </div>
-                        </div>
-                        <div className="mx_GroupView_header_rightCol">
-                            { rightButtons }
-                        </div>
-                        <GroupHeaderButtons />
-                    </div>
-                    <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                        <AutoHideScrollbar className="mx_GroupView_body">
-                            { this._getMembershipSection() }
-                            { this._getGroupSection() }
-                        </AutoHideScrollbar>
-                    </MainSplit>
-                </main>
-            );
-        } else if (this.state.error) {
-            if (this.state.error.httpStatus === 404) {
-                return (
-                    <div className="mx_GroupView_error">
-                        { _t('Community %(groupId)s not found', { groupId: this.props.groupId }) }
-                    </div>
-                );
-            } else {
-                let extraText;
-                if (this.state.error.errcode === 'M_UNRECOGNIZED') {
-                    extraText = <div>{ _t('This homeserver does not support communities') }</div>;
-                }
-                return (
-                    <div className="mx_GroupView_error">
-                        { _t('Failed to load %(groupId)s', { groupId: this.props.groupId }) }
-                        { extraText }
-                    </div>
-                );
-            }
-        } else {
-            logger.error("Invalid state for GroupView");
-            return <div />;
-        }
-    }
-}
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index 52ac9cc1eaf..ddba1c81d71 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -21,7 +21,6 @@ import AutoHideScrollbar from './AutoHideScrollbar';
 import { getHomePageUrl } from "../../utils/pages";
 import { _tDom } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
-import * as sdk from "../../index";
 import dis from "../../dispatcher/dispatcher";
 import { Action } from "../../dispatcher/actions";
 import BaseAvatar from "../views/avatars/BaseAvatar";
@@ -33,14 +32,17 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import MiniAvatarUploader, { AVATAR_SIZE } from "../views/elements/MiniAvatarUploader";
 import Analytics from "../../Analytics";
 import PosthogTrackers from "../../PosthogTrackers";
+import EmbeddedPage from "./EmbeddedPage";
 
-const onClickSendDm = () => {
+const onClickSendDm = (ev: ButtonEvent) => {
     Analytics.trackEvent('home_page', 'button', 'dm');
+    PosthogTrackers.trackInteraction("WebHomeCreateChatButton", ev);
     dis.dispatch({ action: 'view_create_chat' });
 };
 
-const onClickExplore = () => {
+const onClickExplore = (ev: ButtonEvent) => {
     Analytics.trackEvent('home_page', 'button', 'room_directory');
+    PosthogTrackers.trackInteraction("WebHomeExploreRoomsButton", ev);
     dis.fire(Action.ViewRoomDirectory);
 };
 
@@ -94,8 +96,6 @@ const HomePage: React.FC<IProps> = ({ justRegistered = false }) => {
     const pageUrl = getHomePageUrl(config);
 
     if (pageUrl) {
-        // FIXME: Using an import will result in wrench-element-tests failures
-        const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         return <EmbeddedPage className="mx_HomePage" url={pageUrl} scrollbar={true} />;
     }
 
@@ -103,11 +103,8 @@ const HomePage: React.FC<IProps> = ({ justRegistered = false }) => {
     if (justRegistered) {
         introSection = <UserWelcomeTop />;
     } else {
-        const brandingConfig = config.branding;
-        let logoUrl = "themes/element/img/logos/element-logo.svg";
-        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
-            logoUrl = brandingConfig.authHeaderLogoUrl;
-        }
+        const brandingConfig = SdkConfig.getObject("branding");
+        const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";
 
         introSection = <React.Fragment>
             <img src={logoUrl} alt={config.brand} />
diff --git a/src/components/structures/HostSignupAction.tsx b/src/components/structures/HostSignupAction.tsx
index 99881f27c4e..6ba37eb9aa9 100644
--- a/src/components/structures/HostSignupAction.tsx
+++ b/src/components/structures/HostSignupAction.tsx
@@ -23,7 +23,6 @@ import {
 import { _t } from "../../languageHandler";
 import { HostSignupStore } from "../../stores/HostSignupStore";
 import SdkConfig from "../../SdkConfig";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IProps {
     onClick?(): void;
@@ -31,7 +30,6 @@ interface IProps {
 
 interface IState {}
 
-@replaceableComponent("structures.HostSignupAction")
 export default class HostSignupAction extends React.PureComponent<IProps, IState> {
     private openDialog = async () => {
         this.props.onClick?.();
@@ -39,8 +37,8 @@ export default class HostSignupAction extends React.PureComponent<IProps, IState
     };
 
     public render(): React.ReactNode {
-        const hostSignupConfig = SdkConfig.get().hostSignup;
-        if (!hostSignupConfig?.brand) {
+        const hostSignupConfig = SdkConfig.getObject("host_signup");
+        if (!hostSignupConfig?.get("brand")) {
             return null;
         }
 
@@ -51,7 +49,7 @@ export default class HostSignupAction extends React.PureComponent<IProps, IState
                     label={_t(
                         "Upgrade to %(hostSignupBrand)s",
                         {
-                            hostSignupBrand: hostSignupConfig.brand,
+                            hostSignupBrand: hostSignupConfig.get("brand"),
                         },
                     )}
                     onClick={this.openDialog}
diff --git a/src/components/structures/IndicatorScrollbar.tsx b/src/components/structures/IndicatorScrollbar.tsx
index 307541cb0b9..4b122345b32 100644
--- a/src/components/structures/IndicatorScrollbar.tsx
+++ b/src/components/structures/IndicatorScrollbar.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ComponentProps, createRef } from "react";
 
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import UIStore, { UI_EVENTS } from "../../stores/UIStore";
 
 interface IProps extends Omit<ComponentProps<typeof AutoHideScrollbar>, "onWheel"> {
@@ -40,7 +39,6 @@ interface IState {
     rightIndicatorOffset: string;
 }
 
-@replaceableComponent("structures.IndicatorScrollbar")
 export default class IndicatorScrollbar extends React.Component<IProps, IState> {
     private autoHideScrollbar = createRef<AutoHideScrollbar>();
     private scrollElement: HTMLDivElement;
diff --git a/src/components/structures/InteractiveAuth.tsx b/src/components/structures/InteractiveAuth.tsx
index 0c8c2a807ab..94c54b32e32 100644
--- a/src/components/structures/InteractiveAuth.tsx
+++ b/src/components/structures/InteractiveAuth.tsx
@@ -28,7 +28,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import getEntryComponentForLoginType, { IStageComponent } from '../views/auth/InteractiveAuthEntryComponents';
 import Spinner from "../views/elements/Spinner";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
 
@@ -89,7 +88,6 @@ interface IState {
     submitButtonEnabled: boolean;
 }
 
-@replaceableComponent("structures.InteractiveAuthComponent")
 export default class InteractiveAuthComponent extends React.Component<IProps, IState> {
     private readonly authLogic: InteractiveAuth;
     private readonly intervalId: number = null;
@@ -177,10 +175,6 @@ export default class InteractiveAuthComponent extends React.Component<IProps, IS
         }
     };
 
-    private tryContinue = (): void => {
-        this.stageComponent.current?.tryContinue?.();
-    };
-
     private authStateUpdated = (stageType: AuthType, stageState: IStageStatus): void => {
         const oldStage = this.state.authStage;
         this.setState({
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index e9fdd29eda3..ed1f990c3f8 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -27,8 +27,6 @@ import { Action } from "../../dispatcher/actions";
 import RoomSearch from "./RoomSearch";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
-import LeftPanelWidget from "./LeftPanelWidget";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { MetaSpace, SpaceKey, UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
@@ -42,10 +40,11 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import IndicatorScrollbar from "./IndicatorScrollbar";
 import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
 import SettingsStore from "../../settings/SettingsStore";
-import UserMenu from "./UserMenu";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../settings/UIFeature";
+import { ButtonEvent } from "../views/elements/AccessibleButton";
+import PosthogTrackers from "../../PosthogTrackers";
 
 interface IProps {
     isMinimized: boolean;
@@ -63,7 +62,6 @@ interface IState {
     activeSpace: SpaceKey;
 }
 
-@replaceableComponent("structures.LeftPanel")
 export default class LeftPanel extends React.Component<IProps, IState> {
     private listContainerRef = createRef<HTMLDivElement>();
     private roomSearchRef = createRef<RoomSearch>();
@@ -120,8 +118,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         dis.fire(Action.OpenDialPad);
     };
 
-    private onExplore = () => {
+    private onExplore = (ev: ButtonEvent) => {
         dis.fire(Action.ViewRoomDirectory);
+        PosthogTrackers.trackInteraction("WebLeftPanelExploreRoomsButton", ev);
     };
 
     private refreshStickyHeaders = () => {
@@ -385,7 +384,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                 onBlur={this.onBlur}
                 onKeyDown={this.onKeyDown}
             >
-                { !SpaceStore.spacesEnabled && <UserMenu isPanelCollapsed={true} /> }
                 <RoomSearch
                     isMinimized={this.props.isMinimized}
                     ref={this.roomSearchRef}
@@ -429,7 +427,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                     { !this.props.isMinimized && (
                         <RoomListHeader
                             onVisibilityChange={this.refreshStickyHeaders}
-                            spacePanelDisabled={!SpaceStore.spacesEnabled}
                         />
                     ) }
                     <div className="mx_LeftPanel_roomListWrapper">
@@ -444,7 +441,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                             { roomList }
                         </div>
                     </div>
-                    { !this.props.isMinimized && <LeftPanelWidget /> }
                 </aside>
             </div>
         );
diff --git a/src/components/structures/LeftPanelWidget.tsx b/src/components/structures/LeftPanelWidget.tsx
deleted file mode 100644
index a73d08d29f8..00000000000
--- a/src/components/structures/LeftPanelWidget.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { useContext, useMemo } from "react";
-import { Resizable } from "re-resizable";
-import classNames from "classnames";
-
-import AccessibleButton from "../views/elements/AccessibleButton";
-import { useRovingTabIndex } from "../../accessibility/RovingTabIndex";
-import { useLocalStorageState } from "../../hooks/useLocalStorageState";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
-import WidgetUtils, { IWidgetEvent } from "../../utils/WidgetUtils";
-import { useAccountData } from "../../hooks/useAccountData";
-import AppTile from "../views/elements/AppTile";
-import { useSettingValue } from "../../hooks/useSettings";
-import UIStore from "../../stores/UIStore";
-import { getKeyBindingsManager } from "../../KeyBindingsManager";
-import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
-
-const MIN_HEIGHT = 100;
-const MAX_HEIGHT = 500; // or 50% of the window height
-const INITIAL_HEIGHT = 280;
-
-const LeftPanelWidget: React.FC = () => {
-    const cli = useContext(MatrixClientContext);
-
-    const mWidgetsEvent = useAccountData<Record<string, IWidgetEvent>>(cli, "m.widgets");
-    const leftPanelWidgetId = useSettingValue("Widgets.leftPanel");
-    const app = useMemo(() => {
-        if (!mWidgetsEvent || !leftPanelWidgetId) return null;
-        const widgetConfig = Object.values(mWidgetsEvent).find(w => w.id === leftPanelWidgetId);
-        if (!widgetConfig) return null;
-
-        return WidgetUtils.makeAppConfig(
-            widgetConfig.state_key,
-            widgetConfig.content,
-            widgetConfig.sender,
-            null,
-            widgetConfig.id);
-    }, [mWidgetsEvent, leftPanelWidgetId]);
-
-    const [height, setHeight] = useLocalStorageState("left-panel-widget-height", INITIAL_HEIGHT);
-    const [expanded, setExpanded] = useLocalStorageState("left-panel-widget-expanded", true);
-
-    const [onFocus, isActive, ref] = useRovingTabIndex();
-    const tabIndex = isActive ? 0 : -1;
-
-    if (!app) return null;
-
-    let content;
-    if (expanded) {
-        content = <Resizable
-            size={{ height } as any}
-            minHeight={MIN_HEIGHT}
-            maxHeight={Math.min(UIStore.instance.windowHeight / 2, MAX_HEIGHT)}
-            onResizeStop={(e, dir, ref, d) => {
-                setHeight(height + d.height);
-            }}
-            handleWrapperClass="mx_LeftPanelWidget_resizerHandles"
-            handleClasses={{ top: "mx_LeftPanelWidget_resizerHandle" }}
-            className="mx_LeftPanelWidget_resizeBox"
-            enable={{ top: true }}
-        >
-            <AppTile
-                app={app}
-                fullWidth
-                showMenubar={false}
-                userWidget
-                userId={cli.getUserId()}
-                creatorUserId={app.creatorUserId}
-                widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
-                waitForIframeLoad={app.waitForIframeLoad}
-            />
-        </Resizable>;
-    }
-
-    return <div className="mx_LeftPanelWidget">
-        <div
-            onFocus={onFocus}
-            className="mx_LeftPanelWidget_headerContainer"
-            onKeyDown={(ev: React.KeyboardEvent) => {
-                const action = getKeyBindingsManager().getAccessibilityAction(ev);
-                switch (action) {
-                    case KeyBindingAction.ArrowLeft:
-                        ev.stopPropagation();
-                        setExpanded(false);
-                        break;
-                    case KeyBindingAction.ArrowRight:
-                        ev.stopPropagation();
-                        setExpanded(true);
-                        break;
-                }
-            }}
-        >
-            <div className="mx_LeftPanelWidget_stickable">
-                <AccessibleButton
-                    onFocus={onFocus}
-                    inputRef={ref}
-                    tabIndex={tabIndex}
-                    className="mx_LeftPanelWidget_headerText"
-                    role="treeitem"
-                    aria-expanded={expanded}
-                    aria-level={1}
-                    onClick={() => {
-                        setExpanded(!expanded);
-                    }}
-                >
-                    <span className={classNames({
-                        "mx_LeftPanelWidget_collapseBtn": true,
-                        "mx_LeftPanelWidget_collapseBtn_collapsed": !expanded,
-                    })} />
-                    <span>{ WidgetUtils.getWidgetName(app) }</span>
-                </AccessibleButton>
-
-                { /* Code for the maximise button for once we have full screen widgets */ }
-                { /*<AccessibleTooltipButton
-                    tabIndex={tabIndex}
-                    onClick={() => {
-                    }}
-                    className="mx_LeftPanelWidget_maximizeButton"
-                    tooltipClassName="mx_LeftPanelWidget_maximizeButtonTooltip"
-                    title={_t("Maximise")}
-                />*/ }
-            </div>
-        </div>
-
-        { content }
-    </div>;
-};
-
-export default LeftPanelWidget;
diff --git a/src/components/structures/LegacyCommunityPreview.tsx b/src/components/structures/LegacyCommunityPreview.tsx
deleted file mode 100644
index 7d7f1b90fb0..00000000000
--- a/src/components/structures/LegacyCommunityPreview.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { useContext } from "react";
-
-import MatrixClientContext from "../../contexts/MatrixClientContext";
-import { _t } from "../../languageHandler";
-import AccessibleButton from "../views/elements/AccessibleButton";
-import ErrorBoundary from "../views/elements/ErrorBoundary";
-import { useAsyncMemo } from "../../hooks/useAsyncMemo";
-import Spinner from "../views/elements/Spinner";
-import GroupAvatar from "../views/avatars/GroupAvatar";
-import { linkifyElement } from "../../HtmlUtils";
-import defaultDispatcher from "../../dispatcher/dispatcher";
-import { Action } from "../../dispatcher/actions";
-import { UserTab } from "../views/dialogs/UserSettingsDialog";
-import { IGroupSummary } from "../../@types/groups";
-
-interface IProps {
-    groupId: string;
-}
-
-const onSwapClick = () => {
-    defaultDispatcher.dispatch({
-        action: Action.ViewUserSettings,
-        initialTabId: UserTab.Preferences,
-    });
-};
-
-// XXX: temporary community migration component, reuses SpaceRoomView & SpacePreview classes for simplicity
-const LegacyCommunityPreview = ({ groupId }: IProps) => {
-    const cli = useContext(MatrixClientContext);
-
-    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [cli, groupId]);
-
-    if (!groupSummary) {
-        return <main className="mx_SpaceRoomView">
-            <div className="mx_MainSplit">
-                <div className="mx_SpaceRoomView_preview">
-                    <Spinner />
-                </div>
-            </div>
-        </main>;
-    }
-
-    let visibilitySection: JSX.Element;
-    if (groupSummary.profile.is_public) {
-        visibilitySection = <span className="mx_SpaceRoomView_info_public">
-            { _t("Public community") }
-        </span>;
-    } else {
-        visibilitySection = <span className="mx_SpaceRoomView_info_private">
-            { _t("Private community") }
-        </span>;
-    }
-
-    return <main className="mx_SpaceRoomView">
-        <ErrorBoundary>
-            <div className="mx_MainSplit">
-                <div className="mx_SpaceRoomView_preview">
-                    <GroupAvatar
-                        groupId={groupId}
-                        groupName={groupSummary.profile.name}
-                        groupAvatarUrl={groupSummary.profile.avatar_url}
-                        height={80}
-                        width={80}
-                        resizeMethod='crop'
-                    />
-                    <h1 className="mx_SpaceRoomView_preview_name">
-                        { groupSummary.profile.name }
-                    </h1>
-                    <div className="mx_SpaceRoomView_info">
-                        { visibilitySection }
-                    </div>
-                    <div className="mx_SpaceRoomView_preview_topic" ref={e => e && linkifyElement(e)}>
-                        { groupSummary.profile.short_description }
-                    </div>
-                    <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
-                        { groupSummary.user?.membership === "join"
-                            ? _t("To view %(communityName)s, swap to communities in your <a>preferences</a>", {
-                                communityName: groupSummary.profile.name,
-                            }, {
-                                a: sub => (
-                                    <AccessibleButton onClick={onSwapClick} kind="link">{ sub }</AccessibleButton>
-                                ),
-                            })
-                            : _t("To join %(communityName)s, swap to communities in your <a>preferences</a>", {
-                                communityName: groupSummary.profile.name,
-                            }, {
-                                a: sub => (
-                                    <AccessibleButton onClick={onSwapClick} kind="link">{ sub }</AccessibleButton>
-                                ),
-                            })
-                        }
-                    </div>
-                </div>
-            </div>
-        </ErrorBoundary>
-    </main>;
-};
-
-export default LegacyCommunityPreview;
diff --git a/src/components/structures/LegacyGroupView.tsx b/src/components/structures/LegacyGroupView.tsx
new file mode 100644
index 00000000000..236c4f6ecde
--- /dev/null
+++ b/src/components/structures/LegacyGroupView.tsx
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+
+import AutoHideScrollbar from './AutoHideScrollbar';
+import { _t } from "../../languageHandler";
+import SdkConfig, { DEFAULTS } from "../../SdkConfig";
+
+interface IProps {
+    groupId: string;
+}
+
+const LegacyGroupView: React.FC<IProps> = ({ groupId }) => {
+    // XXX: Stealing classes from the HomePage component for CSS simplicity.
+    // XXX: Inline CSS because this is all temporary
+    const learnMoreUrl = SdkConfig.get().spaces_learn_more_url ?? DEFAULTS.spaces_learn_more_url;
+    return <AutoHideScrollbar className="mx_HomePage mx_HomePage_default">
+        <div className="mx_HomePage_default_wrapper">
+            <h1 style={{ fontSize: '24px' }}>{ _t("That link is no longer supported") }</h1>
+            <p>
+                { _t(
+                    "You're trying to access a community link (%(groupId)s).<br/>" +
+                    "Communities are no longer supported and have been replaced by spaces.<br2/>" +
+                    "<a>Learn more about spaces here.</a>",
+                    { groupId },
+                    {
+                        br: () => <br />,
+                        br2: () => <br />,
+                        a: (sub) => <a href={learnMoreUrl} rel="noreferrer noopener" target="_blank">{ sub }</a>,
+                    },
+                ) }
+            </p>
+        </div>
+    </AutoHideScrollbar>;
+};
+
+export default LegacyGroupView;
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 4c868ab15fe..de60ca71fa1 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2015 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -52,28 +52,25 @@ import HostSignupContainer from '../views/host_signup/HostSignupContainer';
 import { getKeyBindingsManager } from '../../KeyBindingsManager';
 import { IOpts } from "../../createRoom";
 import SpacePanel from "../views/spaces/SpacePanel";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import CallHandler, { CallHandlerEvent } from '../../CallHandler';
 import AudioFeedArrayForCall from '../views/voip/AudioFeedArrayForCall';
 import { OwnProfileStore } from '../../stores/OwnProfileStore';
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import RoomView from './RoomView';
+import type { RoomView as RoomViewType } from './RoomView';
 import ToastContainer from './ToastContainer';
-import MyGroups from "./MyGroups";
 import UserView from "./UserView";
-import GroupView from "./GroupView";
 import BackdropPanel from "./BackdropPanel";
-import SpaceStore from "../../stores/spaces/SpaceStore";
-import GroupFilterPanel from './GroupFilterPanel';
-import CustomRoomTagPanel from './CustomRoomTagPanel';
 import { mediaFromMxc } from "../../customisations/Media";
-import LegacyCommunityPreview from "./LegacyCommunityPreview";
-import { UserTab } from "../views/dialogs/UserSettingsDialog";
+import { UserTab } from "../views/dialogs/UserTab";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import RightPanelStore from '../../stores/right-panel/RightPanelStore';
 import { TimelineRenderingType } from "../../contexts/RoomContext";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import { SwitchSpacePayload } from "../../dispatcher/payloads/SwitchSpacePayload";
+import LegacyGroupView from "./LegacyGroupView";
+import { IConfigOptions } from "../../IConfigOptions";
+import LeftPanelLiveShareWarning from '../views/beacon/LeftPanelLiveShareWarning';
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -101,18 +98,13 @@ interface IProps {
     roomOobData?: IOOBData;
     currentRoomId: string;
     collapseLhs: boolean;
-    config: {
-        piwik: {
-            policyUrl: string;
-        };
-        [key: string]: any;
-    };
+    config: IConfigOptions;
     currentUserId?: string;
-    currentGroupId?: string;
-    currentGroupIsNew?: boolean;
     justRegistered?: boolean;
     roomJustCreatedOpts?: IOpts;
     forceTimeline?: boolean; // see props on MatrixChat
+
+    currentGroupId?: string;
 }
 
 interface IState {
@@ -134,12 +126,11 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-@replaceableComponent("structures.LoggedInView")
 class LoggedInView extends React.Component<IProps, IState> {
     static displayName = 'LoggedInView';
 
     protected readonly _matrixClient: MatrixClient;
-    protected readonly _roomView: React.RefObject<any>;
+    protected readonly _roomView: React.RefObject<RoomViewType>;
     protected readonly _resizeContainer: React.RefObject<HTMLDivElement>;
     protected readonly resizeHandler: React.RefObject<HTMLDivElement>;
     protected layoutWatcherRef: string;
@@ -501,7 +492,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                 handled = true;
                 break;
             case KeyBindingAction.ToggleRoomSidePanel:
-                if (this.props.page_type === "room_view" || this.props.page_type === "group_view") {
+                if (this.props.page_type === "room_view") {
                     RightPanelStore.instance.togglePanel();
                     handled = true;
                 }
@@ -536,11 +527,11 @@ class LoggedInView extends React.Component<IProps, IState> {
                     unread: true,
                 });
                 break;
-            case KeyBindingAction.PreviousVisitedRoomOrCommunity:
+            case KeyBindingAction.PreviousVisitedRoomOrSpace:
                 PlatformPeg.get().navigateForwardBack(true);
                 handled = true;
                 break;
-            case KeyBindingAction.NextVisitedRoomOrCommunity:
+            case KeyBindingAction.NextVisitedRoomOrSpace:
                 PlatformPeg.get().navigateForwardBack(false);
                 handled = true;
                 break;
@@ -572,7 +563,6 @@ class LoggedInView extends React.Component<IProps, IState> {
         if (
             !handled &&
             PlatformPeg.get().overrideBrowserShortcuts() &&
-            SpaceStore.spacesEnabled &&
             ev.code.startsWith("Digit") &&
             ev.code !== "Digit0" && // this is the shortcut for reset zoom, don't override it
             isOnlyCtrlOrCmdKeyEvent(ev)
@@ -644,10 +634,6 @@ class LoggedInView extends React.Component<IProps, IState> {
                 />;
                 break;
 
-            case PageTypes.MyGroups:
-                pageElement = <MyGroups />;
-                break;
-
             case PageTypes.HomePage:
                 pageElement = <HomePage justRegistered={this.props.justRegistered} />;
                 break;
@@ -655,16 +641,9 @@ class LoggedInView extends React.Component<IProps, IState> {
             case PageTypes.UserView:
                 pageElement = <UserView userId={this.props.currentUserId} resizeNotifier={this.props.resizeNotifier} />;
                 break;
-            case PageTypes.GroupView:
-                if (SpaceStore.spacesEnabled) {
-                    pageElement = <LegacyCommunityPreview groupId={this.props.currentGroupId} />;
-                } else {
-                    pageElement = <GroupView
-                        groupId={this.props.currentGroupId}
-                        isNew={this.props.currentGroupIsNew}
-                        resizeNotifier={this.props.resizeNotifier}
-                    />;
-                }
+
+            case PageTypes.LegacyGroupView:
+                pageElement = <LegacyGroupView groupId={this.props.currentGroupId} />;
                 break;
         }
 
@@ -693,36 +672,27 @@ class LoggedInView extends React.Component<IProps, IState> {
                 >
                     <ToastContainer />
                     <div className={bodyClasses}>
-                        <div className='mx_LeftPanel_wrapper'>
-                            { SettingsStore.getValue('TagPanel.enableTagPanel') &&
-                                (<div className="mx_GroupFilterPanelContainer">
-                                    <BackdropPanel
-                                        blurMultiplier={0.5}
-                                        backgroundImage={this.state.backgroundImage}
-                                    />
-                                    <GroupFilterPanel />
-                                    { SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null }
-                                </div>)
-                            }
-                            { SpaceStore.spacesEnabled ? <>
+                        <div className='mx_LeftPanel_outerWrapper'>
+                            <LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
+                            <div className='mx_LeftPanel_wrapper'>
                                 <BackdropPanel
                                     blurMultiplier={0.5}
                                     backgroundImage={this.state.backgroundImage}
                                 />
                                 <SpacePanel />
-                            </> : null }
-                            <BackdropPanel
-                                backgroundImage={this.state.backgroundImage}
-                            />
-                            <div
-                                className="mx_LeftPanel_wrapper--user"
-                                ref={this._resizeContainer}
-                                data-collapsed={this.props.collapseLhs ? true : undefined}
-                            >
-                                <LeftPanel
-                                    isMinimized={this.props.collapseLhs || false}
-                                    resizeNotifier={this.props.resizeNotifier}
+                                <BackdropPanel
+                                    backgroundImage={this.state.backgroundImage}
                                 />
+                                <div
+                                    className="mx_LeftPanel_wrapper--user"
+                                    ref={this._resizeContainer}
+                                    data-collapsed={this.props.collapseLhs ? true : undefined}
+                                >
+                                    <LeftPanel
+                                        isMinimized={this.props.collapseLhs || false}
+                                        resizeNotifier={this.props.resizeNotifier}
+                                    />
+                                </div>
                             </div>
                         </div>
                         <ResizeHandle passRef={this.resizeHandler} id="lp-resizer" />
diff --git a/src/components/structures/MainSplit.tsx b/src/components/structures/MainSplit.tsx
index 7cf6964c1fd..a90758b4427 100644
--- a/src/components/structures/MainSplit.tsx
+++ b/src/components/structures/MainSplit.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import { NumberSize, Resizable } from 're-resizable';
 import { Direction } from "re-resizable/lib/resizer";
 
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 
 interface IProps {
@@ -28,7 +27,6 @@ interface IProps {
     panel?: JSX.Element;
 }
 
-@replaceableComponent("structures.MainSplit")
 export default class MainSplit extends React.Component<IProps> {
     private onResizeStart = (): void => {
         this.props.resizeNotifier.startResizing();
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index ebc90f51ad2..328af853142 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -31,8 +31,9 @@ import { defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 import { throttle } from "lodash";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 
-// focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
+// focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by various components
 import 'focus-visible';
 // what-input helps improve keyboard accessibility
 import 'what-input';
@@ -83,23 +84,18 @@ import {
     UPDATE_STATUS_INDICATOR,
 } from "../../stores/notifications/RoomNotificationStateStore";
 import { SettingLevel } from "../../settings/SettingLevel";
-import { leaveRoomBehaviour } from "../../utils/membership";
-import CreateCommunityPrototypeDialog from "../views/dialogs/CreateCommunityPrototypeDialog";
 import ThreepidInviteStore, { IThreepidInvite, IThreepidInviteWireFormat } from "../../stores/ThreepidInviteStore";
 import { UIFeature } from "../../settings/UIFeature";
-import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
 import DialPadModal from "../views/voip/DialPadModal";
 import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
 import { shouldUseLoginForWelcome } from "../../utils/pages";
-import SpaceStore from "../../stores/spaces/SpaceStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import { RoomUpdateCause } from "../../stores/room-list/models";
 import SecurityCustomisations from "../../customisations/Security";
 import Spinner from "../views/elements/Spinner";
 import QuestionDialog from "../views/dialogs/QuestionDialog";
-import UserSettingsDialog, { UserTab } from '../views/dialogs/UserSettingsDialog';
-import CreateGroupDialog from '../views/dialogs/CreateGroupDialog';
+import UserSettingsDialog from '../views/dialogs/UserSettingsDialog';
+import { UserTab } from "../views/dialogs/UserTab";
 import CreateRoomDialog from '../views/dialogs/CreateRoomDialog';
 import RoomDirectory from './RoomDirectory';
 import KeySignatureUploadFailedDialog from "../views/dialogs/KeySignatureUploadFailedDialog";
@@ -131,6 +127,11 @@ import { ViewHomePagePayload } from '../../dispatcher/payloads/ViewHomePagePaylo
 import { AfterLeaveRoomPayload } from '../../dispatcher/payloads/AfterLeaveRoomPayload';
 import { DoAfterSyncPreparedPayload } from '../../dispatcher/payloads/DoAfterSyncPreparedPayload';
 import { ViewStartChatOrReusePayload } from '../../dispatcher/payloads/ViewStartChatOrReusePayload';
+import { IConfigOptions } from "../../IConfigOptions";
+import { SnakedObject } from "../../utils/SnakedObject";
+import InfoDialog from '../views/dialogs/InfoDialog';
+import { leaveRoomBehaviour } from "../../utils/leave-behaviour";
+import VideoChannelStore from "../../stores/VideoChannelStore";
 
 // legacy export
 export { default as Views } from "../../Views";
@@ -144,7 +145,6 @@ const ONBOARDING_FLOW_STARTERS = [
     Action.ViewUserSettings,
     'view_create_chat',
     'view_create_room',
-    'view_create_group',
 ];
 
 interface IScreen {
@@ -153,12 +153,7 @@ interface IScreen {
 }
 
 interface IProps { // TODO type things better
-    config: {
-        piwik: {
-            policyUrl: string;
-        };
-        [key: string]: any;
-    };
+    config: IConfigOptions;
     serverConfig?: ValidatedServerConfig;
     onNewScreen: (screen: string, replaceLast: boolean) => void;
     enableGuest?: boolean;
@@ -186,10 +181,10 @@ interface IState {
     // in the case where we view a room by ID or by RoomView when it resolves
     // what ID an alias points at.
     currentRoomId?: string;
-    currentGroupId?: string;
-    currentGroupIsNew?: boolean;
     // If we're trying to just view a user ID (i.e. /user URL), this is it
     currentUserId?: string;
+    // Group ID for legacy "communities don't exist" page
+    currentGroupId?: string;
     // this is persisted as mx_lhs_size, loaded in LoggedInView
     collapseLhs: boolean;
     // Parameters used in the registration dance with the IS
@@ -214,7 +209,6 @@ interface IState {
     forceTimeline?: boolean; // see props
 }
 
-@replaceableComponent("structures.MatrixChat")
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
     static displayName = "MatrixChat";
 
@@ -229,7 +223,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private firstSyncPromise: IDeferred<void>;
 
     private screenAfterLogin?: IScreen;
-    private pageChanging: boolean;
     private tokenLogin?: boolean;
     private accountPassword?: string;
     private accountPasswordTimer?: number;
@@ -284,8 +277,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.prevWindowWidth = UIStore.instance.windowWidth || 1000;
         UIStore.instance.on(UI_EVENTS.Resize, this.handleResize);
 
-        this.pageChanging = false;
-
         // For PersistentElement
         this.state.resizeNotifier.on("middlePanelResized", this.dispatchTimelineResize);
 
@@ -357,7 +348,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             Analytics.enable();
         }
 
-        initSentry(SdkConfig.get()["sentry"]);
+        initSentry(SdkConfig.get("sentry"));
     }
 
     private async postLoginSetup() {
@@ -476,7 +467,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private getServerProperties() {
         let props = this.state.serverConfig;
         if (!props) props = this.props.serverConfig; // for unit tests
-        if (!props) props = SdkConfig.get()["validated_server_config"];
+        if (!props) props = SdkConfig.get("validated_server_config");
         return { serverConfig: props };
     }
 
@@ -586,6 +577,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             case 'logout':
                 CallHandler.instance.hangupAllCalls();
+                if (VideoChannelStore.instance.connected) VideoChannelStore.instance.setDisconnected();
                 Lifecycle.logout();
                 break;
             case 'require_registration':
@@ -673,6 +665,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 }
                 break;
             }
+            case 'view_legacy_group':
+                this.viewLegacyGroup(payload.groupId);
+                break;
             case Action.ViewUserSettings: {
                 const tabPayload = payload as OpenToTabPayload;
                 Modal.createTrackedDialog('User settings', '', UserSettingsDialog,
@@ -684,20 +679,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_create_room':
-                this.createRoom(payload.public, payload.defaultName);
+                this.createRoom(payload.public, payload.defaultName, payload.type);
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
                 break;
-            case 'view_create_group': {
-                const prototype = SettingsStore.getValue("feature_communities_v2_prototypes");
-                Modal.createTrackedDialog(
-                    'Create Community',
-                    '',
-                    prototype ? CreateCommunityPrototypeDialog : CreateGroupDialog,
-                );
-                break;
-            }
             case Action.ViewRoomDirectory: {
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
                     initialText: payload.initialText,
@@ -707,13 +693,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.viewSomethingBehindModal();
                 break;
             }
-            case 'view_my_groups':
-                this.setPage(PageType.MyGroups);
-                this.notifyNewScreen('groups');
-                break;
-            case 'view_group':
-                this.viewGroup(payload);
-                break;
             case 'view_welcome_page':
                 this.viewWelcome();
                 break;
@@ -745,17 +724,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 // function will have cleared that state and not execute that path.
                 this.showScreenAfterLogin();
                 break;
-            case 'toggle_my_groups':
-                // persist that the user has interacted with this, use it to dismiss the beta dot
-                localStorage.setItem("mx_seenSpacesBeta", "1");
-                // We just dispatch the page change rather than have to worry about
-                // what the logic is for each of these branches.
-                if (this.state.page_type === PageType.MyGroups) {
-                    dis.dispatch({ action: 'view_last_screen' });
-                } else {
-                    dis.dispatch({ action: 'view_my_groups' });
-                }
-                break;
             case 'hide_left_panel':
                 this.setState({
                     collapseLhs: true,
@@ -867,7 +835,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             );
 
             // If the hs url matches then take the hs name we know locally as it is likely prettier
-            const defaultConfig = SdkConfig.get()["validated_server_config"] as ValidatedServerConfig;
+            const defaultConfig = SdkConfig.get("validated_server_config");
             if (defaultConfig && defaultConfig.hsUrl === newState.serverConfig.hsUrl) {
                 newState.serverConfig.hsName = defaultConfig.hsName;
                 newState.serverConfig.hsNameIsDifferent = defaultConfig.hsNameIsDifferent;
@@ -957,33 +925,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private async viewGroup(payload) {
-        const groupId = payload.group_id;
-
-        // Wait for the first sync to complete
-        if (!this.firstSyncComplete) {
-            if (!this.firstSyncPromise) {
-                logger.warn('Cannot view a group before first sync. group_id:', groupId);
-                return;
-            }
-            await this.firstSyncPromise.promise;
-        }
-
-        this.setState({
-            view: Views.LOGGED_IN,
-            currentGroupId: groupId,
-            currentGroupIsNew: payload.group_is_new,
-        });
-        this.setPage(PageType.GroupView);
-        this.notifyNewScreen('group/' + groupId);
-    }
-
     private viewSomethingBehindModal() {
         if (this.state.view !== Views.LOGGED_IN) {
             this.viewWelcome();
             return;
         }
-        if (!this.state.currentGroupId && !this.state.currentRoomId && !this.state.currentUserId) {
+        if (!this.state.currentRoomId && !this.state.currentUserId) {
             this.viewHome();
         }
     }
@@ -1039,20 +986,19 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private async createRoom(defaultPublic = false, defaultName?: string) {
-        const communityId = CommunityPrototypeStore.instance.getSelectedCommunityId();
-        if (communityId) {
-            // double check the user will have permission to associate this room with the community
-            if (!CommunityPrototypeStore.instance.isAdminOf(communityId)) {
-                Modal.createTrackedDialog('Pre-failure to create room', '', ErrorDialog, {
-                    title: _t("Cannot create rooms in this community"),
-                    description: _t("You do not have permission to create rooms in this community."),
-                });
-                return;
-            }
-        }
+    private viewLegacyGroup(groupId: string) {
+        this.setStateForNewView({
+            view: Views.LOGGED_IN,
+            currentRoomId: null,
+            currentGroupId: groupId,
+        });
+        this.notifyNewScreen('group/' + groupId);
+        this.setPage(PageType.LegacyGroupView);
+    }
 
+    private async createRoom(defaultPublic = false, defaultName?: string, type?: RoomType) {
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, {
+            type,
             defaultPublic,
             defaultName,
         });
@@ -1064,11 +1010,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     private chatCreateOrReuse(userId: string) {
+        const snakedConfig = new SnakedObject<IConfigOptions>(this.props.config);
         // Use a deferred action to reshow the dialog once the user has registered
         if (MatrixClientPeg.get().isGuest()) {
             // No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
             // result in a new DM with the welcome user.
-            if (userId !== this.props.config.welcomeUserId) {
+            if (userId !== snakedConfig.get("welcome_user_id")) {
                 dis.dispatch<DoAfterSyncPreparedPayload<ViewStartChatOrReusePayload>>({
                     action: Action.DoAfterSyncPrepared,
                     deferred_action: {
@@ -1085,7 +1032,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 // `_chatCreateOrReuse` again)
                 go_welcome_on_cancel: true,
                 screen_after: {
-                    screen: `user/${this.props.config.welcomeUserId}`,
+                    screen: `user/${snakedConfig.get("welcome_user_id")}`,
                     params: { action: 'chat' },
                 },
             });
@@ -1114,7 +1061,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private leaveRoomWarnings(roomId: string) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
-        const isSpace = SpaceStore.spacesEnabled && roomToLeave?.isSpaceRoom();
+        const isSpace = roomToLeave?.isSpaceRoom();
         // Show a warning if there are additional complications.
         const warnings = [];
 
@@ -1152,7 +1099,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const warnings = this.leaveRoomWarnings(roomId);
 
-        const isSpace = SpaceStore.spacesEnabled && roomToLeave?.isSpaceRoom();
+        const isSpace = roomToLeave?.isSpaceRoom();
         Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
             title: isSpace ? _t("Leave space") : _t("Leave room"),
             description: (
@@ -1233,12 +1180,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
         await waitFor;
 
+        const snakedConfig = new SnakedObject<IConfigOptions>(this.props.config);
         const welcomeUserRooms = DMRoomMap.shared().getDMRoomsForUserId(
-            this.props.config.welcomeUserId,
+            snakedConfig.get("welcome_user_id"),
         );
         if (welcomeUserRooms.length === 0) {
             const roomId = await createRoom({
-                dmUserId: this.props.config.welcomeUserId,
+                dmUserId: snakedConfig.get("welcome_user_id"),
                 // Only view the welcome user if we're NOT looking at a room
                 andView: !this.state.currentRoomId,
                 spinner: false, // we're already showing one: we don't need another one
@@ -1252,7 +1200,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // user room (it doesn't wait for new data from the server, just
             // the saved sync to be loaded).
             const saveWelcomeUser = (ev: MatrixEvent) => {
-                if (ev.getType() === EventType.Direct && ev.getContent()[this.props.config.welcomeUserId]) {
+                if (ev.getType() === EventType.Direct && ev.getContent()[snakedConfig.get("welcome_user_id")]) {
                     MatrixClientPeg.get().store.save(true);
                     MatrixClientPeg.get().removeListener(ClientEvent.AccountData, saveWelcomeUser);
                 }
@@ -1282,7 +1230,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);
 
-            if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
+            const snakedConfig = new SnakedObject<IConfigOptions>(this.props.config);
+            if (snakedConfig.get("welcome_user_id") && getCurrentLanguage().startsWith("en")) {
                 const welcomeUserRoom = await this.startWelcomeUserChat();
                 if (welcomeUserRoom === null) {
                     // We didn't redirect to the welcome user room, so show
@@ -1314,7 +1263,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             showAnonymousAnalyticsOptInToast();
         }
 
-        if (SdkConfig.get().mobileGuideToast) {
+        if (SdkConfig.get("mobile_guide_toast")) {
             // The toast contains further logic to detect mobile platforms,
             // check if it has been dismissed before, etc.
             showMobileGuideToast();
@@ -1463,6 +1412,36 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 showNotificationsToast(false);
             }
 
+            if (!localStorage.getItem("mx_seen_feature_thread_experimental")) {
+                setTimeout(() => {
+                    if (SettingsStore.getValue("feature_thread") && SdkConfig.get("show_labs_settings")) {
+                        Modal.createDialog(InfoDialog, {
+                            title: _t("Threads Approaching Beta 🎉"),
+                            description: <>
+                                <p>
+                                    { _t("We're getting closer to releasing a public Beta for Threads.") }
+                                </p>
+                                <p>
+                                    { _t("As we prepare for it, we need to make some changes: threads created "
+                                       + "before this point will be <strong>displayed as regular replies</strong>.",
+                                    {}, {
+                                        "strong": sub => <strong>{ sub }</strong>,
+                                    }) }
+                                </p>
+                                <p>
+                                    { _t("This will be a one-off transition, as threads are now part "
+                                       + "of the Matrix specification.") }
+                                </p>
+                            </>,
+                            button: _t("Got it"),
+                            onFinished: () => {
+                                localStorage.setItem("mx_seen_feature_thread_experimental", "true");
+                            },
+                        });
+                    }
+                }, 1 * 60 * 1000); // show after 1 minute to not overload user on launch
+            }
+
             if (!localStorage.getItem("mx_seen_feature_spotlight_toast")) {
                 setTimeout(() => {
                     // Skip the toast if the beta is already enabled or the user has changed the setting from default
@@ -1747,14 +1726,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
             const type = screen === "start_sso" ? "sso" : "cas";
             PlatformPeg.get().startSingleSignOn(cli, type, this.getFragmentAfterLogin());
-        } else if (screen === 'groups') {
-            if (SpaceStore.spacesEnabled) {
-                dis.dispatch({ action: Action.ViewHomePage });
-                return;
-            }
-            dis.dispatch({
-                action: 'view_my_groups',
-            });
         } else if (screen.indexOf('room/') === 0) {
             // Rooms can have the following formats:
             // #room_alias:domain or !opaque_id:domain
@@ -1837,12 +1808,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         } else if (screen.indexOf('group/') === 0) {
             const groupId = screen.substring(6);
-
-            // TODO: Check valid group ID
-
             dis.dispatch({
-                action: 'view_group',
-                group_id: groupId,
+                action: 'view_legacy_group',
+                groupId: groupId,
             });
         } else {
             logger.info("Ignoring showScreen for '%s'", screen);
@@ -2130,12 +2098,3 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         </ErrorBoundary>;
     }
 }
-
-export function isLoggedIn(): boolean {
-    // JRS: Maybe we should move the step that writes this to the window out of
-    // `element-web` and into this file? Better yet, we should probably create a
-    // store to hold this state.
-    // See also https://github.com/vector-im/element-web/issues/15034.
-    const app = window.matrixChat;
-    return app && (app as MatrixChat).state.view === Views.LOGGED_IN;
-}
diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index 20af21a9e59..38d18e92f76 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, KeyboardEvent, ReactNode, SyntheticEvent, TransitionEvent } from 'react';
+import React, { createRef, KeyboardEvent, ReactNode, TransitionEvent } from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import { Room } from 'matrix-js-sdk/src/models/room';
@@ -31,13 +31,12 @@ import SettingsStore from '../../settings/SettingsStore';
 import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext";
 import { Layout } from "../../settings/enums/Layout";
 import { _t } from "../../languageHandler";
-import EventTile, { haveTileForEvent, IReadReceiptProps } from "../views/rooms/EventTile";
+import EventTile, { UnwrappedEventTile, IReadReceiptProps } from "../views/rooms/EventTile";
 import { hasText } from "../../TextForEvent";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 import DMRoomMap from "../../utils/DMRoomMap";
 import NewRoomIntro from "../views/rooms/NewRoomIntro";
 import HistoryTile from "../views/rooms/HistoryTile";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import defaultDispatcher from '../../dispatcher/dispatcher';
 import CallEventGrouper from "./CallEventGrouper";
 import WhoIsTypingTile from '../views/rooms/WhoIsTypingTile';
@@ -51,8 +50,10 @@ import Spinner from "../views/elements/Spinner";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
 import EditorStateTransfer from "../../utils/EditorStateTransfer";
 import { Action } from '../../dispatcher/actions';
-import { getEventDisplayInfo } from "../../utils/EventUtils";
+import { getEventDisplayInfo } from "../../utils/EventRenderingUtils";
 import { IReadReceiptInfo } from "../views/rooms/ReadReceiptMarker";
+import { haveRendererForEvent } from "../../events/EventTileFactory";
+import { editorRoomKey } from "../../Editing";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = [EventType.Sticker, EventType.RoomMessage];
@@ -69,6 +70,7 @@ export function shouldFormContinuation(
     prevEvent: MatrixEvent,
     mxEvent: MatrixEvent,
     showHiddenEvents: boolean,
+    threadsEnabled: boolean,
     timelineRenderingType?: TimelineRenderingType,
 ): boolean {
     if (timelineRenderingType === TimelineRenderingType.ThreadsList) return false;
@@ -90,8 +92,16 @@ export function shouldFormContinuation(
         mxEvent.sender.name !== prevEvent.sender.name ||
         mxEvent.sender.getMxcAvatarUrl() !== prevEvent.sender.getMxcAvatarUrl()) return false;
 
+    // Thread summaries in the main timeline should break up a continuation on both sides
+    if (threadsEnabled &&
+        (mxEvent.isThreadRoot || prevEvent.isThreadRoot) &&
+        timelineRenderingType !== TimelineRenderingType.Thread
+    ) {
+        return false;
+    }
+
     // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
-    if (!haveTileForEvent(prevEvent, showHiddenEvents)) return false;
+    if (!haveRendererForEvent(prevEvent, showHiddenEvents)) return false;
 
     return true;
 }
@@ -157,9 +167,6 @@ interface IProps {
     // which layout to use
     layout?: Layout;
 
-    // whether or not to show flair at all
-    enableFlair?: boolean;
-
     resizeNotifier: ResizeNotifier;
     permalinkCreator?: RoomPermalinkCreator;
     editState?: EditorStateTransfer;
@@ -167,9 +174,6 @@ interface IProps {
     // callback which is called when the panel is scrolled.
     onScroll?(event: Event): void;
 
-    // callback which is called when the user interacts with the room timeline
-    onUserScroll(event: SyntheticEvent): void;
-
     // callback which is called when more content is needed.
     onFillRequest?(backwards: boolean): Promise<boolean>;
 
@@ -197,7 +201,6 @@ interface IReadReceiptForUser {
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
-@replaceableComponent("structures.MessagePanel")
 export default class MessagePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -243,7 +246,8 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     // displayed event in the current render cycle.
     private readReceiptsByUserId: Record<string, IReadReceiptForUser> = {};
 
-    private readonly showHiddenEventsInTimeline: boolean;
+    private readonly _showHiddenEvents: boolean;
+    private readonly threadsEnabled: boolean;
     private isMounted = false;
 
     private readMarkerNode = createRef<HTMLLIElement>();
@@ -251,7 +255,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     private scrollPanel = createRef<ScrollPanel>();
 
     private readonly showTypingNotificationsWatcherRef: string;
-    private eventTiles: Record<string, EventTile> = {};
+    private eventTiles: Record<string, UnwrappedEventTile> = {};
 
     // A map to allow groupers to maintain consistent keys even if their first event is uprooted due to back-pagination.
     public grouperKeyMap = new WeakMap<MatrixEvent, string>();
@@ -267,10 +271,11 @@ export default class MessagePanel extends React.Component<IProps, IState> {
             hideSender: this.shouldHideSender(),
         };
 
-        // Cache hidden events setting on mount since Settings is expensive to
-        // query, and we check this in a hot code path. This is also cached in
-        // our RoomContext, however we still need a fallback for roomless MessagePanels.
-        this.showHiddenEventsInTimeline = SettingsStore.getValue("showHiddenEventsInTimeline");
+        // Cache these settings on mount since Settings is expensive to query,
+        // and we check this in a hot code path. This is also cached in our
+        // RoomContext, however we still need a fallback for roomless MessagePanels.
+        this._showHiddenEvents = SettingsStore.getValue("showHiddenEventsInTimeline");
+        this.threadsEnabled = SettingsStore.getValue("feature_thread");
 
         this.showTypingNotificationsWatcherRef =
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
@@ -303,9 +308,10 @@ export default class MessagePanel extends React.Component<IProps, IState> {
 
         const pendingEditItem = this.pendingEditItem;
         if (!this.props.editState && this.props.room && pendingEditItem) {
+            const event = this.props.room.findEventById(pendingEditItem);
             defaultDispatcher.dispatch({
                 action: Action.EditEvent,
-                event: this.props.room.findEventById(pendingEditItem),
+                event: !event?.isRedacted() ? event : null,
                 timelineRenderingType: this.context.timelineRenderingType,
             });
         }
@@ -336,7 +342,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         return this.eventTiles[eventId]?.ref?.current;
     }
 
-    public getTileForEventId(eventId: string): EventTile {
+    public getTileForEventId(eventId: string): UnwrappedEventTile {
         if (!this.eventTiles) {
             return undefined;
         }
@@ -450,25 +456,17 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         }
     }
 
-    /* check the scroll state and send out pagination requests if necessary.
-     */
-    public checkFillState(): void {
-        if (this.scrollPanel.current) {
-            this.scrollPanel.current.checkFillState();
-        }
-    }
-
     private isUnmounting = (): boolean => {
         return !this.isMounted;
     };
 
     public get showHiddenEvents(): boolean {
-        return this.context?.showHiddenEventsInTimeline ?? this.showHiddenEventsInTimeline;
+        return this.context?.showHiddenEvents ?? this._showHiddenEvents;
     }
 
     // TODO: Implement granular (per-room) hide options
     public shouldShowEvent(mxEv: MatrixEvent, forceHideEvents = false): boolean {
-        if (this.props.hideThreadedMessages && SettingsStore.getValue("feature_thread")) {
+        if (this.props.hideThreadedMessages && this.threadsEnabled) {
             if (mxEv.isThreadRelation) {
                 return false;
             }
@@ -486,7 +484,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
             return true;
         }
 
-        if (!haveTileForEvent(mxEv, this.showHiddenEvents)) {
+        if (!haveRendererForEvent(mxEv, this.showHiddenEvents)) {
             return false; // no tile = no show
         }
 
@@ -609,13 +607,15 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         if (!this.props.room) {
             return undefined;
         }
+
         try {
-            return localStorage.getItem(`mx_edit_room_${this.props.room.roomId}_${this.context.timelineRenderingType}`);
+            return localStorage.getItem(editorRoomKey(this.props.room.roomId, this.context.timelineRenderingType));
         } catch (err) {
             logger.error(err);
             return undefined;
         }
     }
+
     private getEventTiles(): ReactNode[] {
         let i;
 
@@ -718,10 +718,8 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     ): ReactNode[] {
         const ret = [];
 
-        const isEditing = this.props.editState &&
-            this.props.editState.getEvent().getId() === mxEv.getId();
-        // local echoes have a fake date, which could even be yesterday. Treat them
-        // as 'today' for the date separators.
+        const isEditing = this.props.editState?.getEvent().getId() === mxEv.getId();
+        // local echoes have a fake date, which could even be yesterday. Treat them as 'today' for the date separators.
         let ts1 = mxEv.getTs();
         let eventDate = mxEv.getDate();
         if (mxEv.status) {
@@ -746,13 +744,17 @@ export default class MessagePanel extends React.Component<IProps, IState> {
             const willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEv.getDate() || new Date());
             lastInSection = willWantDateSeparator ||
                 mxEv.getSender() !== nextEv.getSender() ||
-                getEventDisplayInfo(nextEv).isInfoMessage ||
-                !shouldFormContinuation(mxEv, nextEv, this.showHiddenEvents, this.context.timelineRenderingType);
+                getEventDisplayInfo(nextEv, this.showHiddenEvents).isInfoMessage ||
+                !shouldFormContinuation(
+                    mxEv, nextEv, this.showHiddenEvents, this.threadsEnabled, this.context.timelineRenderingType,
+                );
         }
 
         // is this a continuation of the previous message?
         const continuation = !wantsDateSeparator &&
-            shouldFormContinuation(prevEvent, mxEv, this.showHiddenEvents, this.context.timelineRenderingType);
+            shouldFormContinuation(
+                prevEvent, mxEv, this.showHiddenEvents, this.threadsEnabled, this.context.timelineRenderingType,
+            );
 
         const eventId = mxEv.getId();
         const highlight = (eventId === this.props.highlightedEventId);
@@ -811,7 +813,6 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                 getRelationsForEvent={this.props.getRelationsForEvent}
                 showReactions={this.props.showReactions}
                 layout={this.props.layout}
-                enableFlair={this.props.enableFlair}
                 showReadReceipts={this.props.showReadReceipts}
                 callEventGrouper={callEventGrouper}
                 hideSender={this.state.hideSender}
@@ -919,7 +920,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         return receiptsByEvent;
     }
 
-    private collectEventTile = (eventId: string, node: EventTile): void => {
+    private collectEventTile = (eventId: string, node: UnwrappedEventTile): void => {
         this.eventTiles[eventId] = node;
     };
 
@@ -1022,7 +1023,6 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                     ref={this.scrollPanel}
                     className={classes}
                     onScroll={this.props.onScroll}
-                    onUserScroll={this.props.onUserScroll}
                     onFillRequest={this.props.onFillRequest}
                     onUnfillRequest={this.props.onUnfillRequest}
                     style={style}
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
deleted file mode 100644
index 7efa5335edb..00000000000
--- a/src/components/structures/MyGroups.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import * as sdk from '../../index';
-import { _t } from '../../languageHandler';
-import SdkConfig from '../../SdkConfig';
-import dis from '../../dispatcher/dispatcher';
-import AccessibleButton from '../views/elements/AccessibleButton';
-import MatrixClientContext from "../../contexts/MatrixClientContext";
-import AutoHideScrollbar from "./AutoHideScrollbar";
-import { replaceableComponent } from "../../utils/replaceableComponent";
-
-@replaceableComponent("structures.MyGroups")
-export default class MyGroups extends React.Component {
-    static contextType = MatrixClientContext;
-
-    state = {
-        groups: null,
-        error: null,
-    };
-
-    componentDidMount() {
-        this._fetch();
-    }
-
-    _onCreateGroupClick = () => {
-        dis.dispatch({ action: 'view_create_group' });
-    };
-
-    _fetch() {
-        this.context.getJoinedGroups().then((result) => {
-            this.setState({ groups: result.groups, error: null });
-        }, (err) => {
-            if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
-                // Indicate that the guest isn't in any groups (which should be true)
-                this.setState({ groups: [], error: null });
-                return;
-            }
-            this.setState({ groups: null, error: err });
-        });
-    }
-
-    render() {
-        const brand = SdkConfig.get().brand;
-        const Loader = sdk.getComponent("elements.Spinner");
-        const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
-        const GroupTile = sdk.getComponent("groups.GroupTile");
-
-        let content;
-        let contentHeader;
-        if (this.state.groups) {
-            const groupNodes = [];
-            this.state.groups.forEach((g) => {
-                groupNodes.push(<GroupTile key={g} groupId={g} />);
-            });
-            contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
-            content = groupNodes.length > 0 ?
-                <AutoHideScrollbar className="mx_MyGroups_scrollable">
-                    <div className="mx_MyGroups_microcopy">
-                        <p>
-                            { _t(
-                                "Did you know: you can use communities to filter your %(brand)s experience!",
-                                { brand },
-                            ) }
-                        </p>
-                        <p>
-                            { _t(
-                                "You can click on an avatar in the " +
-                                "filter panel at any time to see only the rooms and people associated " +
-                                "with that community.",
-                            ) }
-                        </p>
-                    </div>
-                    <div className="mx_MyGroups_joinedGroups">
-                        { groupNodes }
-                    </div>
-                </AutoHideScrollbar> :
-                <div className="mx_MyGroups_placeholder">
-                    { _t(
-                        "You're not currently a member of any communities.",
-                    ) }
-                </div>;
-        } else if (this.state.error) {
-            content = <div className="mx_MyGroups_error">
-                { _t('Error whilst fetching joined communities') }
-            </div>;
-        } else {
-            content = <Loader />;
-        }
-
-        return <div className="mx_MyGroups">
-            <SimpleRoomHeader title={_t("Communities")} icon={require("../../../res/img/icons-groups.svg").default} />
-            <div className='mx_MyGroups_header'>
-                <div className="mx_MyGroups_headerCard">
-                    <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onCreateGroupClick} />
-                    <div className="mx_MyGroups_headerCard_content">
-                        <div className="mx_MyGroups_headerCard_header">
-                            { _t('Create a new community') }
-                        </div>
-                        { _t(
-                            'Create a community to group together users and rooms! ' +
-                            'Build a custom homepage to mark out your space in the Matrix universe.',
-                        ) }
-                    </div>
-                </div>
-                { /*<div className="mx_MyGroups_joinBox mx_MyGroups_headerCard">
-                    <AccessibleButton className='mx_MyGroups_headerCard_button' onClick={this._onJoinGroupClick}>
-                        <img src={require("../../../res/img/icons-create-room.svg").default} width="50" height="50" />
-                    </AccessibleButton>
-                    <div className="mx_MyGroups_headerCard_content">
-                        <div className="mx_MyGroups_headerCard_header">
-                            { _t('Join an existing community') }
-                        </div>
-                        { _t(
-                            'To join an existing community you\'ll have to '+
-                            'know its community identifier; this will look '+
-                            'something like <i>+example:matrix.org</i>.',
-                            {},
-                            { 'i': (sub) => <i>{ sub }</i> })
-                        }
-                    </div>
-                </div>*/ }
-            </div>
-            <div className="mx_MyGroups_content">
-                { contentHeader }
-                { content }
-            </div>
-        </div>;
-    }
-}
diff --git a/src/components/structures/NonUrgentToastContainer.tsx b/src/components/structures/NonUrgentToastContainer.tsx
index 7872c2596cd..10cb1ad427c 100644
--- a/src/components/structures/NonUrgentToastContainer.tsx
+++ b/src/components/structures/NonUrgentToastContainer.tsx
@@ -19,7 +19,6 @@ import * as React from "react";
 import { ComponentClass } from "../../@types/common";
 import NonUrgentToastStore from "../../stores/NonUrgentToastStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -28,7 +27,6 @@ interface IState {
     toasts: ComponentClass[];
 }
 
-@replaceableComponent("structures.NonUrgentToastContainer")
 export default class NonUrgentToastContainer extends React.PureComponent<IProps, IState> {
     public constructor(props, context) {
         super(props, context);
diff --git a/src/components/structures/NotificationPanel.tsx b/src/components/structures/NotificationPanel.tsx
index 6af271bcc20..e5f094773bb 100644
--- a/src/components/structures/NotificationPanel.tsx
+++ b/src/components/structures/NotificationPanel.tsx
@@ -20,7 +20,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from '../../languageHandler';
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import BaseCard from "../views/right_panel/BaseCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import TimelinePanel from "./TimelinePanel";
 import Spinner from "../views/elements/Spinner";
 import { Layout } from "../../settings/enums/Layout";
@@ -38,7 +37,6 @@ interface IState {
 /*
  * Component which shows the global notification list using a TimelinePanel
  */
-@replaceableComponent("structures.NotificationPanel")
 export default class NotificationPanel extends React.PureComponent<IProps, IState> {
     static contextType = RoomContext;
 
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index bb772faa806..5c2eaaf9a4e 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -28,12 +28,8 @@ import RightPanelStore from "../../stores/right-panel/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
 import WidgetCard from "../views/right_panel/WidgetCard";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SettingsStore from "../../settings/SettingsStore";
 import MemberList from "../views/rooms/MemberList";
-import GroupMemberList from "../views/groups/GroupMemberList";
-import GroupRoomList from "../views/groups/GroupRoomList";
-import GroupRoomInfo from "../views/groups/GroupRoomInfo";
 import UserInfo from "../views/right_panel/UserInfo";
 import ThirdPartyMemberInfo from "../views/rooms/ThirdPartyMemberInfo";
 import FilePanel from "./FilePanel";
@@ -51,7 +47,6 @@ import { Action } from '../../dispatcher/actions';
 
 interface IProps {
     room?: Room; // if showing panels for a given room, this is set
-    groupId?: string; // if showing panels for a given group, this is set
     overwriteCard?: IRightPanelCard; // used to display a custom card and ignoring the RightPanelStore (used for UserView)
     resizeNotifier: ResizeNotifier;
     permalinkCreator?: RoomPermalinkCreator;
@@ -64,7 +59,6 @@ interface IState {
     cardState?: IRightPanelCardState;
 }
 
-@replaceableComponent("structures.RightPanel")
 export default class RightPanel extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
@@ -96,9 +90,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
         if (props.room) {
             currentCard = RightPanelStore.instance.currentCardForRoom(props.room.roomId);
         }
-        if (props.groupId) {
-            currentCard = RightPanelStore.instance.currentGroup;
-        }
 
         if (currentCard?.phase && !RightPanelStore.instance.isPhaseValid(currentCard.phase, !!props.room)) {
             // XXX: We can probably get rid of this workaround once GroupView is dead, it's unmounting happens weirdly
@@ -186,16 +177,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 />;
                 break;
 
-            case RightPanelPhases.GroupMemberList:
-                if (this.props.groupId) {
-                    card = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
-                }
-                break;
-
-            case RightPanelPhases.GroupRoomList:
-                card = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
-                break;
-
             case RightPanelPhases.RoomMemberInfo:
             case RightPanelPhases.SpaceMemberInfo:
             case RightPanelPhases.EncryptionPanel: {
@@ -218,24 +199,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 card = <ThirdPartyMemberInfo event={cardState.memberInfoEvent} key={roomId} />;
                 break;
 
-            case RightPanelPhases.GroupMemberInfo:
-                card = <UserInfo
-                    user={cardState.member}
-                    groupId={this.props.groupId}
-                    key={cardState.member.userId}
-                    phase={phase}
-                    onClose={this.onClose}
-                />;
-                break;
-
-            case RightPanelPhases.GroupRoomInfo:
-                card = <GroupRoomInfo
-                    groupRoomId={cardState.groupRoomId}
-                    groupId={this.props.groupId}
-                    key={cardState.groupRoomId}
-                />;
-                break;
-
             case RightPanelPhases.NotificationPanel:
                 card = <NotificationPanel onClose={this.onClose} />;
                 break;
@@ -268,6 +231,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
                     mxEvent={cardState.threadHeadEvent}
                     initialEvent={cardState.initialEvent}
                     isInitialEventHighlighted={cardState.isInitialEventHighlighted}
+                    initialEventScrollIntoView={cardState.initialEventScrollIntoView}
                     permalinkCreator={this.props.permalinkCreator}
                     e2eStatus={this.props.e2eStatus}
                 />;
diff --git a/src/components/structures/RoomDirectory.tsx b/src/components/structures/RoomDirectory.tsx
index b29cc245fd3..99aeb6f5478 100644
--- a/src/components/structures/RoomDirectory.tsx
+++ b/src/components/structures/RoomDirectory.tsx
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { IFieldType, IInstance, IProtocol, IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client";
+import { IFieldType, IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client";
 import { Visibility } from "matrix-js-sdk/src/@types/partials";
 import { IRoomDirectoryOptions } from "matrix-js-sdk/src/@types/requests";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -24,21 +24,14 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import dis from "../../dispatcher/dispatcher";
 import Modal from "../../Modal";
-import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import { _t } from '../../languageHandler';
 import SdkConfig from '../../SdkConfig';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
-import NetworkDropdown, { ALL_ROOMS, Protocols } from "../views/directory/NetworkDropdown";
+import NetworkDropdown from "../views/directory/NetworkDropdown";
 import SettingsStore from "../../settings/SettingsStore";
-import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
-import GroupStore from "../../stores/GroupStore";
-import FlairStore from "../../stores/FlairStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../customisations/Media";
 import { IDialogProps } from "../views/dialogs/IDialogProps";
 import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
-import BaseAvatar from "../views/avatars/BaseAvatar";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import QuestionDialog from "../views/dialogs/QuestionDialog";
 import BaseDialog from "../views/dialogs/BaseDialog";
@@ -46,12 +39,11 @@ import DirectorySearchBox from "../views/elements/DirectorySearchBox";
 import ScrollPanel from "./ScrollPanel";
 import Spinner from "../views/elements/Spinner";
 import { getDisplayAliasForAliasSet } from "../../Rooms";
-import { Action } from "../../dispatcher/actions";
 import PosthogTrackers from "../../PosthogTrackers";
-import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
-
-const MAX_NAME_LENGTH = 80;
-const MAX_TOPIC_LENGTH = 800;
+import { PublicRoomTile } from "../views/rooms/PublicRoomTile";
+import { getFieldsForThirdPartyLocation, joinRoomByAlias, showRoom } from "../../utils/rooms";
+import { GenericError } from "../../utils/error";
+import { ALL_ROOMS, Protocols } from "../../utils/DirectoryUtils";
 
 const LAST_SERVER_KEY = "mx_last_room_directory_server";
 const LAST_INSTANCE_KEY = "mx_last_room_directory_instance";
@@ -72,13 +64,9 @@ interface IState {
     instanceId: string;
     roomServer: string;
     filterString: string;
-    selectedCommunityId?: string;
-    communityName?: string;
 }
 
-@replaceableComponent("structures.RoomDirectory")
 export default class RoomDirectory extends React.Component<IProps, IState> {
-    private readonly startTime: number;
     private unmounted = false;
     private nextBatch: string = null;
     private filterTimeout: number;
@@ -87,15 +75,11 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
 
-        const selectedCommunityId = SettingsStore.getValue("feature_communities_v2_prototypes")
-            ? GroupFilterOrderStore.getSelectedTags()[0]
-            : null;
-
         let protocolsLoading = true;
         if (!MatrixClientPeg.get()) {
             // We may not have a client yet when invoked from welcome page
             protocolsLoading = false;
-        } else if (!selectedCommunityId) {
+        } else {
             MatrixClientPeg.get().getThirdpartyProtocols().then((response) => {
                 this.protocols = response;
                 const myHomeserver = MatrixClientPeg.getHomeserverName();
@@ -104,7 +88,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
 
                 let roomServer = myHomeserver;
                 if (
-                    SdkConfig.get().roomDirectory?.servers?.includes(lsRoomServer) ||
+                    SdkConfig.getObject("room_directory")?.get("servers")?.includes(lsRoomServer) ||
                     SettingsStore.getValue("room_directory_servers")?.includes(lsRoomServer)
                 ) {
                     roomServer = lsRoomServer;
@@ -148,14 +132,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                     ),
                 });
             });
-        } else {
-            // We don't use the protocols in the communities v2 prototype experience
-            protocolsLoading = false;
-
-            // Grab the profile info async
-            FlairStore.getGroupProfileCached(MatrixClientPeg.get(), this.state.selectedCommunityId).then(profile => {
-                this.setState({ communityName: profile.name });
-            });
         }
 
         this.state = {
@@ -165,8 +141,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             instanceId: localStorage.getItem(LAST_INSTANCE_KEY),
             roomServer: localStorage.getItem(LAST_SERVER_KEY),
             filterString: this.props.initialText || "",
-            selectedCommunityId,
-            communityName: null,
             protocolsLoading,
         };
     }
@@ -183,33 +157,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
     }
 
     private refreshRoomList = () => {
-        if (this.state.selectedCommunityId) {
-            this.setState({
-                publicRooms: GroupStore.getGroupRooms(this.state.selectedCommunityId).map(r => {
-                    return {
-                        // Translate all the group properties to the directory format
-                        room_id: r.roomId,
-                        name: r.name,
-                        topic: r.topic,
-                        canonical_alias: r.canonicalAlias,
-                        num_joined_members: r.numJoinedMembers,
-                        avatarUrl: r.avatarUrl,
-                        world_readable: r.worldReadable,
-                        guest_can_join: r.guestsCanJoin,
-                    };
-                }).filter(r => {
-                    const filterString = this.state.filterString;
-                    if (filterString) {
-                        const containedIn = (s: string) => (s || "").toLowerCase().includes(filterString.toLowerCase());
-                        return containedIn(r.name) || containedIn(r.topic) || containedIn(r.canonical_alias);
-                    }
-                    return true;
-                }),
-                loading: false,
-            });
-            return;
-        }
-
         this.nextBatch = null;
         this.setState({
             publicRooms: [],
@@ -219,7 +166,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
     };
 
     private getMoreRooms(): Promise<boolean> {
-        if (this.state.selectedCommunityId) return Promise.resolve(false); // no more rooms
         if (!MatrixClientPeg.get()) return Promise.resolve(false);
 
         this.setState({
@@ -299,7 +245,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
      * HS admins to do this through the RoomSettings interface, but
      * this needs SPEC-417.
      */
-    private removeFromDirectory(room: IPublicRoomsChunkRoom) {
+    private removeFromDirectory = (room: IPublicRoomsChunkRoom) => {
         const alias = getDisplayAliasForRoom(room);
         const name = room.name || alias || _t('Unnamed room');
 
@@ -339,14 +285,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                 });
             },
         });
-    }
-
-    private onRoomClicked = (room: IPublicRoomsChunkRoom, ev: React.MouseEvent) => {
-        // If room was shift-clicked, remove it from the room directory
-        if (ev.shiftKey && !this.state.selectedCommunityId) {
-            ev.preventDefault();
-            this.removeFromDirectory(room);
-        }
     };
 
     private onOptionChange = (server: string, instanceId?: string) => {
@@ -413,62 +351,26 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
     };
 
     private onJoinFromSearchClick = (alias: string) => {
-        // If we don't have a particular instance id selected, just show that rooms alias
-        if (!this.state.instanceId || this.state.instanceId === ALL_ROOMS) {
-            // If the user specified an alias without a domain, add on whichever server is selected
-            // in the dropdown
-            if (alias.indexOf(':') == -1) {
-                alias = alias + ':' + this.state.roomServer;
-            }
-            this.showRoomAlias(alias, true);
-        } else {
-            // This is a 3rd party protocol. Let's see if we can join it
-            const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
-            const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
-            const fields = protocolName
-                ? this.getFieldsForThirdPartyLocation(alias, this.protocols[protocolName], instance)
-                : null;
-            if (!fields) {
-                const brand = SdkConfig.get().brand;
-                Modal.createTrackedDialog('Unable to join network', '', ErrorDialog, {
-                    title: _t('Unable to join network'),
-                    description: _t('%(brand)s does not know how to join a room on this network', { brand }),
+        const cli = MatrixClientPeg.get();
+        try {
+            joinRoomByAlias(cli, alias, {
+                instanceId: this.state.instanceId,
+                roomServer: this.state.roomServer,
+                protocols: this.protocols,
+                metricsTrigger: "RoomDirectory",
+            });
+        } catch (e) {
+            if (e instanceof GenericError) {
+                Modal.createTrackedDialog(e.message, '', ErrorDialog, {
+                    title: e.message,
+                    description: e.description,
                 });
-                return;
+            } else {
+                throw e;
             }
-            MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).then((resp) => {
-                if (resp.length > 0 && resp[0].alias) {
-                    this.showRoomAlias(resp[0].alias, true);
-                } else {
-                    Modal.createTrackedDialog('Room not found', '', ErrorDialog, {
-                        title: _t('Room not found'),
-                        description: _t('Couldn\'t find a matching Matrix room'),
-                    });
-                }
-            }, (e) => {
-                Modal.createTrackedDialog('Fetching third party location failed', '', ErrorDialog, {
-                    title: _t('Fetching third party location failed'),
-                    description: _t('Unable to look up room ID from server'),
-                });
-            });
         }
     };
 
-    private onPreviewClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
-        this.showRoom(room, null, false, true);
-        ev.stopPropagation();
-    };
-
-    private onViewClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
-        this.showRoom(room);
-        ev.stopPropagation();
-    };
-
-    private onJoinClick = (ev: ButtonEvent, room: IPublicRoomsChunkRoom) => {
-        this.showRoom(room, null, true);
-        ev.stopPropagation();
-    };
-
     private onCreateRoomClick = (ev: ButtonEvent) => {
         this.onFinished();
         dis.dispatch({
@@ -479,159 +381,17 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         PosthogTrackers.trackInteraction("WebRoomDirectoryCreateRoomButton", ev);
     };
 
-    private showRoomAlias(alias: string, autoJoin = false) {
-        this.showRoom(null, alias, autoJoin);
-    }
-
-    private showRoom(room: IPublicRoomsChunkRoom, roomAlias?: string, autoJoin = false, shouldPeek = false) {
+    private onRoomClick = (room: IPublicRoomsChunkRoom, roomAlias?: string, autoJoin = false, shouldPeek = false) => {
         this.onFinished();
-        const payload: ViewRoomPayload = {
-            action: Action.ViewRoom,
-            auto_join: autoJoin,
-            should_peek: shouldPeek,
+        const cli = MatrixClientPeg.get();
+        showRoom(cli, room, {
+            roomAlias,
+            autoJoin,
+            shouldPeek,
+            roomServer: this.state.roomServer,
             metricsTrigger: "RoomDirectory",
-        };
-        if (room) {
-            // Don't let the user view a room they won't be able to either
-            // peek or join: fail earlier so they don't have to click back
-            // to the directory.
-            if (MatrixClientPeg.get().isGuest()) {
-                if (!room.world_readable && !room.guest_can_join) {
-                    dis.dispatch({ action: 'require_registration' });
-                    return;
-                }
-            }
-
-            if (!roomAlias) {
-                roomAlias = getDisplayAliasForRoom(room);
-            }
-
-            payload.oob_data = {
-                avatarUrl: room.avatar_url,
-                // XXX: This logic is duplicated from the JS SDK which
-                // would normally decide what the name is.
-                name: room.name || roomAlias || _t('Unnamed room'),
-            };
-
-            if (this.state.roomServer) {
-                payload.via_servers = [this.state.roomServer];
-            }
-        }
-        // It's not really possible to join Matrix rooms by ID because the HS has no way to know
-        // which servers to start querying. However, there's no other way to join rooms in
-        // this list without aliases at present, so if roomAlias isn't set here we have no
-        // choice but to supply the ID.
-        if (roomAlias) {
-            payload.room_alias = roomAlias;
-        } else {
-            payload.room_id = room.room_id;
-        }
-        dis.dispatch(payload);
-    }
-
-    private createRoomCells(room: IPublicRoomsChunkRoom) {
-        const client = MatrixClientPeg.get();
-        const clientRoom = client.getRoom(room.room_id);
-        const hasJoinedRoom = clientRoom && clientRoom.getMyMembership() === "join";
-        const isGuest = client.isGuest();
-        let previewButton;
-        let joinOrViewButton;
-
-        // Element Web currently does not allow guests to join rooms, so we
-        // instead show them preview buttons for all rooms. If the room is not
-        // world readable, a modal will appear asking you to register first. If
-        // it is readable, the preview appears as normal.
-        if (!hasJoinedRoom && (room.world_readable || isGuest)) {
-            previewButton = (
-                <AccessibleButton kind="secondary" onClick={(ev) => this.onPreviewClick(ev, room)}>
-                    { _t("Preview") }
-                </AccessibleButton>
-            );
-        }
-        if (hasJoinedRoom) {
-            joinOrViewButton = (
-                <AccessibleButton kind="secondary" onClick={(ev) => this.onViewClick(ev, room)}>
-                    { _t("View") }
-                </AccessibleButton>
-            );
-        } else if (!isGuest) {
-            joinOrViewButton = (
-                <AccessibleButton kind="primary" onClick={(ev) => this.onJoinClick(ev, room)}>
-                    { _t("Join") }
-                </AccessibleButton>
-            );
-        }
-
-        let name = room.name || getDisplayAliasForRoom(room) || _t('Unnamed room');
-        if (name.length > MAX_NAME_LENGTH) {
-            name = `${name.substring(0, MAX_NAME_LENGTH)}...`;
-        }
-
-        let topic = room.topic || '';
-        // Additional truncation based on line numbers is done via CSS,
-        // but to ensure that the DOM is not polluted with a huge string
-        // we give it a hard limit before rendering.
-        if (topic.length > MAX_TOPIC_LENGTH) {
-            topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
-        }
-        topic = linkifyAndSanitizeHtml(topic);
-        let avatarUrl = null;
-        if (room.avatar_url) avatarUrl = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(32);
-
-        // We use onMouseDown instead of onClick, so that we can avoid text getting selected
-        return <div
-            key={room.room_id}
-            role="listitem"
-            className="mx_RoomDirectory_listItem"
-        >
-            <div
-                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
-                className="mx_RoomDirectory_roomAvatar"
-            >
-                <BaseAvatar
-                    width={32}
-                    height={32}
-                    resizeMethod='crop'
-                    name={name}
-                    idName={name}
-                    url={avatarUrl}
-                />
-            </div>
-            <div
-                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
-                className="mx_RoomDirectory_roomDescription"
-            >
-                <div className="mx_RoomDirectory_name">
-                    { name }
-                </div>&nbsp;
-                <div
-                    className="mx_RoomDirectory_topic"
-                    dangerouslySetInnerHTML={{ __html: topic }}
-                />
-                <div className="mx_RoomDirectory_alias">
-                    { getDisplayAliasForRoom(room) }
-                </div>
-            </div>
-            <div
-                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
-                className="mx_RoomDirectory_roomMemberCount"
-            >
-                { room.num_joined_members }
-            </div>
-            <div
-                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
-                className="mx_RoomDirectory_preview"
-            >
-                { previewButton }
-            </div>
-            <div
-                onMouseDown={(ev) => this.onRoomClicked(room, ev)}
-                className="mx_RoomDirectory_join"
-            >
-                { joinOrViewButton }
-            </div>
-        </div>;
-    }
+        });
+    };
 
     private stringLooksLikeId(s: string, fieldType: IFieldType) {
         let pat = /^#[^\s]+:[^\s]/;
@@ -642,27 +402,11 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         return pat.test(s);
     }
 
-    private getFieldsForThirdPartyLocation(userInput: string, protocol: IProtocol, instance: IInstance) {
-        // make an object with the fields specified by that protocol. We
-        // require that the values of all but the last field come from the
-        // instance. The last is the user input.
-        const requiredFields = protocol.location_fields;
-        if (!requiredFields) return null;
-        const fields = {};
-        for (let i = 0; i < requiredFields.length - 1; ++i) {
-            const thisField = requiredFields[i];
-            if (instance.fields[thisField] === undefined) return null;
-            fields[thisField] = instance.fields[thisField];
-        }
-        fields[requiredFields[requiredFields.length - 1]] = userInput;
-        return fields;
-    }
-
     private onFinished = () => {
         this.props.onFinished(false);
     };
 
-    render() {
+    public render() {
         let content;
         if (this.state.error) {
             content = this.state.error;
@@ -670,7 +414,14 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             content = <Spinner />;
         } else {
             const cells = (this.state.publicRooms || [])
-                .reduce((cells, room) => cells.concat(this.createRoomCells(room)), []);
+                .map(room =>
+                    <PublicRoomTile
+                        key={room.room_id}
+                        room={room}
+                        showRoom={this.onRoomClick}
+                        removeFromDirectory={this.removeFromDirectory}
+                    />,
+                );
             // we still show the scrollpanel, at least for now, because
             // otherwise we don't fetch more because we don't get a fill
             // request from the scrollpanel because there isn't one
@@ -747,7 +498,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             let showJoinButton = this.stringLooksLikeId(this.state.filterString, instanceExpectedFieldType);
             if (protocolName) {
                 const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
-                if (this.getFieldsForThirdPartyLocation(
+                if (getFieldsForThirdPartyLocation(
                     this.state.filterString,
                     this.protocols[protocolName],
                     instance,
@@ -756,18 +507,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                 }
             }
 
-            let dropdown = (
-                <NetworkDropdown
-                    protocols={this.protocols}
-                    onOptionChange={this.onOptionChange}
-                    selectedServerName={this.state.roomServer}
-                    selectedInstanceId={this.state.instanceId}
-                />
-            );
-            if (this.state.selectedCommunityId) {
-                dropdown = null;
-            }
-
             listHeader = <div className="mx_RoomDirectory_listheader">
                 <DirectorySearchBox
                     className="mx_RoomDirectory_searchbox"
@@ -778,22 +517,24 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
                     showJoinButton={showJoinButton}
                     initialText={this.props.initialText}
                 />
-                { dropdown }
+                <NetworkDropdown
+                    protocols={this.protocols}
+                    onOptionChange={this.onOptionChange}
+                    selectedServerName={this.state.roomServer}
+                    selectedInstanceId={this.state.instanceId}
+                />
             </div>;
         }
         const explanation =
-            _t("If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.", null,
+            _t("If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.", null,
                 { a: sub => (
-                    <AccessibleButton kind="secondary" onClick={this.onCreateRoomClick}>
+                    <AccessibleButton kind="link_inline" onClick={this.onCreateRoomClick}>
                         { sub }
                     </AccessibleButton>
                 ) },
             );
 
-        const title = this.state.selectedCommunityId
-            ? _t("Explore rooms in %(communityName)s", {
-                communityName: this.state.communityName || this.state.selectedCommunityId,
-            }) : _t("Explore rooms");
+        const title = _t("Explore rooms");
         return (
             <BaseDialog
                 className="mx_RoomDirectory_dialog"
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 5591e382eac..94212927641 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -26,7 +26,6 @@ import { Action } from "../../dispatcher/actions";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import { isMac, Key } from "../../Keyboard";
@@ -50,7 +49,6 @@ interface IState {
     spotlightBetaEnabled: boolean;
 }
 
-@replaceableComponent("structures.RoomSearch")
 export default class RoomSearch extends React.PureComponent<IProps, IState> {
     private readonly dispatcherRef: string;
     private readonly betaRef: string;
diff --git a/src/components/structures/RoomStatusBar.tsx b/src/components/structures/RoomStatusBar.tsx
index 514c3a507c6..94b9905becc 100644
--- a/src/components/structures/RoomStatusBar.tsx
+++ b/src/components/structures/RoomStatusBar.tsx
@@ -24,7 +24,6 @@ import Resend from '../../Resend';
 import dis from '../../dispatcher/dispatcher';
 import { messageForResourceLimitError } from '../../utils/ErrorUtils';
 import { Action } from "../../dispatcher/actions";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import NotificationBadge from "../views/rooms/NotificationBadge";
 import { StaticNotificationState } from "../../stores/notifications/StaticNotificationState";
 import AccessibleButton from "../views/elements/AccessibleButton";
@@ -82,7 +81,6 @@ interface IState {
     isResending: boolean;
 }
 
-@replaceableComponent("structures.RoomStatusBar")
 export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     public static contextType = MatrixClientContext;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index d69a9d20547..761dd9b496f 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -23,7 +23,7 @@ limitations under the License.
 import React, { createRef } from 'react';
 import classNames from 'classnames';
 import { IRecommendedVersion, NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
+import { IThreadBundledRelationship, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
 import { EventSubscription } from "fbemitter";
 import { ISearchResults } from 'matrix-js-sdk/src/@types/search';
 import { logger } from "matrix-js-sdk/src/logger";
@@ -35,6 +35,7 @@ import { throttle } from "lodash";
 import { MatrixError } from 'matrix-js-sdk/src/http-api';
 import { ClientEvent } from "matrix-js-sdk/src/client";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
+import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
 
 import shouldHideEvent from '../../shouldHideEvent';
 import { _t } from '../../languageHandler';
@@ -48,14 +49,13 @@ import * as Rooms from '../../Rooms';
 import eventSearch, { searchPagination } from '../../Searching';
 import MainSplit from './MainSplit';
 import RightPanel from './RightPanel';
-import RoomViewStore from '../../stores/RoomViewStore';
+import { RoomViewStore } from '../../stores/RoomViewStore';
 import RoomScrollStateStore, { ScrollState } from '../../stores/RoomScrollStateStore';
 import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore from "../../settings/SettingsStore";
 import { Layout } from "../../settings/enums/Layout";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/right-panel/RightPanelStore";
-import { haveTileForEvent } from "../views/rooms/EventTile";
 import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext";
 import MatrixClientContext, { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 import { E2EStatus, shieldStatusForRoom } from '../../utils/ShieldUtils';
@@ -75,6 +75,7 @@ import EffectsOverlay from "../views/elements/EffectsOverlay";
 import { containsEmoji } from '../../effects/utils';
 import { CHAT_EFFECTS } from '../../effects';
 import WidgetStore from "../../stores/WidgetStore";
+import VideoRoomView from "./VideoRoomView";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import Notifier from "../../Notifier";
 import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast";
@@ -84,7 +85,6 @@ import { getKeyBindingsManager } from '../../KeyBindingsManager';
 import { objectHasDiff } from "../../utils/objects";
 import SpaceRoomView from "./SpaceRoomView";
 import { IOpts } from "../../createRoom";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import EditorStateTransfer from "../../utils/EditorStateTransfer";
 import ErrorDialog from '../views/dialogs/ErrorDialog';
 import SearchResultTile from '../views/rooms/SearchResultTile';
@@ -94,7 +94,6 @@ import RoomStatusBar from "./RoomStatusBar";
 import MessageComposer from '../views/rooms/MessageComposer';
 import JumpToBottomButton from "../views/rooms/JumpToBottomButton";
 import TopUnreadMessagesBar from "../views/rooms/TopUnreadMessagesBar";
-import SpaceStore from "../../stores/spaces/SpaceStore";
 import { showThread } from '../../dispatcher/dispatch-actions/threads';
 import { fetchInitialEvent } from "../../utils/EventUtils";
 import { ComposerInsertPayload, ComposerType } from "../../dispatcher/payloads/ComposerInsertPayload";
@@ -108,6 +107,7 @@ import { DoAfterSyncPreparedPayload } from '../../dispatcher/payloads/DoAfterSyn
 import FileDropTarget from './FileDropTarget';
 import Measured from '../views/elements/Measured';
 import { FocusComposerPayload } from '../../dispatcher/payloads/FocusComposerPayload';
+import { haveRendererForEvent } from "../../events/EventTileFactory";
 
 const DEBUG = false;
 let debuglog = function(msg: string) {};
@@ -137,7 +137,7 @@ interface IRoomProps extends MatrixClientProps {
 enum MainSplitContentType {
     Timeline,
     MaximisedWidget,
-    // Video
+    Video, // immersive voip
 }
 export interface IRoomState {
     room?: Room;
@@ -155,6 +155,8 @@ export interface IRoomState {
     initialEventPixelOffset?: number;
     // Whether to highlight the event scrolled to
     isInitialEventHighlighted?: boolean;
+    // Whether to scroll the event into view
+    initialEventScrollIntoView?: boolean;
     replyToEvent?: MatrixEvent;
     numUnreadMessages: number;
     searchTerm?: string;
@@ -189,13 +191,14 @@ export interface IRoomState {
     canReact: boolean;
     canSendMessages: boolean;
     tombstone?: MatrixEvent;
+    resizing: boolean;
     layout: Layout;
     lowBandwidth: boolean;
     alwaysShowTimestamps: boolean;
     showTwelveHourTimestamps: boolean;
     readMarkerInViewThresholdMs: number;
     readMarkerOutOfViewThresholdMs: number;
-    showHiddenEventsInTimeline: boolean;
+    showHiddenEvents: boolean;
     showReadReceipts: boolean;
     showRedactions: boolean;
     showJoinLeaves: boolean;
@@ -218,7 +221,6 @@ export interface IRoomState {
     narrow: boolean;
 }
 
-@replaceableComponent("structures.RoomView")
 export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private readonly dispatcherRef: string;
     private readonly roomStoreToken: EventSubscription;
@@ -261,13 +263,14 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             statusBarVisible: false,
             canReact: false,
             canSendMessages: false,
+            resizing: false,
             layout: SettingsStore.getValue("layout"),
             lowBandwidth: SettingsStore.getValue("lowBandwidth"),
             alwaysShowTimestamps: SettingsStore.getValue("alwaysShowTimestamps"),
             showTwelveHourTimestamps: SettingsStore.getValue("showTwelveHourTimestamps"),
             readMarkerInViewThresholdMs: SettingsStore.getValue("readMarkerInViewThresholdMs"),
             readMarkerOutOfViewThresholdMs: SettingsStore.getValue("readMarkerOutOfViewThresholdMs"),
-            showHiddenEventsInTimeline: SettingsStore.getValue("showHiddenEventsInTimeline"),
+            showHiddenEvents: SettingsStore.getValue("showHiddenEventsInTimeline"),
             showReadReceipts: true,
             showRedactions: true,
             showJoinLeaves: true,
@@ -295,13 +298,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         context.on(CryptoEvent.KeysChanged, this.onCrossSigningKeysChanged);
         context.on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         // Start listening for RoomViewStore updates
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.roomStoreToken = RoomViewStore.instance.addListener(this.onRoomViewStoreUpdate);
 
         RightPanelStore.instance.on(UPDATE_EVENT, this.onRightPanelStoreUpdate);
 
         WidgetEchoStore.on(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
         WidgetStore.instance.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
+        this.props.resizeNotifier.on("isResizing", this.onIsResizing);
+
         this.settingWatchers = [
             SettingsStore.watchSetting("layout", null, (...[,,, value]) =>
                 this.setState({ layout: value as Layout }),
@@ -322,11 +327,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 this.setState({ readMarkerOutOfViewThresholdMs: value as number }),
             ),
             SettingsStore.watchSetting("showHiddenEventsInTimeline", null, (...[,,, value]) =>
-                this.setState({ showHiddenEventsInTimeline: value as boolean }),
+                this.setState({ showHiddenEvents: value as boolean }),
             ),
         ];
     }
 
+    private onIsResizing = (resizing: boolean) => {
+        this.setState({ resizing });
+    };
+
     private onWidgetStoreUpdate = () => {
         if (!this.state.room) return;
         this.checkWidgets(this.state.room);
@@ -357,7 +366,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.checkWidgets(this.state.room);
     };
 
-    private checkWidgets = (room) => {
+    private checkWidgets = (room: Room): void => {
         this.setState({
             hasPinnedWidgets: WidgetLayoutStore.instance.hasPinnedWidgets(room),
             mainSplitContentType: this.getMainSplitContentType(room),
@@ -365,11 +374,14 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         });
     };
 
-    private getMainSplitContentType = (room) => {
-        // TODO-video check if video should be displayed in main panel
-        return (WidgetLayoutStore.instance.hasMaximisedWidget(room))
-            ? MainSplitContentType.MaximisedWidget
-            : MainSplitContentType.Timeline;
+    private getMainSplitContentType = (room: Room) => {
+        if (SettingsStore.getValue("feature_video_rooms") && room.isElementVideoRoom()) {
+            return MainSplitContentType.Video;
+        }
+        if (WidgetLayoutStore.instance.hasMaximisedWidget(room)) {
+            return MainSplitContentType.MaximisedWidget;
+        }
+        return MainSplitContentType.Timeline;
     };
 
     private onRoomViewStoreUpdate = async (initial?: boolean): Promise<void> => {
@@ -377,7 +389,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
 
-        if (!initial && this.state.roomId !== RoomViewStore.getRoomId()) {
+        if (!initial && this.state.roomId !== RoomViewStore.instance.getRoomId()) {
             // RoomView explicitly does not support changing what room
             // is being viewed: instead it should just be re-mounted when
             // switching rooms. Therefore, if the room ID changes, we
@@ -392,28 +404,29 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
 
-        const roomId = RoomViewStore.getRoomId();
+        const roomId = RoomViewStore.instance.getRoomId();
 
-        const newState: Pick<IRoomState, any> = {
+        // This convoluted type signature ensures we get IntelliSense *and* correct typing
+        const newState: Partial<IRoomState> & Pick<IRoomState, any> = {
             roomId,
-            roomAlias: RoomViewStore.getRoomAlias(),
-            roomLoading: RoomViewStore.isRoomLoading(),
-            roomLoadError: RoomViewStore.getRoomLoadError(),
-            joining: RoomViewStore.isJoining(),
-            replyToEvent: RoomViewStore.getQuotingEvent(),
+            roomAlias: RoomViewStore.instance.getRoomAlias(),
+            roomLoading: RoomViewStore.instance.isRoomLoading(),
+            roomLoadError: RoomViewStore.instance.getRoomLoadError(),
+            joining: RoomViewStore.instance.isJoining(),
+            replyToEvent: RoomViewStore.instance.getQuotingEvent(),
             // we should only peek once we have a ready client
-            shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
+            shouldPeek: this.state.matrixClientIsReady && RoomViewStore.instance.shouldPeek(),
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
             showRedactions: SettingsStore.getValue("showRedactions", roomId),
             showJoinLeaves: SettingsStore.getValue("showJoinLeaves", roomId),
             showAvatarChanges: SettingsStore.getValue("showAvatarChanges", roomId),
             showDisplaynameChanges: SettingsStore.getValue("showDisplaynameChanges", roomId),
-            wasContextSwitch: RoomViewStore.getWasContextSwitch(),
+            wasContextSwitch: RoomViewStore.instance.getWasContextSwitch(),
             initialEventId: null, // default to clearing this, will get set later in the method if needed
             showRightPanel: RightPanelStore.instance.isOpenForRoom(roomId),
         };
 
-        const initialEventId = RoomViewStore.getInitialEventId();
+        const initialEventId = RoomViewStore.instance.getInitialEventId();
         if (initialEventId) {
             const room = this.context.getRoom(roomId);
             let initialEvent = room?.findEventById(initialEventId);
@@ -433,22 +446,29 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 );
             }
 
+            // If we have an initial event, we want to reset the event pixel offset to ensure it ends up
+            // visible
+            newState.initialEventPixelOffset = null;
+
             const thread = initialEvent?.getThread();
             if (thread && !initialEvent?.isThreadRoot) {
                 showThread({
                     rootEvent: thread.rootEvent,
                     initialEvent,
-                    highlighted: RoomViewStore.isInitialEventHighlighted(),
+                    highlighted: RoomViewStore.instance.isInitialEventHighlighted(),
+                    scroll_into_view: RoomViewStore.instance.initialEventScrollIntoView(),
                 });
             } else {
                 newState.initialEventId = initialEventId;
-                newState.isInitialEventHighlighted = RoomViewStore.isInitialEventHighlighted();
+                newState.isInitialEventHighlighted = RoomViewStore.instance.isInitialEventHighlighted();
+                newState.initialEventScrollIntoView = RoomViewStore.instance.initialEventScrollIntoView();
 
                 if (thread && initialEvent?.isThreadRoot) {
                     showThread({
                         rootEvent: thread.rootEvent,
                         initialEvent,
-                        highlighted: RoomViewStore.isInitialEventHighlighted(),
+                        highlighted: RoomViewStore.instance.isInitialEventHighlighted(),
+                        scroll_into_view: RoomViewStore.instance.initialEventScrollIntoView(),
                     });
                 }
             }
@@ -729,6 +749,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
         WidgetStore.instance.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
+        this.props.resizeNotifier.off("isResizing", this.onIsResizing);
+
         if (this.state.room) {
             WidgetLayoutStore.instance.off(
                 WidgetLayoutStore.emissionForRoom(this.state.room),
@@ -746,19 +768,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         }
     }
 
-    private onUserScroll = () => {
-        if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
-            dis.dispatch<ViewRoomPayload>({
-                action: Action.ViewRoom,
-                room_id: this.state.room.roomId,
-                event_id: this.state.initialEventId,
-                highlighted: false,
-                replyingToEvent: this.state.replyToEvent,
-                metricsTrigger: undefined, // room doesn't change
-            });
-        }
-    };
-
     private onRightPanelStoreUpdate = () => {
         this.setState({
             showRightPanel: RightPanelStore.instance.isOpenForRoom(this.state.roomId),
@@ -842,28 +851,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 });
                 break;
             case 'reply_to_event':
-                if (this.state.searchResults
-                        && payload.event.getRoomId() === this.state.roomId
-                        && !this.unmounted
-                        && payload.context === TimelineRenderingType.Room) {
+                if (!this.unmounted &&
+                    this.state.searchResults &&
+                    payload.event?.getRoomId() === this.state.roomId &&
+                    payload.context === TimelineRenderingType.Search
+                ) {
                     this.onCancelSearchClick();
-                }
-                break;
-            case 'quote':
-                if (this.state.searchResults) {
-                    const roomId = payload.event.getRoomId();
-                    if (roomId === this.state.roomId) {
-                        this.onCancelSearchClick();
-                    }
-
-                    setImmediate(() => {
-                        dis.dispatch<ViewRoomPayload>({
-                            action: Action.ViewRoom,
-                            room_id: roomId,
-                            deferred_action: payload,
-                            metricsTrigger: "MessageSearch",
-                        });
-                    });
+                    // we don't need to re-dispatch as RoomViewStore knows to persist with context=Search also
                 }
                 break;
             case 'MatrixActions.sync':
@@ -945,6 +939,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         if (ev.getType() === "m.room.encryption") {
             this.updateE2EStatus(room);
+            this.updatePreviewUrlVisibility(room);
         }
 
         // ignore anything but real-time updates at the end of the room:
@@ -1253,8 +1248,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         }
     };
 
-    private onInviteButtonClick = () => {
-        // call AddressPickerDialog
+    private onInviteClick = () => {
+        // open the room inviter
         dis.dispatch({
             action: 'view_invite',
             roomId: this.state.room.roomId,
@@ -1303,6 +1298,22 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.updateTopUnreadMessagesBar();
     };
 
+    private resetJumpToEvent = (eventId?: string) => {
+        if (this.state.initialEventId && this.state.initialEventScrollIntoView &&
+            this.state.initialEventId === eventId) {
+            debuglog("Removing scroll_into_view flag from initial event");
+            dis.dispatch<ViewRoomPayload>({
+                action: Action.ViewRoom,
+                room_id: this.state.room.roomId,
+                event_id: this.state.initialEventId,
+                highlighted: this.state.isInitialEventHighlighted,
+                scroll_into_view: false,
+                replyingToEvent: this.state.replyToEvent,
+                metricsTrigger: undefined, // room doesn't change
+            });
+        }
+    };
+
     private injectSticker(url: string, info: object, text: string, threadId: string | null) {
         if (this.context.isGuest()) {
             dis.dispatch({ action: 'require_registration' });
@@ -1347,7 +1358,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.handleSearchResult(searchPromise);
     };
 
-    private handleSearchResult(searchPromise: Promise<any>): Promise<boolean> {
+    private handleSearchResult(searchPromise: Promise<ISearchResults>): Promise<boolean> {
         // keep a record of the current search id, so that if the search terms
         // change before we get a response, we can ignore the results.
         const localSearchId = this.searchId;
@@ -1356,7 +1367,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             searchInProgress: true,
         });
 
-        return searchPromise.then((results) => {
+        return searchPromise.then(async (results) => {
             debuglog("search complete");
             if (this.unmounted ||
                 this.state.timelineRenderingType !== TimelineRenderingType.Search ||
@@ -1383,6 +1394,20 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 return b.length - a.length;
             });
 
+            if (this.context.supportsExperimentalThreads()) {
+                // Process all thread roots returned in this batch of search results
+                // XXX: This won't work for results coming from Seshat which won't include the bundled relationship
+                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 = this.context.getRoom(event.getRoomId());
+                        event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true));
+                    }
+                }
+            }
+
             this.setState({
                 searchHighlights: highlights,
                 searchResults: results,
@@ -1454,7 +1479,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 continue;
             }
 
-            if (!haveTileForEvent(mxEv, this.state.showHiddenEventsInTimeline)) {
+            if (!haveRendererForEvent(mxEv, this.state.showHiddenEvents)) {
                 // XXX: can this ever happen? It will make the result count
                 // not match the displayed count.
                 continue;
@@ -1681,8 +1706,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
      *
      * We pass it down to the scroll panel.
      */
-    private handleScrollKey = ev => {
-        let panel;
+    public handleScrollKey = ev => {
+        let panel: ScrollPanel | TimelinePanel;
         if (this.searchResultsPanel.current) {
             panel = this.searchResultsPanel.current;
         } else if (this.messagePanel) {
@@ -1807,7 +1832,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         const myMembership = this.state.room.getMyMembership();
         // SpaceRoomView handles invites itself
-        if (myMembership === "invite" && (!SpaceStore.spacesEnabled || !this.state.room.isSpaceRoom())) {
+        if (myMembership === "invite" && !this.state.room.isSpaceRoom()) {
             if (this.state.joining || this.state.rejecting) {
                 return (
                     <ErrorBoundary>
@@ -1878,7 +1903,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             statusBar = <RoomStatusBar
                 room={this.state.room}
                 isPeeking={myMembership !== "join"}
-                onInviteClick={this.onInviteButtonClick}
+                onInviteClick={this.onInviteClick}
                 onVisible={this.onStatusBarVisible}
                 onHidden={this.onStatusBarHidden}
             />;
@@ -1938,7 +1963,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     room={this.state.room}
                 />
             );
-            if (!this.state.canPeek && (!SpaceStore.spacesEnabled || !this.state.room?.isSpaceRoom())) {
+            if (!this.state.canPeek && !this.state.room?.isSpaceRoom()) {
                 return (
                     <div className="mx_RoomView">
                         { previewBar }
@@ -1984,11 +2009,11 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         );
 
         let messageComposer; let searchInfo;
-        const canSpeak = (
+        const showComposer = (
             // joined and not showing search results
             myMembership === 'join' && !this.state.searchResults
         );
-        if (canSpeak) {
+        if (showComposer) {
             messageComposer =
                 <MessageComposer
                     room={this.state.room}
@@ -2053,9 +2078,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 hidden={hideMessagePanel}
                 highlightedEventId={highlightedEventId}
                 eventId={this.state.initialEventId}
+                eventScrollIntoView={this.state.initialEventScrollIntoView}
                 eventPixelOffset={this.state.initialEventPixelOffset}
                 onScroll={this.onMessageListScroll}
-                onUserScroll={this.onUserScroll}
+                onEventScrolledIntoView={this.resetJumpToEvent}
                 onReadMarkerUpdated={this.updateTopUnreadMessagesBar}
                 showUrlPreview={this.state.showUrlPreview}
                 className={this.messagePanelClassNames}
@@ -2100,59 +2126,90 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         const mainClasses = classNames("mx_RoomView", {
             mx_RoomView_inCall: Boolean(activeCall),
+            mx_RoomView_immersive: this.state.mainSplitContentType === MainSplitContentType.Video,
         });
 
         const showChatEffects = SettingsStore.getValue('showChatEffects');
 
+        let mainSplitBody: React.ReactFragment;
+        let mainSplitContentClassName: string;
         // Decide what to show in the main split
-        let mainSplitBody = <React.Fragment>
-            <Measured
-                sensor={this.roomViewBody.current}
-                onMeasurement={this.onMeasurement}
-            />
-            { auxPanel }
-            <div className={timelineClasses}>
-                <FileDropTarget parent={this.roomView.current} onFileDrop={this.onFileDrop} />
-                { topUnreadMessagesBar }
-                { jumpToBottom }
-                { messagePanel }
-                { searchResultsPanel }
-            </div>
-            { statusBarArea }
-            { previewBar }
-            { messageComposer }
-        </React.Fragment>;
-
         switch (this.state.mainSplitContentType) {
             case MainSplitContentType.Timeline:
-                // keep the timeline in as the mainSplitBody
+                mainSplitContentClassName = "mx_MainSplit_timeline";
+                mainSplitBody = <>
+                    <Measured
+                        sensor={this.roomViewBody.current}
+                        onMeasurement={this.onMeasurement}
+                    />
+                    { auxPanel }
+                    <div className={timelineClasses}>
+                        <FileDropTarget parent={this.roomView.current} onFileDrop={this.onFileDrop} />
+                        { topUnreadMessagesBar }
+                        { jumpToBottom }
+                        { messagePanel }
+                        { searchResultsPanel }
+                    </div>
+                    { statusBarArea }
+                    { previewBar }
+                    { messageComposer }
+                </>;
                 break;
             case MainSplitContentType.MaximisedWidget:
-                mainSplitBody = <AppsDrawer
-                    room={this.state.room}
-                    userId={this.context.credentials.userId}
-                    resizeNotifier={this.props.resizeNotifier}
-                    showApps={true}
-                />;
+                mainSplitContentClassName = "mx_MainSplit_maximisedWidget";
+                mainSplitBody = <>
+                    <AppsDrawer
+                        room={this.state.room}
+                        userId={this.context.credentials.userId}
+                        resizeNotifier={this.props.resizeNotifier}
+                        showApps={true}
+                    />
+                    { previewBar }
+                </>;
                 break;
-            // TODO-video MainSplitContentType.Video:
-            //     break;
+            case MainSplitContentType.Video: {
+                mainSplitContentClassName = "mx_MainSplit_video";
+                mainSplitBody = <>
+                    <VideoRoomView room={this.state.room} resizing={this.state.resizing} />
+                    { previewBar }
+                </>;
+            }
         }
+        const mainSplitContentClasses = classNames("mx_RoomView_body", mainSplitContentClassName);
+
         let excludedRightPanelPhaseButtons = [RightPanelPhases.Timeline];
+        let onCallPlaced = this.onCallPlaced;
         let onAppsClick = this.onAppsClick;
         let onForgetClick = this.onForgetClick;
         let onSearchClick = this.onSearchClick;
-        if (this.state.mainSplitContentType === MainSplitContentType.MaximisedWidget) {
-            // Disable phase buttons and action button to have a simplified header when a widget is maximised
-            // and enable (not disable) the RightPanelPhases.Timeline button
-            excludedRightPanelPhaseButtons = [
-                RightPanelPhases.ThreadPanel,
-                RightPanelPhases.PinnedMessages,
-            ];
-            onAppsClick = null;
-            onForgetClick = null;
-            onSearchClick = null;
+        let onInviteClick = null;
+
+        // Simplify the header for other main split types
+        switch (this.state.mainSplitContentType) {
+            case MainSplitContentType.MaximisedWidget:
+                excludedRightPanelPhaseButtons = [
+                    RightPanelPhases.ThreadPanel,
+                    RightPanelPhases.PinnedMessages,
+                ];
+                onAppsClick = null;
+                onForgetClick = null;
+                onSearchClick = null;
+                break;
+            case MainSplitContentType.Video:
+                excludedRightPanelPhaseButtons = [
+                    RightPanelPhases.ThreadPanel,
+                    RightPanelPhases.PinnedMessages,
+                    RightPanelPhases.NotificationPanel,
+                ];
+                onCallPlaced = null;
+                onAppsClick = null;
+                onForgetClick = null;
+                onSearchClick = null;
+                if (this.state.room.canInvite(this.context.credentials.userId)) {
+                    onInviteClick = this.onInviteClick;
+                }
         }
+
         return (
             <RoomContext.Provider value={this.state}>
                 <main className={mainClasses} ref={this.roomView} onKeyDown={this.onReactKeyDown}>
@@ -2166,15 +2223,16 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                             oobData={this.props.oobData}
                             inRoom={myMembership === 'join'}
                             onSearchClick={onSearchClick}
+                            onInviteClick={onInviteClick}
                             onForgetClick={(myMembership === "leave") ? onForgetClick : null}
                             e2eStatus={this.state.e2eStatus}
                             onAppsClick={this.state.hasPinnedWidgets ? onAppsClick : null}
                             appsShown={this.state.showApps}
-                            onCallPlaced={this.onCallPlaced}
+                            onCallPlaced={onCallPlaced}
                             excludedRightPanelPhaseButtons={excludedRightPanelPhaseButtons}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                            <div className="mx_RoomView_body" ref={this.roomViewBody} data-layout={this.state.layout}>
+                            <div className={mainSplitContentClasses} ref={this.roomViewBody} data-layout={this.state.layout}>
                                 { mainSplitBody }
                             </div>
                         </MainSplit>
diff --git a/src/components/structures/ScrollPanel.tsx b/src/components/structures/ScrollPanel.tsx
index d650cfc9623..f2595471c96 100644
--- a/src/components/structures/ScrollPanel.tsx
+++ b/src/components/structures/ScrollPanel.tsx
@@ -14,28 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, CSSProperties, ReactNode, SyntheticEvent, KeyboardEvent } from "react";
+import React, { createRef, CSSProperties, ReactNode, KeyboardEvent } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
-import UIStore, { UI_EVENTS } from "../../stores/UIStore";
 
 const DEBUG_SCROLL = false;
 
 // The amount of extra scroll distance to allow prior to unfilling.
 // See getExcessHeight.
 const UNPAGINATION_PADDING = 6000;
-// The number of milliseconds to debounce calls to onUnfillRequest, to prevent
-// many scroll events causing many unfilling requests.
+// The number of milliseconds to debounce calls to onUnfillRequest,
+// to prevent many scroll events causing many unfilling requests.
 const UNFILL_REQUEST_DEBOUNCE_MS = 200;
-// _updateHeight makes the height a ceiled multiple of this so we
-// don't have to update the height too often. It also allows the user
-// to scroll past the pagination spinner a bit so they don't feel blocked so
+// updateHeight makes the height a ceiled multiple of this so we don't have to update the height too often.
+// It also allows the user to scroll past the pagination spinner a bit so they don't feel blocked so
 // much while the content loads.
 const PAGE_SIZE = 400;
 
@@ -110,10 +107,6 @@ interface IProps {
     /* onScroll: a callback which is called whenever any scroll happens.
      */
     onScroll?(event: Event): void;
-
-    /* onUserScroll: callback which is called when the user interacts with the room timeline
-     */
-    onUserScroll?(event: SyntheticEvent): void;
 }
 
 /* This component implements an intelligent scrolling list.
@@ -170,7 +163,6 @@ interface IPreventShrinkingState {
     offsetNode: HTMLElement;
 }
 
-@replaceableComponent("structures.ScrollPanel")
 export default class ScrollPanel extends React.Component<IProps> {
     static defaultProps = {
         stickyBottom: true,
@@ -199,24 +191,20 @@ export default class ScrollPanel extends React.Component<IProps> {
     private preventShrinkingState: IPreventShrinkingState;
     private unfillDebouncer: number;
     private bottomGrowth: number;
-    private pages: number;
+    private minListHeight: number;
     private heightUpdateInProgress: boolean;
     private divScroll: HTMLDivElement;
 
     constructor(props, context) {
         super(props, context);
 
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.on("middlePanelResizedNoisy", this.onResize);
-        }
+        this.props.resizeNotifier?.on("middlePanelResizedNoisy", this.onResize);
 
         this.resetScrollState();
     }
 
     componentDidMount() {
         this.checkScroll();
-
-        UIStore.instance.on(UI_EVENTS.Resize, this.onUiResize);
     }
 
     componentDidUpdate() {
@@ -236,11 +224,7 @@ export default class ScrollPanel extends React.Component<IProps> {
         // (We could use isMounted(), but facebook have deprecated that.)
         this.unmounted = true;
 
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.removeListener("middlePanelResizedNoisy", this.onResize);
-        }
-
-        UIStore.instance.off(UI_EVENTS.Resize, this.onUiResize);
+        this.props.resizeNotifier?.removeListener("middlePanelResizedNoisy", this.onResize);
     }
 
     private onScroll = ev => {
@@ -552,7 +536,7 @@ export default class ScrollPanel extends React.Component<IProps> {
             stuckAtBottom: this.props.startAtBottom,
         };
         this.bottomGrowth = 0;
-        this.pages = 0;
+        this.minListHeight = 0;
         this.scrollTimeout = new Timer(100);
         this.heightUpdateInProgress = false;
     };
@@ -595,29 +579,21 @@ export default class ScrollPanel extends React.Component<IProps> {
      * @param {object} ev the keyboard event
      */
     public handleScrollKey = (ev: KeyboardEvent) => {
-        let isScrolling = false;
         const roomAction = getKeyBindingsManager().getRoomAction(ev);
         switch (roomAction) {
             case KeyBindingAction.ScrollUp:
                 this.scrollRelative(-1);
-                isScrolling = true;
                 break;
             case KeyBindingAction.ScrollDown:
                 this.scrollRelative(1);
-                isScrolling = true;
                 break;
             case KeyBindingAction.JumpToFirstMessage:
                 this.scrollToTop();
-                isScrolling = true;
                 break;
             case KeyBindingAction.JumpToLatestMessage:
                 this.scrollToBottom();
-                isScrolling = true;
                 break;
         }
-        if (isScrolling && this.props.onUserScroll) {
-            this.props.onUserScroll(ev);
-        }
     };
 
     /* Scroll the panel to bring the DOM node with the scroll token
@@ -735,17 +711,6 @@ export default class ScrollPanel extends React.Component<IProps> {
         }
     }
 
-    private onUiResize = () => {
-        this.setDataScrollbar();
-    };
-
-    private setDataScrollbar(contentHeight = this.getMessagesHeight()) {
-        const sn = this.getScrollNode();
-        const minHeight = sn.clientHeight;
-        const displayScrollbar = contentHeight > minHeight;
-        sn.dataset.scrollbar = displayScrollbar.toString();
-    }
-
     // need a better name that also indicates this will change scrollTop? Rebalance height? Reveal content?
     private async updateHeight(): Promise<void> {
         // wait until user has stopped scrolling
@@ -764,10 +729,13 @@ export default class ScrollPanel extends React.Component<IProps> {
         const sn = this.getScrollNode();
         const itemlist = this.itemlist.current;
         const contentHeight = this.getMessagesHeight();
-        const minHeight = sn.clientHeight;
-        const height = Math.max(minHeight, contentHeight);
-        this.pages = Math.ceil(height / PAGE_SIZE);
-        this.setDataScrollbar(contentHeight);
+        // Only round to the nearest page when we're basing the height off the content, not off the scrollNode height
+        // otherwise it'll cause too much overscroll which makes it possible to entirely scroll content off-screen.
+        if (contentHeight < sn.clientHeight) {
+            this.minListHeight = sn.clientHeight;
+        } else {
+            this.minListHeight = Math.ceil(contentHeight / PAGE_SIZE) * PAGE_SIZE;
+        }
         this.bottomGrowth = 0;
         const newHeight = `${this.getListHeight()}px`;
 
@@ -836,7 +804,7 @@ export default class ScrollPanel extends React.Component<IProps> {
     }
 
     private getListHeight(): number {
-        return this.bottomGrowth + (this.pages * PAGE_SIZE);
+        return this.bottomGrowth + this.minListHeight;
     }
 
     private getMessagesHeight(): number {
@@ -967,7 +935,6 @@ export default class ScrollPanel extends React.Component<IProps> {
             <AutoHideScrollbar
                 wrappedRef={this.collectScroll}
                 onScroll={this.onScroll}
-                onWheel={this.props.onUserScroll}
                 className={`mx_ScrollPanel ${this.props.className}`}
                 style={this.props.style}
             >
diff --git a/src/components/structures/SearchBox.tsx b/src/components/structures/SearchBox.tsx
index 5789e5adf13..bcf3dcc8757 100644
--- a/src/components/structures/SearchBox.tsx
+++ b/src/components/structures/SearchBox.tsx
@@ -20,7 +20,6 @@ import { throttle } from 'lodash';
 import classNames from 'classnames';
 
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 
@@ -43,7 +42,6 @@ interface IState {
     blurred: boolean;
 }
 
-@replaceableComponent("structures.SearchBox")
 export default class SearchBox extends React.Component<IProps, IState> {
     private search = createRef<HTMLInputElement>();
 
diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
index 65da850e8e1..756cacab1fe 100644
--- a/src/components/structures/SpaceHierarchy.tsx
+++ b/src/components/structures/SpaceHierarchy.tsx
@@ -60,7 +60,7 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { useTypedEventEmitterState } from "../../hooks/useEventEmitter";
 import { IOOBData } from "../../stores/ThreepidInviteStore";
 import { awaitRoomDownSync } from "../../utils/RoomUpgrade";
-import RoomViewStore from "../../stores/RoomViewStore";
+import { RoomViewStore } from "../../stores/RoomViewStore";
 import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { JoinRoomReadyPayload } from "../../dispatcher/payloads/JoinRoomReadyPayload";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
@@ -206,24 +206,27 @@ const Tile: React.FC<ITileProps> = ({
     }
 
     const content = <React.Fragment>
-        { avatar }
-        <div className="mx_SpaceHierarchy_roomTile_name">
-            { name }
-            { joinedSection }
-            { suggestedSection }
-        </div>
-
-        <div
-            className="mx_SpaceHierarchy_roomTile_info"
-            ref={e => e && linkifyElement(e)}
-            onClick={ev => {
-                // prevent clicks on links from bubbling up to the room tile
-                if ((ev.target as HTMLElement).tagName === "A") {
-                    ev.stopPropagation();
-                }
-            }}
-        >
-            { description }
+        <div className="mx_SpaceHierarchy_roomTile_item">
+            <div className="mx_SpaceHierarchy_roomTile_avatar">
+                { avatar }
+            </div>
+            <div className="mx_SpaceHierarchy_roomTile_name">
+                { name }
+                { joinedSection }
+                { suggestedSection }
+            </div>
+            <div
+                className="mx_SpaceHierarchy_roomTile_info"
+                ref={e => e && linkifyElement(e)}
+                onClick={ev => {
+                    // prevent clicks on links from bubbling up to the room tile
+                    if ((ev.target as HTMLElement).tagName === "A") {
+                        ev.stopPropagation();
+                    }
+                }}
+            >
+                { description }
+            </div>
         </div>
         <div className="mx_SpaceHierarchy_actions">
             { button }
@@ -368,7 +371,7 @@ export const joinRoom = (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: st
             metricsTrigger: "SpaceHierarchy",
         });
     }, err => {
-        RoomViewStore.showJoinRoomError(err, roomId);
+        RoomViewStore.instance.showJoinRoomError(err, roomId);
     });
 
     return prom;
@@ -770,8 +773,10 @@ const SpaceHierarchy = ({
 
                 content = <>
                     <div className="mx_SpaceHierarchy_listHeader">
-                        <h4>{ query.trim() ? _t("Results") : _t("Rooms and spaces") }</h4>
-                        <span>
+                        <h4 className="mx_SpaceHierarchy_listHeader_header">
+                            { query.trim() ? _t("Results") : _t("Rooms and spaces") }
+                        </h4>
+                        <div className="mx_SpaceHierarchy_listHeader_buttons">
                             { additionalButtons }
                             { hasPermissions && (
                                 <ManageButtons
@@ -781,7 +786,7 @@ const SpaceHierarchy = ({
                                     setError={setError}
                                 />
                             ) }
-                        </span>
+                        </div>
                     </div>
                     { errorText && <div className="mx_SpaceHierarchy_error">
                         { errorText }
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 896c2965040..1e9d5caa0cf 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, { RefObject, useContext, useRef, useState } from "react";
-import { EventType } from "matrix-js-sdk/src/@types/event";
+import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
 import { JoinRule, Preset } from "matrix-js-sdk/src/@types/partials";
 import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -29,6 +29,7 @@ import RoomTopic from "../views/elements/RoomTopic";
 import InlineSpinner from "../views/elements/InlineSpinner";
 import { inviteMultipleToRoom, showRoomInviteDialog } from "../../RoomInvite";
 import { useRoomMembers } from "../../hooks/useRoomMembers";
+import { useFeatureEnabled } from "../../hooks/useSettings";
 import createRoom, { IOpts } from "../../createRoom";
 import Field from "../views/elements/Field";
 import { useTypedEventEmitter } from "../../hooks/useEventEmitter";
@@ -57,8 +58,7 @@ import {
 } from "../../utils/space";
 import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
 import MemberAvatar from "../views/avatars/MemberAvatar";
-import SpaceStore from "../../stores/spaces/SpaceStore";
-import FacePile from "../views/elements/FacePile";
+import RoomFacePile from "../views/elements/RoomFacePile";
 import {
     AddExistingToSpace,
     defaultDmsRenderer,
@@ -71,12 +71,9 @@ import IconizedContextMenu, {
 } from "../views/context_menus/IconizedContextMenu";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
 import { BetaPill } from "../views/beta/BetaCard";
-import { UserTab } from "../views/dialogs/UserSettingsDialog";
 import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
 import { SpaceFeedbackPrompt } from "../views/spaces/SpaceCreateMenu";
 import { useAsyncMemo } from "../../hooks/useAsyncMemo";
-import Spinner from "../views/elements/Spinner";
-import GroupAvatar from "../views/avatars/GroupAvatar";
 import { useDispatcher } from "../../hooks/useDispatcher";
 import { useRoomState } from "../../hooks/useRoomState";
 import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
@@ -84,7 +81,6 @@ import { UIComponent } from "../../settings/UIFeature";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import PosthogTrackers from "../../PosthogTrackers";
 import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
-import { CreateEventField, IGroupSummary } from "../../@types/groups";
 
 interface IProps {
     space: Room;
@@ -179,33 +175,6 @@ const SpaceInfo = ({ space }: { space: Room }) => {
     </div>;
 };
 
-const onPreferencesClick = () => {
-    defaultDispatcher.dispatch({
-        action: Action.ViewUserSettings,
-        initialTabId: UserTab.Preferences,
-    });
-};
-
-// XXX: temporary community migration component
-const GroupTile = ({ groupId }: { groupId: string }) => {
-    const cli = useContext(MatrixClientContext);
-    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [cli, groupId]);
-
-    if (!groupSummary) return <Spinner />;
-
-    return <>
-        <GroupAvatar
-            groupId={groupId}
-            groupName={groupSummary.profile.name}
-            groupAvatarUrl={groupSummary.profile.avatar_url}
-            width={16}
-            height={16}
-            resizeMethod='crop'
-        />
-        { groupSummary.profile.name }
-    </>;
-};
-
 interface ISpacePreviewProps {
     space: Room;
     onJoinButtonClicked(): void;
@@ -223,8 +192,6 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
 
     const [busy, setBusy] = useState(false);
 
-    const spacesEnabled = SpaceStore.spacesEnabled;
-
     const joinRule = useRoomState(space, state => state.getJoinRule());
     const cannotJoin = getEffectiveMembership(myMembership) === EffectiveMembership.Leave
         && joinRule !== JoinRule.Public;
@@ -282,7 +249,6 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
                     setBusy(true);
                     onJoinButtonClicked();
                 }}
-                disabled={!spacesEnabled}
             >
                 { _t("Accept") }
             </AccessibleButton>
@@ -298,7 +264,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
                         setBusy(true);
                     }
                 }}
-                disabled={!spacesEnabled || cannotJoin}
+                disabled={cannotJoin}
             >
                 { _t("Join") }
             </AccessibleButton>
@@ -310,18 +276,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
     }
 
     let footer;
-    if (!spacesEnabled) {
-        footer = <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
-            { myMembership === "join"
-                ? _t("To view this Space, hide communities in your <a>preferences</a>", {}, {
-                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
-                })
-                : _t("To join this Space, hide communities in your <a>preferences</a>", {}, {
-                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
-                })
-            }
-        </div>;
-    } else if (cannotJoin) {
+    if (cannotJoin) {
         footer = <div className="mx_SpaceRoomView_preview_spaceBetaPrompt">
             { _t("To view %(spaceName)s, you need an invite", {
                 spaceName: space.name,
@@ -329,18 +284,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
         </div>;
     }
 
-    let migratedCommunitySection: JSX.Element;
-    const createContent = space.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent();
-    if (createContent[CreateEventField]) {
-        migratedCommunitySection = <div className="mx_SpaceRoomView_preview_migratedCommunity">
-            { _t("Created from <Community />", {}, {
-                Community: () => <GroupTile groupId={createContent[CreateEventField]} />,
-            }) }
-        </div>;
-    }
-
     return <div className="mx_SpaceRoomView_preview">
-        { migratedCommunitySection }
         { inviterSection }
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <h1 className="mx_SpaceRoomView_preview_name">
@@ -354,7 +298,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
                 </div>
             }
         </RoomTopic>
-        { space.getJoinRule() === "public" && <FacePile room={space} /> }
+        { space.getJoinRule() === "public" && <RoomFacePile room={space} /> }
         <div className="mx_SpaceRoomView_preview_joinButtons">
             { joinButtons }
         </div>
@@ -366,6 +310,7 @@ const SpaceLandingAddButton = ({ space }) => {
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
     const canCreateRoom = shouldShowComponent(UIComponent.CreateRooms);
     const canCreateSpace = shouldShowComponent(UIComponent.CreateSpaces);
+    const videoRoomsEnabled = useFeatureEnabled("feature_video_rooms");
 
     let contextMenu;
     if (menuDisplayed) {
@@ -379,20 +324,35 @@ const SpaceLandingAddButton = ({ space }) => {
             compact
         >
             <IconizedContextMenuOptionList first>
-                { canCreateRoom && <IconizedContextMenuOption
-                    label={_t("Create new room")}
-                    iconClassName="mx_RoomList_iconPlus"
-                    onClick={async (e) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        closeMenu();
+                { canCreateRoom && <>
+                    <IconizedContextMenuOption
+                        label={_t("New room")}
+                        iconClassName="mx_RoomList_iconPlus"
+                        onClick={async (e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            closeMenu();
 
-                        PosthogTrackers.trackInteraction("WebSpaceHomeCreateRoomButton", e);
-                        if (await showCreateNewRoom(space)) {
-                            defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
-                        }
-                    }}
-                /> }
+                            PosthogTrackers.trackInteraction("WebSpaceHomeCreateRoomButton", e);
+                            if (await showCreateNewRoom(space)) {
+                                defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                            }
+                        }}
+                    />
+                    { videoRoomsEnabled && <IconizedContextMenuOption
+                        label={_t("New video room")}
+                        iconClassName="mx_RoomList_iconNewVideoRoom"
+                        onClick={async (e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            closeMenu();
+
+                            if (await showCreateNewRoom(space, RoomType.ElementVideo)) {
+                                defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                            }
+                        }}
+                    /> }
+                </> }
                 <IconizedContextMenuOption
                     label={_t("Add existing room")}
                     iconClassName="mx_RoomList_iconAddExistingRoom"
@@ -479,23 +439,25 @@ const SpaceLanding = ({ space }: { space: Room }) => {
     };
 
     return <div className="mx_SpaceRoomView_landing">
-        <SpaceFeedbackPrompt />
-        <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
+        <div className="mx_SpaceRoomView_landing_header">
+            <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
+            <SpaceFeedbackPrompt />
+        </div>
         <div className="mx_SpaceRoomView_landing_name">
             <RoomName room={space}>
                 { (name) => {
-                    const tags = { name: () => <div className="mx_SpaceRoomView_landing_nameRow">
-                        <h1>{ name }</h1>
-                    </div> };
+                    const tags = { name: () => <h1>{ name }</h1> };
                     return _t("Welcome to <name/>", {}, tags) as JSX.Element;
                 } }
             </RoomName>
         </div>
-        <div className="mx_SpaceRoomView_landing_info">
+        <div className="mx_SpaceRoomView_landing_infoBar">
             <SpaceInfo space={space} />
-            <FacePile room={space} onlyKnownUsers={false} numShown={7} onClick={onMembersClick} />
-            { inviteButton }
-            { settingsButton }
+            <div className="mx_SpaceRoomView_landing_infoBar_interactive">
+                <RoomFacePile room={space} onlyKnownUsers={false} numShown={7} onClick={onMembersClick} />
+                { inviteButton }
+                { settingsButton }
+            </div>
         </div>
         <RoomTopic room={space}>
             { (topic, ref) => (
@@ -856,7 +818,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
         } else if (payload.action === "view_3pid_invite" && payload.event) {
             RightPanelStore.instance.setCard({
                 phase: RightPanelPhases.Space3pidMemberInfo,
-                state: { spaceId: this.props.space.roomId, member: payload.member },
+                state: { spaceId: this.props.space.roomId, memberInfoEvent: payload.event },
             });
         } else {
             RightPanelStore.instance.setCard({
@@ -882,7 +844,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     private renderBody() {
         switch (this.state.phase) {
             case Phase.Landing:
-                if (this.state.myMembership === "join" && SpaceStore.spacesEnabled) {
+                if (this.state.myMembership === "join") {
                     return <SpaceLanding space={this.props.space} />;
                 } else {
                     return <SpacePreview
@@ -897,10 +859,11 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                     title={_t("What are some things you want to discuss in %(spaceName)s?", {
                         spaceName: this.props.justCreatedOpts?.createOpts?.name || this.props.space.name,
                     })}
-                    description={
-                        _t("Let's create a room for each of them.") + "\n" +
-                        _t("You can add more later too, including already existing ones.")
-                    }
+                    description={<>
+                        { _t("Let's create a room for each of them.") }
+                        <br />
+                        { _t("You can add more later too, including already existing ones.") }
+                    </>}
                     onFinished={(firstRoomId: string) => this.setState({ phase: Phase.PublicShare, firstRoomId })}
                 />;
             case Phase.PublicShare:
@@ -928,8 +891,11 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
                     title={_t("What projects are your team working on?")}
-                    description={_t("We'll create rooms for each of them. " +
-                        "You can add more later too, including already existing ones.")}
+                    description={<>
+                        { _t("We'll create rooms for each of them.") }
+                        <br />
+                        { _t("You can add more later too, including already existing ones.") }
+                    </>}
                     onFinished={(firstRoomId: string) => this.setState({ phase: Phase.PrivateInvite, firstRoomId })}
                 />;
             case Phase.PrivateExistingRooms:
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index ea116b7d8e3..91e64946ada 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../languageHandler';
 import AutoHideScrollbar from './AutoHideScrollbar';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import { PosthogScreenTracker, ScreenName } from "../../PosthogTrackers";
 
@@ -64,7 +63,6 @@ interface IState {
     activeTabIndex: number;
 }
 
-@replaceableComponent("structures.TabbedView")
 export default class TabbedView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index c843e20cb59..eccb68ed997 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -16,16 +16,8 @@ limitations under the License.
 
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
-import { Room } from 'matrix-js-sdk/src/models/room';
-import { RelationType } from 'matrix-js-sdk/src/@types/event';
-import { MatrixClient } from 'matrix-js-sdk/src/client';
-import {
-    Filter,
-    IFilterDefinition,
-    UNSTABLE_FILTER_RELATED_BY_SENDERS,
-    UNSTABLE_FILTER_RELATED_BY_REL_TYPES,
-} from 'matrix-js-sdk/src/filter';
 import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
+import { Room } from 'matrix-js-sdk/src/models/room';
 
 import BaseCard from "../views/right_panel/BaseCard";
 import ResizeNotifier from '../../utils/ResizeNotifier';
@@ -39,66 +31,14 @@ import { Layout } from '../../settings/enums/Layout';
 import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
 import Measured from '../views/elements/Measured';
 import PosthogTrackers from "../../PosthogTrackers";
-import { ButtonEvent } from "../views/elements/AccessibleButton";
-
-export async function getThreadTimelineSet(
-    client: MatrixClient,
-    room: Room,
-    filterType = ThreadFilterType.All,
-): Promise<EventTimelineSet> {
-    if (Thread.hasServerSideSupport) {
-        const myUserId = client.getUserId();
-        const filter = new Filter(myUserId);
-
-        const definition: IFilterDefinition = {
-            "room": {
-                "timeline": {
-                    [UNSTABLE_FILTER_RELATED_BY_REL_TYPES.name]: [RelationType.Thread],
-                },
-            },
-        };
-
-        if (filterType === ThreadFilterType.My) {
-            definition.room.timeline[UNSTABLE_FILTER_RELATED_BY_SENDERS.name] = [myUserId];
-        }
-
-        filter.setDefinition(definition);
-        const filterId = await client.getOrCreateFilter(
-            `THREAD_PANEL_${room.roomId}_${filterType}`,
-            filter,
-        );
-        filter.filterId = filterId;
-        const timelineSet = room.getOrCreateFilteredTimelineSet(
-            filter,
-            { prepopulateTimeline: false },
-        );
-
-        timelineSet.resetLiveTimeline();
-        await client.paginateEventTimeline(
-            timelineSet.getLiveTimeline(),
-            { backwards: true, limit: 20 },
-        );
-        return timelineSet;
-    } else {
-        // Filter creation fails if HomeServer does not support the new relation
-        // filter fields. We fallback to the threads that have been discovered in
-        // the main timeline
-        const timelineSet = new EventTimelineSet(room, {
-            pendingEvents: false,
-        });
-
-        Array.from(room.threads)
-            .sort(([, threadA], [, threadB]) => threadA.replyToEvent.getTs() - threadB.replyToEvent.getTs())
-            .forEach(([, thread]) => {
-                const currentUserParticipated = thread.events.some(event => event.getSender() === client.getUserId());
-                if (filterType !== ThreadFilterType.My || currentUserParticipated) {
-                    timelineSet.getLiveTimeline().addEvent(thread.rootEvent, false);
-                }
-            });
-
-        return timelineSet;
-    }
-}
+import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
+import { BetaPill } from '../views/beta/BetaCard';
+import SdkConfig from '../../SdkConfig';
+import Modal from '../../Modal';
+import BetaFeedbackDialog from '../views/dialogs/BetaFeedbackDialog';
+import { Action } from '../../dispatcher/actions';
+import { UserTab } from '../views/dialogs/UserTab';
+import dis from '../../dispatcher/dispatcher';
 
 interface IProps {
     roomId: string;
@@ -168,7 +108,7 @@ export const ThreadPanelHeader = ({ filterOption, setFilterOption, empty }: {
         isSelected={opt === value}
     />);
     const contextMenu = menuDisplayed ? <ContextMenu
-        top={100}
+        top={108}
         right={33}
         onFinished={closeMenu}
         chevronFace={ChevronFace.Top}
@@ -196,103 +136,124 @@ export const ThreadPanelHeader = ({ filterOption, setFilterOption, empty }: {
 };
 
 interface EmptyThreadIProps {
+    hasThreads: boolean;
     filterOption: ThreadFilterType;
     showAllThreadsCallback: () => void;
 }
 
-const EmptyThread: React.FC<EmptyThreadIProps> = ({ filterOption, showAllThreadsCallback }) => {
+const EmptyThread: React.FC<EmptyThreadIProps> = ({ hasThreads, filterOption, showAllThreadsCallback }) => {
+    let body: JSX.Element;
+    if (hasThreads) {
+        body = <>
+            <p>
+                { _t("Reply to an ongoing thread or use “%(replyInThread)s” "
+                    + "when hovering over a message to start a new one.", {
+                    replyInThread: _t("Reply in thread"),
+                }) }
+            </p>
+            <p>
+                { /* Always display that paragraph to prevent layout shift when hiding the button */ }
+                { (filterOption === ThreadFilterType.My)
+                    ? <button onClick={showAllThreadsCallback}>{ _t("Show all threads") }</button>
+                    : <>&nbsp;</>
+                }
+            </p>
+        </>;
+    } else {
+        body = <>
+            <p>{ _t("Threads help keep your conversations on-topic and easy to track.") }</p>
+            <p className="mx_ThreadPanel_empty_tip">
+                { _t('<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.', {
+                    replyInThread: _t("Reply in thread"),
+                }, {
+                    b: sub => <b>{ sub }</b>,
+                }) }
+            </p>
+        </>;
+    }
+
     return <aside className="mx_ThreadPanel_empty">
         <div className="mx_ThreadPanel_largeIcon" />
         <h2>{ _t("Keep discussions organised with threads") }</h2>
-        <p>{ _t("Reply to an ongoing thread or use “%(replyInThread)s” "
-              + "when hovering over a message to start a new one.", { replyInThread: _t("Reply in thread") }) }
-        </p>
-        <p>
-            { /* Always display that paragraph to prevent layout shift
-                When hiding the button */ }
-            { filterOption === ThreadFilterType.My
-                ? <button onClick={showAllThreadsCallback}>{ _t("Show all threads") }</button>
-                : <>&nbsp;</>
-            }
-        </p>
+        { body }
     </aside>;
 };
 
-const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) => {
+const ThreadPanel: React.FC<IProps> = ({
+    roomId,
+    onClose,
+    permalinkCreator,
+}) => {
     const mxClient = useContext(MatrixClientContext);
     const roomContext = useContext(RoomContext);
     const timelinePanel = useRef<TimelinePanel>();
     const card = useRef<HTMLDivElement>();
 
     const [filterOption, setFilterOption] = useState<ThreadFilterType>(ThreadFilterType.All);
-    const [room, setRoom] = useState(mxClient.getRoom(roomId));
+    const [room, setRoom] = useState<Room | null>(null);
     const [threadCount, setThreadCount] = useState<number>(0);
     const [timelineSet, setTimelineSet] = useState<EventTimelineSet | null>(null);
     const [narrow, setNarrow] = useState<boolean>(false);
 
     useEffect(() => {
-        setRoom(mxClient.getRoom(roomId));
+        const room = mxClient.getRoom(roomId);
+        room.createThreadsTimelineSets().then(() => {
+            return room.fetchRoomThreads();
+        }).then(() => {
+            setFilterOption(ThreadFilterType.All);
+            setRoom(room);
+        });
     }, [mxClient, roomId]);
 
     useEffect(() => {
-        async function onNewThread(thread: Thread): Promise<void> {
+        function onNewThread(): void {
             setThreadCount(room.threads.size);
-            if (timelineSet) {
-                const discoveredScrollingBack =
-                    room.lastThread.rootEvent.localTimestamp < thread.rootEvent.localTimestamp;
-
-                // When the server support threads we're only interested in adding
-                // the newly created threads to the list.
-                // The ones discovered when scrolling back should be discarded as
-                // they will be discovered by the `/messages` filter
-                if (Thread.hasServerSideSupport) {
-                    if (!discoveredScrollingBack) {
-                        timelineSet.addEventToTimeline(
-                            thread.rootEvent,
-                            timelineSet.getLiveTimeline(),
-                            false,
-                        );
-                    }
-                } else {
-                    timelineSet.addEventToTimeline(
-                        thread.rootEvent,
-                        timelineSet.getLiveTimeline(),
-                        !discoveredScrollingBack,
-                    );
-                }
-            }
         }
 
         function refreshTimeline() {
             if (timelineSet) timelinePanel.current.refreshTimeline();
         }
 
-        setThreadCount(room.threads.size);
+        if (room) {
+            setThreadCount(room.threads.size);
 
-        room.on(ThreadEvent.New, onNewThread);
-        room.on(ThreadEvent.Update, refreshTimeline);
+            room.on(ThreadEvent.New, onNewThread);
+            room.on(ThreadEvent.Update, refreshTimeline);
+        }
 
         return () => {
-            room.removeListener(ThreadEvent.New, onNewThread);
-            room.removeListener(ThreadEvent.Update, refreshTimeline);
+            room?.removeListener(ThreadEvent.New, onNewThread);
+            room?.removeListener(ThreadEvent.Update, refreshTimeline);
         };
     }, [room, mxClient, timelineSet]);
 
     useEffect(() => {
-        getThreadTimelineSet(mxClient, room, filterOption)
-            .then(timelineSet => { setTimelineSet(timelineSet); })
-            .catch(() => setTimelineSet(null));
-    }, [mxClient, room, filterOption]);
+        if (room) {
+            if (filterOption === ThreadFilterType.My) {
+                setTimelineSet(room.threadsTimelineSets[1]);
+            } else {
+                setTimelineSet(room.threadsTimelineSets[0]);
+            }
+        }
+    }, [room, filterOption]);
 
     useEffect(() => {
-        if (timelineSet) timelinePanel.current.refreshTimeline();
+        if (timelineSet && !Thread.hasServerSideSupport) {
+            timelinePanel.current.refreshTimeline();
+        }
     }, [timelineSet, timelinePanel]);
 
+    const openFeedback = SdkConfig.get().bug_report_endpoint_url ? () => {
+        Modal.createTrackedDialog("Threads Feedback", "feature_thread", BetaFeedbackDialog, {
+            featureId: "feature_thread",
+        });
+    } : null;
+
     return (
         <RoomContext.Provider value={{
             ...roomContext,
             timelineRenderingType: TimelineRenderingType.ThreadsList,
-            showHiddenEventsInTimeline: true,
+            showHiddenEvents: true,
             narrow,
         }}>
             <BaseCard
@@ -301,6 +262,22 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
                     setFilterOption={setFilterOption}
                     empty={threadCount === 0}
                 />}
+                footer={<>
+                    <BetaPill
+                        tooltipTitle={_t("Threads are a beta feature")}
+                        tooltipCaption={_t("Click for more info")}
+                        onClick={() => {
+                            dis.dispatch({
+                                action: Action.ViewUserSettings,
+                                initialTabId: UserTab.Labs,
+                            });
+                        }}
+                    />
+                    { openFeedback && _t("<a>Give feedback</a>", {}, {
+                        a: sub =>
+                            <AccessibleButton kind="link_inline" onClick={openFeedback}>{ sub }</AccessibleButton>,
+                    }) }
+                </>}
                 className="mx_ThreadPanel"
                 onClose={onClose}
                 withoutScrollContainer={true}
@@ -310,16 +287,18 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
                     sensor={card.current}
                     onMeasurement={setNarrow}
                 />
-                { timelineSet && (
-                    <TimelinePanel
+                { timelineSet
+                    ? <TimelinePanel
+                        key={timelineSet.getFilter()?.filterId ?? (roomId + ":" + filterOption)}
                         ref={timelinePanel}
                         showReadReceipts={false} // No RR support in thread's MVP
                         manageReadReceipts={false} // No RR support in thread's MVP
                         manageReadMarkers={false} // No RM support in thread's MVP
                         sendReadReceiptOnLoad={false} // No RR support in thread's MVP
                         timelineSet={timelineSet}
-                        showUrlPreview={true}
+                        showUrlPreview={false} // No URL previews at the threads list level
                         empty={<EmptyThread
+                            hasThreads={room.threadsTimelineSets?.[0]?.getLiveTimeline().getEvents().length > 0}
                             filterOption={filterOption}
                             showAllThreadsCallback={() => setFilterOption(ThreadFilterType.All)}
                         />}
@@ -333,7 +312,8 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
                         permalinkCreator={permalinkCreator}
                         disableGrouping={true}
                     />
-                ) }
+                    : <div className="mx_AutoHideScrollbar" />
+                }
             </BaseCard>
         </RoomContext.Provider>
     );
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index bb993304b23..12dd84685d9 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { createRef, KeyboardEvent } from 'react';
-import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
-import { RelationType } from 'matrix-js-sdk/src/@types/event';
+import { Thread, ThreadEvent, THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { TimelineWindow } from 'matrix-js-sdk/src/timeline-window';
@@ -26,7 +25,6 @@ import classNames from "classnames";
 
 import BaseCard from "../views/right_panel/BaseCard";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import MessageComposer from '../views/rooms/MessageComposer';
 import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
@@ -52,6 +50,7 @@ import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import Measured from '../views/elements/Measured';
 import PosthogTrackers from "../../PosthogTrackers";
 import { ButtonEvent } from "../views/elements/AccessibleButton";
+import { RoomViewStore } from '../../stores/RoomViewStore';
 
 interface IProps {
     room: Room;
@@ -62,6 +61,7 @@ interface IProps {
     e2eStatus?: E2EStatus;
     initialEvent?: MatrixEvent;
     isInitialEventHighlighted?: boolean;
+    initialEventScrollIntoView?: boolean;
 }
 
 interface IState {
@@ -73,7 +73,6 @@ interface IState {
     narrow: boolean;
 }
 
-@replaceableComponent("structures.ThreadView")
 export default class ThreadView extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -107,9 +106,19 @@ export default class ThreadView extends React.Component<IProps, IState> {
     public componentWillUnmount(): void {
         this.teardownThread();
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
-        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        const roomId = this.props.mxEvent.getRoomId();
+        const room = MatrixClientPeg.get().getRoom(roomId);
         room.removeListener(ThreadEvent.New, this.onNewThread);
         SettingsStore.unwatchSetting(this.layoutWatcherRef);
+
+        const hasRoomChanged = RoomViewStore.instance.getRoomId() !== roomId;
+        if (this.props.isInitialEventHighlighted && !hasRoomChanged) {
+            dis.dispatch<ViewRoomPayload>({
+                action: Action.ViewRoom,
+                room_id: this.props.room.roomId,
+                metricsTrigger: undefined, // room doesn't change
+            });
+        }
     }
 
     public componentDidUpdate(prevProps) {
@@ -157,7 +166,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
     private setupThread = (mxEv: MatrixEvent) => {
         let thread = this.props.room.threads?.get(mxEv.getId());
         if (!thread) {
-            thread = this.props.room.createThread(mxEv, [mxEv]);
+            thread = this.props.room.createThread(mxEv, [mxEv], true);
         }
         thread.on(ThreadEvent.Update, this.updateLastThreadReply);
         this.updateThread(thread);
@@ -181,7 +190,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
             this.setState({
                 thread,
                 lastThreadReply: thread.lastReply((ev: MatrixEvent) => {
-                    return ev.isThreadRelation && !ev.status;
+                    return ev.isRelation(THREAD_RELATION_TYPE.name) && !ev.status;
                 }),
             }, async () => {
                 thread.emit(ThreadEvent.ViewThread);
@@ -201,19 +210,21 @@ export default class ThreadView extends React.Component<IProps, IState> {
         if (this.state.thread) {
             this.setState({
                 lastThreadReply: this.state.thread.lastReply((ev: MatrixEvent) => {
-                    return ev.isThreadRelation && !ev.status;
+                    return ev.isRelation(THREAD_RELATION_TYPE.name) && !ev.status;
                 }),
             });
         }
     };
 
-    private onScroll = (): void => {
-        if (this.props.initialEvent && this.props.isInitialEventHighlighted) {
+    private resetJumpToEvent = (event?: string): void => {
+        if (this.props.initialEvent && this.props.initialEventScrollIntoView &&
+            event === this.props.initialEvent?.getId()) {
             dis.dispatch<ViewRoomPayload>({
                 action: Action.ViewRoom,
                 room_id: this.props.room.roomId,
                 event_id: this.props.initialEvent?.getId(),
-                highlighted: false,
+                highlighted: this.props.isInitialEventHighlighted,
+                scroll_into_view: false,
                 replyingToEvent: this.state.replyToEvent,
                 metricsTrigger: undefined, // room doesn't change
             });
@@ -288,8 +299,9 @@ export default class ThreadView extends React.Component<IProps, IState> {
 
     private get threadRelation(): IEventRelation {
         return {
-            "rel_type": RelationType.Thread,
+            "rel_type": THREAD_RELATION_TYPE.name,
             "event_id": this.state.thread?.id,
+            "is_falling_back": true,
             "m.in_reply_to": {
                 "event_id": this.state.lastThreadReply?.getId() ?? this.state.thread?.id,
             },
@@ -351,7 +363,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
                             manageReadMarkers={true}
                             sendReadReceiptOnLoad={true}
                             timelineSet={this.state?.thread?.timelineSet}
-                            showUrlPreview={true}
+                            showUrlPreview={this.context.showUrlPreview}
                             // ThreadView doesn't support IRC layout at this time
                             layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
                             hideThreadedMessages={false}
@@ -363,7 +375,8 @@ export default class ThreadView extends React.Component<IProps, IState> {
                             editState={this.state.editState}
                             eventId={this.props.initialEvent?.getId()}
                             highlightedEventId={highlightedEventId}
-                            onUserScroll={this.onScroll}
+                            eventScrollIntoView={this.props.initialEventScrollIntoView}
+                            onEventScrolledIntoView={this.resetJumpToEvent}
                             onPaginationRequest={this.onPaginationRequest}
                         />
                     </div> }
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index f968cb6a193..7201e3c6f2e 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode, SyntheticEvent } from 'react';
+import React, { createRef, ReactNode } from 'react';
 import ReactDOM from "react-dom";
 import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
@@ -40,9 +40,6 @@ import dis from "../../dispatcher/dispatcher";
 import { Action } from '../../dispatcher/actions';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
-import { haveTileForEvent } from "../views/rooms/EventTile";
-import { UIFeature } from "../../settings/UIFeature";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { arrayFastClone } from "../../utils/arrays";
 import MessagePanel from "./MessagePanel";
 import { IScrollState } from "./ScrollPanel";
@@ -56,6 +53,7 @@ import CallEventGrouper, { buildCallEventGroupers } from "./CallEventGrouper";
 import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
+import { haveRendererForEvent } from "../../events/EventTileFactory";
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
@@ -93,6 +91,9 @@ interface IProps {
     // id of an event to jump to. If not given, will go to the end of the live timeline.
     eventId?: string;
 
+    // whether we should scroll the event into view
+    eventScrollIntoView?: boolean;
+
     // where to position the event given by eventId, in pixels from the bottom of the viewport.
     // If not given, will try to put the event half way down the viewport.
     eventPixelOffset?: number;
@@ -126,8 +127,7 @@ interface IProps {
     // callback which is called when the panel is scrolled.
     onScroll?(event: Event): void;
 
-    // callback which is called when the user interacts with the room timeline
-    onUserScroll?(event: SyntheticEvent): void;
+    onEventScrolledIntoView?(eventId?: string): void;
 
     // callback which is called when the read-up-to mark is updated.
     onReadMarkerUpdated?(): void;
@@ -212,7 +212,6 @@ interface IEventIndexOpts {
  *
  * Also responsible for handling and sending read receipts.
  */
-@replaceableComponent("structures.TimelinePanel")
 class TimelinePanel extends React.Component<IProps, IState> {
     static contextType = RoomContext;
 
@@ -330,9 +329,11 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
         const differentEventId = newProps.eventId != this.props.eventId;
         const differentHighlightedEventId = newProps.highlightedEventId != this.props.highlightedEventId;
-        if (differentEventId || differentHighlightedEventId) {
-            logger.log("TimelinePanel switching to eventId " + newProps.eventId +
-                        " (was " + this.props.eventId + ")");
+        const differentAvoidJump = newProps.eventScrollIntoView && !this.props.eventScrollIntoView;
+        if (differentEventId || differentHighlightedEventId || differentAvoidJump) {
+            logger.log("TimelinePanel switching to " +
+                "eventId " + newProps.eventId + " (was " + this.props.eventId + "), " +
+                "scrollIntoView: " + newProps.eventScrollIntoView + " (was " + this.props.eventScrollIntoView + ")");
             return this.initTimeline(newProps);
         }
     }
@@ -560,7 +561,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         // updates from pagination will happen when the paginate completes.
         if (toStartOfTimeline || !data || !data.liveEvent) return;
 
-        if (!this.messagePanel.current) return;
+        if (!this.messagePanel.current?.getScrollState()) return;
 
         if (!this.messagePanel.current.getScrollState().stuckAtBottom) {
             // we won't load this event now, because we don't want to push any
@@ -571,7 +572,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         }
 
         // tell the timeline window to try to advance itself, but not to make
-        // an http request to do so.
+        // a http request to do so.
         //
         // we deliberately avoid going via the ScrollPanel for this call - the
         // ScrollPanel might already have an active pagination promise, which
@@ -1126,7 +1127,41 @@ class TimelinePanel extends React.Component<IProps, IState> {
             offsetBase = 0.5;
         }
 
-        return this.loadTimeline(initialEvent, pixelOffset, offsetBase);
+        return this.loadTimeline(initialEvent, pixelOffset, offsetBase, props.eventScrollIntoView);
+    }
+
+    private scrollIntoView(eventId?: string, pixelOffset?: number, offsetBase?: number): void {
+        const doScroll = () => {
+            if (eventId) {
+                debuglog("TimelinePanel scrolling to eventId " + eventId +
+                    " at position " + (offsetBase * 100) + "% + " + pixelOffset);
+                this.messagePanel.current.scrollToEvent(
+                    eventId,
+                    pixelOffset,
+                    offsetBase,
+                );
+            } else {
+                debuglog("TimelinePanel scrolling to bottom");
+                this.messagePanel.current.scrollToBottom();
+            }
+        };
+
+        debuglog("TimelinePanel scheduling scroll to event");
+        this.props.onEventScrolledIntoView?.(eventId);
+        // Ensure the correct scroll position pre render, if the messages have already been loaded to DOM,
+        // to avoid it jumping around
+        doScroll();
+
+        // Ensure the correct scroll position post render for correct behaviour.
+        //
+        // requestAnimationFrame runs our code immediately after the DOM update but before the next repaint.
+        //
+        // If the messages have just been loaded for the first time, this ensures we'll repeat setting the
+        // correct scroll position after React has re-rendered the TimelinePanel and MessagePanel and
+        // updated the DOM.
+        window.requestAnimationFrame(() => {
+            doScroll();
+        });
     }
 
     /**
@@ -1142,8 +1177,10 @@ class TimelinePanel extends React.Component<IProps, IState> {
      * @param {number?} offsetBase the reference point for the pixelOffset. 0
      *     means the top of the container, 1 means the bottom, and fractional
      *     values mean somewhere in the middle. If omitted, it defaults to 0.
+     *
+     * @param {boolean?} scrollIntoView whether to scroll the event into view.
      */
-    private loadTimeline(eventId?: string, pixelOffset?: number, offsetBase?: number): void {
+    private loadTimeline(eventId?: string, pixelOffset?: number, offsetBase?: number, scrollIntoView = true): void {
         this.timelineWindow = new TimelineWindow(
             MatrixClientPeg.get(), this.props.timelineSet,
             { windowLimit: this.props.timelineCap });
@@ -1151,11 +1188,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
         const onLoaded = () => {
             if (this.unmounted) return;
 
-            // clear the timeline min-height when
-            // (re)loading the timeline
-            if (this.messagePanel.current) {
-                this.messagePanel.current.onTimelineReset();
-            }
+            // clear the timeline min-height when (re)loading the timeline
+            this.messagePanel.current?.onTimelineReset();
             this.reloadEvents();
 
             // If we switched away from the room while there were pending
@@ -1178,11 +1212,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
                                 "messagePanel didn't load");
                     return;
                 }
-                if (eventId) {
-                    this.messagePanel.current.scrollToEvent(eventId, pixelOffset,
-                        offsetBase);
-                } else {
-                    this.messagePanel.current.scrollToBottom();
+
+                if (scrollIntoView) {
+                    this.scrollIntoView(eventId, pixelOffset, offsetBase);
                 }
 
                 if (this.props.sendReadReceiptOnLoad) {
@@ -1476,7 +1508,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
             const shouldIgnore = !!ev.status || // local echo
                 (ignoreOwn && ev.getSender() === myUserId); // own message
-            const isWithoutTile = !haveTileForEvent(ev, this.context?.showHiddenEventsInTimeline) ||
+            const isWithoutTile = !haveRendererForEvent(ev, this.context?.showHiddenEvents) ||
                 shouldHideEvent(ev, this.context);
 
             if (isWithoutTile || !node) {
@@ -1633,7 +1665,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 ourUserId={MatrixClientPeg.get().credentials.userId}
                 stickyBottom={stickyBottom}
                 onScroll={this.onMessageListScroll}
-                onUserScroll={this.props.onUserScroll}
                 onFillRequest={this.onMessageListFillRequest}
                 onUnfillRequest={this.onMessageListUnfillRequest}
                 isTwelveHour={this.context?.showTwelveHourTimestamps ?? this.state.isTwelveHour}
@@ -1648,7 +1679,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 editState={this.props.editState}
                 showReactions={this.props.showReactions}
                 layout={this.props.layout}
-                enableFlair={SettingsStore.getValue(UIFeature.Flair)}
                 hideThreadedMessages={this.props.hideThreadedMessages}
                 disableGrouping={this.props.disableGrouping}
                 callEventGroupers={this.callEventGroupers}
diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 0b71fa9dc92..4cd1e654af2 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -18,14 +18,12 @@ import * as React from "react";
 import classNames from "classnames";
 
 import ToastStore, { IToast } from "../../stores/ToastStore";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 
 interface IState {
     toasts: IToast<any>[];
     countSeen: number;
 }
 
-@replaceableComponent("structures.ToastContainer")
 export default class ToastContainer extends React.Component<{}, IState> {
     constructor(props, context) {
         super(props, context);
@@ -81,7 +79,7 @@ export default class ToastContainer extends React.Component<{}, IState> {
                 titleElement = (
                     <div className="mx_Toast_title">
                         <h2>{ title }</h2>
-                        <span>{ countIndicator }</span>
+                        <span className="mx_Toast_title_countIndicator">{ countIndicator }</span>
                     </div>
                 );
             }
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index eb4ef51681a..e3dc77a4665 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -27,7 +27,6 @@ import { Action } from "../../dispatcher/actions";
 import ProgressBar from "../views/elements/ProgressBar";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import { IUpload } from "../../models/IUpload";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 interface IProps {
@@ -40,7 +39,6 @@ interface IState {
     uploadsHere: IUpload[];
 }
 
-@replaceableComponent("structures.UploadBar")
 export default class UploadBar extends React.Component<IProps, IState> {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 82855ebd870..27cc08f0bcc 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { createRef, useContext, useRef, useState } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
-import * as fbEmitter from "fbemitter";
 import classNames from "classnames";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
@@ -26,7 +25,7 @@ import { ActionPayload } from "../../dispatcher/payloads";
 import { Action } from "../../dispatcher/actions";
 import { _t } from "../../languageHandler";
 import { ChevronFace, ContextMenuButton } from "./ContextMenu";
-import { UserTab } from "../views/dialogs/UserSettingsDialog";
+import { UserTab } from "../views/dialogs/UserTab";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import FeedbackDialog from "../views/dialogs/FeedbackDialog";
 import Modal from "../../Modal";
@@ -50,13 +49,10 @@ import IconizedContextMenu, {
     IconizedContextMenuOption,
     IconizedContextMenuOptionList,
 } from "../views/context_menus/IconizedContextMenu";
-import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import { UIFeature } from "../../settings/UIFeature";
 import HostSignupAction from "./HostSignupAction";
-import { IHostSignupConfig } from "../views/dialogs/HostSignupDialogTypes";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
 import UserIdentifierCustomisations from "../../customisations/UserIdentifier";
@@ -146,13 +142,11 @@ const below = (rect: PartialDOMRect) => {
     };
 };
 
-@replaceableComponent("structures.UserMenu")
 export default class UserMenu extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private themeWatcherRef: string;
     private readonly dndWatcherRef: string;
     private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
-    private tagStoreRef: fbEmitter.EventSubscription;
 
     constructor(props: IProps) {
         super(props);
@@ -166,9 +160,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
-        if (SpaceStore.spacesEnabled) {
-            SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-        }
+        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
 
         SettingsStore.monitorSetting("feature_dnd", null);
         SettingsStore.monitorSetting("doNotDisturb", null);
@@ -185,7 +177,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
     public componentDidMount() {
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
         this.themeWatcherRef = SettingsStore.watchSetting("theme", null, this.onThemeChanged);
-        this.tagStoreRef = GroupFilterOrderStore.addListener(this.onTagStoreUpdate);
     }
 
     public componentWillUnmount() {
@@ -193,16 +184,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.dndWatcherRef) SettingsStore.unwatchSetting(this.dndWatcherRef);
         if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
-        this.tagStoreRef.remove();
-        if (SpaceStore.spacesEnabled) {
-            SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-        }
+        SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
     }
 
-    private onTagStoreUpdate = () => {
-        this.forceUpdate(); // we don't have anything useful in state to update
-    };
-
     private isUserOnDarkTheme(): boolean {
         if (SettingsStore.getValue("use_system_theme")) {
             return window.matchMedia("(prefers-color-scheme: dark)").matches;
@@ -375,7 +359,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (!this.state.contextMenuPosition) return null;
 
         let topSection;
-        const hostSignupConfig: IHostSignupConfig = SdkConfig.get().hostSignup;
+        const hostSignupConfig = SdkConfig.getObject("host_signup");
         if (MatrixClientPeg.get().isGuest()) {
             topSection = (
                 <div className="mx_UserMenu_contextMenu_header mx_UserMenu_contextMenu_guestPrompts">
@@ -395,16 +379,14 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     }) }
                 </div>
             );
-        } else if (hostSignupConfig) {
-            if (hostSignupConfig && hostSignupConfig.url) {
-                // If hostSignup.domains is set to a non-empty array, only show
-                // dialog if the user is on the domain or a subdomain.
-                const hostSignupDomains = hostSignupConfig.domains || [];
-                const mxDomain = MatrixClientPeg.get().getDomain();
-                const validDomains = hostSignupDomains.filter(d => (d === mxDomain || mxDomain.endsWith(`.${d}`)));
-                if (!hostSignupConfig.domains || validDomains.length > 0) {
-                    topSection = <HostSignupAction onClick={this.onCloseMenu} />;
-                }
+        } else if (hostSignupConfig?.get("url")) {
+            // If hostSignup.domains is set to a non-empty array, only show
+            // dialog if the user is on the domain or a subdomain.
+            const hostSignupDomains = hostSignupConfig.get("domains") || [];
+            const mxDomain = MatrixClientPeg.get().getDomain();
+            const validDomains = hostSignupDomains.filter(d => (d === mxDomain || mxDomain.endsWith(`.${d}`)));
+            if (!hostSignupConfig.get("domains") || validDomains.length > 0) {
+                topSection = <HostSignupAction onClick={this.onCloseMenu} />;
             }
         }
 
diff --git a/src/components/structures/UserView.tsx b/src/components/structures/UserView.tsx
index 657b9ab6ff5..9ba9d808c91 100644
--- a/src/components/structures/UserView.tsx
+++ b/src/components/structures/UserView.tsx
@@ -23,7 +23,6 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 import HomePage from "./HomePage";
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import MainSplit from "./MainSplit";
 import RightPanel from "./RightPanel";
@@ -41,7 +40,6 @@ interface IState {
     member?: RoomMember;
 }
 
-@replaceableComponent("structures.UserView")
 export default class UserView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/structures/VideoRoomView.tsx b/src/components/structures/VideoRoomView.tsx
new file mode 100644
index 00000000000..2695dafa798
--- /dev/null
+++ b/src/components/structures/VideoRoomView.tsx
@@ -0,0 +1,67 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { FC, useContext, useState, useMemo } from "react";
+import { logger } from "matrix-js-sdk/src/logger";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { useEventEmitter } from "../../hooks/useEventEmitter";
+import { getVideoChannel } from "../../utils/VideoChannelUtils";
+import WidgetStore from "../../stores/WidgetStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import VideoChannelStore, { VideoChannelEvent } from "../../stores/VideoChannelStore";
+import AppTile from "../views/elements/AppTile";
+import VideoLobby from "../views/voip/VideoLobby";
+
+const VideoRoomView: FC<{ room: Room, resizing: boolean }> = ({ room, resizing }) => {
+    const cli = useContext(MatrixClientContext);
+    const store = VideoChannelStore.instance;
+
+    // In case we mount before the WidgetStore knows about our Jitsi widget
+    const [widgetLoaded, setWidgetLoaded] = useState(false);
+    useEventEmitter(WidgetStore.instance, UPDATE_EVENT, (roomId: string) => {
+        if (roomId === null || roomId === room.roomId) setWidgetLoaded(true);
+    });
+
+    const app = useMemo(() => {
+        const app = getVideoChannel(room.roomId);
+        if (!app) logger.warn(`No video channel for room ${room.roomId}`);
+        return app;
+    }, [room, widgetLoaded]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    const [connected, setConnected] = useState(store.connected && store.roomId === room.roomId);
+    useEventEmitter(store, VideoChannelEvent.Connect, () => setConnected(store.roomId === room.roomId));
+    useEventEmitter(store, VideoChannelEvent.Disconnect, () => setConnected(false));
+
+    if (!app) return null;
+
+    return <div className="mx_VideoRoomView">
+        { connected ? null : <VideoLobby room={room} /> }
+        { /* We render the widget even if we're disconnected, so it stays loaded */ }
+        <AppTile
+            app={app}
+            room={room}
+            userId={cli.credentials.userId}
+            creatorUserId={app.creatorUserId}
+            waitForIframeLoad={app.waitForIframeLoad}
+            showMenubar={false}
+            pointerEvents={resizing ? "none" : null}
+        />
+    </div>;
+};
+
+export default VideoRoomView;
diff --git a/src/components/structures/ViewSource.tsx b/src/components/structures/ViewSource.tsx
index 3b8250991c9..c8628a7f96f 100644
--- a/src/components/structures/ViewSource.tsx
+++ b/src/components/structures/ViewSource.tsx
@@ -22,12 +22,14 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import SyntaxHighlight from "../views/elements/SyntaxHighlight";
 import { _t } from "../../languageHandler";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import { SendCustomEvent } from "../views/dialogs/DevtoolsDialog";
 import { canEditContent } from "../../utils/EventUtils";
 import { MatrixClientPeg } from '../../MatrixClientPeg';
-import { replaceableComponent } from "../../utils/replaceableComponent";
 import { IDialogProps } from "../views/dialogs/IDialogProps";
 import BaseDialog from "../views/dialogs/BaseDialog";
+import { DevtoolsContext } from "../views/dialogs/devtools/BaseTool";
+import { StateEventEditor } from "../views/dialogs/devtools/RoomState";
+import { stringify, TimelineEventEditor } from "../views/dialogs/devtools/Event";
+import CopyableText from "../views/elements/CopyableText";
 
 interface IProps extends IDialogProps {
     mxEvent: MatrixEvent; // the MatrixEvent associated with the context menu
@@ -37,7 +39,6 @@ interface IState {
     isEditing: boolean;
 }
 
-@replaceableComponent("structures.ViewSource")
 export default class ViewSource extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
@@ -47,10 +48,10 @@ export default class ViewSource extends React.Component<IProps, IState> {
         };
     }
 
-    private onBack(): void {
+    private onBack = (): void => {
         // TODO: refresh the "Event ID:" modal header
         this.setState({ isEditing: false });
-    }
+    };
 
     private onEdit(): void {
         this.setState({ isEditing: true });
@@ -63,106 +64,91 @@ export default class ViewSource extends React.Component<IProps, IState> {
         // @ts-ignore
         const decryptedEventSource = mxEvent.clearEvent; // FIXME: clearEvent is private
         const originalEventSource = mxEvent.event;
-
+        const copyOriginalFunc = (): string => {
+            return stringify(originalEventSource);
+        };
         if (isEncrypted) {
+            const copyDecryptedFunc = (): string => {
+                return stringify(decryptedEventSource);
+            };
             return (
                 <>
                     <details open className="mx_ViewSource_details">
                         <summary>
-                            <span className="mx_ViewSource_heading">{ _t("Decrypted event source") }</span>
+                            <span className="mx_ViewSource_heading">
+                                { _t("Decrypted event source") }
+                            </span>
                         </summary>
-                        <SyntaxHighlight language="json">{ JSON.stringify(decryptedEventSource, null, 2) }</SyntaxHighlight>
+                        <div className="mx_ViewSource_container">
+                            <CopyableText getTextToCopy={copyDecryptedFunc}>
+                                <SyntaxHighlight language="json">
+                                    { stringify(decryptedEventSource) }
+                                </SyntaxHighlight>
+                            </CopyableText>
+                        </div>
                     </details>
                     <details className="mx_ViewSource_details">
                         <summary>
-                            <span className="mx_ViewSource_heading">{ _t("Original event source") }</span>
+                            <span className="mx_ViewSource_heading">
+                                { _t("Original event source") }
+                            </span>
                         </summary>
-                        <SyntaxHighlight language="json">{ JSON.stringify(originalEventSource, null, 2) }</SyntaxHighlight>
+                        <div className="mx_ViewSource_container">
+                            <CopyableText getTextToCopy={copyOriginalFunc}>
+                                <SyntaxHighlight language="json">
+                                    { stringify(originalEventSource) }
+                                </SyntaxHighlight>
+                            </CopyableText>
+                        </div>
                     </details>
                 </>
             );
         } else {
             return (
                 <>
-                    <div className="mx_ViewSource_heading">{ _t("Original event source") }</div>
-                    <SyntaxHighlight language="json">{ JSON.stringify(originalEventSource, null, 2) }</SyntaxHighlight>
+                    <div className="mx_ViewSource_heading">
+                        { _t("Original event source") }
+                    </div>
+                    <div className="mx_ViewSource_container">
+                        <CopyableText getTextToCopy={copyOriginalFunc}>
+                            <SyntaxHighlight language="json">
+                                { stringify(originalEventSource) }
+                            </SyntaxHighlight>
+                        </CopyableText>
+                    </div>
                 </>
             );
         }
     }
 
-    // returns the id of the initial message, not the id of the previous edit
-    private getBaseEventId(): string {
-        const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
-        const isEncrypted = mxEvent.isEncrypted();
-        const baseMxEvent = this.props.mxEvent;
-
-        if (isEncrypted) {
-            // `relates_to` field is inside the encrypted event
-            return mxEvent.event.content["m.relates_to"]?.event_id ?? baseMxEvent.getId();
-        } else {
-            return mxEvent.getContent()["m.relates_to"]?.event_id ?? baseMxEvent.getId();
-        }
-    }
-
     // returns the SendCustomEvent component prefilled with the correct details
     private editSourceContent(): JSX.Element {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
 
         const isStateEvent = mxEvent.isState();
         const roomId = mxEvent.getRoomId();
-        const originalContent = mxEvent.getContent();
 
         if (isStateEvent) {
             return (
                 <MatrixClientContext.Consumer>
                     { (cli) => (
-                        <SendCustomEvent
-                            room={cli.getRoom(roomId)}
-                            forceStateEvent={true}
-                            onBack={() => this.onBack()}
-                            inputs={{
-                                eventType: mxEvent.getType(),
-                                evContent: JSON.stringify(originalContent, null, "\t"),
-                                stateKey: mxEvent.getStateKey(),
-                            }}
-                        />
-                    ) }
-                </MatrixClientContext.Consumer>
-            );
-        } else {
-            // prefill an edit-message event
-            // keep only the `body` and `msgtype` fields of originalContent
-            const bodyToStartFrom = originalContent["m.new_content"]?.body ?? originalContent.body; // prefill the last edit body, to start editing from there
-            const newContent = {
-                "body": ` * ${bodyToStartFrom}`,
-                "msgtype": originalContent.msgtype,
-                "m.new_content": {
-                    body: bodyToStartFrom,
-                    msgtype: originalContent.msgtype,
-                },
-                "m.relates_to": {
-                    rel_type: "m.replace",
-                    event_id: this.getBaseEventId(),
-                },
-            };
-            return (
-                <MatrixClientContext.Consumer>
-                    { (cli) => (
-                        <SendCustomEvent
-                            room={cli.getRoom(roomId)}
-                            forceStateEvent={false}
-                            forceGeneralEvent={true}
-                            onBack={() => this.onBack()}
-                            inputs={{
-                                eventType: mxEvent.getType(),
-                                evContent: JSON.stringify(newContent, null, "\t"),
-                            }}
-                        />
+                        <DevtoolsContext.Provider value={{ room: cli.getRoom(roomId) }}>
+                            <StateEventEditor onBack={this.onBack} mxEvent={mxEvent} />
+                        </DevtoolsContext.Provider>
                     ) }
                 </MatrixClientContext.Consumer>
             );
         }
+
+        return (
+            <MatrixClientContext.Consumer>
+                { (cli) => (
+                    <DevtoolsContext.Provider value={{ room: cli.getRoom(roomId) }}>
+                        <TimelineEventEditor onBack={this.onBack} mxEvent={mxEvent} />
+                    </DevtoolsContext.Provider>
+                ) }
+            </MatrixClientContext.Consumer>
+        );
     }
 
     private canSendStateEvent(mxEvent: MatrixEvent): boolean {
@@ -181,8 +167,16 @@ export default class ViewSource extends React.Component<IProps, IState> {
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>
-                    <div>Room ID: { roomId }</div>
-                    <div>Event ID: { eventId }</div>
+                    <div>
+                        <CopyableText getTextToCopy={() => roomId} border={false}>
+                            { _t("Room ID: %(roomId)s", { roomId }) }
+                        </CopyableText>
+                    </div>
+                    <div>
+                        <CopyableText getTextToCopy={() => eventId} border={false}>
+                            { _t("Event ID: %(eventId)s", { eventId }) }
+                        </CopyableText>
+                    </div>
                     <div className="mx_ViewSource_separator" />
                     { isEditing ? this.editSourceContent() : this.viewSourceContent() }
                 </div>
diff --git a/src/components/structures/auth/CompleteSecurity.tsx b/src/components/structures/auth/CompleteSecurity.tsx
index 7043878a729..c187e2d7891 100644
--- a/src/components/structures/auth/CompleteSecurity.tsx
+++ b/src/components/structures/auth/CompleteSecurity.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
 import SetupEncryptionBody from "./SetupEncryptionBody";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import CompleteSecurityBody from "../../views/auth/CompleteSecurityBody";
 import AuthPage from "../../views/auth/AuthPage";
@@ -33,7 +32,6 @@ interface IState {
     lostKeys: boolean;
 }
 
-@replaceableComponent("structures.auth.CompleteSecurity")
 export default class CompleteSecurity extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/structures/auth/E2eSetup.tsx b/src/components/structures/auth/E2eSetup.tsx
index 96d6a0dc0b0..ebd88b882c0 100644
--- a/src/components/structures/auth/E2eSetup.tsx
+++ b/src/components/structures/auth/E2eSetup.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import AuthPage from '../../views/auth/AuthPage';
 import CompleteSecurityBody from '../../views/auth/CompleteSecurityBody';
 import CreateCrossSigningDialog from '../../views/dialogs/security/CreateCrossSigningDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     onFinished: () => void;
@@ -27,7 +26,6 @@ interface IProps {
     tokenLogin?: boolean;
 }
 
-@replaceableComponent("structures.auth.E2eSetup")
 export default class E2eSetup extends React.Component<IProps> {
     render() {
         return (
diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx
index 14b201afc6b..df39f0aa8f2 100644
--- a/src/components/structures/auth/ForgotPassword.tsx
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -19,6 +19,7 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import { logger } from "matrix-js-sdk/src/logger";
+import { createClient } from "matrix-js-sdk/src/matrix";
 
 import { _t, _td } from '../../../languageHandler';
 import Modal from "../../../Modal";
@@ -28,7 +29,6 @@ import AuthPage from "../../views/auth/AuthPage";
 import ServerPicker from "../../views/elements/ServerPicker";
 import EmailField from "../../views/auth/EmailField";
 import PassphraseField from '../../views/auth/PassphraseField';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm';
 import InlineSpinner from '../../views/elements/InlineSpinner';
 import Spinner from "../../views/elements/Spinner";
@@ -38,6 +38,7 @@ import AuthHeader from "../../views/auth/AuthHeader";
 import AuthBody from "../../views/auth/AuthBody";
 import PassphraseConfirmField from "../../views/auth/PassphraseConfirmField";
 import AccessibleButton from '../../views/elements/AccessibleButton';
+import StyledCheckbox from '../../views/elements/StyledCheckbox';
 
 enum Phase {
     // Show the forgot password inputs
@@ -73,6 +74,9 @@ interface IState {
     serverDeadError: string;
 
     currentHttpRequest?: Promise<any>;
+
+    serverSupportsControlOfDevicesLogout: boolean;
+    logoutDevices: boolean;
 }
 
 enum ForgotPasswordField {
@@ -81,7 +85,6 @@ enum ForgotPasswordField {
     PasswordConfirm = 'field_password_confirm',
 }
 
-@replaceableComponent("structures.auth.ForgotPassword")
 export default class ForgotPassword extends React.Component<IProps, IState> {
     private reset: PasswordReset;
 
@@ -99,11 +102,14 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
         serverIsAlive: true,
         serverErrorIsFatal: false,
         serverDeadError: "",
+        serverSupportsControlOfDevicesLogout: false,
+        logoutDevices: false,
     };
 
     public componentDidMount() {
         this.reset = null;
         this.checkServerLiveliness(this.props.serverConfig);
+        this.checkServerCapabilities(this.props.serverConfig);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -114,6 +120,9 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
 
         // Do a liveliness check on the new URLs
         this.checkServerLiveliness(newProps.serverConfig);
+
+        // Do capabilities check on new URLs
+        this.checkServerCapabilities(newProps.serverConfig);
     }
 
     private async checkServerLiveliness(serverConfig): Promise<void> {
@@ -131,12 +140,25 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
         }
     }
 
-    public submitPasswordReset(email: string, password: string): void {
+    private async checkServerCapabilities(serverConfig: ValidatedServerConfig): Promise<void> {
+        const tempClient = createClient({
+            baseUrl: serverConfig.hsUrl,
+        });
+
+        const serverSupportsControlOfDevicesLogout = await tempClient.doesServerSupportLogoutDevices();
+
+        this.setState({
+            logoutDevices: !serverSupportsControlOfDevicesLogout,
+            serverSupportsControlOfDevicesLogout,
+        });
+    }
+
+    public submitPasswordReset(email: string, password: string, logoutDevices = true): void {
         this.setState({
             phase: Phase.SendingEmail,
         });
         this.reset = new PasswordReset(this.props.serverConfig.hsUrl, this.props.serverConfig.isUrl);
-        this.reset.resetPassword(email, password).then(() => {
+        this.reset.resetPassword(email, password, logoutDevices).then(() => {
             this.setState({
                 phase: Phase.EmailSent,
             });
@@ -176,24 +198,35 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
             return;
         }
 
-        Modal.createTrackedDialog('Forgot Password Warning', '', QuestionDialog, {
-            title: _t('Warning!'),
-            description:
-                <div>
-                    { _t(
-                        "Changing your password will reset any end-to-end encryption keys " +
-                        "on all of your sessions, making encrypted chat history unreadable. Set up " +
-                        "Key Backup or export your room keys from another session before resetting your " +
-                        "password.",
-                    ) }
-                </div>,
-            button: _t('Continue'),
-            onFinished: (confirmed) => {
-                if (confirmed) {
-                    this.submitPasswordReset(this.state.email, this.state.password);
-                }
-            },
-        });
+        if (this.state.logoutDevices) {
+            const { finished } = Modal.createTrackedDialog<[boolean]>('Forgot Password Warning', '', QuestionDialog, {
+                title: _t('Warning!'),
+                description:
+                    <div>
+                        <p>{ !this.state.serverSupportsControlOfDevicesLogout ?
+                            _t(
+                                "Resetting your password on this homeserver will cause all of your devices to be " +
+                                "signed out. This will delete the message encryption keys stored on them, " +
+                                "making encrypted chat history unreadable.",
+                            ) :
+                            _t(
+                                "Signing out your devices will delete the message encryption keys stored on them, " +
+                                "making encrypted chat history unreadable.",
+                            )
+                        }</p>
+                        <p>{ _t(
+                            "If you want to retain access to your chat history in encrypted rooms, set up Key Backup " +
+                            "or export your message keys from one of your other devices before proceeding.",
+                        ) }</p>
+                    </div>,
+                button: _t('Continue'),
+            });
+            const [confirmed] = await finished;
+
+            if (!confirmed) return;
+        }
+
+        this.submitPasswordReset(this.state.email, this.state.password, this.state.logoutDevices);
     };
 
     private async verifyFieldsBeforeSubmit() {
@@ -224,8 +257,10 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
     }
 
     private onInputChanged = (stateKey: string, ev: React.FormEvent<HTMLInputElement>) => {
+        let value = ev.currentTarget.value;
+        if (stateKey === "email") value = value.trim();
         this.setState({
-            [stateKey]: ev.currentTarget.value,
+            [stateKey]: value,
         } as any);
     };
 
@@ -316,6 +351,13 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
                         autoComplete="new-password"
                     />
                 </div>
+                { this.state.serverSupportsControlOfDevicesLogout ?
+                    <div className="mx_AuthBody_fieldRow">
+                        <StyledCheckbox onChange={() => this.setState({ logoutDevices: !this.state.logoutDevices })} checked={this.state.logoutDevices}>
+                            { _t("Sign out all devices") }
+                        </StyledCheckbox>
+                    </div> : null
+                }
                 <span>{ _t(
                     'A verification email will be sent to your inbox to confirm ' +
                     'setting your new password.',
@@ -355,11 +397,14 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
     renderDone() {
         return <div>
             <p>{ _t("Your password has been reset.") }</p>
-            <p>{ _t(
-                "You have been logged out of all sessions and will no longer receive " +
-                "push notifications. To re-enable notifications, sign in again on each " +
-                "device.",
-            ) }</p>
+            { this.state.logoutDevices ?
+                <p>{ _t(
+                    "You have been logged out of all devices and will no longer receive " +
+                    "push notifications. To re-enable notifications, sign in again on each " +
+                    "device.",
+                ) }</p>
+                : null
+            }
             <input
                 className="mx_Login_submit"
                 type="button"
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index cbf524c1bb1..297e233444e 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -34,7 +34,6 @@ import InlineSpinner from "../../views/elements/InlineSpinner";
 import Spinner from "../../views/elements/Spinner";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from "../../views/elements/ServerPicker";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthBody from "../../views/auth/AuthBody";
 import AuthHeader from "../../views/auth/AuthHeader";
 import AccessibleButton from '../../views/elements/AccessibleButton';
@@ -103,7 +102,6 @@ interface IState {
 /*
  * A wire component which glues together login UI components and Login logic
  */
-@replaceableComponent("structures.auth.LoginComponent")
 export default class LoginComponent extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     private loginLogic: Login;
@@ -137,7 +135,9 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
             'm.login.password': this.renderPasswordStep,
 
             // CAS and SSO are the same thing, modulo the url we link to
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             'm.login.cas': () => this.renderSsoStep("cas"),
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             'm.login.sso': () => this.renderSsoStep("sso"),
         };
     }
@@ -245,7 +245,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
                 if (error.errcode === 'M_USER_DEACTIVATED') {
                     errorText = _t('This account has been deactivated.');
-                } else if (SdkConfig.get()['disable_custom_urls']) {
+                } else if (SdkConfig.get("disable_custom_urls")) {
                     errorText = (
                         <div>
                             <div>{ _t('Incorrect username and/or password.') }</div>
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 828ca8d79d7..ff7e41b9d58 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -30,7 +30,6 @@ import Login, { ISSOFlow } from "../../../Login";
 import dis from "../../../dispatcher/dispatcher";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from '../../views/elements/ServerPicker';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RegistrationForm from '../../views/auth/RegistrationForm';
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import AuthBody from "../../views/auth/AuthBody";
@@ -110,9 +109,10 @@ interface IState {
     ssoFlow?: ISSOFlow;
 }
 
-@replaceableComponent("structures.auth.Registration")
 export default class Registration extends React.Component<IProps, IState> {
-    loginLogic: Login;
+    private readonly loginLogic: Login;
+    // `replaceClient` tracks latest serverConfig to spot when it changes under the async method which fetches flows
+    private latestServerConfig: ValidatedServerConfig;
 
     constructor(props) {
         super(props);
@@ -139,8 +139,21 @@ export default class Registration extends React.Component<IProps, IState> {
 
     componentDidMount() {
         this.replaceClient(this.props.serverConfig);
+        //triggers a confirmation dialog for data loss before page unloads/refreshes
+        window.addEventListener("beforeunload", this.unloadCallback);
     }
 
+    componentWillUnmount() {
+        window.removeEventListener("beforeunload", this.unloadCallback);
+    }
+
+    private unloadCallback = (event: BeforeUnloadEvent) => {
+        if (this.state.doingUIAuth) {
+            event.preventDefault();
+            event.returnValue = "";
+            return "";
+        }
+    };
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
     // eslint-disable-next-line
     UNSAFE_componentWillReceiveProps(newProps) {
@@ -151,26 +164,28 @@ export default class Registration extends React.Component<IProps, IState> {
     }
 
     private async replaceClient(serverConfig: ValidatedServerConfig) {
+        this.latestServerConfig = serverConfig;
+        const { hsUrl, isUrl } = serverConfig;
+
         this.setState({
             errorText: null,
             serverDeadError: null,
             serverErrorIsFatal: false,
-            // busy while we do liveness check (we need to avoid trying to render
+            // busy while we do live-ness check (we need to avoid trying to render
             // the UI auth component while we don't have a matrix client)
             busy: true,
         });
 
         // Do a liveliness check on the URLs
         try {
-            await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
-                serverConfig.hsUrl,
-                serverConfig.isUrl,
-            );
+            await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
+            if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
             this.setState({
                 serverIsAlive: true,
                 serverErrorIsFatal: false,
             });
         } catch (e) {
+            if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
             this.setState({
                 busy: false,
                 ...AutoDiscoveryUtils.authComponentStateForError(e, "register"),
@@ -180,7 +195,6 @@ export default class Registration extends React.Component<IProps, IState> {
             }
         }
 
-        const { hsUrl, isUrl } = serverConfig;
         const cli = createClient({
             baseUrl: hsUrl,
             idBaseUrl: isUrl,
@@ -192,8 +206,10 @@ export default class Registration extends React.Component<IProps, IState> {
         let ssoFlow: ISSOFlow;
         try {
             const loginFlows = await this.loginLogic.getFlows();
+            if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
             ssoFlow = loginFlows.find(f => f.type === "m.login.sso" || f.type === "m.login.cas") as ISSOFlow;
         } catch (e) {
+            if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
             logger.error("Failed to get login flows to check for SSO support", e);
         }
 
@@ -202,23 +218,19 @@ export default class Registration extends React.Component<IProps, IState> {
             ssoFlow,
             busy: false,
         });
-        const showGenericError = (e) => {
-            this.setState({
-                errorText: _t("Unable to query for supported registration methods."),
-                // add empty flows array to get rid of spinner
-                flows: [],
-            });
-        };
+
         try {
             // We do the first registration request ourselves to discover whether we need to
             // do SSO instead. If we've already started the UI Auth process though, we don't
             // need to.
             if (!this.state.doingUIAuth) {
                 await this.makeRegisterRequest(null);
+                if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
                 // This should never succeed since we specified no auth object.
                 logger.log("Expecting 401 from register request but got success!");
             }
         } catch (e) {
+            if (serverConfig !== this.latestServerConfig) return; // discard, serverConfig changed from under us
             if (e.httpStatus === 401) {
                 this.setState({
                     flows: e.data.flows,
@@ -241,16 +253,20 @@ export default class Registration extends React.Component<IProps, IState> {
                 }
             } else {
                 logger.log("Unable to query for supported registration methods.", e);
-                showGenericError(e);
+                this.setState({
+                    errorText: _t("Unable to query for supported registration methods."),
+                    // add empty flows array to get rid of spinner
+                    flows: [],
+                });
             }
         }
     }
 
-    private onFormSubmit = async (formVals): Promise<void> => {
+    private onFormSubmit = async (formVals: Record<string, string>): Promise<void> => {
         this.setState({
             errorText: "",
             busy: true,
-            formVals: formVals,
+            formVals,
             doingUIAuth: true,
         });
     };
diff --git a/src/components/structures/auth/SetupEncryptionBody.tsx b/src/components/structures/auth/SetupEncryptionBody.tsx
index 8783ae3f581..2553f8fbaa0 100644
--- a/src/components/structures/auth/SetupEncryptionBody.tsx
+++ b/src/components/structures/auth/SetupEncryptionBody.tsx
@@ -25,7 +25,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
 import { SetupEncryptionStore, Phase } from '../../../stores/SetupEncryptionStore';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
 import AccessibleButton from '../../views/elements/AccessibleButton';
 import Spinner from '../../views/elements/Spinner';
@@ -49,7 +48,6 @@ interface IState {
     lostKeys: boolean;
 }
 
-@replaceableComponent("structures.auth.SetupEncryptionBody")
 export default class SetupEncryptionBody extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index f24230806a5..7a366d71225 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -27,7 +27,6 @@ import { ISSOFlow, LoginFlow, sendLoginRequest } from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
 import { SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY } from "../../../BasePlatform";
 import SSOButtons from "../../views/elements/SSOButtons";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ConfirmWipeDeviceDialog from '../../views/dialogs/ConfirmWipeDeviceDialog';
 import Field from '../../views/elements/Field';
 import AccessibleButton from '../../views/elements/AccessibleButton';
@@ -70,7 +69,6 @@ interface IState {
     flows: LoginFlow[];
 }
 
-@replaceableComponent("structures.auth.SoftLogout")
 export default class SoftLogout extends React.Component<IProps, IState> {
     public constructor(props: IProps) {
         super(props);
diff --git a/src/components/structures/static-page-vars.ts b/src/components/structures/static-page-vars.ts
new file mode 100644
index 00000000000..801eeb155a2
--- /dev/null
+++ b/src/components/structures/static-page-vars.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// We're importing via require specifically so the svg becomes a URI rather than a DOM element.
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const matrixSvg = require('../../../res/img/matrix.svg').default;
+
+/**
+ * Intended to replace $matrixLogo in the welcome page.
+ */
+export const MATRIX_LOGO_HTML = `<a href="https://matrix.org" target="_blank" rel="noreferrer noopener">
+    <img width="79" height="34" alt="Matrix" style="padding-left: 1px;vertical-align: middle" src="${matrixSvg}"/>
+</a>`;
diff --git a/src/components/views/audio_messages/AudioPlayer.tsx b/src/components/views/audio_messages/AudioPlayer.tsx
index 84b96632f10..c681b366cf8 100644
--- a/src/components/views/audio_messages/AudioPlayer.tsx
+++ b/src/components/views/audio_messages/AudioPlayer.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,51 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode, RefObject } from "react";
+import React, { ReactNode } from "react";
 
 import PlayPauseButton from "./PlayPauseButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { formatBytes } from "../../../utils/FormattingUtils";
 import DurationClock from "./DurationClock";
 import { _t } from "../../../languageHandler";
 import SeekBar from "./SeekBar";
 import PlaybackClock from "./PlaybackClock";
 import AudioPlayerBase from "./AudioPlayerBase";
-import { getKeyBindingsManager } from "../../../KeyBindingsManager";
-import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
-@replaceableComponent("views.audio_messages.AudioPlayer")
 export default class AudioPlayer extends AudioPlayerBase {
-    private playPauseRef: RefObject<PlayPauseButton> = createRef();
-    private seekRef: RefObject<SeekBar> = createRef();
-
-    private onKeyDown = (ev: React.KeyboardEvent) => {
-        let handled = true;
-        const action = getKeyBindingsManager().getAccessibilityAction(ev);
-
-        switch (action) {
-            case KeyBindingAction.Space:
-                this.playPauseRef.current?.toggleState();
-                break;
-            case KeyBindingAction.ArrowLeft:
-                this.seekRef.current?.left();
-                break;
-            case KeyBindingAction.ArrowRight:
-                this.seekRef.current?.right();
-                break;
-            default:
-                handled = false;
-                break;
-        }
-
-        // stopPropagation() prevents the FocusComposer catch-all from triggering,
-        // but we need to do it on key down instead of press (even though the user
-        // interaction is typically on press).
-        if (handled) {
-            ev.stopPropagation();
-        }
-    };
-
     protected renderFileSize(): string {
         const bytes = this.props.playback.sizeBytes;
         if (!bytes) return null;
diff --git a/src/components/views/audio_messages/AudioPlayerBase.tsx b/src/components/views/audio_messages/AudioPlayerBase.tsx
index 1ce0ed1e955..9b3a7e4cefd 100644
--- a/src/components/views/audio_messages/AudioPlayerBase.tsx
+++ b/src/components/views/audio_messages/AudioPlayerBase.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode } from "react";
+import React, { createRef, ReactNode, RefObject } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { Playback, PlaybackState } from "../../../audio/Playback";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { _t } from "../../../languageHandler";
+import { getKeyBindingsManager } from "../../../KeyBindingsManager";
+import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
+import SeekBar from "./SeekBar";
+import PlayPauseButton from "./PlayPauseButton";
 
-interface IProps {
+export interface IProps {
     // Playback instance to render. Cannot change during component lifecycle: create
     // an all-new component instead.
     playback: Playback;
@@ -35,9 +38,11 @@ interface IState {
     error?: boolean;
 }
 
-@replaceableComponent("views.audio_messages.AudioPlayerBase")
-export default abstract class AudioPlayerBase extends React.PureComponent<IProps, IState> {
-    constructor(props: IProps) {
+export default abstract class AudioPlayerBase<T extends IProps = IProps> extends React.PureComponent<T, IState> {
+    protected seekRef: RefObject<SeekBar> = createRef();
+    protected playPauseRef: RefObject<PlayPauseButton> = createRef();
+
+    constructor(props: T) {
         super(props);
 
         // Playback instances can be reused in the composer
@@ -56,6 +61,33 @@ export default abstract class AudioPlayerBase extends React.PureComponent<IProps
         });
     }
 
+    protected onKeyDown = (ev: React.KeyboardEvent) => {
+        let handled = true;
+        const action = getKeyBindingsManager().getAccessibilityAction(ev);
+
+        switch (action) {
+            case KeyBindingAction.Space:
+                this.playPauseRef.current?.toggleState();
+                break;
+            case KeyBindingAction.ArrowLeft:
+                this.seekRef.current?.left();
+                break;
+            case KeyBindingAction.ArrowRight:
+                this.seekRef.current?.right();
+                break;
+            default:
+                handled = false;
+                break;
+        }
+
+        // stopPropagation() prevents the FocusComposer catch-all from triggering,
+        // but we need to do it on key down instead of press (even though the user
+        // interaction is typically on press).
+        if (handled) {
+            ev.stopPropagation();
+        }
+    };
+
     private onPlaybackUpdate = (ev: PlaybackState) => {
         this.setState({ playbackPhase: ev });
     };
diff --git a/src/components/views/audio_messages/Clock.tsx b/src/components/views/audio_messages/Clock.tsx
index 13ffaa7d765..f978d8837c9 100644
--- a/src/components/views/audio_messages/Clock.tsx
+++ b/src/components/views/audio_messages/Clock.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { HTMLProps } from "react";
 
 import { formatSeconds } from "../../../DateUtils";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 export interface IProps extends Pick<HTMLProps<HTMLSpanElement>, "aria-live"> {
     seconds: number;
@@ -27,7 +26,6 @@ export interface IProps extends Pick<HTMLProps<HTMLSpanElement>, "aria-live"> {
  * Simply converts seconds into minutes and seconds. Note that hours will not be
  * displayed, making it possible to see "82:29".
  */
-@replaceableComponent("views.audio_messages.Clock")
 export default class Clock extends React.Component<IProps> {
     public constructor(props) {
         super(props);
diff --git a/src/components/views/audio_messages/DurationClock.tsx b/src/components/views/audio_messages/DurationClock.tsx
index e0c180123ab..47dc8e83759 100644
--- a/src/components/views/audio_messages/DurationClock.tsx
+++ b/src/components/views/audio_messages/DurationClock.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { Playback } from "../../../audio/Playback";
 
@@ -31,7 +30,6 @@ interface IState {
 /**
  * A clock which shows a clip's maximum duration.
  */
-@replaceableComponent("views.audio_messages.DurationClock")
 export default class DurationClock extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
diff --git a/src/components/views/audio_messages/LiveRecordingClock.tsx b/src/components/views/audio_messages/LiveRecordingClock.tsx
index aa88d999bed..34e4c559fec 100644
--- a/src/components/views/audio_messages/LiveRecordingClock.tsx
+++ b/src/components/views/audio_messages/LiveRecordingClock.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { IRecordingUpdate, VoiceRecording } from "../../../audio/VoiceRecording";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
 
@@ -32,7 +31,6 @@ interface IState {
 /**
  * A clock for a live recording.
  */
-@replaceableComponent("views.audio_messages.LiveRecordingClock")
 export default class LiveRecordingClock extends React.PureComponent<IProps, IState> {
     private seconds = 0;
     private scheduledUpdate = new MarkedExecution(
diff --git a/src/components/views/audio_messages/LiveRecordingWaveform.tsx b/src/components/views/audio_messages/LiveRecordingWaveform.tsx
index 13ba7b9f960..c9c122c98ac 100644
--- a/src/components/views/audio_messages/LiveRecordingWaveform.tsx
+++ b/src/components/views/audio_messages/LiveRecordingWaveform.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { IRecordingUpdate, RECORDING_PLAYBACK_SAMPLES, VoiceRecording } from "../../../audio/VoiceRecording";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { arrayFastResample, arraySeed } from "../../../utils/arrays";
 import Waveform from "./Waveform";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
@@ -33,7 +32,6 @@ interface IState {
 /**
  * A waveform which shows the waveform of a live recording
  */
-@replaceableComponent("views.audio_messages.LiveRecordingWaveform")
 export default class LiveRecordingWaveform extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         progress: 1,
diff --git a/src/components/views/audio_messages/PlayPauseButton.tsx b/src/components/views/audio_messages/PlayPauseButton.tsx
index 5562a33ab50..1a2da04a388 100644
--- a/src/components/views/audio_messages/PlayPauseButton.tsx
+++ b/src/components/views/audio_messages/PlayPauseButton.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ReactNode } from "react";
 import classNames from "classnames";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import { _t } from "../../../languageHandler";
 import { Playback, PlaybackState } from "../../../audio/Playback";
@@ -35,7 +34,6 @@ interface IProps extends Omit<React.ComponentProps<typeof AccessibleTooltipButto
  * Displays a play/pause button (activating the play/pause function of the recorder)
  * to be displayed in reference to a recording.
  */
-@replaceableComponent("views.audio_messages.PlayPauseButton")
 export default class PlayPauseButton extends React.PureComponent<IProps> {
     public constructor(props) {
         super(props);
diff --git a/src/components/views/audio_messages/PlaybackClock.tsx b/src/components/views/audio_messages/PlaybackClock.tsx
index c792d1c4837..3f05ad0b895 100644
--- a/src/components/views/audio_messages/PlaybackClock.tsx
+++ b/src/components/views/audio_messages/PlaybackClock.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { Playback, PlaybackState } from "../../../audio/Playback";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
@@ -39,7 +38,6 @@ interface IState {
 /**
  * A clock for a playback of a recording.
  */
-@replaceableComponent("views.audio_messages.PlaybackClock")
 export default class PlaybackClock extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
diff --git a/src/components/views/audio_messages/PlaybackWaveform.tsx b/src/components/views/audio_messages/PlaybackWaveform.tsx
index 70bf0ebeef3..712044ca78f 100644
--- a/src/components/views/audio_messages/PlaybackWaveform.tsx
+++ b/src/components/views/audio_messages/PlaybackWaveform.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { arraySeed, arrayTrimFill } from "../../../utils/arrays";
 import Waveform from "./Waveform";
 import { Playback, PLAYBACK_WAVEFORM_SAMPLES } from "../../../audio/Playback";
@@ -34,7 +33,6 @@ interface IState {
 /**
  * A waveform which shows the waveform of a previously recorded recording
  */
-@replaceableComponent("views.audio_messages.PlaybackWaveform")
 export default class PlaybackWaveform extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
diff --git a/src/components/views/audio_messages/RecordingPlayback.tsx b/src/components/views/audio_messages/RecordingPlayback.tsx
index 05fca276fe9..f9e84059588 100644
--- a/src/components/views/audio_messages/RecordingPlayback.tsx
+++ b/src/components/views/audio_messages/RecordingPlayback.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,30 +18,49 @@ import React, { ReactNode } from "react";
 
 import PlayPauseButton from "./PlayPauseButton";
 import PlaybackClock from "./PlaybackClock";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import AudioPlayerBase, { IProps as IAudioPlayerBaseProps } from "./AudioPlayerBase";
+import SeekBar from "./SeekBar";
 import PlaybackWaveform from "./PlaybackWaveform";
-import AudioPlayerBase from "./AudioPlayerBase";
-import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
-
-@replaceableComponent("views.audio_messages.RecordingPlayback")
-export default class RecordingPlayback extends AudioPlayerBase {
-    static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    private get isWaveformable(): boolean {
-        return this.context.timelineRenderingType !== TimelineRenderingType.Notification
-            && this.context.timelineRenderingType !== TimelineRenderingType.File
-            && this.context.timelineRenderingType !== TimelineRenderingType.Pinned;
+
+interface IProps extends IAudioPlayerBaseProps {
+    /**
+     * When true, use a waveform instead of a seek bar
+     */
+    withWaveform?: boolean;
+}
+
+export default class RecordingPlayback extends AudioPlayerBase<IProps> {
+    // This component is rendered in two ways: the composer and timeline. They have different
+    // rendering properties (specifically the difference of a waveform or not).
+
+    private renderWaveformLook(): ReactNode {
+        return <>
+            <PlaybackClock playback={this.props.playback} />
+            <PlaybackWaveform playback={this.props.playback} />
+        </>;
     }
 
-    protected renderComponent(): ReactNode {
-        const shapeClass = !this.isWaveformable ? 'mx_VoiceMessagePrimaryContainer_noWaveform' : '';
+    private renderSeekableLook(): ReactNode {
+        return <>
+            <SeekBar
+                playback={this.props.playback}
+                tabIndex={-1} // prevent tabbing into the bar
+                playbackPhase={this.state.playbackPhase}
+                ref={this.seekRef}
+            />
+            <PlaybackClock playback={this.props.playback} />
+        </>;
+    }
 
+    protected renderComponent(): ReactNode {
         return (
-            <div className={'mx_MediaBody mx_VoiceMessagePrimaryContainer ' + shapeClass}>
-                <PlayPauseButton playback={this.props.playback} playbackPhase={this.state.playbackPhase} />
-                <PlaybackClock playback={this.props.playback} />
-                { this.isWaveformable && <PlaybackWaveform playback={this.props.playback} /> }
+            <div className="mx_MediaBody mx_VoiceMessagePrimaryContainer" onKeyDown={this.onKeyDown}>
+                <PlayPauseButton
+                    playback={this.props.playback}
+                    playbackPhase={this.state.playbackPhase}
+                    ref={this.playPauseRef}
+                />
+                { this.props.withWaveform ? this.renderWaveformLook() : this.renderSeekableLook() }
             </div>
         );
     }
diff --git a/src/components/views/audio_messages/SeekBar.tsx b/src/components/views/audio_messages/SeekBar.tsx
index 817f3e04526..d86d11c95ed 100644
--- a/src/components/views/audio_messages/SeekBar.tsx
+++ b/src/components/views/audio_messages/SeekBar.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ChangeEvent, CSSProperties, ReactNode } from "react";
 
 import { Playback, PlaybackState } from "../../../audio/Playback";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
 import { percentageOf } from "../../../utils/numbers";
 
@@ -43,7 +42,6 @@ interface ISeekCSS extends CSSProperties {
 
 const ARROW_SKIP_SECONDS = 5; // arbitrary
 
-@replaceableComponent("views.audio_messages.SeekBar")
 export default class SeekBar extends React.PureComponent<IProps, IState> {
     // We use an animation frame request to avoid overly spamming prop updates, even if we aren't
     // really using anything demanding on the CSS front.
diff --git a/src/components/views/audio_messages/Waveform.tsx b/src/components/views/audio_messages/Waveform.tsx
index dedd95c7e1b..deccc23ac62 100644
--- a/src/components/views/audio_messages/Waveform.tsx
+++ b/src/components/views/audio_messages/Waveform.tsx
@@ -17,8 +17,6 @@ limitations under the License.
 import React, { CSSProperties } from "react";
 import classNames from "classnames";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface WaveformCSSProperties extends CSSProperties {
     '--barHeight': number;
 }
@@ -39,7 +37,6 @@ interface IState {
  * For CSS purposes, a mx_Waveform_bar_100pct class is added when the bar should be
  * "filled", as a demonstration of the progress property.
  */
-@replaceableComponent("views.audio_messages.Waveform")
 export default class Waveform extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         progress: 1,
diff --git a/src/components/views/auth/AuthBody.tsx b/src/components/views/auth/AuthBody.tsx
index 22bb919141b..4532ceeaf44 100644
--- a/src/components/views/auth/AuthBody.tsx
+++ b/src/components/views/auth/AuthBody.tsx
@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.AuthBody")
 export default class AuthBody extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_AuthBody">
diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx
index d936e346e60..46e389cb467 100644
--- a/src/components/views/auth/AuthFooter.tsx
+++ b/src/components/views/auth/AuthFooter.tsx
@@ -19,9 +19,7 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-@replaceableComponent("views.auth.AuthFooter")
 export default class AuthFooter extends React.Component {
     public render(): React.ReactNode {
         return (
diff --git a/src/components/views/auth/AuthHeader.tsx b/src/components/views/auth/AuthHeader.tsx
index 27768c9e6e9..90e9e888af9 100644
--- a/src/components/views/auth/AuthHeader.tsx
+++ b/src/components/views/auth/AuthHeader.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthHeaderLogo from "./AuthHeaderLogo";
 import LanguageSelector from "./LanguageSelector";
 
@@ -25,7 +24,6 @@ interface IProps {
     disableLanguageSelector?: boolean;
 }
 
-@replaceableComponent("views.auth.AuthHeader")
 export default class AuthHeader extends React.Component<IProps> {
     public render(): React.ReactNode {
         return (
diff --git a/src/components/views/auth/AuthHeaderLogo.tsx b/src/components/views/auth/AuthHeaderLogo.tsx
index 29e57372388..72a2df7b831 100644
--- a/src/components/views/auth/AuthHeaderLogo.tsx
+++ b/src/components/views/auth/AuthHeaderLogo.tsx
@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.AuthHeaderLogo")
 export default class AuthHeaderLogo extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_AuthHeaderLogo">
diff --git a/src/components/views/auth/AuthPage.tsx b/src/components/views/auth/AuthPage.tsx
index d13c8dd6ae6..344e890ebb0 100644
--- a/src/components/views/auth/AuthPage.tsx
+++ b/src/components/views/auth/AuthPage.tsx
@@ -18,10 +18,8 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthFooter from "./AuthFooter";
 
-@replaceableComponent("views.auth.AuthPage")
 export default class AuthPage extends React.PureComponent {
     public render(): React.ReactNode {
         return (
diff --git a/src/components/views/auth/CaptchaForm.tsx b/src/components/views/auth/CaptchaForm.tsx
index 887f174c003..7f718bae6dd 100644
--- a/src/components/views/auth/CaptchaForm.tsx
+++ b/src/components/views/auth/CaptchaForm.tsx
@@ -18,7 +18,6 @@ import React, { createRef } from 'react';
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const DIV_ID = 'mx_recaptcha';
 
@@ -35,7 +34,6 @@ interface ICaptchaFormState {
 /**
  * A pure UI component which displays a captcha form.
  */
-@replaceableComponent("views.auth.CaptchaForm")
 export default class CaptchaForm extends React.Component<ICaptchaFormProps, ICaptchaFormState> {
     static defaultProps = {
         onCaptchaResponse: () => {},
diff --git a/src/components/views/auth/CompleteSecurityBody.tsx b/src/components/views/auth/CompleteSecurityBody.tsx
index 349016add55..ecc6eace7dc 100644
--- a/src/components/views/auth/CompleteSecurityBody.tsx
+++ b/src/components/views/auth/CompleteSecurityBody.tsx
@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.CompleteSecurityBody")
 export default class CompleteSecurityBody extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_CompleteSecurityBody">
diff --git a/src/components/views/auth/CountryDropdown.tsx b/src/components/views/auth/CountryDropdown.tsx
index eb5b27be9dc..0318c4b95d7 100644
--- a/src/components/views/auth/CountryDropdown.tsx
+++ b/src/components/views/auth/CountryDropdown.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import { COUNTRIES, getEmojiFlag, PhoneNumberCountryDefinition } from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Dropdown from "../elements/Dropdown";
 
 const COUNTRIES_BY_ISO2 = {};
@@ -53,13 +52,12 @@ interface IState {
     defaultCountry: PhoneNumberCountryDefinition;
 }
 
-@replaceableComponent("views.auth.CountryDropdown")
 export default class CountryDropdown extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
         let defaultCountry: PhoneNumberCountryDefinition = COUNTRIES[0];
-        const defaultCountryCode = SdkConfig.get()["defaultCountryCode"];
+        const defaultCountryCode = SdkConfig.get("default_country_code");
         if (defaultCountryCode) {
             const country = COUNTRIES.find(c => c.iso2 === defaultCountryCode.toUpperCase());
             if (country) defaultCountry = country;
diff --git a/src/components/views/auth/EmailField.tsx b/src/components/views/auth/EmailField.tsx
index f274f1fdfad..2aa6204cfae 100644
--- a/src/components/views/auth/EmailField.tsx
+++ b/src/components/views/auth/EmailField.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { PureComponent, RefCallback, RefObject } from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field, { IInputProps } from "../elements/Field";
 import { _t, _td } from "../../../languageHandler";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
@@ -39,7 +38,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult): void;
 }
 
-@replaceableComponent("views.auth.EmailField")
 class EmailField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Email"),
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
index 1903fcd96e1..11a28d1e05d 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import Spinner from "../elements/Spinner";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { LocalisedPolicy, Policies } from '../../../Terms';
 import Field from '../elements/Field';
 import CaptchaForm from "./CaptchaForm";
@@ -93,7 +92,6 @@ interface IPasswordAuthEntryState {
     password: string;
 }
 
-@replaceableComponent("views.auth.PasswordAuthEntry")
 export class PasswordAuthEntry extends React.Component<IAuthEntryProps, IPasswordAuthEntryState> {
     static LOGIN_TYPE = AuthType.Password;
 
@@ -191,7 +189,6 @@ interface IRecaptchaAuthEntryProps extends IAuthEntryProps {
 }
 /* eslint-enable camelcase */
 
-@replaceableComponent("views.auth.RecaptchaAuthEntry")
 export class RecaptchaAuthEntry extends React.Component<IRecaptchaAuthEntryProps> {
     static LOGIN_TYPE = AuthType.Recaptcha;
 
@@ -262,7 +259,6 @@ interface ITermsAuthEntryState {
     errorText?: string;
 }
 
-@replaceableComponent("views.auth.TermsAuthEntry")
 export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITermsAuthEntryState> {
     static LOGIN_TYPE = AuthType.Terms;
 
@@ -326,10 +322,6 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
         this.props.onPhaseChange(DEFAULT_PHASE);
     }
 
-    public tryContinue = () => {
-        this.trySubmit();
-    };
-
     private togglePolicy(policyId: string) {
         const newToggles = {};
         for (const policy of this.state.policies) {
@@ -413,7 +405,6 @@ interface IEmailIdentityAuthEntryProps extends IAuthEntryProps {
     };
 }
 
-@replaceableComponent("views.auth.EmailIdentityAuthEntry")
 export class EmailIdentityAuthEntry extends React.Component<IEmailIdentityAuthEntryProps> {
     static LOGIN_TYPE = AuthType.Email;
 
@@ -476,7 +467,6 @@ interface IMsisdnAuthEntryState {
     errorText: string;
 }
 
-@replaceableComponent("views.auth.MsisdnAuthEntry")
 export class MsisdnAuthEntry extends React.Component<IMsisdnAuthEntryProps, IMsisdnAuthEntryState> {
     static LOGIN_TYPE = AuthType.Msisdn;
 
@@ -627,7 +617,6 @@ interface ISSOAuthEntryState {
     attemptFailed: boolean;
 }
 
-@replaceableComponent("views.auth.SSOAuthEntry")
 export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEntryState> {
     static LOGIN_TYPE = AuthType.Sso;
     static UNSTABLE_LOGIN_TYPE = AuthType.SsoUnstable;
@@ -747,7 +736,6 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
     }
 }
 
-@replaceableComponent("views.auth.FallbackAuthEntry")
 export class FallbackAuthEntry extends React.Component<IAuthEntryProps> {
     private popupWindow: Window;
     private fallbackButton = createRef<HTMLButtonElement>();
@@ -832,7 +820,6 @@ export interface IStageComponentProps extends IAuthEntryProps {
 }
 
 export interface IStageComponent extends React.ComponentClass<React.PropsWithRef<IStageComponentProps>> {
-    tryContinue?(): void;
     attemptFailed?(): void;
     focus?(): void;
 }
diff --git a/src/components/views/auth/LanguageSelector.tsx b/src/components/views/auth/LanguageSelector.tsx
index cd88652e432..6a098ba1138 100644
--- a/src/components/views/auth/LanguageSelector.tsx
+++ b/src/components/views/auth/LanguageSelector.tsx
@@ -35,7 +35,7 @@ interface IProps {
 }
 
 export default function LanguageSelector({ disabled }: IProps): JSX.Element {
-    if (SdkConfig.get()['disable_login_language_selector']) return <div />;
+    if (SdkConfig.get("disable_login_language_selector")) return <div />;
     return <LanguageDropdown
         className="mx_AuthBody_language"
         onOptionChange={onChange}
diff --git a/src/components/views/auth/PassphraseConfirmField.tsx b/src/components/views/auth/PassphraseConfirmField.tsx
index 3a2b6f89b7c..e30e25a00e7 100644
--- a/src/components/views/auth/PassphraseConfirmField.tsx
+++ b/src/components/views/auth/PassphraseConfirmField.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { PureComponent, RefCallback, RefObject } from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field, { IInputProps } from "../elements/Field";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
 import { _t, _td } from "../../../languageHandler";
@@ -35,7 +34,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult);
 }
 
-@replaceableComponent("views.auth.EmailField")
 class PassphraseConfirmField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Confirm password"),
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index 157ec521fde..94353669ffc 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -22,7 +22,6 @@ import SdkConfig from "../../../SdkConfig";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
 import { _t, _td } from "../../../languageHandler";
 import Field, { IInputProps } from "../elements/Field";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends Omit<IInputProps, "onValidate"> {
     autoFocus?: boolean;
@@ -41,7 +40,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult);
 }
 
-@replaceableComponent("views.auth.PassphraseField")
 class PassphraseField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Password"),
@@ -73,7 +71,7 @@ class PassphraseField extends PureComponent<IProps> {
                         return false;
                     }
                     const safe = complexity.score >= this.props.minScore;
-                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
+                    const allowUnsafe = SdkConfig.get("dangerously_allow_unsafe_and_insecure_passwords");
                     return allowUnsafe || safe;
                 },
                 valid: function(complexity) {
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
index 9142358674f..db223931125 100644
--- a/src/components/views/auth/PasswordLogin.tsx
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -24,7 +24,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import withValidation, { IValidationResult } from "../elements/Validation";
 import Field from "../elements/Field";
 import CountryDropdown from "./CountryDropdown";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EmailField from "./EmailField";
 
 // For validating phone numbers without country codes
@@ -66,7 +65,6 @@ enum LoginField {
  * A pure UI component which displays a username/password form.
  * The email/username/phone fields are fully-controlled, the password field is not.
  */
-@replaceableComponent("views.auth.PasswordLogin")
 export default class PasswordLogin extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onUsernameChanged: function() {},
diff --git a/src/components/views/auth/RegistrationForm.tsx b/src/components/views/auth/RegistrationForm.tsx
index 2665e1789fe..83ee70a7053 100644
--- a/src/components/views/auth/RegistrationForm.tsx
+++ b/src/components/views/auth/RegistrationForm.tsx
@@ -31,9 +31,9 @@ import EmailField from "./EmailField";
 import PassphraseField from "./PassphraseField";
 import Field from '../elements/Field';
 import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import CountryDropdown from "./CountryDropdown";
 import PassphraseConfirmField from "./PassphraseConfirmField";
+import { PosthogAnalytics } from '../../../PosthogAnalytics';
 
 enum RegistrationField {
     Email = "field_email",
@@ -92,7 +92,6 @@ interface IState {
 /*
  * A pure UI component which displays a registration form.
  */
-@replaceableComponent("views.auth.RegistrationForm")
 export default class RegistrationForm extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onValidationChange: logger.error,
@@ -149,6 +148,8 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
     };
 
     private doSubmit(ev) {
+        PosthogAnalytics.instance.setAuthenticationType("Password");
+
         const email = this.state.email.trim();
 
         const promise = this.props.onRegisterClick({
diff --git a/src/components/views/auth/Welcome.tsx b/src/components/views/auth/Welcome.tsx
index 5f1de174509..5f59dbdf529 100644
--- a/src/components/views/auth/Welcome.tsx
+++ b/src/components/views/auth/Welcome.tsx
@@ -17,14 +17,14 @@ limitations under the License.
 import React from 'react';
 import classNames from "classnames";
 
-import * as sdk from "../../../index";
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
 import { _td } from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import LanguageSelector from "./LanguageSelector";
+import EmbeddedPage from "../../structures/EmbeddedPage";
+import { MATRIX_LOGO_HTML } from "../../structures/static-page-vars";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
@@ -33,16 +33,12 @@ interface IProps {
 
 }
 
-@replaceableComponent("views.auth.Welcome")
 export default class Welcome extends React.PureComponent<IProps> {
     public render(): React.ReactNode {
-        // FIXME: Using an import will result in wrench-element-tests failures
-        const EmbeddedPage = sdk.getComponent("structures.EmbeddedPage");
-
-        const pagesConfig = SdkConfig.get().embeddedPages;
+        const pagesConfig = SdkConfig.getObject("embedded_pages");
         let pageUrl = null;
         if (pagesConfig) {
-            pageUrl = pagesConfig.welcomeUrl;
+            pageUrl = pagesConfig.get("welcome_url");
         }
         if (!pageUrl) {
             pageUrl = 'welcome.html';
@@ -59,6 +55,8 @@ export default class Welcome extends React.PureComponent<IProps> {
                         replaceMap={{
                             "$riot:ssoUrl": "#/start_sso",
                             "$riot:casUrl": "#/start_cas",
+                            "$matrixLogo": MATRIX_LOGO_HTML,
+                            "[matrix]": MATRIX_LOGO_HTML,
                         }}
                     />
                     <LanguageSelector />
diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 22d2d1ab00d..76eea6cec06 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -45,6 +45,7 @@ interface IProps {
     onClick?: React.MouseEventHandler;
     inputRef?: React.RefObject<HTMLImageElement & HTMLSpanElement>;
     className?: string;
+    tabIndex?: number;
 }
 
 const calculateUrls = (url, urls, lowBandwidth) => {
diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx
index 0456a2e6340..06ee20cc08e 100644
--- a/src/components/views/avatars/DecoratedRoomAvatar.tsx
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@@ -21,6 +21,7 @@ import { User, UserEvent } from "matrix-js-sdk/src/models/user";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { JoinRule } from "matrix-js-sdk/src/@types/partials";
+import { UnstableValue } from "matrix-js-sdk/src/NamespacedValue";
 
 import RoomAvatar from "./RoomAvatar";
 import NotificationBadge from '../rooms/NotificationBadge';
@@ -31,7 +32,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IOOBData } from "../../../stores/ThreepidInviteStore";
 import TooltipTarget from "../elements/TooltipTarget";
 
@@ -50,6 +50,8 @@ interface IState {
     icon: Icon;
 }
 
+const BUSY_PRESENCE_NAME = new UnstableValue("busy", "org.matrix.msc3026.busy");
+
 enum Icon {
     // Note: the names here are used in CSS class names
     None = "NONE", // ... except this one
@@ -57,6 +59,7 @@ enum Icon {
     PresenceOnline = "ONLINE",
     PresenceAway = "AWAY",
     PresenceOffline = "OFFLINE",
+    PresenceBusy = "BUSY",
 }
 
 function tooltipText(variant: Icon) {
@@ -69,10 +72,11 @@ function tooltipText(variant: Icon) {
             return _t("Away");
         case Icon.PresenceOffline:
             return _t("Offline");
+        case Icon.PresenceBusy:
+            return _t("Busy");
     }
 }
 
-@replaceableComponent("views.avatars.DecoratedRoomAvatar")
 export default class DecoratedRoomAvatar extends React.PureComponent<IProps, IState> {
     private _dmUser: User;
     private isUnmounted = false;
@@ -141,7 +145,9 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
         let icon = Icon.None;
 
         const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === 'online';
-        if (isOnline) {
+        if (BUSY_PRESENCE_NAME.matches(this.dmUser.presence)) {
+            icon = Icon.PresenceBusy;
+        } else if (isOnline) {
             icon = Icon.PresenceOnline;
         } else if (this.dmUser.presence === 'offline') {
             icon = Icon.PresenceOffline;
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
deleted file mode 100644
index 5df58555c44..00000000000
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2017, 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { ResizeMethod } from 'matrix-js-sdk/src/@types/partials';
-
-import BaseAvatar from './BaseAvatar';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-export interface IProps {
-        groupId?: string;
-        groupName?: string;
-        groupAvatarUrl?: string;
-        width?: number;
-        height?: number;
-        resizeMethod?: ResizeMethod;
-        onClick?: React.MouseEventHandler;
-}
-
-@replaceableComponent("views.avatars.GroupAvatar")
-export default class GroupAvatar extends React.Component<IProps> {
-    public static defaultProps = {
-        width: 36,
-        height: 36,
-        resizeMethod: 'crop',
-    };
-
-    getGroupAvatarUrl() {
-        if (!this.props.groupAvatarUrl) return null;
-        return mediaFromMxc(this.props.groupAvatarUrl).getThumbnailOfSourceHttp(
-            this.props.width,
-            this.props.height,
-            this.props.resizeMethod,
-        );
-    }
-
-    render() {
-        // extract the props we use from props so we can pass any others through
-        // should consider adding this as a global rule in js-sdk?
-        /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
-        const { groupId, groupAvatarUrl, groupName, ...otherProps } = this.props;
-
-        return (
-            <BaseAvatar
-                name={groupName || this.props.groupId[1]}
-                idName={this.props.groupId}
-                url={this.getGroupAvatarUrl()}
-                {...otherProps}
-            />
-        );
-    }
-}
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index e00b9b4b857..76dc9e69621 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -23,15 +23,14 @@ import { logger } from "matrix-js-sdk/src/logger";
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import BaseAvatar from "./BaseAvatar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
-import { CardContext } from '../right_panel/BaseCard';
+import { CardContext } from '../right_panel/context';
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 import SettingsStore from "../../../settings/SettingsStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
-    member: RoomMember;
+    member: RoomMember | null;
     fallbackUserId?: string;
     width: number;
     height: number;
@@ -44,6 +43,7 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
     title?: string;
     style?: any;
     forceHistorical?: boolean; // true to deny `feature_use_only_current_profiles` usage. Default false.
+    hideTitle?: boolean;
 }
 
 interface IState {
@@ -52,7 +52,6 @@ interface IState {
     imageUrl?: string;
 }
 
-@replaceableComponent("views.avatars.MemberAvatar")
 export default class MemberAvatar extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         width: 40,
@@ -108,8 +107,16 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
     }
 
     render() {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        let { member, fallbackUserId, onClick, viewUserOnClick, forceHistorical, ...otherProps } = this.props;
+        let {
+            member,
+            fallbackUserId,
+            onClick,
+            viewUserOnClick,
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            forceHistorical,
+            hideTitle,
+            ...otherProps
+        } = this.props;
         const userId = member ? member.userId : fallbackUserId;
 
         if (viewUserOnClick) {
@@ -126,7 +133,7 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
             <BaseAvatar
                 {...otherProps}
                 name={this.state.name}
-                title={this.state.title}
+                title={hideTitle ? undefined : this.state.title}
                 idName={userId}
                 url={this.state.imageUrl}
                 onClick={onClick}
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index 9625b64138c..f50232fb220 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -28,7 +28,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
 import DMRoomMap from "../../../utils/DMRoomMap";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { IOOBData } from '../../../stores/ThreepidInviteStore';
 
@@ -52,7 +51,6 @@ interface IState {
     urls: string[];
 }
 
-@replaceableComponent("views.avatars.RoomAvatar")
 export default class RoomAvatar extends React.Component<IProps, IState> {
     public static defaultProps = {
         width: 36,
diff --git a/src/components/views/beacon/BeaconListItem.tsx b/src/components/views/beacon/BeaconListItem.tsx
new file mode 100644
index 00000000000..eda1580700e
--- /dev/null
+++ b/src/components/views/beacon/BeaconListItem.tsx
@@ -0,0 +1,82 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext } from 'react';
+import { Beacon, BeaconEvent } from 'matrix-js-sdk/src/matrix';
+import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { humanizeTime } from '../../../utils/humanize';
+import { _t } from '../../../languageHandler';
+import MemberAvatar from '../avatars/MemberAvatar';
+import CopyableText from '../elements/CopyableText';
+import BeaconStatus from './BeaconStatus';
+import { BeaconDisplayStatus } from './displayStatus';
+import StyledLiveBeaconIcon from './StyledLiveBeaconIcon';
+
+interface Props {
+    beacon: Beacon;
+}
+
+const BeaconListItem: React.FC<Props> = ({ beacon }) => {
+    const latestLocationState = useEventEmitterState(
+        beacon,
+        BeaconEvent.LocationUpdate,
+        () => beacon.latestLocationState,
+    );
+    const matrixClient = useContext(MatrixClientContext);
+    const room = matrixClient.getRoom(beacon.roomId);
+
+    if (!latestLocationState || !beacon.isLive) {
+        return null;
+    }
+
+    const isSelfLocation = beacon.beaconInfo.assetType === LocationAssetType.Self;
+    const beaconMember = isSelfLocation ?
+        room.getMember(beacon.beaconInfoOwner) :
+        undefined;
+
+    const humanizedUpdateTime = humanizeTime(latestLocationState.timestamp);
+
+    return <li className='mx_BeaconListItem'>
+        { isSelfLocation ?
+            <MemberAvatar
+                className='mx_BeaconListItem_avatar'
+                member={beaconMember}
+                height={32}
+                width={32}
+            /> :
+            <StyledLiveBeaconIcon className='mx_BeaconListItem_avatarIcon' />
+        }
+        <div className='mx_BeaconListItem_info'>
+            <BeaconStatus
+                className='mx_BeaconListItem_status'
+                beacon={beacon}
+                label={beaconMember?.name || beacon.beaconInfo.description || beacon.beaconInfoOwner}
+                displayStatus={BeaconDisplayStatus.Active}
+            >
+                <CopyableText
+                    border={false}
+                    getTextToCopy={() => latestLocationState?.uri}
+                />
+            </BeaconStatus>
+            <span className='mx_BeaconListItem_lastUpdated'>{ _t("Updated %(humanizedUpdateTime)s", { humanizedUpdateTime }) }</span>
+        </div>
+    </li>;
+};
+
+export default BeaconListItem;
diff --git a/src/components/views/beacon/BeaconMarker.tsx b/src/components/views/beacon/BeaconMarker.tsx
new file mode 100644
index 00000000000..f7f284b88ed
--- /dev/null
+++ b/src/components/views/beacon/BeaconMarker.tsx
@@ -0,0 +1,65 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext } from 'react';
+import maplibregl from 'maplibre-gl';
+import {
+    Beacon,
+    BeaconEvent,
+} from 'matrix-js-sdk/src/matrix';
+import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import SmartMarker from '../location/SmartMarker';
+
+interface Props {
+    map: maplibregl.Map;
+    beacon: Beacon;
+}
+
+/**
+ * Updates a map SmartMarker with latest location from given beacon
+ */
+const BeaconMarker: React.FC<Props> = ({ map, beacon }) => {
+    const latestLocationState = useEventEmitterState(
+        beacon,
+        BeaconEvent.LocationUpdate,
+        () => beacon.latestLocationState,
+    );
+    const matrixClient = useContext(MatrixClientContext);
+    const room = matrixClient.getRoom(beacon.roomId);
+
+    if (!latestLocationState || !beacon.isLive) {
+        return null;
+    }
+
+    const geoUri = latestLocationState?.uri;
+
+    const markerRoomMember = beacon.beaconInfo.assetType === LocationAssetType.Self ?
+        room.getMember(beacon.beaconInfoOwner) :
+        undefined;
+
+    return <SmartMarker
+        map={map}
+        id={beacon.identifier}
+        geoUri={geoUri}
+        roomMember={markerRoomMember}
+        useMemberColor
+    />;
+};
+
+export default BeaconMarker;
diff --git a/src/components/views/beacon/BeaconStatus.tsx b/src/components/views/beacon/BeaconStatus.tsx
new file mode 100644
index 00000000000..935e22f4f0b
--- /dev/null
+++ b/src/components/views/beacon/BeaconStatus.tsx
@@ -0,0 +1,86 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { HTMLProps } from 'react';
+import classNames from 'classnames';
+import { Beacon } from 'matrix-js-sdk/src/matrix';
+
+import StyledLiveBeaconIcon from './StyledLiveBeaconIcon';
+import { _t } from '../../../languageHandler';
+import LiveTimeRemaining from './LiveTimeRemaining';
+import { BeaconDisplayStatus } from './displayStatus';
+import { getBeaconExpiryTimestamp } from '../../../utils/beacon';
+import { formatTime } from '../../../DateUtils';
+
+interface Props {
+    displayStatus: BeaconDisplayStatus;
+    displayLiveTimeRemaining?: boolean;
+    withIcon?: boolean;
+    beacon?: Beacon;
+    label?: string;
+}
+
+const BeaconExpiryTime: React.FC<{ beacon: Beacon }> = ({ beacon }) => {
+    const expiryTime = formatTime(new Date(getBeaconExpiryTimestamp(beacon)));
+    return <span className='mx_BeaconStatus_expiryTime'>{ _t('Live until %(expiryTime)s', { expiryTime }) }</span>;
+};
+
+const BeaconStatus: React.FC<Props & HTMLProps<HTMLDivElement>> =
+    ({
+        beacon,
+        displayStatus,
+        displayLiveTimeRemaining,
+        label,
+        className,
+        children,
+        withIcon,
+        ...rest
+    }) => {
+        const isIdle = displayStatus === BeaconDisplayStatus.Loading ||
+            displayStatus === BeaconDisplayStatus.Stopped;
+
+        return <div
+            {...rest}
+            className={classNames('mx_BeaconStatus', `mx_BeaconStatus_${displayStatus}`, className)}
+        >
+            { withIcon && <StyledLiveBeaconIcon
+                className='mx_BeaconStatus_icon'
+                withError={displayStatus === BeaconDisplayStatus.Error}
+                isIdle={isIdle}
+            /> }
+            <div className='mx_BeaconStatus_description'>
+
+                { displayStatus === BeaconDisplayStatus.Loading && <span>{ _t('Loading live location...') }</span> }
+                { displayStatus === BeaconDisplayStatus.Stopped && <span>{ _t('Live location ended') }</span> }
+
+                { displayStatus === BeaconDisplayStatus.Error && <span>{ _t('Live location error') }</span> }
+
+                { displayStatus === BeaconDisplayStatus.Active && beacon && <>
+                    <>
+                        <span className='mx_BeaconStatus_label'>{ label }</span>
+                        { displayLiveTimeRemaining ?
+                            <LiveTimeRemaining beacon={beacon} /> :
+                            <BeaconExpiryTime beacon={beacon} />
+                        }
+                    </>
+                </>
+                }
+            </div>
+            { children }
+        </div>;
+    };
+
+export default BeaconStatus;
diff --git a/src/components/views/beacon/BeaconViewDialog.tsx b/src/components/views/beacon/BeaconViewDialog.tsx
new file mode 100644
index 00000000000..e6c4a423fe9
--- /dev/null
+++ b/src/components/views/beacon/BeaconViewDialog.tsx
@@ -0,0 +1,144 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useState, useRef } from 'react';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
+import {
+    Beacon,
+    Room,
+} from 'matrix-js-sdk/src/matrix';
+import maplibregl from 'maplibre-gl';
+
+import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';
+import { useLiveBeacons } from '../../../utils/beacon/useLiveBeacons';
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import BaseDialog from "../dialogs/BaseDialog";
+import { IDialogProps } from "../dialogs/IDialogProps";
+import Map from '../location/Map';
+import ZoomButtons from '../location/ZoomButtons';
+import BeaconMarker from './BeaconMarker';
+import { Bounds, getBeaconBounds } from '../../../utils/beacon/bounds';
+import { getGeoUri } from '../../../utils/beacon';
+import { Icon as LocationIcon } from '../../../../res/img/element-icons/location.svg';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
+import DialogSidebar from './DialogSidebar';
+import DialogOwnBeaconStatus from './DialogOwnBeaconStatus';
+
+interface IProps extends IDialogProps {
+    roomId: Room['roomId'];
+    matrixClient: MatrixClient;
+    // open the map centered on this beacon's location
+    focusBeacon?: Beacon;
+}
+
+const getBoundsCenter = (bounds: Bounds): string | undefined => {
+    if (!bounds) {
+        return;
+    }
+    return getGeoUri({
+        latitude: (bounds.north + bounds.south) / 2,
+        longitude: (bounds.east + bounds.west) / 2,
+        timestamp: Date.now(),
+    });
+};
+
+const useInitialMapPosition = (liveBeacons: Beacon[], focusBeacon?: Beacon): {
+    bounds?: Bounds; centerGeoUri: string;
+} => {
+    const bounds = useRef<Bounds | undefined>(getBeaconBounds(liveBeacons));
+    const centerGeoUri = useRef<string>(
+        focusBeacon?.latestLocationState?.uri ||
+        getBoundsCenter(bounds.current),
+    );
+    return { bounds: bounds.current, centerGeoUri: centerGeoUri.current };
+};
+
+/**
+ * Dialog to view live beacons maximised
+ */
+const BeaconViewDialog: React.FC<IProps> = ({
+    focusBeacon,
+    roomId,
+    matrixClient,
+    onFinished,
+}) => {
+    const liveBeacons = useLiveBeacons(roomId, matrixClient);
+
+    const [isSidebarOpen, setSidebarOpen] = useState(false);
+
+    const { bounds, centerGeoUri } = useInitialMapPosition(liveBeacons, focusBeacon);
+
+    return (
+        <BaseDialog
+            className='mx_BeaconViewDialog'
+            onFinished={onFinished}
+            fixedWidth={false}
+        >
+            <MatrixClientContext.Provider value={matrixClient}>
+                { !!liveBeacons?.length ? <Map
+                    id='mx_BeaconViewDialog'
+                    bounds={bounds}
+                    centerGeoUri={centerGeoUri}
+                    interactive
+                    className="mx_BeaconViewDialog_map"
+                >
+                    {
+                        ({ map }: { map: maplibregl.Map}) =>
+                            <>
+                                { liveBeacons.map(beacon => <BeaconMarker
+                                    key={beacon.identifier}
+                                    map={map}
+                                    beacon={beacon}
+                                />) }
+                                <ZoomButtons map={map} />
+                            </>
+                    }
+                </Map> :
+                    <div
+                        data-test-id='beacon-view-dialog-map-fallback'
+                        className='mx_BeaconViewDialog_map mx_BeaconViewDialog_mapFallback'
+                    >
+                        <LocationIcon className='mx_BeaconViewDialog_mapFallbackIcon' />
+                        <span className='mx_BeaconViewDialog_mapFallbackMessage'>{ _t('No live locations') }</span>
+                        <AccessibleButton
+                            kind='primary'
+                            onClick={onFinished}
+                            data-test-id='beacon-view-dialog-fallback-close'
+                        >
+                            { _t('Close') }
+                        </AccessibleButton>
+                    </div>
+                }
+                { isSidebarOpen ?
+                    <DialogSidebar beacons={liveBeacons} requestClose={() => setSidebarOpen(false)} /> :
+                    <AccessibleButton
+                        kind='primary'
+                        onClick={() => setSidebarOpen(true)}
+                        data-test-id='beacon-view-dialog-open-sidebar'
+                        className='mx_BeaconViewDialog_viewListButton'
+                    >
+                        <LiveLocationIcon height={12} />&nbsp;
+                        { _t('View list') }
+                    </AccessibleButton>
+                }
+                <DialogOwnBeaconStatus roomId={roomId} />
+            </MatrixClientContext.Provider>
+        </BaseDialog>
+    );
+};
+
+export default BeaconViewDialog;
diff --git a/src/components/views/beacon/DialogOwnBeaconStatus.tsx b/src/components/views/beacon/DialogOwnBeaconStatus.tsx
new file mode 100644
index 00000000000..6ae1e8f5b8f
--- /dev/null
+++ b/src/components/views/beacon/DialogOwnBeaconStatus.tsx
@@ -0,0 +1,80 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext } from 'react';
+import { Room, Beacon } from 'matrix-js-sdk/src/matrix';
+import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+
+import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../stores/OwnBeaconStore';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { OwnProfileStore } from '../../../stores/OwnProfileStore';
+import OwnBeaconStatus from './OwnBeaconStatus';
+import { BeaconDisplayStatus } from './displayStatus';
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import MemberAvatar from '../avatars/MemberAvatar';
+import StyledLiveBeaconIcon from './StyledLiveBeaconIcon';
+
+interface Props {
+    roomId: Room['roomId'];
+}
+
+const useOwnBeacon = (roomId: Room['roomId']): Beacon | undefined => {
+    const ownBeacon = useEventEmitterState(
+        OwnProfileStore.instance,
+        OwnBeaconStoreEvent.LivenessChange,
+        () => {
+            const [ownBeaconId] = OwnBeaconStore.instance.getLiveBeaconIds(roomId);
+            return OwnBeaconStore.instance.getBeaconById(ownBeaconId);
+        },
+    );
+
+    return ownBeacon;
+};
+
+const DialogOwnBeaconStatus: React.FC<Props> = ({ roomId }) => {
+    const beacon = useOwnBeacon(roomId);
+
+    const matrixClient = useContext(MatrixClientContext);
+    const room = matrixClient.getRoom(roomId);
+
+    if (!beacon?.isLive) {
+        return null;
+    }
+
+    const isSelfLocation = beacon.beaconInfo.assetType === LocationAssetType.Self;
+    const beaconMember = isSelfLocation ?
+        room.getMember(beacon.beaconInfoOwner) :
+        undefined;
+
+    return <div className='mx_DialogOwnBeaconStatus'>
+        { isSelfLocation ?
+            <MemberAvatar
+                className='mx_DialogOwnBeaconStatus_avatar'
+                member={beaconMember}
+                height={32}
+                width={32}
+            /> :
+            <StyledLiveBeaconIcon className='mx_DialogOwnBeaconStatus_avatarIcon' />
+        }
+        <OwnBeaconStatus
+            className='mx_DialogOwnBeaconStatus_status'
+            beacon={beacon}
+            displayStatus={BeaconDisplayStatus.Active}
+        />
+    </div>;
+};
+
+export default DialogOwnBeaconStatus;
diff --git a/src/components/views/beacon/DialogSidebar.tsx b/src/components/views/beacon/DialogSidebar.tsx
new file mode 100644
index 00000000000..4365b5fa8b6
--- /dev/null
+++ b/src/components/views/beacon/DialogSidebar.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { Beacon } from 'matrix-js-sdk/src/matrix';
+
+import { Icon as CloseIcon } from '../../../../res/img/image-view/close.svg';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
+import Heading from '../typography/Heading';
+import BeaconListItem from './BeaconListItem';
+
+interface Props {
+    beacons: Beacon[];
+    requestClose: () => void;
+}
+
+const DialogSidebar: React.FC<Props> = ({ beacons, requestClose }) => {
+    return <div className='mx_DialogSidebar'>
+        <div className='mx_DialogSidebar_header'>
+            <Heading size='h4'>{ _t('View List') }</Heading>
+            <AccessibleButton
+                className='mx_DialogSidebar_closeButton'
+                onClick={requestClose}
+                title={_t('Close sidebar')}
+                data-test-id='dialog-sidebar-close'
+            >
+                <CloseIcon className='mx_DialogSidebar_closeButtonIcon' />
+            </AccessibleButton>
+        </div>
+        <ol className='mx_DialogSidebar_list'>
+            { beacons.map((beacon) => <BeaconListItem key={beacon.identifier} beacon={beacon} />) }
+        </ol>
+    </div>;
+};
+
+export default DialogSidebar;
diff --git a/src/components/views/beacon/LeftPanelLiveShareWarning.tsx b/src/components/views/beacon/LeftPanelLiveShareWarning.tsx
new file mode 100644
index 00000000000..43b00a8fa76
--- /dev/null
+++ b/src/components/views/beacon/LeftPanelLiveShareWarning.tsx
@@ -0,0 +1,124 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import classNames from 'classnames';
+import React from 'react';
+import { BeaconIdentifier, Room } from 'matrix-js-sdk/src/matrix';
+
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { _t } from '../../../languageHandler';
+import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../stores/OwnBeaconStore';
+import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';
+import { ViewRoomPayload } from '../../../dispatcher/payloads/ViewRoomPayload';
+import { Action } from '../../../dispatcher/actions';
+import dispatcher from '../../../dispatcher/dispatcher';
+import AccessibleButton from '../elements/AccessibleButton';
+
+interface Props {
+    isMinimized?: boolean;
+}
+
+/**
+ * Choose the most relevant beacon
+ * and get its roomId
+ */
+const chooseBestBeaconRoomId = (
+    liveBeaconIds: BeaconIdentifier[],
+    updateErrorBeaconIds: BeaconIdentifier[],
+    locationErrorBeaconIds: BeaconIdentifier[],
+): Room['roomId'] | undefined => {
+    // both lists are ordered by creation timestamp in store
+    // so select latest beacon
+    const beaconId = updateErrorBeaconIds?.[0] ?? locationErrorBeaconIds?.[0] ?? liveBeaconIds?.[0];
+    if (!beaconId) {
+        return undefined;
+    }
+    const beacon = OwnBeaconStore.instance.getBeaconById(beaconId);
+
+    return beacon?.roomId;
+};
+
+const getLabel = (hasStoppingErrors: boolean, hasLocationErrors: boolean): string => {
+    if (hasStoppingErrors) {
+        return _t('An error occurred while stopping your live location');
+    }
+    if (hasLocationErrors) {
+        return _t('An error occured whilst sharing your live location');
+    }
+    return _t('You are sharing your live location');
+};
+
+const LeftPanelLiveShareWarning: React.FC<Props> = ({ isMinimized }) => {
+    const isMonitoringLiveLocation = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.MonitoringLivePosition,
+        () => OwnBeaconStore.instance.isMonitoringLiveLocation,
+    );
+
+    const beaconIdsWithLocationPublishError = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.LocationPublishError,
+        () => OwnBeaconStore.instance.getLiveBeaconIdsWithLocationPublishError(),
+    );
+
+    const beaconIdsWithStoppingError = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.BeaconUpdateError,
+        () => OwnBeaconStore.instance.getLiveBeaconIds().filter(
+            beaconId => OwnBeaconStore.instance.beaconUpdateErrors.has(beaconId),
+        ),
+    );
+
+    const liveBeaconIds = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.LivenessChange,
+        () => OwnBeaconStore.instance.getLiveBeaconIds(),
+    );
+
+    const hasLocationPublishErrors = !!beaconIdsWithLocationPublishError.length;
+    const hasStoppingErrors = !!beaconIdsWithStoppingError.length;
+
+    if (!isMonitoringLiveLocation) {
+        return null;
+    }
+
+    const relevantBeaconRoomId = chooseBestBeaconRoomId(
+        liveBeaconIds, beaconIdsWithStoppingError, beaconIdsWithLocationPublishError,
+    );
+
+    const onWarningClick = relevantBeaconRoomId ? () => {
+        dispatcher.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: relevantBeaconRoomId,
+            metricsTrigger: undefined,
+        });
+    } : undefined;
+
+    const label = getLabel(hasStoppingErrors, hasLocationPublishErrors);
+
+    return <AccessibleButton
+        className={classNames('mx_LeftPanelLiveShareWarning', {
+            'mx_LeftPanelLiveShareWarning__minimized': isMinimized,
+            'mx_LeftPanelLiveShareWarning__error': hasLocationPublishErrors || hasStoppingErrors,
+        })}
+        title={isMinimized ? label : undefined}
+        onClick={onWarningClick}
+    >
+        { isMinimized ? <LiveLocationIcon height={10} /> : label }
+    </AccessibleButton>;
+};
+
+export default LeftPanelLiveShareWarning;
diff --git a/src/components/views/beacon/LiveTimeRemaining.tsx b/src/components/views/beacon/LiveTimeRemaining.tsx
new file mode 100644
index 00000000000..1f25706a13f
--- /dev/null
+++ b/src/components/views/beacon/LiveTimeRemaining.tsx
@@ -0,0 +1,75 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useCallback, useEffect, useState } from 'react';
+import { BeaconEvent, Beacon } from 'matrix-js-sdk/src/matrix';
+
+import { formatDuration } from '../../../DateUtils';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { useInterval } from '../../../hooks/useTimeout';
+import { _t } from '../../../languageHandler';
+import { getBeaconMsUntilExpiry } from '../../../utils/beacon';
+
+const MINUTE_MS = 60000;
+const HOUR_MS = MINUTE_MS * 60;
+const getUpdateInterval = (ms: number) => {
+    // every 10 mins when more than an hour
+    if (ms > HOUR_MS) {
+        return MINUTE_MS * 10;
+    }
+    // every minute when more than a minute
+    if (ms > MINUTE_MS) {
+        return MINUTE_MS;
+    }
+    // otherwise every second
+    return 1000;
+};
+const useMsRemaining = (beacon: Beacon): number => {
+    const beaconInfo = useEventEmitterState(
+        beacon,
+        BeaconEvent.Update,
+        () => beacon.beaconInfo,
+    );
+
+    const [msRemaining, setMsRemaining] = useState(() => getBeaconMsUntilExpiry(beaconInfo));
+
+    useEffect(() => {
+        setMsRemaining(getBeaconMsUntilExpiry(beaconInfo));
+    }, [beaconInfo]);
+
+    const updateMsRemaining = useCallback(() => {
+        const ms = getBeaconMsUntilExpiry(beaconInfo);
+        setMsRemaining(ms);
+    }, [beaconInfo]);
+
+    useInterval(updateMsRemaining, getUpdateInterval(msRemaining));
+
+    return msRemaining;
+};
+
+const LiveTimeRemaining: React.FC<{ beacon: Beacon }> = ({ beacon }) => {
+    const msRemaining = useMsRemaining(beacon);
+
+    const timeRemaining = formatDuration(msRemaining);
+    const liveTimeRemaining = _t(`%(timeRemaining)s left`, { timeRemaining });
+
+    return <span
+        data-test-id='room-live-share-expiry'
+        className="mx_LiveTimeRemaining"
+    >{ liveTimeRemaining }</span>;
+};
+
+export default LiveTimeRemaining;
diff --git a/src/components/views/beacon/OwnBeaconStatus.tsx b/src/components/views/beacon/OwnBeaconStatus.tsx
new file mode 100644
index 00000000000..3ef2de7a72a
--- /dev/null
+++ b/src/components/views/beacon/OwnBeaconStatus.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Beacon } from 'matrix-js-sdk/src/matrix';
+import React, { HTMLProps } from 'react';
+
+import { _t } from '../../../languageHandler';
+import { useOwnLiveBeacons } from '../../../utils/beacon';
+import BeaconStatus from './BeaconStatus';
+import { BeaconDisplayStatus } from './displayStatus';
+import AccessibleButton from '../elements/AccessibleButton';
+
+interface Props {
+    displayStatus: BeaconDisplayStatus;
+    className?: string;
+    beacon?: Beacon;
+    withIcon?: boolean;
+}
+
+/**
+ * Wraps BeaconStatus with more capabilities
+ * for errors and actions available for users own live beacons
+ */
+const OwnBeaconStatus: React.FC<Props & HTMLProps<HTMLDivElement>> = ({
+    beacon, displayStatus, ...rest
+}) => {
+    const {
+        hasLocationPublishError,
+        hasStopSharingError,
+        stoppingInProgress,
+        onStopSharing,
+        onResetLocationPublishError,
+    } = useOwnLiveBeacons([beacon?.identifier]);
+
+    // combine display status with errors that only occur for user's own beacons
+    const ownDisplayStatus = hasLocationPublishError || hasStopSharingError ?
+        BeaconDisplayStatus.Error :
+        displayStatus;
+
+    return <BeaconStatus
+        beacon={beacon}
+        displayStatus={ownDisplayStatus}
+        label={_t('Live location enabled')}
+        displayLiveTimeRemaining
+        {...rest}
+    >
+        { ownDisplayStatus === BeaconDisplayStatus.Active && <AccessibleButton
+            data-test-id='beacon-status-stop-beacon'
+            kind='link'
+            onClick={onStopSharing}
+            className='mx_OwnBeaconStatus_button mx_OwnBeaconStatus_destructiveButton'
+            disabled={stoppingInProgress}
+        >
+            { _t('Stop') }
+        </AccessibleButton>
+        }
+        { hasLocationPublishError && <AccessibleButton
+            data-test-id='beacon-status-reset-wire-error'
+            kind='link'
+            onClick={onResetLocationPublishError}
+            className='mx_OwnBeaconStatus_button mx_OwnBeaconStatus_destructiveButton'
+        >
+            { _t('Retry') }
+        </AccessibleButton>
+        }
+        { hasStopSharingError && <AccessibleButton
+            data-test-id='beacon-status-stop-beacon-retry'
+            kind='link'
+            onClick={onStopSharing}
+            className='mx_OwnBeaconStatus_button mx_OwnBeaconStatus_destructiveButton'
+        >
+            { _t('Retry') }
+        </AccessibleButton> }
+    </BeaconStatus>;
+};
+
+export default OwnBeaconStatus;
diff --git a/src/components/views/beacon/RoomLiveShareWarning.tsx b/src/components/views/beacon/RoomLiveShareWarning.tsx
new file mode 100644
index 00000000000..2fe76a10e88
--- /dev/null
+++ b/src/components/views/beacon/RoomLiveShareWarning.tsx
@@ -0,0 +1,130 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { Room } from 'matrix-js-sdk/src/matrix';
+
+import { _t } from '../../../languageHandler';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../stores/OwnBeaconStore';
+import { useOwnLiveBeacons } from '../../../utils/beacon';
+import AccessibleButton from '../elements/AccessibleButton';
+import Spinner from '../elements/Spinner';
+import StyledLiveBeaconIcon from './StyledLiveBeaconIcon';
+import { Icon as CloseIcon } from '../../../../res/img/image-view/close.svg';
+import LiveTimeRemaining from './LiveTimeRemaining';
+
+const getLabel = (hasLocationPublishError: boolean, hasStopSharingError: boolean): string => {
+    if (hasLocationPublishError) {
+        return _t('An error occured whilst sharing your live location, please try again');
+    }
+    if (hasStopSharingError) {
+        return _t('An error occurred while stopping your live location, please try again');
+    }
+    return _t('You are sharing your live location');
+};
+
+interface RoomLiveShareWarningInnerProps {
+    liveBeaconIds: string[];
+    roomId: Room['roomId'];
+}
+const RoomLiveShareWarningInner: React.FC<RoomLiveShareWarningInnerProps> = ({ liveBeaconIds, roomId }) => {
+    const {
+        onStopSharing,
+        onResetLocationPublishError,
+        beacon,
+        stoppingInProgress,
+        hasStopSharingError,
+        hasLocationPublishError,
+    } = useOwnLiveBeacons(liveBeaconIds);
+
+    if (!beacon) {
+        return null;
+    }
+
+    const hasError = hasStopSharingError || hasLocationPublishError;
+
+    const onButtonClick = () => {
+        if (hasLocationPublishError) {
+            onResetLocationPublishError();
+        } else {
+            onStopSharing();
+        }
+    };
+
+    return <div
+        className='mx_RoomLiveShareWarning'
+    >
+        <StyledLiveBeaconIcon className="mx_RoomLiveShareWarning_icon" withError={hasError} />
+
+        <span className="mx_RoomLiveShareWarning_label">
+            { getLabel(hasLocationPublishError, hasStopSharingError) }
+        </span>
+
+        { stoppingInProgress &&
+            <span className='mx_RoomLiveShareWarning_spinner'><Spinner h={16} w={16} /></span>
+        }
+        { !stoppingInProgress && !hasError && <LiveTimeRemaining beacon={beacon} /> }
+
+        <AccessibleButton
+            className='mx_RoomLiveShareWarning_stopButton'
+            data-test-id='room-live-share-primary-button'
+            onClick={onButtonClick}
+            kind='danger'
+            element='button'
+            disabled={stoppingInProgress}
+        >
+            { hasError ? _t('Retry') : _t('Stop sharing') }
+        </AccessibleButton>
+        { hasLocationPublishError && <AccessibleButton
+            data-test-id='room-live-share-wire-error-close-button'
+            title={_t('Stop sharing and close')}
+            element='button'
+            className='mx_RoomLiveShareWarning_closeButton'
+            onClick={onStopSharing}
+        >
+            <CloseIcon className='mx_RoomLiveShareWarning_closeButtonIcon' />
+        </AccessibleButton> }
+    </div>;
+};
+
+interface Props {
+    roomId: Room['roomId'];
+}
+const RoomLiveShareWarning: React.FC<Props> = ({ roomId }) => {
+    // do we have an active geolocation.watchPosition
+    const isMonitoringLiveLocation = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.MonitoringLivePosition,
+        () => OwnBeaconStore.instance.isMonitoringLiveLocation,
+    );
+
+    const liveBeaconIds = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.LivenessChange,
+        () => OwnBeaconStore.instance.getLiveBeaconIds(roomId),
+    );
+
+    if (!isMonitoringLiveLocation || !liveBeaconIds.length) {
+        return null;
+    }
+
+    // split into outer/inner to avoid watching various parts of live beacon state
+    // when there are none
+    return <RoomLiveShareWarningInner liveBeaconIds={liveBeaconIds} roomId={roomId} />;
+};
+
+export default RoomLiveShareWarning;
diff --git a/src/components/views/beacon/StyledLiveBeaconIcon.tsx b/src/components/views/beacon/StyledLiveBeaconIcon.tsx
new file mode 100644
index 00000000000..74b5ae70621
--- /dev/null
+++ b/src/components/views/beacon/StyledLiveBeaconIcon.tsx
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import classNames from 'classnames';
+
+import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';
+
+interface Props extends React.SVGProps<SVGSVGElement> {
+    // use error styling when true
+    withError?: boolean;
+    isIdle?: boolean;
+}
+const StyledLiveBeaconIcon: React.FC<Props> = ({ className, withError, isIdle, ...props }) =>
+    <LiveLocationIcon
+        {...props}
+        className={classNames(
+            'mx_StyledLiveBeaconIcon',
+            className,
+            {
+                'mx_StyledLiveBeaconIcon_error': withError,
+                'mx_StyledLiveBeaconIcon_idle': isIdle,
+
+            })}
+    />;
+
+export default StyledLiveBeaconIcon;
diff --git a/src/components/views/beacon/displayStatus.ts b/src/components/views/beacon/displayStatus.ts
new file mode 100644
index 00000000000..ee65991070f
--- /dev/null
+++ b/src/components/views/beacon/displayStatus.ts
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { BeaconLocationState } from "matrix-js-sdk/src/content-helpers";
+
+export enum BeaconDisplayStatus {
+    Loading = 'Loading',
+    Error = 'Error',
+    Stopped = 'Stopped',
+    Active = 'Active',
+}
+export const getBeaconDisplayStatus = (
+    isLive: boolean,
+    latestLocationState?: BeaconLocationState,
+    error?: Error): BeaconDisplayStatus => {
+    if (error) {
+        return BeaconDisplayStatus.Error;
+    }
+    if (!isLive) {
+        return BeaconDisplayStatus.Stopped;
+    }
+
+    if (!latestLocationState) {
+        return BeaconDisplayStatus.Loading;
+    }
+    if (latestLocationState) {
+        return BeaconDisplayStatus.Active;
+    }
+};
diff --git a/src/components/views/beta/BetaCard.tsx b/src/components/views/beta/BetaCard.tsx
index 561de940d2a..4639886b701 100644
--- a/src/components/views/beta/BetaCard.tsx
+++ b/src/components/views/beta/BetaCard.tsx
@@ -36,17 +36,27 @@ interface IProps {
     featureId: string;
 }
 
-export const BetaPill = ({ onClick }: { onClick?: () => void }) => {
+interface IBetaPillProps {
+    onClick?: () => void;
+    tooltipTitle?: string;
+    tooltipCaption?: string;
+}
+
+export const BetaPill = ({
+    onClick,
+    tooltipTitle = _t("This is a beta feature"),
+    tooltipCaption = _t("Click for more info"),
+}: IBetaPillProps) => {
     if (onClick) {
         return <AccessibleTooltipButton
             className="mx_BetaCard_betaPill"
-            title={_t("This is a beta feature. Click for more info")}
+            title={`${tooltipTitle} ${tooltipCaption}`}
             tooltip={<div>
                 <div className="mx_Tooltip_title">
-                    { _t("This is a beta feature") }
+                    { tooltipTitle }
                 </div>
                 <div className="mx_Tooltip_sub">
-                    { _t("Click for more info") }
+                    { tooltipCaption }
                 </div>
             </div>}
             onClick={onClick}
@@ -101,12 +111,12 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
 
     return <div className="mx_BetaCard">
         <div className="mx_BetaCard_columns">
-            <div>
+            <div className="mx_BetaCard_columns_description">
                 <h3 className="mx_BetaCard_title">
-                    { titleOverride || _t(title) }
+                    <span>{ titleOverride || _t(title) }</span>
                     <BetaPill />
                 </h3>
-                <span className="mx_BetaCard_caption">{ caption() }</span>
+                <div className="mx_BetaCard_caption">{ caption() }</div>
                 <div className="mx_BetaCard_buttons">
                     { feedbackButton }
                     <AccessibleButton
@@ -132,7 +142,9 @@ const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
                     { disclaimer(value) }
                 </div> }
             </div>
-            <img src={image} alt="" />
+            <div className="mx_BetaCard_columns_image_wrapper">
+                <img className="mx_BetaCard_columns_image" src={image} alt="" />
+            </div>
         </div>
         { extraSettings && value && <div className="mx_BetaCard_relatedSettings">
             { extraSettings.map(key => (
diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx
index ec835d1e312..8c9e07dfcc5 100644
--- a/src/components/views/context_menus/CallContextMenu.tsx
+++ b/src/components/views/context_menus/CallContextMenu.tsx
@@ -21,13 +21,11 @@ import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import { _t } from '../../../languageHandler';
 import ContextMenu, { IProps as IContextMenuProps, MenuItem } from '../../structures/ContextMenu';
 import CallHandler from '../../../CallHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
 }
 
-@replaceableComponent("views.context_menus.CallContextMenu")
 export default class CallContextMenu extends React.Component<IProps> {
     static propTypes = {
         // js-sdk User object. Not required because it might not exist.
diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx
index 70a5aae2e8c..f6530452d0d 100644
--- a/src/components/views/context_menus/DialpadContextMenu.tsx
+++ b/src/components/views/context_menus/DialpadContextMenu.tsx
@@ -22,7 +22,6 @@ import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import ContextMenu, { IProps as IContextMenuProps } from '../../structures/ContextMenu';
 import Field from "../elements/Field";
 import DialPad from '../voip/DialPad';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
@@ -32,7 +31,6 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.context_menus.DialpadContextMenu")
 export default class DialpadContextMenu extends React.Component<IProps, IState> {
     private numberEntryFieldRef: React.RefObject<Field> = createRef();
 
diff --git a/src/components/views/context_menus/GenericElementContextMenu.tsx b/src/components/views/context_menus/GenericElementContextMenu.tsx
index d5ebfca26eb..7b53dc0ed9a 100644
--- a/src/components/views/context_menus/GenericElementContextMenu.tsx
+++ b/src/components/views/context_menus/GenericElementContextMenu.tsx
@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     element: React.ReactNode;
     // Function to be called when the parent window is resized
@@ -30,7 +28,6 @@ interface IProps {
  * This component can be used to display generic HTML content in a contextual
  * menu.
  */
-@replaceableComponent("views.context_menus.GenericElementContextMenu")
 export default class GenericElementContextMenu extends React.Component<IProps> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/context_menus/GenericTextContextMenu.tsx b/src/components/views/context_menus/GenericTextContextMenu.tsx
index d25c7086222..0f6cc708a18 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.tsx
+++ b/src/components/views/context_menus/GenericTextContextMenu.tsx
@@ -16,13 +16,10 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     message: string;
 }
 
-@replaceableComponent("views.context_menus.GenericTextContextMenu")
 export default class GenericTextContextMenu extends React.Component<IProps> {
     public render(): JSX.Element {
         return <div className="mx_Tooltip mx_Tooltip_visible" style={{ display: "block" }}>
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
deleted file mode 100644
index 3cd2cd7ec6b..00000000000
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright 2018 Vector Creations Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Group } from 'matrix-js-sdk/src/models/group';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import Modal from '../../../Modal';
-import GroupStore from "../../../stores/GroupStore";
-import { MenuItem } from "../../structures/ContextMenu";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.context_menus.GroupInviteTileContextMenu")
-export default class GroupInviteTileContextMenu extends React.Component {
-    static propTypes = {
-        group: PropTypes.instanceOf(Group).isRequired,
-        /* callback called when the menu is dismissed */
-        onFinished: PropTypes.func,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this._onClickReject = this._onClickReject.bind(this);
-    }
-
-    componentDidMount() {
-        this._unmounted = false;
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-    }
-
-    _onClickReject() {
-        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
-        Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
-            title: _t('Reject invitation'),
-            description: _t('Are you sure you want to reject the invitation?'),
-            onFinished: async (shouldLeave) => {
-                if (!shouldLeave) return;
-
-                // FIXME: controller shouldn't be loading a view :(
-                const Loader = sdk.getComponent("elements.Spinner");
-                const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
-
-                try {
-                    await GroupStore.leaveGroup(this.props.group.groupId);
-                } catch (e) {
-                    logger.error("Error rejecting community invite: ", e);
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, {
-                        title: _t("Error"),
-                        description: _t("Unable to reject invite"),
-                    });
-                } finally {
-                    modal.close();
-                }
-            },
-        });
-
-        // Close the context menu
-        if (this.props.onFinished) {
-            this.props.onFinished();
-        }
-    }
-
-    render() {
-        return <div>
-            <MenuItem className="mx_RoomTileContextMenu_leave" onClick={this._onClickReject}>
-                <img className="mx_RoomTileContextMenu_tag_icon" src={require("../../../../res/img/icon_context_delete.svg").default} width="15" height="15" alt="" />
-                { _t('Reject') }
-            </MenuItem>
-        </div>;
-    }
-}
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
index 28089fb70f7..917091ece83 100644
--- a/src/components/views/context_menus/MessageContextMenu.tsx
+++ b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -1,6 +1,7 @@
 /*
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,12 +16,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactElement } from 'react';
+import React, { createRef } from 'react';
 import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { Relations } from 'matrix-js-sdk/src/models/relations';
 import { RoomMemberEvent } from "matrix-js-sdk/src/models/room-member";
-import { LOCATION_EVENT_TYPE } from 'matrix-js-sdk/src/@types/location';
 import { M_POLL_START } from "matrix-events-sdk";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -30,80 +30,81 @@ import Modal from '../../../Modal';
 import Resend from '../../../Resend';
 import SettingsStore from '../../../settings/SettingsStore';
 import { isUrlPermitted } from '../../../HtmlUtils';
-import { isContentActionable } from '../../../utils/EventUtils';
+import { canEditContent, canForward, editEvent, isContentActionable, isLocationEvent } from '../../../utils/EventUtils';
 import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from './IconizedContextMenu';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
-import ForwardDialog from "../dialogs/ForwardDialog";
+import { ReadPinsEventId } from "../right_panel/types";
 import { Action } from "../../../dispatcher/actions";
-import ReportEventDialog from '../dialogs/ReportEventDialog';
+import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
+import { ButtonEvent } from '../elements/AccessibleButton';
+import { copyPlaintext, getSelectedText } from '../../../utils/strings';
+import ContextMenu, { toRightOf } from '../../structures/ContextMenu';
+import ReactionPicker from '../emojipicker/ReactionPicker';
 import ViewSource from '../../structures/ViewSource';
 import { createRedactEventDialog } from '../dialogs/ConfirmRedactDialog';
 import ShareDialog from '../dialogs/ShareDialog';
-import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
-import { ChevronFace, IPosition } from '../../structures/ContextMenu';
+import { IPosition, ChevronFace } from '../../structures/ContextMenu';
 import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
 import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
-import { WidgetLayoutStore } from '../../../stores/widgets/WidgetLayoutStore';
 import EndPollDialog from '../dialogs/EndPollDialog';
 import { isPollEnded } from '../messages/MPollBody';
-import { createMapSiteLink } from "../messages/MLocationBody";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-
-export function canCancel(status: EventStatus): boolean {
-    return status === EventStatus.QUEUED || status === EventStatus.NOT_SENT || status === EventStatus.ENCRYPTING;
-}
-
-export interface IEventTileOps {
-    isWidgetHidden(): boolean;
-    unhideWidget(): void;
-}
-
-export interface IOperableEventTile {
-    getEventTileOps(): IEventTileOps;
-}
+import { GetRelationsForEvent, IEventTileOps } from "../rooms/EventTile";
+import { OpenForwardDialogPayload } from "../../../dispatcher/payloads/OpenForwardDialogPayload";
+import { OpenReportEventDialogPayload } from "../../../dispatcher/payloads/OpenReportEventDialogPayload";
+import { createMapSiteLink } from '../../../utils/location';
 
 interface IProps extends IPosition {
     chevronFace: ChevronFace;
     /* the MatrixEvent associated with the context menu */
     mxEvent: MatrixEvent;
-    /* an optional EventTileOps implementation that can be used to unhide preview widgets */
+    // An optional EventTileOps implementation that can be used to unhide preview widgets
     eventTileOps?: IEventTileOps;
+    // Callback called when the menu is dismissed
     permalinkCreator?: RoomPermalinkCreator;
     /* an optional function to be called when the user clicks collapse thread, if not provided hide button */
     collapseReplyChain?(): void;
     /* callback called when the menu is dismissed */
     onFinished(): void;
-    /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
+    // If the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding)
     onCloseDialog?(): void;
-    getRelationsForEvent?: (
-        eventId: string,
-        relationType: string,
-        eventType: string
-    ) => Relations;
+    // True if the menu is being used as a right click menu
+    rightClick?: boolean;
+    // The Relations model from the JS SDK for reactions to `mxEvent`
+    reactions?: Relations;
+    // A permalink to the event
+    showPermalink?: boolean;
+
+    getRelationsForEvent?: GetRelationsForEvent;
 }
 
 interface IState {
     canRedact: boolean;
     canPin: boolean;
+    reactionPickerDisplayed: boolean;
 }
 
-@replaceableComponent("views.context_menus.MessageContextMenu")
 export default class MessageContextMenu extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
 
-    state = {
-        canRedact: false,
-        canPin: false,
-    };
+    private reactButtonRef = createRef<any>(); // XXX Ref to a functional component
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            canRedact: false,
+            canPin: false,
+            reactionPickerDisplayed: false,
+        };
+    }
 
-    componentDidMount() {
+    public componentDidMount() {
         MatrixClientPeg.get().on(RoomMemberEvent.PowerLevel, this.checkPermissions);
         this.checkPermissions();
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount(): void {
         const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener(RoomMemberEvent.PowerLevel, this.checkPermissions);
@@ -156,9 +157,10 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
     };
 
     private onReportEventClick = (): void => {
-        Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
-            mxEvent: this.props.mxEvent,
-        }, 'mx_Dialog_reportEvent');
+        dis.dispatch<OpenReportEventDialogPayload>({
+            action: Action.OpenReportEventDialog,
+            event: this.props.mxEvent,
+        });
         this.closeMenu();
     };
 
@@ -179,8 +181,8 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
     };
 
     private onForwardClick = (): void => {
-        Modal.createTrackedDialog('Forward Message', '', ForwardDialog, {
-            matrixClient: MatrixClientPeg.get(),
+        dis.dispatch<OpenForwardDialogPayload>({
+            action: Action.OpenForwardDialog,
             event: this.props.mxEvent,
             permalinkCreator: this.props.permalinkCreator,
         });
@@ -235,11 +237,45 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         this.closeMenu();
     };
 
+    private onCopyPermalinkClick = (e: ButtonEvent): void => {
+        e.preventDefault(); // So that we don't open the permalink
+        copyPlaintext(this.getPermalink());
+        this.closeMenu();
+    };
+
     private onCollapseReplyChainClick = (): void => {
         this.props.collapseReplyChain();
         this.closeMenu();
     };
 
+    private onCopyClick = (): void => {
+        copyPlaintext(getSelectedText());
+        this.closeMenu();
+    };
+
+    private onEditClick = (): void => {
+        editEvent(this.props.mxEvent, this.context.timelineRenderingType, this.props.getRelationsForEvent);
+        this.closeMenu();
+    };
+
+    private onReplyClick = (): void => {
+        dis.dispatch({
+            action: 'reply_to_event',
+            event: this.props.mxEvent,
+            context: this.context.timelineRenderingType,
+        });
+        this.closeMenu();
+    };
+
+    private onReactClick = (): void => {
+        this.setState({ reactionPickerDisplayed: true });
+    };
+
+    private onCloseReactionPicker = (): void => {
+        this.setState({ reactionPickerDisplayed: false });
+        this.closeMenu();
+    };
+
     private onEndPollClick = (): void => {
         const matrixClient = MatrixClientPeg.get();
         Modal.createTrackedDialog('End Poll', '', EndPollDialog, {
@@ -260,11 +296,16 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         });
     }
 
+    private getPermalink(): string {
+        if (!this.props.permalinkCreator) return;
+        return this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
+    }
+
     private getUnsentReactions(): MatrixEvent[] {
         return this.getReactions(e => e.status === EventStatus.NOT_SENT);
     }
 
-    private viewInRoom = () => {
+    private viewInRoom = (): void => {
         dis.dispatch<ViewRoomPayload>({
             action: Action.ViewRoom,
             event_id: this.props.mxEvent.getId(),
@@ -275,39 +316,35 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         this.closeMenu();
     };
 
-    render() {
+    public render(): JSX.Element {
         const cli = MatrixClientPeg.get();
         const me = cli.getUserId();
-        const mxEvent = this.props.mxEvent;
+        const { mxEvent, rightClick, showPermalink, eventTileOps, reactions, collapseReplyChain } = this.props;
         const eventStatus = mxEvent.status;
         const unsentReactionsCount = this.getUnsentReactions().length;
-
-        let openInMapSiteButton: JSX.Element;
-        let endPollButton: JSX.Element;
-        let resendReactionsButton: JSX.Element;
-        let redactButton: JSX.Element;
-        let forwardButton: JSX.Element;
-        let pinButton: JSX.Element;
-        let unhidePreviewButton: JSX.Element;
-        let externalURLButton: JSX.Element;
-        let quoteButton: JSX.Element;
-        let collapseReplyChain: JSX.Element;
-        let redactItemList: JSX.Element;
-
+        const contentActionable = isContentActionable(mxEvent);
+        const permalink = this.getPermalink();
         // status is SENT before remote-echo, null after
         const isSent = !eventStatus || eventStatus === EventStatus.SENT;
-        if (!mxEvent.isRedacted()) {
-            if (unsentReactionsCount !== 0) {
-                resendReactionsButton = (
-                    <IconizedContextMenuOption
-                        iconClassName="mx_MessageContextMenu_iconResend"
-                        label={_t('Resend %(unsentCount)s reaction(s)', { unsentCount: unsentReactionsCount })}
-                        onClick={this.onResendReactionsClick}
-                    />
-                );
-            }
+        const { timelineRenderingType, canReact, canSendMessages } = this.context;
+        const isThread = (
+            timelineRenderingType === TimelineRenderingType.Thread ||
+            timelineRenderingType === TimelineRenderingType.ThreadsList
+        );
+        const isThreadRootEvent = isThread && mxEvent?.getThread()?.rootEvent === mxEvent;
+
+        let resendReactionsButton: JSX.Element;
+        if (!mxEvent.isRedacted() && unsentReactionsCount !== 0) {
+            resendReactionsButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconResend"
+                    label={_t('Resend %(unsentCount)s reaction(s)', { unsentCount: unsentReactionsCount })}
+                    onClick={this.onResendReactionsClick}
+                />
+            );
         }
 
+        let redactButton: JSX.Element;
         if (isSent && this.state.canRedact) {
             redactButton = (
                 <IconizedContextMenuOption
@@ -318,6 +355,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
+        let openInMapSiteButton: JSX.Element;
         if (this.canOpenInMapSite(mxEvent)) {
             const mapSiteLink = createMapSiteLink(mxEvent);
             openInMapSiteButton = (
@@ -337,28 +375,29 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
-        if (isContentActionable(mxEvent)) {
-            if (canForward(mxEvent)) {
-                forwardButton = (
-                    <IconizedContextMenuOption
-                        iconClassName="mx_MessageContextMenu_iconForward"
-                        label={_t("Forward")}
-                        onClick={this.onForwardClick}
-                    />
-                );
-            }
-
-            if (this.state.canPin) {
-                pinButton = (
-                    <IconizedContextMenuOption
-                        iconClassName="mx_MessageContextMenu_iconPin"
-                        label={this.isPinned() ? _t('Unpin') : _t('Pin')}
-                        onClick={this.onPinClick}
-                    />
-                );
-            }
+        let forwardButton: JSX.Element;
+        if (contentActionable && canForward(mxEvent)) {
+            forwardButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconForward"
+                    label={_t("Forward")}
+                    onClick={this.onForwardClick}
+                />
+            );
         }
 
+        let pinButton: JSX.Element;
+        if (contentActionable && this.state.canPin) {
+            pinButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconPin"
+                    label={this.isPinned() ? _t('Unpin') : _t('Pin')}
+                    onClick={this.onPinClick}
+                />
+            );
+        }
+
+        // This is specifically not behind the developerMode flag to give people insight into the Matrix
         const viewSourceButton = (
             <IconizedContextMenuOption
                 iconClassName="mx_MessageContextMenu_iconSource"
@@ -367,40 +406,42 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             />
         );
 
-        if (this.props.eventTileOps) {
-            if (this.props.eventTileOps.isWidgetHidden()) {
-                unhidePreviewButton = (
-                    <IconizedContextMenuOption
-                        iconClassName="mx_MessageContextMenu_iconUnhidePreview"
-                        label={_t("Show preview")}
-                        onClick={this.onUnhidePreviewClick}
-                    />
-                );
-            }
+        let unhidePreviewButton: JSX.Element;
+        if (eventTileOps?.isWidgetHidden()) {
+            unhidePreviewButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconUnhidePreview"
+                    label={_t("Show preview")}
+                    onClick={this.onUnhidePreviewClick}
+                />
+            );
         }
 
-        let permalink: string | null = null;
-        let permalinkButton: ReactElement | null = null;
-        if (this.props.permalinkCreator) {
-            permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
-        }
-        permalinkButton = (
-            <IconizedContextMenuOption
-                iconClassName="mx_MessageContextMenu_iconPermalink"
-                onClick={this.onPermalinkClick}
-                label={_t('Share')}
-                element="a"
-                {
-                    // XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
-                    ...{
-                        href: permalink,
-                        target: "_blank",
-                        rel: "noreferrer noopener",
+        let permalinkButton: JSX.Element;
+        if (permalink) {
+            permalinkButton = (
+                <IconizedContextMenuOption
+                    iconClassName={showPermalink
+                        ? "mx_MessageContextMenu_iconCopy"
+                        : "mx_MessageContextMenu_iconPermalink"
                     }
-                }
-            />
-        );
+                    onClick={showPermalink ? this.onCopyPermalinkClick : this.onPermalinkClick}
+                    label={showPermalink ? _t('Copy link') : _t('Share')}
+                    element="a"
+                    {
+                        // XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`
+                        ...{
+
+                            href: permalink,
+                            target: "_blank",
+                            rel: "noreferrer noopener",
+                        }
+                    }
+                />
+            );
+        }
 
+        let endPollButton: JSX.Element;
         if (this.canEndPoll(mxEvent)) {
             endPollButton = (
                 <IconizedContextMenuOption
@@ -411,7 +452,8 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
-        if (this.props.eventTileOps) { // this event is rendered using TextualBody
+        let quoteButton: JSX.Element;
+        if (eventTileOps) { // this event is rendered using TextualBody
             quoteButton = (
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconQuote"
@@ -422,7 +464,9 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         }
 
         // Bridges can provide a 'external_url' to link back to the source.
-        if (typeof (mxEvent.getContent().external_url) === "string" &&
+        let externalURLButton: JSX.Element;
+        if (
+            typeof (mxEvent.getContent().external_url) === "string" &&
             isUrlPermitted(mxEvent.getContent().external_url)
         ) {
             externalURLButton = (
@@ -443,8 +487,9 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
-        if (this.props.collapseReplyChain) {
-            collapseReplyChain = (
+        let collapseReplyChainButton: JSX.Element;
+        if (collapseReplyChain) {
+            collapseReplyChainButton = (
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconCollapse"
                     label={_t("Collapse reply thread")}
@@ -464,23 +509,86 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
             );
         }
 
-        const { timelineRenderingType } = this.context;
-        const isThread = (
-            timelineRenderingType === TimelineRenderingType.Thread ||
-            timelineRenderingType === TimelineRenderingType.ThreadsList
-        );
-        const isThreadRootEvent = isThread && this.props.mxEvent?.getThread()?.rootEvent === this.props.mxEvent;
+        let copyButton: JSX.Element;
+        if (rightClick && getSelectedText()) {
+            copyButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconCopy"
+                    label={_t("Copy")}
+                    triggerOnMouseDown={true} // We use onMouseDown so that the selection isn't cleared when we click
+                    onClick={this.onCopyClick}
+                />
+            );
+        }
 
-        const isMainSplitTimelineShown = !WidgetLayoutStore.instance.hasMaximisedWidget(
-            MatrixClientPeg.get().getRoom(mxEvent.getRoomId()),
-        );
-        const commonItemsList = (
-            <IconizedContextMenuOptionList>
-                { (isThreadRootEvent && isMainSplitTimelineShown) && <IconizedContextMenuOption
+        let editButton: JSX.Element;
+        if (rightClick && canEditContent(mxEvent)) {
+            editButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconEdit"
+                    label={_t("Edit")}
+                    onClick={this.onEditClick}
+                />
+            );
+        }
+
+        let replyButton: JSX.Element;
+        if (rightClick && contentActionable && canSendMessages) {
+            replyButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconReply"
+                    label={_t("Reply")}
+                    onClick={this.onReplyClick}
+                />
+            );
+        }
+
+        let reactButton;
+        if (rightClick && contentActionable && canReact) {
+            reactButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_MessageContextMenu_iconReact"
+                    label={_t("React")}
+                    onClick={this.onReactClick}
+                    inputRef={this.reactButtonRef}
+                />
+            );
+        }
+
+        let viewInRoomButton: JSX.Element;
+        if (isThreadRootEvent) {
+            viewInRoomButton = (
+                <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconViewInRoom"
                     label={_t("View in room")}
                     onClick={this.viewInRoom}
-                /> }
+                />
+            );
+        }
+
+        let nativeItemsList: JSX.Element;
+        if (copyButton) {
+            nativeItemsList = (
+                <IconizedContextMenuOptionList>
+                    { copyButton }
+                </IconizedContextMenuOptionList>
+            );
+        }
+
+        let quickItemsList: JSX.Element;
+        if (editButton || replyButton || reactButton) {
+            quickItemsList = (
+                <IconizedContextMenuOptionList>
+                    { reactButton }
+                    { replyButton }
+                    { editButton }
+                </IconizedContextMenuOptionList>
+            );
+        }
+
+        const commonItemsList = (
+            <IconizedContextMenuOptionList>
+                { viewInRoomButton }
                 { openInMapSiteButton }
                 { endPollButton }
                 { quoteButton }
@@ -492,10 +600,11 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
                 { unhidePreviewButton }
                 { viewSourceButton }
                 { resendReactionsButton }
-                { collapseReplyChain }
+                { collapseReplyChainButton }
             </IconizedContextMenuOptionList>
         );
 
+        let redactItemList: JSX.Element;
         if (redactButton) {
             redactItemList = (
                 <IconizedContextMenuOptionList red>
@@ -503,33 +612,40 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
                 </IconizedContextMenuOptionList>
             );
         }
+
+        let reactionPicker: JSX.Element;
+        if (this.state.reactionPickerDisplayed) {
+            const buttonRect = (this.reactButtonRef.current as HTMLElement)?.getBoundingClientRect();
+            reactionPicker = (
+                <ContextMenu
+                    {...toRightOf(buttonRect)}
+                    onFinished={this.closeMenu}
+                    managed={false}
+                >
+                    <ReactionPicker
+                        mxEvent={mxEvent}
+                        onFinished={this.onCloseReactionPicker}
+                        reactions={reactions}
+                    />
+                </ContextMenu>
+            );
+        }
+
         return (
-            <IconizedContextMenu
-                {...this.props}
-                className="mx_MessageContextMenu"
-                compact={true}
-            >
-                { commonItemsList }
-                { redactItemList }
-            </IconizedContextMenu>
+            <React.Fragment>
+                <IconizedContextMenu
+                    {...this.props}
+                    className="mx_MessageContextMenu"
+                    compact={true}
+                >
+                    { nativeItemsList }
+                    { quickItemsList }
+                    { commonItemsList }
+                    { redactItemList }
+                </IconizedContextMenu>
+                { reactionPicker }
+            </React.Fragment>
         );
     }
 }
 
-function canForward(event: MatrixEvent): boolean {
-    return !(
-        isLocationEvent(event) ||
-        M_POLL_START.matches(event.getType())
-    );
-}
-
-function isLocationEvent(event: MatrixEvent): boolean {
-    const eventType = event.getType();
-    return (
-        LOCATION_EVENT_TYPE.matches(eventType) ||
-        (
-            eventType === EventType.RoomMessage &&
-            LOCATION_EVENT_TYPE.matches(event.getContent().msgtype)
-        )
-    );
-}
diff --git a/src/components/views/context_menus/RoomContextMenu.tsx b/src/components/views/context_menus/RoomContextMenu.tsx
index d0bc235a9d9..e8aa73c7790 100644
--- a/src/components/views/context_menus/RoomContextMenu.tsx
+++ b/src/components/views/context_menus/RoomContextMenu.tsx
@@ -35,9 +35,9 @@ import { EchoChamber } from "../../../stores/local-echo/EchoChamber";
 import { RoomNotifState } from "../../../RoomNotifs";
 import Modal from "../../../Modal";
 import ExportDialog from "../dialogs/ExportDialog";
-import { useSettingValue } from "../../../hooks/useSettings";
+import { useFeatureEnabled } from "../../../hooks/useSettings";
 import { usePinnedEvents } from "../right_panel/PinnedMessagesCard";
-import RoomViewStore from "../../../stores/RoomViewStore";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import { ROOM_NOTIFICATIONS_TAB } from "../dialogs/RoomSettingsDialog";
 import { useEventEmitterState } from "../../../hooks/useEventEmitter";
@@ -48,6 +48,8 @@ import PosthogTrackers from "../../../PosthogTrackers";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
+import SettingsStore from "../../../settings/SettingsStore";
+import DevtoolsDialog from "../dialogs/DevtoolsDialog";
 
 interface IProps extends IContextMenuProps {
     room: Room;
@@ -103,6 +105,7 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
     }
 
     const isDm = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+    const isVideoRoom = useFeatureEnabled("feature_video_rooms") && room.isElementVideoRoom();
 
     let inviteOption: JSX.Element;
     if (room.canInvite(cli.getUserId()) && !isDm) {
@@ -231,11 +234,27 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
         />;
     }
 
-    const pinningEnabled = useSettingValue("feature_pinning");
+    let filesOption: JSX.Element;
+    if (!isVideoRoom) {
+        filesOption = <IconizedContextMenuOption
+            onClick={(ev: ButtonEvent) => {
+                ev.preventDefault();
+                ev.stopPropagation();
+
+                ensureViewingRoom(ev);
+                RightPanelStore.instance.pushCard({ phase: RightPanelPhases.FilePanel }, false);
+                onFinished();
+            }}
+            label={_t("Files")}
+            iconClassName="mx_RoomTile_iconFiles"
+        />;
+    }
+
+    const pinningEnabled = useFeatureEnabled("feature_pinning");
     const pinCount = usePinnedEvents(pinningEnabled && room)?.length;
 
     let pinsOption: JSX.Element;
-    if (pinningEnabled) {
+    if (pinningEnabled && !isVideoRoom) {
         pinsOption = <IconizedContextMenuOption
             onClick={(ev: ButtonEvent) => {
                 ev.preventDefault();
@@ -254,6 +273,37 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
         </IconizedContextMenuOption>;
     }
 
+    let widgetsOption: JSX.Element;
+    if (!isVideoRoom) {
+        widgetsOption = <IconizedContextMenuOption
+            onClick={(ev: ButtonEvent) => {
+                ev.preventDefault();
+                ev.stopPropagation();
+
+                ensureViewingRoom(ev);
+                RightPanelStore.instance.setCard({ phase: RightPanelPhases.RoomSummary }, false);
+                onFinished();
+            }}
+            label={_t("Widgets")}
+            iconClassName="mx_RoomTile_iconWidgets"
+        />;
+    }
+
+    let exportChatOption: JSX.Element;
+    if (!isVideoRoom) {
+        exportChatOption = <IconizedContextMenuOption
+            onClick={(ev: ButtonEvent) => {
+                ev.preventDefault();
+                ev.stopPropagation();
+
+                Modal.createTrackedDialog('Export room dialog', '', ExportDialog, { room });
+                onFinished();
+            }}
+            label={_t("Export chat")}
+            iconClassName="mx_RoomTile_iconExport"
+        />;
+    }
+
     const onTagRoom = (ev: ButtonEvent, tagId: TagID) => {
         ev.preventDefault();
         ev.stopPropagation();
@@ -278,7 +328,7 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
     };
 
     const ensureViewingRoom = (ev: ButtonEvent) => {
-        if (RoomViewStore.getRoomId() === room.roomId) return;
+        if (RoomViewStore.instance.getRoomId() === room.roomId) return;
         dis.dispatch<ViewRoomPayload>({
             action: Action.ViewRoom,
             room_id: room.roomId,
@@ -293,35 +343,9 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
             { notificationOption }
             { favouriteOption }
             { peopleOption }
-
-            <IconizedContextMenuOption
-                onClick={(ev: ButtonEvent) => {
-                    ev.preventDefault();
-                    ev.stopPropagation();
-
-                    ensureViewingRoom(ev);
-                    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.FilePanel }, false);
-                    onFinished();
-                }}
-                label={_t("Files")}
-                iconClassName="mx_RoomTile_iconFiles"
-            />
-
+            { filesOption }
             { pinsOption }
-
-            <IconizedContextMenuOption
-                onClick={(ev: ButtonEvent) => {
-                    ev.preventDefault();
-                    ev.stopPropagation();
-
-                    ensureViewingRoom(ev);
-                    RightPanelStore.instance.setCard({ phase: RightPanelPhases.RoomSummary }, false);
-                    onFinished();
-                }}
-                label={_t("Widgets")}
-                iconClassName="mx_RoomTile_iconWidgets"
-            />
-
+            { widgetsOption }
             { lowPriorityOption }
             { copyLinkOption }
 
@@ -341,17 +365,21 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
                 iconClassName="mx_RoomTile_iconSettings"
             />
 
-            <IconizedContextMenuOption
+            { exportChatOption }
+
+            { SettingsStore.getValue("developerMode") && <IconizedContextMenuOption
                 onClick={(ev: ButtonEvent) => {
                     ev.preventDefault();
                     ev.stopPropagation();
 
-                    Modal.createTrackedDialog('Export room dialog', '', ExportDialog, { room });
+                    Modal.createDialog(DevtoolsDialog, {
+                        roomId: RoomViewStore.instance.getRoomId(),
+                    }, "mx_DevtoolsDialog_wrapper");
                     onFinished();
                 }}
-                label={_t("Export chat")}
-                iconClassName="mx_RoomTile_iconExport"
-            />
+                label={_t("Developer tools")}
+                iconClassName="mx_RoomTile_iconDeveloperTools"
+            /> }
 
             { leaveOption }
         </IconizedContextMenuOptionList>
diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx
index aab270e2e80..d9286c618b4 100644
--- a/src/components/views/context_menus/SpaceContextMenu.tsx
+++ b/src/components/views/context_menus/SpaceContextMenu.tsx
@@ -22,7 +22,6 @@ import { IProps as IContextMenuProps } from "../../structures/ContextMenu";
 import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu";
 import { _t } from "../../../languageHandler";
 import {
-    leaveSpace,
     shouldShowSpaceSettings,
     showCreateNewRoom,
     showCreateNewSubspace,
@@ -30,6 +29,7 @@ import {
     showSpacePreferences,
     showSpaceSettings,
 } from "../../../utils/space";
+import { leaveSpace } from "../../../utils/leave-behaviour";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { ButtonEvent } from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.tsx b/src/components/views/context_menus/StatusMessageContextMenu.tsx
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/components/views/context_menus/StatusMessageContextMenu.tsx
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
deleted file mode 100644
index 71e1e614d29..00000000000
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher/dispatcher';
-import TagOrderActions from '../../../actions/TagOrderActions';
-import { MenuItem } from "../../structures/ContextMenu";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
-import { createSpaceFromCommunity } from "../../../utils/space";
-import GroupStore from "../../../stores/GroupStore";
-
-@replaceableComponent("views.context_menus.TagTileContextMenu")
-export default class TagTileContextMenu extends React.Component {
-    static propTypes = {
-        tag: PropTypes.string.isRequired,
-        index: PropTypes.number.isRequired,
-        /* callback called when the menu is dismissed */
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    static contextType = MatrixClientContext;
-
-    _onViewCommunityClick = () => {
-        dis.dispatch({
-            action: 'view_group',
-            group_id: this.props.tag,
-        });
-        this.props.onFinished();
-    };
-
-    _onRemoveClick = () => {
-        dis.dispatch(TagOrderActions.removeTag(this.context, this.props.tag));
-        this.props.onFinished();
-    };
-
-    _onCreateSpaceClick = () => {
-        createSpaceFromCommunity(this.context, this.props.tag);
-        this.props.onFinished();
-    };
-
-    _onMoveUp = () => {
-        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.tag, this.props.index - 1));
-        this.props.onFinished();
-    };
-
-    _onMoveDown = () => {
-        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.tag, this.props.index + 1));
-        this.props.onFinished();
-    };
-
-    render() {
-        let moveUp;
-        let moveDown;
-        if (this.props.index > 0) {
-            moveUp = (
-                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_moveUp" onClick={this._onMoveUp}>
-                    { _t("Move up") }
-                </MenuItem>
-            );
-        }
-        if (this.props.index < (GroupFilterOrderStore.getOrderedTags() || []).length - 1) {
-            moveDown = (
-                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_moveDown" onClick={this._onMoveDown}>
-                    { _t("Move down") }
-                </MenuItem>
-            );
-        }
-
-        let createSpaceOption;
-        if (GroupStore.isUserPrivileged(this.props.tag)) {
-            createSpaceOption = <>
-                <hr className="mx_TagTileContextMenu_separator" />
-                <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_createSpace" onClick={this._onCreateSpaceClick}>
-                    { _t("Create Space") }
-                </MenuItem>
-            </>;
-        }
-
-        return <div>
-            <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_viewCommunity" onClick={this._onViewCommunityClick}>
-                { _t('View Community') }
-            </MenuItem>
-            { (moveUp || moveDown) ? <hr className="mx_TagTileContextMenu_separator" /> : null }
-            { moveUp }
-            { moveDown }
-            <hr className="mx_TagTileContextMenu_separator" />
-            <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_hideCommunity" onClick={this._onRemoveClick}>
-                { _t("Unpin") }
-            </MenuItem>
-            { createSpaceOption }
-        </div>;
-    }
-}
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index f47871d4b59..1aeeccc724b 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -57,7 +57,7 @@ const WidgetContextMenu: React.FC<IProps> = ({
     const cli = useContext(MatrixClientContext);
     const { room, roomId } = useContext(RoomContext);
 
-    const widgetMessaging = WidgetMessagingStore.instance.getMessagingForId(app.id);
+    const widgetMessaging = WidgetMessagingStore.instance.getMessagingForUid(WidgetUtils.getWidgetUid(app));
     const canModify = userWidget || WidgetUtils.canUserModifyWidgets(roomId);
 
     let streamAudioStreamButton;
diff --git a/src/components/views/dialogs/AddressPickerDialog.tsx b/src/components/views/dialogs/AddressPickerDialog.tsx
deleted file mode 100644
index ad925e44076..00000000000
--- a/src/components/views/dialogs/AddressPickerDialog.tsx
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018, 2019 New Vector Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { createRef } from 'react';
-import { sleep } from "matrix-js-sdk/src/utils";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { _t, _td } from '../../../languageHandler';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher/dispatcher';
-import { AddressType, addressTypes, getAddressType, IUserAddress } from '../../../UserAddress';
-import GroupStore from '../../../stores/GroupStore';
-import * as Email from '../../../email';
-import IdentityAuthClient from '../../../IdentityAuthClient';
-import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from '../../../utils/IdentityServerUtils';
-import { abbreviateUrl } from '../../../utils/UrlUtils';
-import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import AddressSelector from '../elements/AddressSelector';
-import AddressTile from '../elements/AddressTile';
-import BaseDialog from "./BaseDialog";
-import DialogButtons from "../elements/DialogButtons";
-import AccessibleButton from '../elements/AccessibleButton';
-import { getKeyBindingsManager } from "../../../KeyBindingsManager";
-import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
-
-const TRUNCATE_QUERY_LIST = 40;
-const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
-
-const addressTypeName = {
-    'mx-user-id': _td("Matrix ID"),
-    'mx-room-id': _td("Matrix Room ID"),
-    'email': _td("email address"),
-};
-
-interface IResult {
-    user_id: string; // eslint-disable-line camelcase
-    room_id?: string; // eslint-disable-line camelcase
-    name?: string;
-    display_name?: string; // eslint-disable-line camelcase
-    avatar_url?: string;// eslint-disable-line camelcase
-}
-
-interface IProps {
-    title: string;
-    description?: JSX.Element;
-    // Extra node inserted after picker input, dropdown and errors
-    extraNode?: JSX.Element;
-    value?: string;
-    placeholder?: ((validAddressTypes: any) => string) | string;
-    roomId?: string;
-    button?: string;
-    focus?: boolean;
-    validAddressTypes?: AddressType[];
-    onFinished: (success: boolean, list?: IUserAddress[]) => void;
-    groupId?: string;
-    // The type of entity to search for. Default: 'user'.
-    pickerType?: 'user' | 'room';
-    // Whether the current user should be included in the addresses returned. Only
-    // applicable when pickerType is `user`. Default: false.
-    includeSelf?: boolean;
-}
-
-interface IState {
-    // Whether to show an error message because of an invalid address
-    invalidAddressError: boolean;
-    // List of UserAddressType objects representing
-    // the list of addresses we're going to invite
-    selectedList: IUserAddress[];
-    // Whether a search is ongoing
-    busy: boolean;
-    // An error message generated during the user directory search
-    searchError: string;
-    // Whether the server supports the user_directory API
-    serverSupportsUserDirectory: boolean;
-    // The query being searched for
-    query: string;
-    // List of UserAddressType objects representing the set of
-    // auto-completion results for the current search query.
-    suggestedList: IUserAddress[];
-    // List of address types initialised from props, but may change while the
-    // dialog is open and represents the supported list of address types at this time.
-    validAddressTypes: AddressType[];
-}
-
-@replaceableComponent("views.dialogs.AddressPickerDialog")
-export default class AddressPickerDialog extends React.Component<IProps, IState> {
-    private textinput = createRef<HTMLTextAreaElement>();
-    private addressSelector = createRef<AddressSelector>();
-    private queryChangedDebouncer: number;
-    private cancelThreepidLookup: () => void;
-
-    static defaultProps: Partial<IProps> = {
-        value: "",
-        focus: true,
-        validAddressTypes: addressTypes,
-        pickerType: 'user',
-        includeSelf: false,
-    };
-
-    constructor(props: IProps) {
-        super(props);
-
-        let validAddressTypes = this.props.validAddressTypes;
-        // Remove email from validAddressTypes if no IS is configured. It may be added at a later stage by the user
-        if (!MatrixClientPeg.get().getIdentityServerUrl() && validAddressTypes.includes(AddressType.Email)) {
-            validAddressTypes = validAddressTypes.filter(type => type !== AddressType.Email);
-        }
-
-        this.state = {
-            invalidAddressError: false,
-            selectedList: [],
-            busy: false,
-            searchError: null,
-            serverSupportsUserDirectory: true,
-            query: "",
-            suggestedList: [],
-            validAddressTypes,
-        };
-    }
-
-    componentDidMount() {
-        if (this.props.focus) {
-            // Set the cursor at the end of the text input
-            this.textinput.current.value = this.props.value;
-        }
-    }
-
-    private getPlaceholder(): string {
-        const { placeholder } = this.props;
-        if (typeof placeholder === "string") {
-            return placeholder;
-        }
-        // Otherwise it's a function, as checked by prop types.
-        return placeholder(this.state.validAddressTypes);
-    }
-
-    private onButtonClick = (): void => {
-        let selectedList = this.state.selectedList.slice();
-        // Check the text input field to see if user has an unconverted address
-        // If there is and it's valid add it to the local selectedList
-        if (this.textinput.current.value !== '') {
-            selectedList = this.addAddressesToList([this.textinput.current.value]);
-            if (selectedList === null) return;
-        }
-        this.props.onFinished(true, selectedList);
-    };
-
-    private onCancel = (): void => {
-        this.props.onFinished(false);
-    };
-
-    private onKeyDown = (e: React.KeyboardEvent): void => {
-        const textInput = this.textinput.current ? this.textinput.current.value : undefined;
-        let handled = true;
-        const action = getKeyBindingsManager().getAccessibilityAction(e);
-
-        if (action === KeyBindingAction.Escape) {
-            this.props.onFinished(false);
-        } else if (e.key === KeyBindingAction.ArrowUp) {
-            this.addressSelector.current?.moveSelectionUp();
-        } else if (e.key === KeyBindingAction.ArrowDown) {
-            this.addressSelector.current?.moveSelectionDown();
-        } else if (
-            [KeyBindingAction.Comma, KeyBindingAction.Enter, KeyBindingAction.Tab].includes(action) &&
-            this.state.suggestedList.length > 0
-        ) {
-            this.addressSelector.current?.chooseSelection();
-        } else if (textInput.length === 0 && this.state.selectedList.length && action === KeyBindingAction.Backspace) {
-            this.onDismissed(this.state.selectedList.length - 1)();
-        } else if (e.key === KeyBindingAction.Enter) {
-            if (textInput === '') {
-                // if there's nothing in the input box, submit the form
-                this.onButtonClick();
-            } else {
-                this.addAddressesToList([textInput]);
-            }
-        } else if (textInput && [KeyBindingAction.Comma, KeyBindingAction.Tab].includes(action)) {
-            this.addAddressesToList([textInput]);
-        } else {
-            handled = false;
-        }
-
-        if (handled) {
-            e.stopPropagation();
-            e.preventDefault();
-        }
-    };
-
-    private onQueryChanged = (ev: React.ChangeEvent): void => {
-        const query = (ev.target as HTMLTextAreaElement).value;
-        if (this.queryChangedDebouncer) {
-            clearTimeout(this.queryChangedDebouncer);
-        }
-        // Only do search if there is something to search
-        if (query.length > 0 && query !== '@' && query.length >= 2) {
-            this.queryChangedDebouncer = setTimeout(() => {
-                if (this.props.pickerType === 'user') {
-                    if (this.props.groupId) {
-                        this.doNaiveGroupSearch(query);
-                    } else if (this.state.serverSupportsUserDirectory) {
-                        this.doUserDirectorySearch(query);
-                    } else {
-                        this.doLocalSearch(query);
-                    }
-                } else if (this.props.pickerType === 'room') {
-                    if (this.props.groupId) {
-                        this.doNaiveGroupRoomSearch(query);
-                    } else {
-                        this.doRoomSearch(query);
-                    }
-                } else {
-                    logger.error('Unknown pickerType', this.props.pickerType);
-                }
-            }, QUERY_USER_DIRECTORY_DEBOUNCE_MS);
-        } else {
-            this.setState({
-                suggestedList: [],
-                query: "",
-                searchError: null,
-            });
-        }
-    };
-
-    private onDismissed = (index: number) => () => {
-        const selectedList = this.state.selectedList.slice();
-        selectedList.splice(index, 1);
-        this.setState({
-            selectedList,
-            suggestedList: [],
-            query: "",
-        });
-        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
-    };
-
-    private onSelected = (index: number): void => {
-        const selectedList = this.state.selectedList.slice();
-        selectedList.push(this.getFilteredSuggestions()[index]);
-        this.setState({
-            selectedList,
-            suggestedList: [],
-            query: "",
-        });
-        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
-    };
-
-    private doNaiveGroupSearch(query: string): void {
-        const lowerCaseQuery = query.toLowerCase();
-        this.setState({
-            busy: true,
-            query,
-            searchError: null,
-        });
-        MatrixClientPeg.get().getGroupUsers(this.props.groupId).then((resp) => {
-            const results = [];
-            resp.chunk.forEach((u) => {
-                const userIdMatch = u.user_id.toLowerCase().includes(lowerCaseQuery);
-                const displayNameMatch = (u.displayname || '').toLowerCase().includes(lowerCaseQuery);
-                if (!(userIdMatch || displayNameMatch)) {
-                    return;
-                }
-                results.push({
-                    user_id: u.user_id,
-                    avatar_url: u.avatar_url,
-                    display_name: u.displayname,
-                });
-            });
-            this.processResults(results, query);
-        }).catch((err) => {
-            logger.error('Error whilst searching group rooms: ', err);
-            this.setState({
-                searchError: err.errcode ? err.message : _t('Something went wrong!'),
-            });
-        }).then(() => {
-            this.setState({
-                busy: false,
-            });
-        });
-    }
-
-    private doNaiveGroupRoomSearch(query: string): void {
-        const lowerCaseQuery = query.toLowerCase();
-        const results = [];
-        GroupStore.getGroupRooms(this.props.groupId).forEach((r) => {
-            const nameMatch = (r.name || '').toLowerCase().includes(lowerCaseQuery);
-            const topicMatch = (r.topic || '').toLowerCase().includes(lowerCaseQuery);
-            const aliasMatch = (r.canonical_alias || '').toLowerCase().includes(lowerCaseQuery);
-            if (!(nameMatch || topicMatch || aliasMatch)) {
-                return;
-            }
-            results.push({
-                room_id: r.room_id,
-                avatar_url: r.avatar_url,
-                name: r.name || r.canonical_alias,
-            });
-        });
-        this.processResults(results, query);
-        this.setState({
-            busy: false,
-        });
-    }
-
-    private doRoomSearch(query: string): void {
-        const lowerCaseQuery = query.toLowerCase();
-        const rooms = MatrixClientPeg.get().getRooms();
-        const results = [];
-        rooms.forEach((room) => {
-            let rank = Infinity;
-            const nameEvent = room.currentState.getStateEvents('m.room.name', '');
-            const name = nameEvent ? nameEvent.getContent().name : '';
-            const canonicalAlias = room.getCanonicalAlias();
-            const aliasEvents = room.currentState.getStateEvents('m.room.aliases');
-            const aliases = aliasEvents.map((ev) => ev.getContent().aliases).reduce((a, b) => {
-                return a.concat(b);
-            }, []);
-
-            const nameMatch = (name || '').toLowerCase().includes(lowerCaseQuery);
-            let aliasMatch = false;
-            let shortestMatchingAliasLength = Infinity;
-            aliases.forEach((alias) => {
-                if ((alias || '').toLowerCase().includes(lowerCaseQuery)) {
-                    aliasMatch = true;
-                    if (shortestMatchingAliasLength > alias.length) {
-                        shortestMatchingAliasLength = alias.length;
-                    }
-                }
-            });
-
-            if (!(nameMatch || aliasMatch)) {
-                return;
-            }
-
-            if (aliasMatch) {
-                // A shorter matching alias will give a better rank
-                rank = shortestMatchingAliasLength;
-            }
-
-            const avatarEvent = room.currentState.getStateEvents('m.room.avatar', '');
-            const avatarUrl = avatarEvent ? avatarEvent.getContent().url : undefined;
-
-            results.push({
-                rank,
-                room_id: room.roomId,
-                avatar_url: avatarUrl,
-                name: name || canonicalAlias || aliases[0] || _t('Unnamed Room'),
-            });
-        });
-
-        // Sort by rank ascending (a high rank being less relevant)
-        const sortedResults = results.sort((a, b) => {
-            return a.rank - b.rank;
-        });
-
-        this.processResults(sortedResults, query);
-        this.setState({
-            busy: false,
-        });
-    }
-
-    private doUserDirectorySearch(query: string): void {
-        this.setState({
-            busy: true,
-            query,
-            searchError: null,
-        });
-        MatrixClientPeg.get().searchUserDirectory({
-            term: query,
-        }).then((resp) => {
-            // The query might have changed since we sent the request, so ignore
-            // responses for anything other than the latest query.
-            if (this.state.query !== query) {
-                return;
-            }
-            this.processResults(resp.results, query);
-        }).catch((err) => {
-            logger.error('Error whilst searching user directory: ', err);
-            this.setState({
-                searchError: err.errcode ? err.message : _t('Something went wrong!'),
-            });
-            if (err.errcode === 'M_UNRECOGNIZED') {
-                this.setState({
-                    serverSupportsUserDirectory: false,
-                });
-                // Do a local search immediately
-                this.doLocalSearch(query);
-            }
-        }).then(() => {
-            this.setState({
-                busy: false,
-            });
-        });
-    }
-
-    private doLocalSearch(query: string): void {
-        this.setState({
-            query,
-            searchError: null,
-        });
-        const queryLowercase = query.toLowerCase();
-        const results = [];
-        MatrixClientPeg.get().getUsers().forEach((user) => {
-            if (user.userId.toLowerCase().indexOf(queryLowercase) === -1 &&
-                user.displayName.toLowerCase().indexOf(queryLowercase) === -1
-            ) {
-                return;
-            }
-
-            // Put results in the format of the new API
-            results.push({
-                user_id: user.userId,
-                display_name: user.displayName,
-                avatar_url: user.avatarUrl,
-            });
-        });
-        this.processResults(results, query);
-    }
-
-    private processResults(results: IResult[], query: string): void {
-        const suggestedList = [];
-        results.forEach((result) => {
-            if (result.room_id) {
-                const client = MatrixClientPeg.get();
-                const room = client.getRoom(result.room_id);
-                if (room) {
-                    const tombstone = room.currentState.getStateEvents('m.room.tombstone', '');
-                    if (tombstone && tombstone.getContent() && tombstone.getContent()["replacement_room"]) {
-                        const replacementRoom = client.getRoom(tombstone.getContent()["replacement_room"]);
-
-                        // Skip rooms with tombstones where we are also aware of the replacement room.
-                        if (replacementRoom) return;
-                    }
-                }
-                suggestedList.push({
-                    addressType: 'mx-room-id',
-                    address: result.room_id,
-                    displayName: result.name,
-                    avatarMxc: result.avatar_url,
-                    isKnown: true,
-                });
-                return;
-            }
-            if (!this.props.includeSelf &&
-                result.user_id === MatrixClientPeg.get().credentials.userId
-            ) {
-                return;
-            }
-
-            // Return objects, structure of which is defined
-            // by UserAddressType
-            suggestedList.push({
-                addressType: 'mx-user-id',
-                address: result.user_id,
-                displayName: result.display_name,
-                avatarMxc: result.avatar_url,
-                isKnown: true,
-            });
-        });
-
-        // If the query is a valid address, add an entry for that
-        // This is important, otherwise there's no way to invite
-        // a perfectly valid address if there are close matches.
-        const addrType = getAddressType(query);
-        if (this.state.validAddressTypes.includes(addrType)) {
-            if (addrType === 'email' && !Email.looksValid(query)) {
-                this.setState({ searchError: _t("That doesn't look like a valid email address") });
-                return;
-            }
-            suggestedList.unshift({
-                addressType: addrType,
-                address: query,
-                isKnown: false,
-            });
-            if (this.cancelThreepidLookup) this.cancelThreepidLookup();
-            if (addrType === 'email') {
-                this.lookupThreepid(addrType, query);
-            }
-        }
-        this.setState({
-            suggestedList,
-            invalidAddressError: false,
-        }, () => {
-            if (this.addressSelector.current) this.addressSelector.current.moveSelectionTop();
-        });
-    }
-
-    private addAddressesToList(addressTexts: string[]): IUserAddress[] {
-        const selectedList = this.state.selectedList.slice();
-
-        let hasError = false;
-        addressTexts.forEach((addressText) => {
-            addressText = addressText.trim();
-            const addrType = getAddressType(addressText);
-            const addrObj: IUserAddress = {
-                addressType: addrType,
-                address: addressText,
-                isKnown: false,
-            };
-
-            if (!this.state.validAddressTypes.includes(addrType)) {
-                hasError = true;
-            } else if (addrType === 'mx-user-id') {
-                const user = MatrixClientPeg.get().getUser(addrObj.address);
-                if (user) {
-                    addrObj.displayName = user.displayName;
-                    addrObj.avatarMxc = user.avatarUrl;
-                    addrObj.isKnown = true;
-                }
-            } else if (addrType === 'mx-room-id') {
-                const room = MatrixClientPeg.get().getRoom(addrObj.address);
-                if (room) {
-                    addrObj.displayName = room.name;
-                    addrObj.isKnown = true;
-                }
-            }
-
-            selectedList.push(addrObj);
-        });
-
-        this.setState({
-            selectedList,
-            suggestedList: [],
-            query: "",
-            invalidAddressError: hasError ? true : this.state.invalidAddressError,
-        });
-        if (this.cancelThreepidLookup) this.cancelThreepidLookup();
-        return hasError ? null : selectedList;
-    }
-
-    private async lookupThreepid(medium: AddressType, address: string): Promise<string> {
-        let cancelled = false;
-        // Note that we can't safely remove this after we're done
-        // because we don't know that it's the same one, so we just
-        // leave it: it's replacing the old one each time so it's
-        // not like they leak.
-        this.cancelThreepidLookup = function() {
-            cancelled = true;
-        };
-
-        // wait a bit to let the user finish typing
-        await sleep(500);
-        if (cancelled) return null;
-
-        try {
-            const authClient = new IdentityAuthClient();
-            const identityAccessToken = await authClient.getAccessToken();
-            if (cancelled) return null;
-
-            const lookup = await MatrixClientPeg.get().lookupThreePid(
-                medium,
-                address,
-                undefined /* callback */,
-                identityAccessToken,
-            );
-            if (cancelled || lookup === null || !lookup.mxid) return null;
-
-            const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
-            if (cancelled || profile === null) return null;
-
-            this.setState({
-                suggestedList: [{
-                    // a UserAddressType
-                    addressType: medium,
-                    address: address,
-                    displayName: profile.displayname,
-                    avatarMxc: profile.avatar_url,
-                    isKnown: true,
-                }],
-            });
-        } catch (e) {
-            logger.error(e);
-            this.setState({
-                searchError: _t('Something went wrong!'),
-            });
-        }
-    }
-
-    private getFilteredSuggestions(): IUserAddress[] {
-        // map addressType => set of addresses to avoid O(n*m) operation
-        const selectedAddresses = {};
-        this.state.selectedList.forEach(({ address, addressType }) => {
-            if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set();
-            selectedAddresses[addressType].add(address);
-        });
-
-        // Filter out any addresses in the above already selected addresses (matching both type and address)
-        return this.state.suggestedList.filter(({ address, addressType }) => {
-            return !(selectedAddresses[addressType] && selectedAddresses[addressType].has(address));
-        });
-    }
-
-    private onPaste = (e: React.ClipboardEvent): void => {
-        // Prevent the text being pasted into the textarea
-        e.preventDefault();
-        const text = e.clipboardData.getData("text");
-        // Process it as a list of addresses to add instead
-        this.addAddressesToList(text.split(/[\s,]+/));
-    };
-
-    private onUseDefaultIdentityServerClick = (e: React.MouseEvent): void => {
-        e.preventDefault();
-
-        // Update the IS in account data. Actually using it may trigger terms.
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        useDefaultIdentityServer();
-
-        // Add email as a valid address type.
-        const { validAddressTypes } = this.state;
-        validAddressTypes.push(AddressType.Email);
-        this.setState({ validAddressTypes });
-    };
-
-    private onManageSettingsClick = (e: React.MouseEvent): void => {
-        e.preventDefault();
-        dis.fire(Action.ViewUserSettings);
-        this.onCancel();
-    };
-
-    render() {
-        let inputLabel;
-        if (this.props.description) {
-            inputLabel = <div className="mx_AddressPickerDialog_label">
-                <label htmlFor="textinput">{ this.props.description }</label>
-            </div>;
-        }
-
-        const query = [];
-        // create the invite list
-        if (this.state.selectedList.length > 0) {
-            for (let i = 0; i < this.state.selectedList.length; i++) {
-                query.push(
-                    <AddressTile
-                        key={i}
-                        address={this.state.selectedList[i]}
-                        canDismiss={true}
-                        onDismissed={this.onDismissed(i)}
-                        showAddress={this.props.pickerType === 'user'} />,
-                );
-            }
-        }
-
-        // Add the query at the end
-        query.push(
-            <textarea
-                key={this.state.selectedList.length}
-                onPaste={this.onPaste}
-                rows={1}
-                id="textinput"
-                ref={this.textinput}
-                className="mx_AddressPickerDialog_input"
-                onChange={this.onQueryChanged}
-                placeholder={this.getPlaceholder()}
-                defaultValue={this.props.value}
-                autoFocus={this.props.focus}
-            />,
-        );
-
-        const filteredSuggestedList = this.getFilteredSuggestions();
-
-        let error;
-        let addressSelector;
-        if (this.state.invalidAddressError) {
-            const validTypeDescriptions = this.state.validAddressTypes.map((t) => _t(addressTypeName[t]));
-            error = <div className="mx_AddressPickerDialog_error">
-                { _t("You have entered an invalid address.") }
-                <br />
-                { _t("Try using one of the following valid address types: %(validTypesList)s.", {
-                    validTypesList: validTypeDescriptions.join(", "),
-                }) }
-            </div>;
-        } else if (this.state.searchError) {
-            error = <div className="mx_AddressPickerDialog_error">{ this.state.searchError }</div>;
-        } else if (this.state.query.length > 0 && filteredSuggestedList.length === 0 && !this.state.busy) {
-            error = <div className="mx_AddressPickerDialog_error">{ _t("No results") }</div>;
-        } else {
-            addressSelector = (
-                <AddressSelector ref={this.addressSelector}
-                    addressList={filteredSuggestedList}
-                    showAddress={this.props.pickerType === 'user'}
-                    onSelected={this.onSelected}
-                    truncateAt={TRUNCATE_QUERY_LIST}
-                />
-            );
-        }
-
-        let identityServer;
-        // If picker cannot currently accept e-mail but should be able to
-        if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes(AddressType.Email)
-            && this.props.validAddressTypes.includes(AddressType.Email)) {
-            const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
-            if (defaultIdentityServerUrl) {
-                identityServer = <div className="mx_AddressPickerDialog_identityServer">{ _t(
-                    "Use an identity server to invite by email. " +
-                    "<default>Use the default (%(defaultIdentityServerName)s)</default> " +
-                    "or manage in <settings>Settings</settings>.",
-                    {
-                        defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
-                    },
-                    {
-                        default: sub => (
-                            <AccessibleButton kind="link_inline" onClick={this.onUseDefaultIdentityServerClick}>
-                                { sub }
-                            </AccessibleButton>
-                        ),
-                        settings: sub => <AccessibleButton kind="link_inline" onClick={this.onManageSettingsClick}>
-                            { sub }
-                        </AccessibleButton>,
-                    },
-                ) }</div>;
-            } else {
-                identityServer = <div className="mx_AddressPickerDialog_identityServer">{ _t(
-                    "Use an identity server to invite by email. " +
-                    "Manage in <settings>Settings</settings>.",
-                    {}, {
-                        settings: sub => <AccessibleButton kind="link_inline" onClick={this.onManageSettingsClick}>
-                            { sub }
-                        </AccessibleButton>,
-                    },
-                ) }</div>;
-            }
-        }
-
-        return (
-            <BaseDialog
-                className="mx_AddressPickerDialog"
-                onKeyDown={this.onKeyDown}
-                onFinished={this.props.onFinished}
-                title={this.props.title}
-            >
-                { inputLabel }
-                <div className="mx_Dialog_content">
-                    <div className="mx_AddressPickerDialog_inputContainer">{ query }</div>
-                    { error }
-                    { addressSelector }
-                    { this.props.extraNode }
-                    { identityServer }
-                </div>
-                <DialogButtons primaryButton={this.props.button}
-                    onPrimaryButtonClick={this.onButtonClick}
-                    onCancel={this.onCancel} />
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
index 04573252b54..a4cb0deae14 100644
--- a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
+++ b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
@@ -15,12 +15,14 @@ limitations under the License.
 */
 
 import React from "react";
+import { Optional } from "matrix-events-sdk";
 
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import DialogButtons from "../elements/DialogButtons";
 import Modal from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
+import { SnakedObject } from "../../../utils/SnakedObject";
 
 export enum ButtonClicked {
     Primary,
@@ -71,9 +73,9 @@ const AnalyticsLearnMoreDialog: React.FC<IProps> = ({
         <div className="mx_Dialog_content">
             <div className="mx_AnalyticsLearnMore_image_holder" />
             <div className="mx_AnalyticsLearnMore_copy">
-                { _t("Help us identify issues and improve Element by sharing anonymous usage data. " +
+                { _t("Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. " +
                     "To understand how people use multiple devices, we'll generate a random identifier, " +
-                    "shared by your devices.",
+                    "shared by your devices.", { analyticsOwner },
                 ) }
             </div>
             <ul className="mx_AnalyticsLearnMore_bullets">
@@ -96,8 +98,12 @@ const AnalyticsLearnMoreDialog: React.FC<IProps> = ({
 };
 
 export const showDialog = (props: Omit<IProps, "cookiePolicyUrl" | "analyticsOwner">): void => {
-    const privacyPolicyUrl = SdkConfig.get().piwik?.policyUrl;
-    const analyticsOwner = SdkConfig.get().analyticsOwner ?? SdkConfig.get().brand;
+    const piwikConfig = SdkConfig.get("piwik");
+    let privacyPolicyUrl: Optional<string>;
+    if (piwikConfig && typeof piwikConfig === "object") {
+        privacyPolicyUrl = (new SnakedObject(piwikConfig)).get("policy_url");
+    }
+    const analyticsOwner = SdkConfig.get("analytics_owner") ?? SdkConfig.get("brand");
     Modal.createTrackedDialog(
         "Analytics Learn More",
         "",
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.tsx b/src/components/views/dialogs/AskInviteAnywayDialog.tsx
index 1815a43d571..bd691a1ed42 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.tsx
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
 interface IProps {
@@ -32,7 +31,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.AskInviteAnywayDialog")
 export default class AskInviteAnywayDialog extends React.Component<IProps> {
     private onInviteClicked = (): void => {
         this.props.onInviteAnyways();
diff --git a/src/components/views/dialogs/BaseDialog.tsx b/src/components/views/dialogs/BaseDialog.tsx
index 519e38601ce..5eb0c6ac82c 100644
--- a/src/components/views/dialogs/BaseDialog.tsx
+++ b/src/components/views/dialogs/BaseDialog.tsx
@@ -25,7 +25,6 @@ import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Heading from '../typography/Heading';
 import { IDialogProps } from "./IDialogProps";
 import { PosthogScreenTracker, ScreenName } from "../../../PosthogTrackers";
@@ -81,7 +80,6 @@ interface IProps extends IDialogProps {
  * Includes a div for the title, and a keypress handler which cancels the
  * dialog on escape.
  */
-@replaceableComponent("views.dialogs.BaseDialog")
 export default class BaseDialog extends React.Component<IProps> {
     private matrixClient: MatrixClient;
 
diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index c5fba52b514..bc6a05a0be1 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -22,7 +22,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "./UserSettingsDialog";
+import { UserTab } from "./UserTab";
 import GenericFeatureFeedbackDialog from "./GenericFeatureFeedbackDialog";
 
 // XXX: Keep this around for re-use in future Betas
@@ -35,7 +35,7 @@ const BetaFeedbackDialog: React.FC<IProps> = ({ featureId, onFinished }) => {
     const info = SettingsStore.getBetaInfo(featureId);
 
     return <GenericFeatureFeedbackDialog
-        title={_t("%(featureName)s beta feedback", { featureName: info.title })}
+        title={_t("%(featureName)s Beta feedback", { featureName: info.title })}
         subheading={_t(info.feedbackSubheading)}
         onFinished={onFinished}
         rageshakeLabel={info.feedbackLabel}
diff --git a/src/components/views/dialogs/BugReportDialog.tsx b/src/components/views/dialogs/BugReportDialog.tsx
index 8324a152140..eae26735214 100644
--- a/src/components/views/dialogs/BugReportDialog.tsx
+++ b/src/components/views/dialogs/BugReportDialog.tsx
@@ -24,7 +24,6 @@ import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 import sendBugReport, { downloadBugReport } from '../../../rageshake/submit-rageshake';
 import AccessibleButton from "../elements/AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Field from '../elements/Field';
@@ -50,7 +49,6 @@ interface IState {
     downloadProgress: string;
 }
 
-@replaceableComponent("views.dialogs.BugReportDialog")
 export default class BugReportDialog extends React.Component<IProps, IState> {
     private unmounted: boolean;
 
@@ -204,7 +202,7 @@ export default class BugReportDialog extends React.Component<IProps, IState> {
                     <p>
                         { _t(
                             "Debug logs contain application usage data including your " +
-                            "username, the IDs or aliases of the rooms or groups you " +
+                            "username, the IDs or aliases of the rooms you " +
                             "have visited, which UI elements you last interacted with, " +
                             "and the usernames of other users. They do not contain messages.",
                         ) }
diff --git a/src/components/views/dialogs/BulkRedactDialog.tsx b/src/components/views/dialogs/BulkRedactDialog.tsx
new file mode 100644
index 00000000000..86c0f4033f1
--- /dev/null
+++ b/src/components/views/dialogs/BulkRedactDialog.tsx
@@ -0,0 +1,136 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useState } from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+import { MatrixClient } from 'matrix-js-sdk/src/client';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { EventTimeline } from 'matrix-js-sdk/src/models/event-timeline';
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import { _t } from '../../../languageHandler';
+import dis from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
+import { IDialogProps } from "../dialogs/IDialogProps";
+import BaseDialog from "../dialogs/BaseDialog";
+import InfoDialog from "../dialogs/InfoDialog";
+import DialogButtons from "../elements/DialogButtons";
+import StyledCheckbox from "../elements/StyledCheckbox";
+
+interface IBulkRedactDialogProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    room: Room;
+    member: RoomMember;
+}
+
+const BulkRedactDialog: React.FC<IBulkRedactDialogProps> = props => {
+    const { matrixClient: cli, room, member, onFinished } = props;
+    const [keepStateEvents, setKeepStateEvents] = useState(true);
+
+    let timeline = room.getLiveTimeline();
+    let eventsToRedact = [];
+    while (timeline) {
+        eventsToRedact = [...eventsToRedact, ...timeline.getEvents().filter(event =>
+            event.getSender() === member.userId &&
+                !event.isRedacted() && !event.isRedaction() &&
+                event.getType() !== EventType.RoomCreate &&
+                // Don't redact ACLs because that'll obliterate the room
+                // See https://github.com/matrix-org/synapse/issues/4042 for details.
+                event.getType() !== EventType.RoomServerAcl &&
+                // Redacting encryption events is equally bad
+                event.getType() !== EventType.RoomEncryption,
+        )];
+        timeline = timeline.getNeighbouringTimeline(EventTimeline.BACKWARDS);
+    }
+
+    if (eventsToRedact.length === 0) {
+        return <InfoDialog
+            onFinished={onFinished}
+            title={_t("No recent messages by %(user)s found", { user: member.name })}
+            description={
+                <div>
+                    <p>{ _t("Try scrolling up in the timeline to see if there are any earlier ones.") }</p>
+                </div>
+            }
+        />;
+    } else {
+        eventsToRedact = eventsToRedact.filter(event => !(keepStateEvents && event.isState()));
+        const count = eventsToRedact.length;
+        const user = member.name;
+
+        const redact = async () => {
+            logger.info(`Started redacting recent ${count} messages for ${member.userId} in ${room.roomId}`);
+            dis.dispatch({
+                action: Action.BulkRedactStart,
+                room_id: room.roomId,
+            });
+
+            // Submitting a large number of redactions freezes the UI,
+            // so first yield to allow to rerender after closing the dialog.
+            await Promise.resolve();
+            await Promise.all(eventsToRedact.reverse().map(async event => {
+                try {
+                    await cli.redactEvent(room.roomId, event.getId());
+                } catch (err) {
+                    // log and swallow errors
+                    logger.error("Could not redact", event.getId());
+                    logger.error(err);
+                }
+            }));
+
+            logger.info(`Finished redacting recent ${count} messages for ${member.userId} in ${room.roomId}`);
+            dis.dispatch({
+                action: Action.BulkRedactEnd,
+                room_id: room.roomId,
+            });
+        };
+
+        return <BaseDialog
+            className="mx_BulkRedactDialog"
+            onFinished={onFinished}
+            title={_t("Remove recent messages by %(user)s", { user })}
+            contentId="mx_Dialog_content"
+        >
+            <div className="mx_Dialog_content" id="mx_Dialog_content">
+                <p>{ _t("You are about to remove %(count)s messages by %(user)s. " +
+                    "This will remove them permanently for everyone in the conversation. " +
+                    "Do you wish to continue?", { count, user }) }</p>
+                <p>{ _t("For a large amount of messages, this might take some time. " +
+                    "Please don't refresh your client in the meantime.") }</p>
+                <StyledCheckbox
+                    checked={keepStateEvents}
+                    onChange={e => setKeepStateEvents(e.target.checked)}
+                >
+                    { _t("Preserve system messages") }
+                </StyledCheckbox>
+                <div className="mx_BulkRedactDialog_checkboxMicrocopy">
+                    { _t("Uncheck if you also want to remove system messages on this user " +
+                     "(e.g. membership change, profile change…)") }
+                </div>
+            </div>
+            <DialogButtons
+                primaryButton={_t("Remove %(count)s messages", { count })}
+                primaryButtonClass="danger"
+                primaryDisabled={count === 0}
+                onPrimaryButtonClick={() => { setImmediate(redact); onFinished(true); }}
+                onCancel={() => onFinished(false)}
+            />
+        </BaseDialog>;
+    }
+};
+
+export default BulkRedactDialog;
diff --git a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
deleted file mode 100644
index 90588178ce5..00000000000
--- a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { ChangeEvent, FormEvent } from 'react';
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import BaseDialog from "./BaseDialog";
-import { _t } from "../../../languageHandler";
-import { IDialogProps } from "./IDialogProps";
-import Field from "../elements/Field";
-import AccessibleButton from "../elements/AccessibleButton";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { arrayFastClone } from "../../../utils/arrays";
-import SdkConfig from "../../../SdkConfig";
-import InviteDialog from "./InviteDialog";
-import BaseAvatar from "../avatars/BaseAvatar";
-import { inviteMultipleToRoom, showAnyInviteErrors } from "../../../RoomInvite";
-import StyledCheckbox from "../elements/StyledCheckbox";
-import Modal from "../../../Modal";
-import ErrorDialog from "./ErrorDialog";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-interface IProps extends IDialogProps {
-    roomId: string;
-    communityName: string;
-}
-
-interface IPerson {
-    userId: string;
-    user: RoomMember;
-    lastActive: number;
-}
-
-interface IState {
-    emailTargets: string[];
-    userTargets: string[];
-    showPeople: boolean;
-    people: IPerson[];
-    numPeople: number;
-    busy: boolean;
-}
-
-@replaceableComponent("views.dialogs.CommunityPrototypeInviteDialog")
-export default class CommunityPrototypeInviteDialog extends React.PureComponent<IProps, IState> {
-    constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            emailTargets: [],
-            userTargets: [],
-            showPeople: false,
-            people: this.buildSuggestions(),
-            numPeople: 5, // arbitrary default
-            busy: false,
-        };
-    }
-
-    private buildSuggestions(): IPerson[] {
-        const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get()['welcomeUserId']]);
-        if (this.props.roomId) {
-            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-            if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
-            room.getMembersWithMembership('invite').forEach(m => alreadyInvited.add(m.userId));
-            room.getMembersWithMembership('join').forEach(m => alreadyInvited.add(m.userId));
-            // add banned users, so we don't try to invite them
-            room.getMembersWithMembership('ban').forEach(m => alreadyInvited.add(m.userId));
-        }
-
-        return InviteDialog.buildRecents(alreadyInvited);
-    }
-
-    private onSubmit = async (ev: FormEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        this.setState({ busy: true });
-        try {
-            const targets = [...this.state.emailTargets, ...this.state.userTargets];
-            const result = await inviteMultipleToRoom(this.props.roomId, targets);
-            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-            const success = showAnyInviteErrors(result.states, room, result.inviter);
-            if (success) {
-                this.props.onFinished(true);
-            } else {
-                this.setState({ busy: false });
-            }
-        } catch (e) {
-            this.setState({ busy: false });
-            logger.error(e);
-            Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
-                title: _t("Failed to invite"),
-                description: ((e && e.message) ? e.message : _t("Operation failed")),
-            });
-        }
-    };
-
-    private onAddressChange = (ev: ChangeEvent<HTMLInputElement>, index: number) => {
-        const targets = arrayFastClone(this.state.emailTargets);
-        if (index >= targets.length) {
-            targets.push(ev.target.value);
-        } else {
-            targets[index] = ev.target.value;
-        }
-        this.setState({ emailTargets: targets });
-    };
-
-    private onAddressBlur = (index: number) => {
-        const targets = arrayFastClone(this.state.emailTargets);
-        if (index >= targets.length) return; // not important
-        if (targets[index].trim() === "") {
-            targets.splice(index, 1);
-            this.setState({ emailTargets: targets });
-        }
-    };
-
-    private onShowPeopleClick = () => {
-        this.setState({ showPeople: !this.state.showPeople });
-    };
-
-    private setPersonToggle = (person: IPerson, selected: boolean) => {
-        const targets = arrayFastClone(this.state.userTargets);
-        if (selected && !targets.includes(person.userId)) {
-            targets.push(person.userId);
-        } else if (!selected && targets.includes(person.userId)) {
-            targets.splice(targets.indexOf(person.userId), 1);
-        }
-        this.setState({ userTargets: targets });
-    };
-
-    private renderPerson(person: IPerson, key: any) {
-        const avatarSize = 36;
-        let avatarUrl = null;
-        if (person.user.getMxcAvatarUrl()) {
-            avatarUrl = mediaFromMxc(person.user.getMxcAvatarUrl()).getSquareThumbnailHttp(avatarSize);
-        }
-        return (
-            <div className="mx_CommunityPrototypeInviteDialog_person" key={key}>
-                <BaseAvatar
-                    url={avatarUrl}
-                    name={person.user.name}
-                    idName={person.user.userId}
-                    width={avatarSize}
-                    height={avatarSize}
-                />
-                <div className="mx_CommunityPrototypeInviteDialog_personIdentifiers">
-                    <span className="mx_CommunityPrototypeInviteDialog_personName">{ person.user.name }</span>
-                    <span className="mx_CommunityPrototypeInviteDialog_personId">{ person.userId }</span>
-                </div>
-                <StyledCheckbox onChange={(e) => this.setPersonToggle(person, e.target.checked)} />
-            </div>
-        );
-    }
-
-    private onShowMorePeople = () => {
-        this.setState({ numPeople: this.state.numPeople + 5 }); // arbitrary increase
-    };
-
-    public render() {
-        const emailAddresses = [];
-        this.state.emailTargets.forEach((address, i) => {
-            emailAddresses.push((
-                <Field
-                    key={i}
-                    value={address}
-                    onChange={(e) => this.onAddressChange(e, i)}
-                    label={_t("Email address")}
-                    placeholder={_t("Email address")}
-                    onBlur={() => this.onAddressBlur(i)}
-                />
-            ));
-        });
-
-        // Push a clean input
-        emailAddresses.push((
-            <Field
-                key={emailAddresses.length}
-                value=""
-                onChange={(e) => this.onAddressChange(e, emailAddresses.length)}
-                label={emailAddresses.length > 0 ? _t("Add another email") : _t("Email address")}
-                placeholder={emailAddresses.length > 0 ? _t("Add another email") : _t("Email address")}
-            />
-        ));
-
-        let peopleIntro = null;
-        const people = [];
-        if (this.state.showPeople) {
-            const humansToPresent = this.state.people.slice(0, this.state.numPeople);
-            humansToPresent.forEach((person, i) => {
-                people.push(this.renderPerson(person, i));
-            });
-            if (humansToPresent.length < this.state.people.length) {
-                people.push((
-                    <AccessibleButton
-                        onClick={this.onShowMorePeople}
-                        kind="link"
-                        key="more"
-                        className="mx_CommunityPrototypeInviteDialog_morePeople"
-                    >
-                        { _t("Show more") }
-                    </AccessibleButton>
-                ));
-            }
-        }
-        if (this.state.people.length > 0) {
-            peopleIntro = (
-                <div className="mx_CommunityPrototypeInviteDialog_people">
-                    <span>{ _t("People you know on %(brand)s", { brand: SdkConfig.get().brand }) }</span>
-                    <AccessibleButton onClick={this.onShowPeopleClick}>
-                        { this.state.showPeople ? _t("Hide") : _t("Show") }
-                    </AccessibleButton>
-                </div>
-            );
-        }
-
-        let buttonText = _t("Skip");
-        const targetCount = this.state.userTargets.length + this.state.emailTargets.length;
-        if (targetCount > 0) {
-            buttonText = _t("Send %(count)s invites", { count: targetCount });
-        }
-
-        return (
-            <BaseDialog
-                className="mx_CommunityPrototypeInviteDialog"
-                onFinished={this.props.onFinished}
-                title={_t("Invite people to join %(communityName)s", { communityName: this.props.communityName })}
-            >
-                <form onSubmit={this.onSubmit}>
-                    <div className="mx_Dialog_content">
-                        { emailAddresses }
-                        { peopleIntro }
-                        { people }
-                        <AccessibleButton
-                            kind="primary"
-                            onClick={this.onSubmit}
-                            disabled={this.state.busy}
-                            className="mx_CommunityPrototypeInviteDialog_primaryButton"
-                        >
-                            { buttonText }
-                        </AccessibleButton>
-                    </div>
-                </form>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
index fbf603c44da..f56f4f61941 100644
--- a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
+++ b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ConfirmRedactDialog from './ConfirmRedactDialog';
 import ErrorDialog from './ErrorDialog';
 import BaseDialog from "./BaseDialog";
@@ -45,7 +44,6 @@ interface IState {
  *
  * To avoid this, we keep the dialog open as long as /redact is in progress.
  */
-@replaceableComponent("views.dialogs.ConfirmAndWaitRedactDialog")
 export default class ConfirmAndWaitRedactDialog extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.tsx b/src/components/views/dialogs/ConfirmRedactDialog.tsx
index 6839c0f7bde..9a9f3627d2f 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.tsx
+++ b/src/components/views/dialogs/ConfirmRedactDialog.tsx
@@ -20,7 +20,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ErrorDialog from './ErrorDialog';
 import TextInputDialog from "./TextInputDialog";
 
@@ -31,7 +30,6 @@ interface IProps {
 /*
  * A dialog for confirming a redaction.
  */
-@replaceableComponent("views.dialogs.ConfirmRedactDialog")
 export default class ConfirmRedactDialog extends React.Component<IProps> {
     render() {
         return (
diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
index ff76202330d..b8d19dec441 100644
--- a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
+++ b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
@@ -22,7 +22,7 @@ import SpaceStore from "../../../stores/spaces/SpaceStore";
 import SpaceChildrenPicker from "../spaces/SpaceChildrenPicker";
 
 type BaseProps = ComponentProps<typeof ConfirmUserActionDialog>;
-interface IProps extends Omit<BaseProps, "groupMember" | "matrixClient" | "children" | "onFinished"> {
+interface IProps extends Omit<BaseProps, "matrixClient" | "children" | "onFinished"> {
     space: Room;
     allLabel: string;
     specificLabel: string;
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.tsx b/src/components/views/dialogs/ConfirmUserActionDialog.tsx
index 15392ad2570..8a41c8f2de3 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.tsx
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.tsx
@@ -15,28 +15,19 @@ limitations under the License.
 */
 
 import React, { ChangeEvent, FormEvent, ReactNode } from 'react';
-import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import classNames from "classnames";
 
 import { _t } from '../../../languageHandler';
-import { GroupMemberType } from '../../../groups';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
 import MemberAvatar from '../avatars/MemberAvatar';
-import BaseAvatar from '../avatars/BaseAvatar';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import Field from '../elements/Field';
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps {
-    // matrix-js-sdk (room) member object. Supply either this or 'groupMember'
-    member?: RoomMember;
-    // group member object. Supply either this or 'member'
-    groupMember?: GroupMemberType;
-    // needed if a group member is specified
-    matrixClient?: MatrixClient;
+    // matrix-js-sdk (room) member object.
+    member: RoomMember;
     action: string; // eg. 'Ban'
     title: string; // eg. 'Ban this user?'
 
@@ -63,7 +54,6 @@ interface IState {
  * to make it obvious what is going to happen.
  * Also tweaks the style for 'dangerous' actions (albeit only with colour)
  */
-@replaceableComponent("views.dialogs.ConfirmUserActionDialog")
 export default class ConfirmUserActionDialog extends React.Component<IProps, IState> {
     static defaultProps = {
         danger: false,
@@ -112,21 +102,9 @@ export default class ConfirmUserActionDialog extends React.Component<IProps, ISt
             );
         }
 
-        let avatar;
-        let name;
-        let userId;
-        if (this.props.member) {
-            avatar = <MemberAvatar member={this.props.member} width={48} height={48} />;
-            name = this.props.member.name;
-            userId = this.props.member.userId;
-        } else {
-            const httpAvatarUrl = this.props.groupMember.avatarUrl
-                ? mediaFromMxc(this.props.groupMember.avatarUrl).getSquareThumbnailHttp(48)
-                : null;
-            name = this.props.groupMember.displayname || this.props.groupMember.userId;
-            userId = this.props.groupMember.userId;
-            avatar = <BaseAvatar name={name} url={httpAvatarUrl} width={48} height={48} />;
-        }
+        const avatar = <MemberAvatar member={this.props.member} width={48} height={48} />;
+        const name = this.props.member.name;
+        const userId = this.props.member.userId;
 
         const displayUserIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier(
             userId, { roomId: this.props.roomId, withDisplayName: true },
diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx b/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
index 33e26ff7a7f..a61b47c04f3 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
@@ -25,7 +24,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.ConfirmWipeDeviceDialog")
 export default class ConfirmWipeDeviceDialog extends React.Component<IProps> {
     private onConfirm = (): void => {
         this.props.onFinished(true);
diff --git a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx b/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
deleted file mode 100644
index 215903c5afe..00000000000
--- a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { ChangeEvent } from 'react';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import BaseDialog from "./BaseDialog";
-import { _t } from "../../../languageHandler";
-import { IDialogProps } from "./IDialogProps";
-import Field from "../elements/Field";
-import AccessibleButton from "../elements/AccessibleButton";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import InfoTooltip from "../elements/InfoTooltip";
-import dis from "../../../dispatcher/dispatcher";
-import { Action } from '../../../dispatcher/actions';
-import { showCommunityRoomInviteDialog } from "../../../RoomInvite";
-import GroupStore from "../../../stores/GroupStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-
-interface IProps extends IDialogProps {
-}
-
-interface IState {
-    name: string;
-    localpart: string;
-    error: string;
-    busy: boolean;
-    avatarFile: File;
-    avatarPreview: string;
-}
-
-@replaceableComponent("views.dialogs.CreateCommunityPrototypeDialog")
-export default class CreateCommunityPrototypeDialog extends React.PureComponent<IProps, IState> {
-    private avatarUploadRef: React.RefObject<HTMLInputElement> = React.createRef();
-
-    constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            name: "",
-            localpart: "",
-            error: null,
-            busy: false,
-            avatarFile: null,
-            avatarPreview: null,
-        };
-    }
-
-    private onNameChange = (ev: ChangeEvent<HTMLInputElement>) => {
-        const localpart = (ev.target.value || "").toLowerCase().replace(/[^a-z0-9.\-_]/g, '-');
-        this.setState({ name: ev.target.value, localpart });
-    };
-
-    private onSubmit = async (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        if (this.state.busy) return;
-
-        // We'll create the community now to see if it's taken, leaving it active in
-        // the background for the user to look at while they invite people.
-        this.setState({ busy: true });
-        try {
-            let avatarUrl = ''; // must be a string for synapse to accept it
-            if (this.state.avatarFile) {
-                avatarUrl = await MatrixClientPeg.get().uploadContent(this.state.avatarFile);
-            }
-
-            const result = await MatrixClientPeg.get().createGroup({
-                localpart: this.state.localpart,
-                profile: {
-                    name: this.state.name,
-                    avatar_url: avatarUrl,
-                },
-            });
-
-            // Ensure the tag gets selected now that we've created it
-            dis.dispatch({ action: 'deselect_tags' }, true);
-            dis.dispatch({
-                action: 'select_tag',
-                tag: result.group_id,
-            });
-
-            // Close our own dialog before moving much further
-            this.props.onFinished(true);
-
-            if (result.room_id) {
-                // Force the group store to update as it might have missed the general chat
-                await GroupStore.refreshGroupRooms(result.group_id);
-                dis.dispatch<ViewRoomPayload>({
-                    action: Action.ViewRoom,
-                    room_id: result.room_id,
-                    metricsTrigger: undefined, // Deprecated groups
-                });
-                showCommunityRoomInviteDialog(result.room_id, this.state.name);
-            } else {
-                dis.dispatch({
-                    action: 'view_group',
-                    group_id: result.group_id,
-                    group_is_new: true,
-                });
-            }
-        } catch (e) {
-            logger.error(e);
-            this.setState({
-                busy: false,
-                error: _t(
-                    "There was an error creating your community. The name may be taken or the " +
-                    "server is unable to process your request.",
-                ),
-            });
-        }
-    };
-
-    private onAvatarChanged = (e: ChangeEvent<HTMLInputElement>) => {
-        if (!e.target.files || !e.target.files.length) {
-            this.setState({ avatarFile: null });
-        } else {
-            this.setState({ busy: true });
-            const file = e.target.files[0];
-            const reader = new FileReader();
-            reader.onload = (ev: ProgressEvent<FileReader>) => {
-                this.setState({ avatarFile: file, busy: false, avatarPreview: ev.target.result as string });
-            };
-            reader.readAsDataURL(file);
-        }
-    };
-
-    private onChangeAvatar = () => {
-        if (this.avatarUploadRef.current) this.avatarUploadRef.current.click();
-    };
-
-    public render() {
-        let communityId = null;
-        if (this.state.localpart) {
-            communityId = (
-                <span className="mx_CreateCommunityPrototypeDialog_communityId">
-                    { _t("Community ID: +<localpart />:%(domain)s", {
-                        domain: MatrixClientPeg.getHomeserverName(),
-                    }, {
-                        localpart: () => <u>{ this.state.localpart }</u>,
-                    }) }
-                    <InfoTooltip
-                        tooltip={_t(
-                            "Use this when referencing your community to others. The community ID " +
-                            "cannot be changed.",
-                        )}
-                    />
-                </span>
-            );
-        }
-
-        let helpText = (
-            <span className="mx_CreateCommunityPrototypeDialog_subtext">
-                { _t("You can change this later if needed.") }
-            </span>
-        );
-        if (this.state.error) {
-            const classes = "mx_CreateCommunityPrototypeDialog_subtext mx_CreateCommunityPrototypeDialog_subtext_error";
-            helpText = (
-                <span className={classes}>
-                    { this.state.error }
-                </span>
-            );
-        }
-
-        let preview = <img src={this.state.avatarPreview} className="mx_CreateCommunityPrototypeDialog_avatar" />;
-        if (!this.state.avatarPreview) {
-            preview = <div className="mx_CreateCommunityPrototypeDialog_placeholderAvatar" />;
-        }
-
-        return (
-            <BaseDialog
-                className="mx_CreateCommunityPrototypeDialog"
-                onFinished={this.props.onFinished}
-                title={_t("What's the name of your community or team?")}
-            >
-                <form onSubmit={this.onSubmit}>
-                    <div className="mx_Dialog_content">
-                        <div className="mx_CreateCommunityPrototypeDialog_colName">
-                            <Field
-                                value={this.state.name}
-                                onChange={this.onNameChange}
-                                placeholder={_t("Enter name")}
-                                label={_t("Enter name")}
-                            />
-                            { helpText }
-                            <span className="mx_CreateCommunityPrototypeDialog_subtext">
-                                { /*nbsp is to reserve the height of this element when there's nothing*/ }
-                                &nbsp;{ communityId }
-                            </span>
-                            <AccessibleButton kind="primary" onClick={this.onSubmit} disabled={this.state.busy}>
-                                { _t("Create") }
-                            </AccessibleButton>
-                        </div>
-                        <div className="mx_CreateCommunityPrototypeDialog_colAvatar">
-                            <input
-                                type="file"
-                                style={{ display: "none" }}
-                                ref={this.avatarUploadRef}
-                                accept="image/*"
-                                onChange={this.onAvatarChanged}
-                            />
-                            <AccessibleButton
-                                onClick={this.onChangeAvatar}
-                                className="mx_CreateCommunityPrototypeDialog_avatarContainer"
-                            >
-                                { preview }
-                            </AccessibleButton>
-                            <div className="mx_CreateCommunityPrototypeDialog_tip">
-                                <b>{ _t("Add image (optional)") }</b>
-                                <span>
-                                    { _t("An image will help people identify your community.") }
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/CreateGroupDialog.tsx b/src/components/views/dialogs/CreateGroupDialog.tsx
deleted file mode 100644
index 6b1dd7cf548..00000000000
--- a/src/components/views/dialogs/CreateGroupDialog.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import dis from '../../../dispatcher/dispatcher';
-import { _t } from '../../../languageHandler';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import BaseDialog from "./BaseDialog";
-import Spinner from "../elements/Spinner";
-
-interface IProps {
-    onFinished: (success: boolean) => void;
-}
-
-interface IState {
-    groupName: string;
-    groupId: string;
-    groupIdError: string;
-    creating: boolean;
-    createError: Error;
-}
-
-@replaceableComponent("views.dialogs.CreateGroupDialog")
-export default class CreateGroupDialog extends React.Component<IProps, IState> {
-    public state = {
-        groupName: '',
-        groupId: '',
-        groupIdError: '',
-        creating: false,
-        createError: null,
-    };
-
-    private onGroupNameChange = (e: React.FormEvent<HTMLInputElement>): void => {
-        this.setState({
-            groupName: e.currentTarget.value,
-        });
-    };
-
-    private onGroupIdChange = (e: React.FormEvent<HTMLInputElement>): void => {
-        this.setState({
-            groupId: e.currentTarget.value,
-        });
-    };
-
-    private onGroupIdBlur = (): void => {
-        this.checkGroupId();
-    };
-
-    private checkGroupId() {
-        let error = null;
-        if (!this.state.groupId) {
-            error = _t("Community IDs cannot be empty.");
-        } else if (!/^[a-z0-9=_\-./]*$/.test(this.state.groupId)) {
-            error = _t("Community IDs may only contain characters a-z, 0-9, or '=_-./'");
-        }
-        this.setState({
-            groupIdError: error,
-            // Reset createError to get rid of now stale error message
-            createError: null,
-        });
-        return error;
-    }
-
-    private onFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
-        e.preventDefault();
-
-        if (this.checkGroupId()) return;
-
-        const profile: any = {};
-        if (this.state.groupName !== '') {
-            profile.name = this.state.groupName;
-        }
-        this.setState({ creating: true });
-        MatrixClientPeg.get().createGroup({
-            localpart: this.state.groupId,
-            profile: profile,
-        }).then((result) => {
-            dis.dispatch({
-                action: 'view_group',
-                group_id: result.group_id,
-                group_is_new: true,
-            });
-            this.props.onFinished(true);
-        }).catch((e) => {
-            this.setState({ createError: e });
-        }).finally(() => {
-            this.setState({ creating: false });
-        });
-    };
-
-    private onCancel = () => {
-        this.props.onFinished(false);
-    };
-
-    render() {
-        if (this.state.creating) {
-            return <Spinner />;
-        }
-
-        let createErrorNode;
-        if (this.state.createError) {
-            // XXX: We should catch errcodes and give sensible i18ned messages for them,
-            // rather than displaying what the server gives us, but synapse doesn't give
-            // any yet.
-            createErrorNode = <div className="error" role="alert">
-                <div>{ _t('Something went wrong whilst creating your community') }</div>
-                <div>{ this.state.createError.message }</div>
-            </div>;
-        }
-
-        return (
-            <BaseDialog
-                className="mx_CreateGroupDialog"
-                onFinished={this.props.onFinished}
-                title={_t('Create Community')}
-            >
-                <form onSubmit={this.onFormSubmit}>
-                    <div className="mx_Dialog_content">
-                        <div className="mx_CreateGroupDialog_inputRow">
-                            <div className="mx_CreateGroupDialog_label">
-                                <label htmlFor="groupname">{ _t('Community Name') }</label>
-                            </div>
-                            <div>
-                                <input
-                                    id="groupname"
-                                    className="mx_CreateGroupDialog_input"
-                                    autoFocus={true}
-                                    size={64}
-                                    placeholder={_t('Example')}
-                                    onChange={this.onGroupNameChange}
-                                    value={this.state.groupName}
-                                />
-                            </div>
-                        </div>
-                        <div className="mx_CreateGroupDialog_inputRow">
-                            <div className="mx_CreateGroupDialog_label">
-                                <label htmlFor="groupid">{ _t('Community ID') }</label>
-                            </div>
-                            <div className="mx_CreateGroupDialog_input_group">
-                                <span className="mx_CreateGroupDialog_prefix">+</span>
-                                <input id="groupid"
-                                    className="mx_CreateGroupDialog_input mx_CreateGroupDialog_input_hasPrefixAndSuffix"
-                                    size={32}
-                                    placeholder={_t('example')}
-                                    onChange={this.onGroupIdChange}
-                                    onBlur={this.onGroupIdBlur}
-                                    value={this.state.groupId}
-                                />
-                                <span className="mx_CreateGroupDialog_suffix">
-                                    :{ MatrixClientPeg.get().getDomain() }
-                                </span>
-                            </div>
-                        </div>
-                        <div className="error">
-                            { this.state.groupIdError }
-                        </div>
-                        { createErrorNode }
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <input type="submit" value={_t('Create')} className="mx_Dialog_primary" />
-                        <button onClick={this.onCancel}>
-                            { _t("Cancel") }
-                        </button>
-                    </div>
-                </form>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index a594a64ca3e..7d1028bba79 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -17,15 +17,14 @@ limitations under the License.
 
 import React, { ChangeEvent, createRef, KeyboardEvent, SyntheticEvent } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 import { JoinRule, Preset, Visibility } from "matrix-js-sdk/src/@types/partials";
 
 import SdkConfig from '../../../SdkConfig';
 import withValidation, { IFieldState } from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { IOpts, privateShouldBeEncrypted } from "../../../createRoom";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IOpts } from "../../../createRoom";
 import Field from "../elements/Field";
 import RoomAliasField from "../elements/RoomAliasField";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
@@ -35,8 +34,10 @@ import SpaceStore from "../../../stores/spaces/SpaceStore";
 import JoinRuleDropdown from "../elements/JoinRuleDropdown";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
+import { privateShouldBeEncrypted } from "../../../utils/rooms";
 
 interface IProps {
+    type?: RoomType;
     defaultPublic?: boolean;
     defaultName?: string;
     parentSpace?: Room;
@@ -57,7 +58,6 @@ interface IState {
     canChangeEncryption: boolean;
 }
 
-@replaceableComponent("views.dialogs.CreateRoomDialog")
 export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private readonly supportsRestricted: boolean;
     private nameField = createRef<Field>();
@@ -75,7 +75,6 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             joinRule = JoinRule.Restricted;
         }
 
-        const config = SdkConfig.get();
         this.state = {
             isPublic: this.props.defaultPublic || false,
             isEncrypted: this.props.defaultEncrypted ?? privateShouldBeEncrypted(),
@@ -84,7 +83,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             topic: "",
             alias: "",
             detailsOpen: false,
-            noFederate: config.default_federate === false,
+            noFederate: SdkConfig.get().default_federate === false,
             nameIsValid: false,
             canChangeEncryption: true,
         };
@@ -96,6 +95,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private roomCreateOptions() {
         const opts: IOpts = {};
         const createOpts: IOpts["createOpts"] = opts.createOpts = {};
+        opts.roomType = this.props.type;
         createOpts.name = this.state.name;
 
         if (this.state.joinRule === JoinRule.Public) {
@@ -103,7 +103,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             createOpts.preset = Preset.PublicChat;
             opts.guestAccess = false;
             const { alias } = this.state;
-            createOpts.room_alias_name = alias.substr(1, alias.indexOf(":") - 1);
+            createOpts.room_alias_name = alias.substring(1, alias.indexOf(":"));
         } else {
             // If we cannot change encryption we pass `true` for safety, the server should automatically do this for us.
             opts.encryption = this.state.canChangeEncryption ? this.state.isEncrypted : true;
@@ -116,10 +116,6 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             createOpts.creation_content = { 'm.federate': false };
         }
 
-        if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-            opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId();
-        }
-
         opts.parentSpace = this.props.parentSpace;
         if (this.props.parentSpace && this.state.joinRule === JoinRule.Restricted) {
             opts.joinRule = JoinRule.Restricted;
@@ -224,6 +220,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
     });
 
     render() {
+        const isVideoRoom = this.props.type === RoomType.ElementVideo;
+
         let aliasField;
         if (this.state.joinRule === JoinRule.Public) {
             const domain = MatrixClientPeg.get().getDomain();
@@ -240,14 +238,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         }
 
         let publicPrivateLabel: JSX.Element;
-        if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-            publicPrivateLabel = <p>
-                { _t(
-                    "Private rooms can be found and joined by invitation only. Public rooms can be " +
-                    "found and joined by anyone in this community.",
-                ) }
-            </p>;
-        } else if (this.state.joinRule === JoinRule.Restricted) {
+        if (this.state.joinRule === JoinRule.Restricted) {
             publicPrivateLabel = <p>
                 { _t(
                     "Everyone in <SpaceName/> will be able to find and join this room.", {}, {
@@ -321,11 +312,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             );
         }
 
-        let title = _t("Create a room");
-        if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-            const name = CommunityPrototypeStore.instance.getSelectedCommunityName();
-            title = _t("Create a room in %(communityName)s", { communityName: name });
-        } else if (!this.props.parentSpace) {
+        let title;
+        if (isVideoRoom) {
+            title = _t("Create a video room");
+        } else if (this.props.parentSpace) {
+            title = _t("Create a room");
+        } else {
             title = this.state.joinRule === JoinRule.Public ? _t('Create a public room') : _t('Create a private room');
         }
 
@@ -381,7 +373,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                         </details>
                     </div>
                 </form>
-                <DialogButtons primaryButton={_t('Create Room')}
+                <DialogButtons primaryButton={isVideoRoom ? _t('Create video room') : _t('Create room')}
                     onPrimaryButtonClick={this.onOk}
                     onCancel={this.onCancel} />
             </BaseDialog>
diff --git a/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx b/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx
deleted file mode 100644
index 64b1dcab2c1..00000000000
--- a/src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { useEffect, useRef, useState } from "react";
-import { JoinRule } from "matrix-js-sdk/src/@types/partials";
-import { EventType } from "matrix-js-sdk/src/@types/event";
-import { MatrixClient } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { _t } from '../../../languageHandler';
-import BaseDialog from "./BaseDialog";
-import AccessibleButton from "../elements/AccessibleButton";
-import { createSpace, SpaceCreateForm } from "../spaces/SpaceCreateMenu";
-import JoinRuleDropdown from "../elements/JoinRuleDropdown";
-import Field from "../elements/Field";
-import RoomAliasField from "../elements/RoomAliasField";
-import { GroupMember } from "../right_panel/UserInfo";
-import { parseMembersResponse, parseRoomsResponse } from "../../../stores/GroupStore";
-import { calculateRoomVia, makeRoomPermalink } from "../../../utils/permalinks/Permalinks";
-import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
-import Spinner from "../elements/Spinner";
-import { mediaFromMxc } from "../../../customisations/Media";
-import SpaceStore from "../../../stores/spaces/SpaceStore";
-import Modal from "../../../Modal";
-import InfoDialog from "./InfoDialog";
-import dis from "../../../dispatcher/dispatcher";
-import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "./UserSettingsDialog";
-import TagOrderActions from "../../../actions/TagOrderActions";
-import { inviteUsersToRoom } from "../../../RoomInvite";
-import ProgressBar from "../elements/ProgressBar";
-import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import { CreateEventField, IGroupRoom, IGroupSummary } from "../../../@types/groups";
-
-interface IProps {
-    matrixClient: MatrixClient;
-    groupId: string;
-    onFinished(spaceId?: string): void;
-}
-
-enum Progress {
-    NotStarted,
-    ValidatingInputs,
-    FetchingData,
-    CreatingSpace,
-    InvitingUsers,
-    // anything beyond here is inviting user n - 4
-}
-
-const CreateSpaceFromCommunityDialog: React.FC<IProps> = ({ matrixClient: cli, groupId, onFinished }) => {
-    const [loading, setLoading] = useState(true);
-    const [error, setError] = useState<string>(null);
-
-    const [progress, setProgress] = useState(Progress.NotStarted);
-    const [numInvites, setNumInvites] = useState(0);
-    const busy = progress > 0;
-
-    const [avatar, setAvatar] = useState<File>(null); // undefined means to remove avatar
-    const [name, setName] = useState("");
-    const spaceNameField = useRef<Field>();
-    const [alias, setAlias] = useState("#" + groupId.substring(1, groupId.indexOf(":")) + ":" + cli.getDomain());
-    const spaceAliasField = useRef<RoomAliasField>();
-    const [topic, setTopic] = useState("");
-    const [joinRule, setJoinRule] = useState<JoinRule>(JoinRule.Public);
-
-    const groupSummary = useAsyncMemo<IGroupSummary>(() => cli.getGroupSummary(groupId), [groupId]);
-    useEffect(() => {
-        if (groupSummary) {
-            setName(groupSummary.profile.name || "");
-            setTopic(groupSummary.profile.short_description || "");
-            setJoinRule(groupSummary.profile.is_openly_joinable ? JoinRule.Public : JoinRule.Invite);
-            setLoading(false);
-        }
-    }, [groupSummary]);
-
-    if (loading) {
-        return <Spinner />;
-    }
-
-    const onCreateSpaceClick = async (e) => {
-        e.preventDefault();
-        if (busy) return;
-
-        setError(null);
-        setProgress(Progress.ValidatingInputs);
-
-        // require & validate the space name field
-        if (!(await spaceNameField.current.validate({ allowEmpty: false }))) {
-            setProgress(0);
-            spaceNameField.current.focus();
-            spaceNameField.current.validate({ allowEmpty: false, focused: true });
-            return;
-        }
-        // validate the space name alias field but do not require it
-        if (joinRule === JoinRule.Public && !(await spaceAliasField.current.validate({ allowEmpty: true }))) {
-            setProgress(0);
-            spaceAliasField.current.focus();
-            spaceAliasField.current.validate({ allowEmpty: true, focused: true });
-            return;
-        }
-
-        try {
-            setProgress(Progress.FetchingData);
-
-            const [rooms, members, invitedMembers] = await Promise.all([
-                cli.getGroupRooms(groupId).then(parseRoomsResponse) as Promise<IGroupRoom[]>,
-                cli.getGroupUsers(groupId).then(parseMembersResponse) as Promise<GroupMember[]>,
-                cli.getGroupInvitedUsers(groupId).then(parseMembersResponse) as Promise<GroupMember[]>,
-            ]);
-
-            setNumInvites(members.length + invitedMembers.length);
-
-            const viaMap = new Map<string, string[]>();
-            for (const { roomId, canonicalAlias } of rooms) {
-                const room = cli.getRoom(roomId);
-                if (room) {
-                    viaMap.set(roomId, calculateRoomVia(room));
-                } else if (canonicalAlias) {
-                    try {
-                        const { servers } = await cli.getRoomIdForAlias(canonicalAlias);
-                        viaMap.set(roomId, servers);
-                    } catch (e) {
-                        logger.warn("Failed to resolve alias during community migration", e);
-                    }
-                }
-
-                if (!viaMap.get(roomId)?.length) {
-                    // XXX: lets guess the via, this might end up being incorrect.
-                    const str = canonicalAlias || roomId;
-                    viaMap.set(roomId, [str.substring(1, str.indexOf(":"))]);
-                }
-            }
-
-            setProgress(Progress.CreatingSpace);
-
-            const spaceAvatar = avatar !== undefined ? avatar : groupSummary.profile.avatar_url;
-            const roomId = await createSpace(name, joinRule === JoinRule.Public, alias, topic, spaceAvatar, {
-                creation_content: {
-                    [CreateEventField]: groupId,
-                },
-                initial_state: rooms.map(({ roomId }) => ({
-                    type: EventType.SpaceChild,
-                    state_key: roomId,
-                    content: {
-                        via: viaMap.get(roomId) || [],
-                    },
-                })),
-                // we do not specify the inviters here because Synapse applies a limit and this may cause it to trip
-            }, {
-                andView: false,
-            });
-
-            setProgress(Progress.InvitingUsers);
-
-            const userIds = [...members, ...invitedMembers].map(m => m.userId).filter(m => m !== cli.getUserId());
-            await inviteUsersToRoom(roomId, userIds, false, () => setProgress(p => p + 1));
-
-            // eagerly remove it from the community panel
-            dis.dispatch(TagOrderActions.removeTag(cli, groupId));
-
-            // don't bother awaiting this, as we don't hugely care if it fails
-            cli.setGroupProfile(groupId, {
-                ...groupSummary.profile,
-                long_description: `<a href="${makeRoomPermalink(roomId)}"><h1>` +
-                    _t("This community has been upgraded into a Space") + `</h1></a><br />`
-                    + groupSummary.profile.long_description,
-            } as IGroupSummary["profile"]).catch(e => {
-                logger.warn("Failed to update community profile during migration", e);
-            });
-
-            onFinished(roomId);
-
-            const onSpaceClick = () => {
-                dis.dispatch<ViewRoomPayload>({
-                    action: Action.ViewRoom,
-                    room_id: roomId,
-                    metricsTrigger: undefined, // other
-                });
-            };
-
-            const onPreferencesClick = () => {
-                dis.dispatch({
-                    action: Action.ViewUserSettings,
-                    initialTabId: UserTab.Preferences,
-                });
-            };
-
-            let spacesDisabledCopy;
-            if (!SpaceStore.spacesEnabled) {
-                spacesDisabledCopy = _t("To view Spaces, hide communities in <a>Preferences</a>", {}, {
-                    a: sub => <AccessibleButton onClick={onPreferencesClick} kind="link">{ sub }</AccessibleButton>,
-                });
-            }
-
-            Modal.createDialog(InfoDialog, {
-                title: _t("Space created"),
-                description: <>
-                    <div className="mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark" />
-                    <p>
-                        { _t("<SpaceName/> has been made and everyone who was a part of the community has " +
-                            "been invited to it.", {}, {
-                            SpaceName: () => <AccessibleButton onClick={onSpaceClick} kind="link">
-                                { name }
-                            </AccessibleButton>,
-                        }) }
-                        &nbsp;
-                        { spacesDisabledCopy }
-                    </p>
-                    <p>
-                        { _t("To create a Space from another community, just pick the community in Preferences.") }
-                    </p>
-                </>,
-                button: _t("Preferences"),
-                onFinished: (openPreferences: boolean) => {
-                    if (openPreferences) {
-                        onPreferencesClick();
-                    }
-                },
-            }, "mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog");
-        } catch (e) {
-            logger.error(e);
-            setError(e);
-        }
-
-        setProgress(Progress.NotStarted);
-    };
-
-    let footer;
-    if (error) {
-        footer = <>
-            <img src={require("../../../../res/img/element-icons/warning-badge.svg").default} height="24" width="24" alt="" />
-
-            <span className="mx_CreateSpaceFromCommunityDialog_error">
-                <div className="mx_CreateSpaceFromCommunityDialog_errorHeading">{ _t("Failed to migrate community") }</div>
-                <div className="mx_CreateSpaceFromCommunityDialog_errorCaption">{ _t("Try again") }</div>
-            </span>
-
-            <AccessibleButton className="mx_CreateSpaceFromCommunityDialog_retryButton" onClick={onCreateSpaceClick}>
-                { _t("Retry") }
-            </AccessibleButton>
-        </>;
-    } else if (busy) {
-        let description: string;
-        switch (progress) {
-            case Progress.ValidatingInputs:
-            case Progress.FetchingData:
-                description = _t("Fetching data...");
-                break;
-            case Progress.CreatingSpace:
-                description = _t("Creating Space...");
-                break;
-            case Progress.InvitingUsers:
-            default:
-                description = _t("Adding rooms... (%(progress)s out of %(count)s)", {
-                    count: numInvites,
-                    progress,
-                });
-                break;
-        }
-
-        footer = <span>
-            <ProgressBar
-                value={progress > Progress.FetchingData ? progress : 0}
-                max={numInvites + Progress.InvitingUsers}
-            />
-            <div className="mx_CreateSpaceFromCommunityDialog_progressText">
-                { description }
-            </div>
-        </span>;
-    } else {
-        footer = <>
-            <AccessibleButton kind="primary_outline" onClick={() => onFinished()}>
-                { _t("Cancel") }
-            </AccessibleButton>
-            <AccessibleButton kind="primary" onClick={onCreateSpaceClick}>
-                { _t("Create Space") }
-            </AccessibleButton>
-        </>;
-    }
-
-    return <BaseDialog
-        title={_t("Create Space from community")}
-        className="mx_CreateSpaceFromCommunityDialog"
-        onFinished={onFinished}
-        fixedWidth={false}
-    >
-        <div className="mx_CreateSpaceFromCommunityDialog_content">
-            <p>
-                { _t("A link to the Space will be put in your community description.") }
-                &nbsp;
-                { _t("All rooms will be added and all community members will be invited.") }
-            </p>
-            <p className="mx_CreateSpaceFromCommunityDialog_flairNotice">
-                { _t("Flair won't be available in Spaces for the foreseeable future.") }
-            </p>
-
-            <SpaceCreateForm
-                busy={busy}
-                onSubmit={onCreateSpaceClick}
-                avatarUrl={groupSummary.profile.avatar_url
-                    ? mediaFromMxc(groupSummary.profile.avatar_url).getThumbnailOfSourceHttp(80, 80, "crop")
-                    : undefined
-                }
-                setAvatar={setAvatar}
-                name={name}
-                setName={setName}
-                nameFieldRef={spaceNameField}
-                topic={topic}
-                setTopic={setTopic}
-                alias={alias}
-                setAlias={setAlias}
-                showAliasField={joinRule === JoinRule.Public}
-                aliasFieldRef={spaceAliasField}
-            >
-                <p>{ _t("This description will be shown to people when they view your space") }</p>
-                <JoinRuleDropdown
-                    label={_t("Space visibility")}
-                    labelInvite={_t("Private space (invite only)")}
-                    labelPublic={_t("Public space")}
-                    value={joinRule}
-                    onChange={setJoinRule}
-                />
-                <p>{ joinRule === JoinRule.Public
-                    ? _t("Open space for anyone, best for communities")
-                    : _t("Invite only, best for yourself or teams")
-                }</p>
-                { joinRule !== JoinRule.Public &&
-                    <div className="mx_CreateSpaceFromCommunityDialog_nonPublicSpacer" />
-                }
-            </SpaceCreateForm>
-        </div>
-
-        <div className="mx_CreateSpaceFromCommunityDialog_footer">
-            { footer }
-        </div>
-    </BaseDialog>;
-};
-
-export default CreateSpaceFromCommunityDialog;
-
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.tsx b/src/components/views/dialogs/DeactivateAccountDialog.tsx
index aece59ef84b..dbdc3b3639a 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.tsx
+++ b/src/components/views/dialogs/DeactivateAccountDialog.tsx
@@ -21,13 +21,13 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import Analytics from '../../../Analytics';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
 import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
 import { DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
 import StyledCheckbox from "../elements/StyledCheckbox";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
 
 interface IProps {
     onFinished: (success: boolean) => void;
@@ -46,7 +46,6 @@ interface IState {
     continueKind: string;
 }
 
-@replaceableComponent("views.dialogs.DeactivateAccountDialog")
 export default class DeactivateAccountDialog extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
@@ -87,7 +86,7 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
             [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
             [PasswordAuthEntry.LOGIN_TYPE]: {
                 [DEFAULT_PHASE]: {
-                    body: _t("To continue, please enter your password:"),
+                    body: _t("To continue, please enter your account password:"),
                 },
             },
         };
@@ -124,7 +123,7 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
         MatrixClientPeg.get().deactivateAccount(auth, this.state.shouldErase).then(r => {
             // Deactivation worked - logout & close this dialog
             Analytics.trackEvent('Account', 'Deactivate Account');
-            Lifecycle.onLoggedOut();
+            defaultDispatcher.fire(Action.TriggerLogout);
             this.props.onFinished(true);
         }).catch(e => {
             logger.error(e);
@@ -207,31 +206,15 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
                 screenName="DeactivateAccount"
             >
                 <div className="mx_Dialog_content">
-                    <p>{ _t(
-                        "This will make your account permanently unusable. " +
-                        "You will not be able to log in, and no one will be able to re-register the same " +
-                        "user ID. " +
-                        "This will cause your account to leave all rooms it is participating in, and it " +
-                        "will remove your account details from your identity server. " +
-                        "<b>This action is irreversible.</b>",
-                        {},
-                        { b: (sub) => <b> { sub } </b> },
-                    ) }</p>
-
-                    <p>{ _t(
-                        "Deactivating your account <b>does not by default cause us to forget messages you " +
-                        "have sent.</b> " +
-                        "If you would like us to forget your messages, please tick the box below.",
-                        {},
-                        { b: (sub) => <b> { sub } </b> },
-                    ) }</p>
-
-                    <p>{ _t(
-                        "Message visibility in Matrix is similar to email. " +
-                        "Our forgetting your messages means that messages you have sent will not be shared " +
-                        "with any new or unregistered users, but registered users who already have access " +
-                        "to these messages will still have access to their copy.",
-                    ) }</p>
+                    <p>{ _t("Confirm that you would like to deactivate your account. If you proceed:") }</p>
+                    <ul>
+                        <li>{ _t("You will not be able to reactivate your account") }</li>
+                        <li>{ _t("You will no longer be able to log in") }</li>
+                        <li>{ _t("No one will be able to reuse your username (MXID), including you: this username will remain unavailable") }</li>
+                        <li>{ _t("You will leave all rooms and DMs that you are in") }</li>
+                        <li>{ _t("You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number") }</li>
+                    </ul>
+                    <p>{ _t("Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?") }</p>
 
                     <div className="mx_DeactivateAccountDialog_input_section">
                         <p>
@@ -239,20 +222,12 @@ export default class DeactivateAccountDialog extends React.Component<IProps, ISt
                                 checked={this.state.shouldErase}
                                 onChange={this.onEraseFieldChange}
                             >
-                                { _t(
-                                    "Please forget all messages I have sent when my account is deactivated " +
-                                    "(<b>Warning:</b> this will cause future users to see an incomplete view " +
-                                    "of conversations)",
-                                    {},
-                                    { b: (sub) => <b>{ sub }</b> },
-                                ) }
+                                { _t("Hide my messages from new joiners") }
                             </StyledCheckbox>
                         </p>
-
                         { error }
                         { auth }
                     </div>
-
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/DevtoolsDialog.tsx b/src/components/views/dialogs/DevtoolsDialog.tsx
index f69041336c4..14fb69b1563 100644
--- a/src/components/views/dialogs/DevtoolsDialog.tsx
+++ b/src/components/views/dialogs/DevtoolsDialog.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
 Copyright 2018-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,1319 +15,111 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useState, useEffect, ChangeEvent } from 'react';
-import {
-    PHASE_UNSENT,
-    PHASE_REQUESTED,
-    PHASE_READY,
-    PHASE_DONE,
-    PHASE_STARTED,
-    PHASE_CANCELLED,
-    VerificationRequest,
-    VerificationRequestEvent,
-} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { logger } from "matrix-js-sdk/src/logger";
-import classNames from 'classnames';
+import React, { useState } from 'react';
 
-import SyntaxHighlight from '../elements/SyntaxHighlight';
-import { _t } from '../../../languageHandler';
-import Field from "../elements/Field";
+import { _t, _td } from '../../../languageHandler';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
-import WidgetStore, { IApp } from "../../../stores/WidgetStore";
-import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { SETTINGS } from "../../../settings/Settings";
-import SettingsStore, { LEVEL_ORDER } from "../../../settings/SettingsStore";
-import Modal from "../../../Modal";
-import ErrorDialog from "./ErrorDialog";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { SettingLevel } from '../../../settings/SettingLevel';
 import BaseDialog from "./BaseDialog";
-import TruncatedList from "../elements/TruncatedList";
-import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
-
-interface IGenericEditorProps {
-    onBack: () => void;
-}
-
-interface IGenericEditorState {
-    message?: string;
-    [inputId: string]: boolean | string;
-}
-
-abstract class GenericEditor<
-    P extends IGenericEditorProps = IGenericEditorProps,
-    S extends IGenericEditorState = IGenericEditorState,
-> extends React.PureComponent<P, S> {
-    protected onBack = () => {
-        if (this.state.message) {
-            this.setState({ message: null });
-        } else {
-            this.props.onBack();
-        }
-    };
-
-    protected onChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-        // @ts-ignore: Unsure how to convince TS this is okay when the state
-        // type can be extended.
-        this.setState({ [e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value });
-    };
-
-    protected abstract send();
-
-    protected buttons(): React.ReactNode {
-        return <div className="mx_Dialog_buttons">
-            <button onClick={this.onBack}>{ _t('Back') }</button>
-            { !this.state.message && <button onClick={this.send}>{ _t('Send') }</button> }
-        </div>;
-    }
-
-    protected textInput(id: string, label: string): React.ReactNode {
-        return <Field
-            id={id}
-            label={label}
-            size={42}
-            autoFocus={true}
-            type="text"
-            autoComplete="on"
-            value={this.state[id] as string}
-            onChange={this.onChange}
-        />;
-    }
-}
-
-interface ISendCustomEventProps extends IGenericEditorProps {
-    room: Room;
-    forceStateEvent?: boolean;
-    forceGeneralEvent?: boolean;
-    inputs?: {
-        eventType?: string;
-        stateKey?: string;
-        evContent?: string;
-    };
-}
-
-interface ISendCustomEventState extends IGenericEditorState {
-    isStateEvent: boolean;
-    eventType: string;
-    stateKey: string;
-    evContent: string;
-}
-
-export class SendCustomEvent extends GenericEditor<ISendCustomEventProps, ISendCustomEventState> {
-    static getLabel() { return _t('Send Custom Event'); }
-
-    static contextType = MatrixClientContext;
-
-    constructor(props) {
-        super(props);
-
-        const { eventType, stateKey, evContent } = Object.assign({
-            eventType: '',
-            stateKey: '',
-            evContent: '{\n\n}',
-        }, this.props.inputs);
-
-        this.state = {
-            isStateEvent: Boolean(this.props.forceStateEvent),
-
-            eventType,
-            stateKey,
-            evContent,
-        };
-    }
-
-    private doSend(content: object): Promise<void> {
-        const cli = this.context;
-        if (this.state.isStateEvent) {
-            return cli.sendStateEvent(this.props.room.roomId, this.state.eventType, content, this.state.stateKey);
-        } else {
-            return cli.sendEvent(this.props.room.roomId, this.state.eventType, content);
-        }
-    }
-
-    protected send = async () => {
-        if (this.state.eventType === '') {
-            this.setState({ message: _t('You must specify an event type!') });
-            return;
-        }
-
-        let message;
-        try {
-            const content = JSON.parse(this.state.evContent);
-            await this.doSend(content);
-            message = _t('Event sent!');
-        } catch (e) {
-            message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
-        }
-        this.setState({ message });
-    };
-
-    render() {
-        if (this.state.message) {
-            return <div>
-                <div className="mx_Dialog_content">
-                    { this.state.message }
-                </div>
-                { this.buttons() }
-            </div>;
-        }
-
-        const showTglFlip = !this.state.message && !this.props.forceStateEvent && !this.props.forceGeneralEvent;
-
-        return <div>
-            <div className="mx_DevTools_content">
-                <div className="mx_DevTools_eventTypeStateKeyGroup">
-                    { this.textInput('eventType', _t('Event Type')) }
-                    { this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) }
-                </div>
-
-                <br />
-
-                <Field
-                    id="evContent"
-                    label={_t("Event Content")}
-                    type="text"
-                    className="mx_DevTools_textarea"
-                    autoComplete="off"
-                    value={this.state.evContent}
-                    onChange={this.onChange}
-                    element="textarea" />
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{ _t('Back') }</button>
-                { !this.state.message && <button onClick={this.send}>{ _t('Send') }</button> }
-                { showTglFlip && <div style={{ float: "right" }}>
-                    <input
-                        id="isStateEvent"
-                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
-                        type="checkbox"
-                        checked={this.state.isStateEvent}
-                        onChange={this.onChange}
-                    />
-                    <label className="mx_DevTools_tgl-btn"
-                        data-tg-off="Event"
-                        data-tg-on="State Event"
-                        htmlFor="isStateEvent"
-                    />
-                </div> }
-            </div>
-        </div>;
-    }
-}
-
-interface ISendAccountDataProps extends IGenericEditorProps {
-    room: Room;
-    isRoomAccountData: boolean;
-    forceMode: boolean;
-    inputs?: {
-        eventType?: string;
-        evContent?: string;
-    };
-}
-
-interface ISendAccountDataState extends IGenericEditorState {
-    isRoomAccountData: boolean;
-    eventType: string;
-    evContent: string;
-}
-
-class SendAccountData extends GenericEditor<ISendAccountDataProps, ISendAccountDataState> {
-    static getLabel() { return _t('Send Account Data'); }
-
-    static contextType = MatrixClientContext;
-
-    constructor(props) {
-        super(props);
-
-        const { eventType, evContent } = Object.assign({
-            eventType: '',
-            evContent: '{\n\n}',
-        }, this.props.inputs);
-
-        this.state = {
-            isRoomAccountData: Boolean(this.props.isRoomAccountData),
-
-            eventType,
-            evContent,
-        };
-    }
-
-    private doSend(content: object): Promise<void> {
-        const cli = this.context;
-        if (this.state.isRoomAccountData) {
-            return cli.setRoomAccountData(this.props.room.roomId, this.state.eventType, content);
-        }
-        return cli.setAccountData(this.state.eventType, content);
-    }
-
-    protected send = async () => {
-        if (this.state.eventType === '') {
-            this.setState({ message: _t('You must specify an event type!') });
-            return;
-        }
-
-        let message;
-        try {
-            const content = JSON.parse(this.state.evContent);
-            await this.doSend(content);
-            message = _t('Event sent!');
-        } catch (e) {
-            message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
-        }
-        this.setState({ message });
-    };
-
-    render() {
-        if (this.state.message) {
-            return <div>
-                <div className="mx_Dialog_content">
-                    { this.state.message }
-                </div>
-                { this.buttons() }
-            </div>;
-        }
-
-        return <div>
-            <div className="mx_DevTools_content">
-                { this.textInput('eventType', _t('Event Type')) }
-                <br />
-
-                <Field
-                    id="evContent"
-                    label={_t("Event Content")}
-                    type="text"
-                    className="mx_DevTools_textarea"
-                    autoComplete="off"
-                    value={this.state.evContent}
-                    onChange={this.onChange}
-                    element="textarea"
-                />
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{ _t('Back') }</button>
-                { !this.state.message && <button onClick={this.send}>{ _t('Send') }</button> }
-                { !this.state.message && <div style={{ float: "right" }}>
-                    <input
-                        id="isRoomAccountData"
-                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
-                        type="checkbox"
-                        checked={this.state.isRoomAccountData}
-                        disabled={this.props.forceMode}
-                        onChange={this.onChange}
-                    />
-                    <label className="mx_DevTools_tgl-btn"
-                        data-tg-off="Account Data"
-                        data-tg-on="Room Data"
-                        htmlFor="isRoomAccountData"
-                    />
-                </div> }
-            </div>
-        </div>;
-    }
-}
-
-const INITIAL_LOAD_TILES = 20;
-const LOAD_TILES_STEP_SIZE = 50;
-
-interface IFilteredListProps {
-    children: React.ReactElement[];
-    query: string;
-    onChange: (value: string) => void;
-}
-
-interface IFilteredListState {
-    filteredChildren: React.ReactElement[];
-    truncateAt: number;
-}
-
-class FilteredList extends React.PureComponent<IFilteredListProps, IFilteredListState> {
-    static filterChildren(children: React.ReactElement[], query: string): React.ReactElement[] {
-        if (!query) return children;
-        const lcQuery = query.toLowerCase();
-        return children.filter((child) => child.key.toString().toLowerCase().includes(lcQuery));
-    }
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            filteredChildren: FilteredList.filterChildren(this.props.children, this.props.query),
-            truncateAt: INITIAL_LOAD_TILES,
-        };
-    }
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line
-        if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
-        this.setState({
-            filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
-            truncateAt: INITIAL_LOAD_TILES,
-        });
-    }
-
-    private showAll = () => {
-        this.setState({
-            truncateAt: this.state.truncateAt + LOAD_TILES_STEP_SIZE,
-        });
-    };
-
-    private createOverflowElement = (overflowCount: number, totalCount: number) => {
-        return <button className="mx_DevTools_RoomStateExplorer_button" onClick={this.showAll}>
-            { _t("and %(count)s others...", { count: overflowCount }) }
-        </button>;
-    };
-
-    private onQuery = (ev: ChangeEvent<HTMLInputElement>) => {
-        if (this.props.onChange) this.props.onChange(ev.target.value);
-    };
-
-    private getChildren = (start: number, end: number): React.ReactElement[] => {
-        return this.state.filteredChildren.slice(start, end);
-    };
-
-    private getChildCount = (): number => {
-        return this.state.filteredChildren.length;
-    };
-
-    render() {
-        return <div>
-            <Field
-                label={_t('Filter results')}
-                autoFocus={true}
-                size={64}
-                type="text"
-                autoComplete="off"
-                value={this.props.query}
-                onChange={this.onQuery}
-                className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
-                // force re-render so that autoFocus is applied when this component is re-used
-                key={this.props.children[0] ? this.props.children[0].key : ''}
-            />
-
-            <TruncatedList getChildren={this.getChildren}
-                getChildCount={this.getChildCount}
-                truncateAt={this.state.truncateAt}
-                createOverflowElement={this.createOverflowElement} />
-        </div>;
-    }
-}
-
-interface IExplorerProps {
-    room: Room;
-    onBack: () => void;
-}
-
-interface IRoomStateExplorerState {
-    eventType?: string;
-    event?: MatrixEvent;
-    editing: boolean;
-    queryEventType: string;
-    queryStateKey: string;
-}
-
-class RoomStateExplorer extends React.PureComponent<IExplorerProps, IRoomStateExplorerState> {
-    static getLabel() { return _t('Explore Room State'); }
-
-    static contextType = MatrixClientContext;
-
-    private roomStateEvents: Map<string, Map<string, MatrixEvent>>;
-
-    constructor(props) {
-        super(props);
-
-        this.roomStateEvents = this.props.room.currentState.events;
-
-        this.state = {
-            eventType: null,
-            event: null,
-            editing: false,
-
-            queryEventType: '',
-            queryStateKey: '',
-        };
-    }
-
-    private browseEventType(eventType: string) {
-        return () => {
-            this.setState({ eventType });
-        };
-    }
-
-    private onViewSourceClick(event: MatrixEvent) {
-        return () => {
-            this.setState({ event });
-        };
-    }
-
-    private onBack = () => {
-        if (this.state.editing) {
-            this.setState({ editing: false });
-        } else if (this.state.event) {
-            this.setState({ event: null });
-        } else if (this.state.eventType) {
-            this.setState({ eventType: null });
-        } else {
-            this.props.onBack();
-        }
-    };
-
-    private editEv = () => {
-        this.setState({ editing: true });
-    };
-
-    private onQueryEventType = (filterEventType: string) => {
-        this.setState({ queryEventType: filterEventType });
-    };
-
-    private onQueryStateKey = (filterStateKey: string) => {
-        this.setState({ queryStateKey: filterStateKey });
-    };
-
-    render() {
-        if (this.state.event) {
-            if (this.state.editing) {
-                return <SendCustomEvent
-                    room={this.props.room}
-                    forceStateEvent={true}
-                    onBack={this.onBack}
-                    inputs={{
-                        eventType: this.state.event.getType(),
-                        evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
-                        stateKey: this.state.event.getStateKey(),
-                    }}
-                />;
-            }
-
-            return <div className="mx_ViewSource">
-                <div className="mx_Dialog_content">
-                    <SyntaxHighlight language="json">
-                        { JSON.stringify(this.state.event.event, null, 2) }
-                    </SyntaxHighlight>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onBack}>{ _t('Back') }</button>
-                    <button onClick={this.editEv}>{ _t('Edit') }</button>
-                </div>
-            </div>;
-        }
-
-        let list = null;
-
-        const classes = 'mx_DevTools_RoomStateExplorer_button';
-        if (this.state.eventType === null) {
-            list = <FilteredList query={this.state.queryEventType} onChange={this.onQueryEventType}>
-                {
-                    Array.from(this.roomStateEvents.entries()).map(([eventType, allStateKeys]) => {
-                        let onClickFn;
-                        if (allStateKeys.size === 1 && allStateKeys.has("")) {
-                            onClickFn = this.onViewSourceClick(allStateKeys.get(""));
-                        } else {
-                            onClickFn = this.browseEventType(eventType);
-                        }
-
-                        return <button className={classes} key={eventType} onClick={onClickFn}>
-                            { eventType }
-                        </button>;
-                    })
-                }
-            </FilteredList>;
-        } else {
-            const stateGroup = this.roomStateEvents.get(this.state.eventType);
-
-            list = <FilteredList query={this.state.queryStateKey} onChange={this.onQueryStateKey}>
-                {
-                    Array.from(stateGroup.entries()).map(([stateKey, ev]) => {
-                        const trimmed = stateKey.trim();
-
-                        return <button
-                            className={classNames(classes, {
-                                mx_DevTools_RoomStateExplorer_button_hasSpaces: trimmed.length !== stateKey.length,
-                                mx_DevTools_RoomStateExplorer_button_emptyString: !trimmed,
-                            })}
-                            key={stateKey}
-                            onClick={this.onViewSourceClick(ev)}
-                        >
-                            { trimmed ? stateKey : _t("<%(count)s spaces>", { count: stateKey.length }) }
-                        </button>;
-                    })
-                }
-            </FilteredList>;
-        }
-
-        return <div>
-            <div className="mx_Dialog_content">
-                { list }
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{ _t('Back') }</button>
-            </div>
-        </div>;
-    }
-}
-
-interface IAccountDataExplorerState {
-    [inputId: string]: boolean | string | any;
-    isRoomAccountData: boolean;
-    event?: MatrixEvent;
-    editing: boolean;
-    queryEventType: string;
-}
-
-class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDataExplorerState> {
-    static getLabel() { return _t('Explore Account Data'); }
-
-    static contextType = MatrixClientContext;
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            isRoomAccountData: false,
-            event: null,
-            editing: false,
-
-            queryEventType: '',
-        };
-    }
-
-    private getData(): Record<string, MatrixEvent> {
-        if (this.state.isRoomAccountData) {
-            return this.props.room.accountData;
-        }
-        return this.context.store.accountData;
-    }
-
-    private onViewSourceClick(event: MatrixEvent) {
-        return () => {
-            this.setState({ event });
-        };
-    }
-
-    private onBack = () => {
-        if (this.state.editing) {
-            this.setState({ editing: false });
-        } else if (this.state.event) {
-            this.setState({ event: null });
-        } else {
-            this.props.onBack();
-        }
-    };
-
-    private onChange = (e: ChangeEvent<HTMLInputElement>) => {
-        this.setState({ [e.target.id]: e.target.type === 'checkbox' ? e.target.checked : e.target.value });
-    };
-
-    private editEv = () => {
-        this.setState({ editing: true });
-    };
-
-    private onQueryEventType = (queryEventType: string) => {
-        this.setState({ queryEventType });
-    };
-
-    render() {
-        if (this.state.event) {
-            if (this.state.editing) {
-                return <SendAccountData
-                    room={this.props.room}
-                    isRoomAccountData={this.state.isRoomAccountData}
-                    onBack={this.onBack}
-                    inputs={{
-                        eventType: this.state.event.getType(),
-                        evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
-                    }}
-                    forceMode={true}
-                />;
-            }
-
-            return <div className="mx_ViewSource">
-                <div className="mx_DevTools_content">
-                    <SyntaxHighlight language="json">
-                        { JSON.stringify(this.state.event.event, null, 2) }
-                    </SyntaxHighlight>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onBack}>{ _t('Back') }</button>
-                    <button onClick={this.editEv}>{ _t('Edit') }</button>
-                </div>
-            </div>;
-        }
-
-        const rows = [];
-
-        const classes = 'mx_DevTools_RoomStateExplorer_button';
-
-        const data = this.getData();
-        Object.keys(data).forEach((evType) => {
-            const ev = data[evType];
-            rows.push(<button className={classes} key={evType} onClick={this.onViewSourceClick(ev)}>
-                { evType }
-            </button>);
-        });
-
-        return <div>
-            <div className="mx_Dialog_content">
-                <FilteredList query={this.state.queryEventType} onChange={this.onQueryEventType}>
-                    { rows }
-                </FilteredList>
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{ _t('Back') }</button>
-                <div style={{ float: "right" }}>
-                    <input
-                        id="isRoomAccountData"
-                        className="mx_DevTools_tgl mx_DevTools_tgl-flip"
-                        type="checkbox"
-                        checked={this.state.isRoomAccountData}
-                        onChange={this.onChange}
-                    />
-                    <label className="mx_DevTools_tgl-btn"
-                        data-tg-off="Account Data"
-                        data-tg-on="Room Data"
-                        htmlFor="isRoomAccountData"
-                    />
-                </div>
-            </div>
-        </div>;
-    }
-}
-
-interface IServersInRoomListState {
-    query: string;
-}
-
-class ServersInRoomList extends React.PureComponent<IExplorerProps, IServersInRoomListState> {
-    static getLabel() { return _t('View Servers in Room'); }
-
-    static contextType = MatrixClientContext;
-
-    private servers: React.ReactElement[];
-
-    constructor(props) {
-        super(props);
-
-        const room = this.props.room;
-        const servers = new Set<string>();
-        room.currentState.getStateEvents("m.room.member").forEach(ev => servers.add(ev.getSender().split(":")[1]));
-        this.servers = Array.from(servers).map(s =>
-            <button key={s} className="mx_DevTools_ServersInRoomList_button">
-                { s }
-            </button>);
-
-        this.state = {
-            query: '',
-        };
-    }
-
-    private onQuery = (query: string) => {
-        this.setState({ query });
-    };
-
-    render() {
-        return <div>
-            <div className="mx_Dialog_content">
-                <FilteredList query={this.state.query} onChange={this.onQuery}>
-                    { this.servers }
-                </FilteredList>
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.props.onBack}>{ _t('Back') }</button>
-            </div>
-        </div>;
-    }
-}
-
-const PHASE_MAP = {
-    [PHASE_UNSENT]: "unsent",
-    [PHASE_REQUESTED]: "requested",
-    [PHASE_READY]: "ready",
-    [PHASE_DONE]: "done",
-    [PHASE_STARTED]: "started",
-    [PHASE_CANCELLED]: "cancelled",
+import { TimelineEventEditor } from "./devtools/Event";
+import ServersInRoom from "./devtools/ServersInRoom";
+import VerificationExplorer from "./devtools/VerificationExplorer";
+import SettingExplorer from "./devtools/SettingExplorer";
+import { RoomStateExplorer } from "./devtools/RoomState";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./devtools/BaseTool";
+import WidgetExplorer from './devtools/WidgetExplorer';
+import { AccountDataExplorer, RoomAccountDataExplorer } from "./devtools/AccountData";
+import SettingsFlag from "../elements/SettingsFlag";
+import { SettingLevel } from "../../../settings/SettingLevel";
+import ServerInfo from './devtools/ServerInfo';
+
+enum Category {
+    Room,
+    Other,
+}
+
+const categoryLabels: Record<Category, string> = {
+    [Category.Room]: _td("Room"),
+    [Category.Other]: _td("Other"),
 };
 
-const VerificationRequestExplorer: React.FC<{
-    txnId: string;
-    request: VerificationRequest;
-}> = ({ txnId, request }) => {
-    const [, updateState] = useState();
-    const [timeout, setRequestTimeout] = useState(request.timeout);
-
-    /* Re-render if something changes state */
-    useTypedEventEmitter(request, VerificationRequestEvent.Change, updateState);
-
-    /* Keep re-rendering if there's a timeout */
-    useEffect(() => {
-        if (request.timeout == 0) return;
-
-        /* Note that request.timeout is a getter, so its value changes */
-        const id = setInterval(() => {
-            setRequestTimeout(request.timeout);
-        }, 500);
-
-        return () => { clearInterval(id); };
-    }, [request]);
-
-    return (<div className="mx_DevTools_VerificationRequest">
-        <dl>
-            <dt>Transaction</dt>
-            <dd>{ txnId }</dd>
-            <dt>Phase</dt>
-            <dd>{ PHASE_MAP[request.phase] || request.phase }</dd>
-            <dt>Timeout</dt>
-            <dd>{ Math.floor(timeout / 1000) }</dd>
-            <dt>Methods</dt>
-            <dd>{ request.methods && request.methods.join(", ") }</dd>
-            <dt>requestingUserId</dt>
-            <dd>{ request.requestingUserId }</dd>
-            <dt>observeOnly</dt>
-            <dd>{ JSON.stringify(request.observeOnly) }</dd>
-        </dl>
-    </div>);
+export type Tool = React.FC<IDevtoolsProps>;
+const Tools: Record<Category, [label: string, tool: Tool][]> = {
+    [Category.Room]: [
+        [_td("Send custom timeline event"), TimelineEventEditor],
+        [_td("Explore room state"), RoomStateExplorer],
+        [_td("Explore room account data"), RoomAccountDataExplorer],
+        [_td("View servers in room"), ServersInRoom],
+        [_td("Verification explorer"), VerificationExplorer],
+        [_td("Active Widgets"), WidgetExplorer],
+    ],
+    [Category.Other]: [
+        [_td("Explore account data"), AccountDataExplorer],
+        [_td("Settings explorer"), SettingExplorer],
+        [_td("Server info"), ServerInfo],
+    ],
 };
 
-class VerificationExplorer extends React.PureComponent<IExplorerProps> {
-    static getLabel() {
-        return _t("Verification Requests");
-    }
-
-    /* Ensure this.context is the cli */
-    static contextType = MatrixClientContext;
-
-    private onNewRequest = () => {
-        this.forceUpdate();
-    };
-
-    componentDidMount() {
-        const cli = this.context;
-        cli.on("crypto.verification.request", this.onNewRequest);
-    }
-
-    componentWillUnmount() {
-        const cli = this.context;
-        cli.off("crypto.verification.request", this.onNewRequest);
-    }
-
-    render() {
-        const cli = this.context;
-        const room = this.props.room;
-        const inRoomChannel = cli.crypto.inRoomVerificationRequests;
-        const inRoomRequests = (inRoomChannel._requestsByRoomId || new Map()).get(room.roomId) || new Map();
-
-        return (<div>
-            <div className="mx_Dialog_content">
-                { Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
-                    <VerificationRequestExplorer txnId={txnId} request={request} key={txnId} />,
-                ) }
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.props.onBack}>{ _t("Back") }</button>
-            </div>
-        </div>);
-    }
-}
-
-interface IWidgetExplorerState {
-    query: string;
-    editWidget?: IApp;
-}
-
-class WidgetExplorer extends React.Component<IExplorerProps, IWidgetExplorerState> {
-    static getLabel() {
-        return _t("Active Widgets");
-    }
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            query: '',
-            editWidget: null, // set to an IApp when editing
-        };
-    }
-
-    private onWidgetStoreUpdate = () => {
-        this.forceUpdate();
-    };
-
-    private onQueryChange = (query: string) => {
-        this.setState({ query });
-    };
-
-    private onEditWidget = (widget: IApp) => {
-        this.setState({ editWidget: widget });
-    };
-
-    private onBack = () => {
-        const widgets = WidgetStore.instance.getApps(this.props.room.roomId);
-        if (this.state.editWidget && widgets.includes(this.state.editWidget)) {
-            this.setState({ editWidget: null });
-        } else {
-            this.props.onBack();
-        }
-    };
-
-    componentDidMount() {
-        WidgetStore.instance.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
-    }
-
-    componentWillUnmount() {
-        WidgetStore.instance.off(UPDATE_EVENT, this.onWidgetStoreUpdate);
-    }
-
-    render() {
-        const room = this.props.room;
-
-        const editWidget = this.state.editWidget;
-        const widgets = WidgetStore.instance.getApps(room.roomId);
-        if (editWidget && widgets.includes(editWidget)) {
-            const allState = Array.from(
-                Array.from(room.currentState.events.values()).map((e: Map<string, MatrixEvent>) => {
-                    return e.values();
-                }),
-            ).reduce((p, c) => { p.push(...c); return p; }, []);
-            const stateEv = allState.find(ev => ev.getId() === editWidget.eventId);
-            if (!stateEv) { // "should never happen"
-                return <div>
-                    { _t("There was an error finding this widget.") }
-                    <div className="mx_Dialog_buttons">
-                        <button onClick={this.onBack}>{ _t("Back") }</button>
-                    </div>
-                </div>;
-            }
-            return <SendCustomEvent
-                onBack={this.onBack}
-                room={room}
-                forceStateEvent={true}
-                inputs={{
-                    eventType: stateEv.getType(),
-                    evContent: JSON.stringify(stateEv.getContent(), null, '\t'),
-                    stateKey: stateEv.getStateKey(),
-                }}
-            />;
-        }
-
-        return (<div>
-            <div className="mx_Dialog_content">
-                <FilteredList query={this.state.query} onChange={this.onQueryChange}>
-                    { widgets.map(w => {
-                        return <button
-                            className='mx_DevTools_RoomStateExplorer_button'
-                            key={w.url + w.eventId}
-                            onClick={() => this.onEditWidget(w)}
-                        >{ w.url }</button>;
-                    }) }
-                </FilteredList>
-            </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>{ _t("Back") }</button>
-            </div>
-        </div>);
-    }
-}
-
-interface ISettingsExplorerState {
-    query: string;
-    editSetting?: string;
-    viewSetting?: string;
-    explicitValues?: string;
-    explicitRoomValues?: string;
- }
-
-class SettingsExplorer extends React.PureComponent<IExplorerProps, ISettingsExplorerState> {
-    static getLabel() {
-        return _t("Settings Explorer");
-    }
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            query: '',
-            editSetting: null, // set to a setting ID when editing
-            viewSetting: null, // set to a setting ID when exploring in detail
-
-            explicitValues: null, // stringified JSON for edit view
-            explicitRoomValues: null, // stringified JSON for edit view
-        };
-    }
-
-    private onQueryChange = (ev: ChangeEvent<HTMLInputElement>) => {
-        this.setState({ query: ev.target.value });
-    };
-
-    private onExplValuesEdit = (ev: ChangeEvent<HTMLTextAreaElement>) => {
-        this.setState({ explicitValues: ev.target.value });
-    };
-
-    private onExplRoomValuesEdit = (ev: ChangeEvent<HTMLTextAreaElement>) => {
-        this.setState({ explicitRoomValues: ev.target.value });
-    };
-
-    private onBack = () => {
-        if (this.state.editSetting) {
-            this.setState({ editSetting: null });
-        } else if (this.state.viewSetting) {
-            this.setState({ viewSetting: null });
-        } else {
-            this.props.onBack();
-        }
-    };
-
-    private onViewClick = (ev: ButtonEvent, settingId: string) => {
-        ev.preventDefault();
-        this.setState({ viewSetting: settingId });
-    };
-
-    private onEditClick = (ev: ButtonEvent, settingId: string) => {
-        ev.preventDefault();
-        this.setState({
-            editSetting: settingId,
-            explicitValues: this.renderExplicitSettingValues(settingId, null),
-            explicitRoomValues: this.renderExplicitSettingValues(settingId, this.props.room.roomId),
-        });
-    };
-
-    private onSaveClick = async () => {
-        try {
-            const settingId = this.state.editSetting;
-            const parsedExplicit = JSON.parse(this.state.explicitValues);
-            const parsedExplicitRoom = JSON.parse(this.state.explicitRoomValues);
-            for (const level of Object.keys(parsedExplicit)) {
-                logger.log(`[Devtools] Setting value of ${settingId} at ${level} from user input`);
-                try {
-                    const val = parsedExplicit[level];
-                    await SettingsStore.setValue(settingId, null, level as SettingLevel, val);
-                } catch (e) {
-                    logger.warn(e);
-                }
-            }
-            const roomId = this.props.room.roomId;
-            for (const level of Object.keys(parsedExplicit)) {
-                logger.log(`[Devtools] Setting value of ${settingId} at ${level} in ${roomId} from user input`);
-                try {
-                    const val = parsedExplicitRoom[level];
-                    await SettingsStore.setValue(settingId, roomId, level as SettingLevel, val);
-                } catch (e) {
-                    logger.warn(e);
-                }
-            }
-            this.setState({
-                viewSetting: settingId,
-                editSetting: null,
-            });
-        } catch (e) {
-            Modal.createTrackedDialog('Devtools - Failed to save settings', '', ErrorDialog, {
-                title: _t("Failed to save settings"),
-                description: e.message,
-            });
-        }
-    };
-
-    private renderSettingValue(val: any): string {
-        // Note: we don't .toString() a string because we want JSON.stringify to inject quotes for us
-        const toStringTypes = ['boolean', 'number'];
-        if (toStringTypes.includes(typeof(val))) {
-            return val.toString();
-        } else {
-            return JSON.stringify(val);
-        }
-    }
-
-    private renderExplicitSettingValues(setting: string, roomId: string): string {
-        const vals = {};
-        for (const level of LEVEL_ORDER) {
-            try {
-                vals[level] = SettingsStore.getValueAt(level, setting, roomId, true, true);
-                if (vals[level] === undefined) {
-                    vals[level] = null;
-                }
-            } catch (e) {
-                logger.warn(e);
-            }
-        }
-        return JSON.stringify(vals, null, 4);
-    }
-
-    private renderCanEditLevel(roomId: string, level: SettingLevel): React.ReactNode {
-        const canEdit = SettingsStore.canSetValue(this.state.editSetting, roomId, level);
-        const className = canEdit ? 'mx_DevTools_SettingsExplorer_mutable' : 'mx_DevTools_SettingsExplorer_immutable';
-        return <td className={className}><code>{ canEdit.toString() }</code></td>;
-    }
-
-    render() {
-        const room = this.props.room;
-
-        if (!this.state.viewSetting && !this.state.editSetting) {
-            // view all settings
-            const allSettings = Object.keys(SETTINGS)
-                .filter(n => this.state.query ? n.toLowerCase().includes(this.state.query.toLowerCase()) : true);
-            return (
-                <div>
-                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
-                        <Field
-                            label={_t('Filter results')}
-                            autoFocus={true}
-                            size={64}
-                            type="text"
-                            autoComplete="off"
-                            value={this.state.query}
-                            onChange={this.onQueryChange}
-                            className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
-                        />
-                        <table>
-                            <thead>
-                                <tr>
-                                    <th>{ _t("Setting ID") }</th>
-                                    <th>{ _t("Value") }</th>
-                                    <th>{ _t("Value in this room") }</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                { allSettings.map(i => (
-                                    <tr key={i}>
-                                        <td>
-                                            <AccessibleButton kind='link_inline' className='mx_DevTools_SettingsExplorer_setting' onClick={(e) => this.onViewClick(e, i)}>
-                                                <code>{ i }</code>
-                                            </AccessibleButton>
-                                            <AccessibleButton
-                                                alt={_t('Edit setting')}
-                                                onClick={(e) => this.onEditClick(e, i)}
-                                                className='mx_DevTools_SettingsExplorer_edit'
-                                            >
-                                            ✏
-                                            </AccessibleButton>
-                                        </td>
-                                        <td>
-                                            <code>{ this.renderSettingValue(SettingsStore.getValue(i)) }</code>
-                                        </td>
-                                        <td>
-                                            <code>
-                                                { this.renderSettingValue(SettingsStore.getValue(i, room.roomId)) }
-                                            </code>
-                                        </td>
-                                    </tr>
-                                )) }
-                            </tbody>
-                        </table>
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <button onClick={this.onBack}>{ _t("Back") }</button>
-                    </div>
-                </div>
-            );
-        } else if (this.state.editSetting) {
-            return (
-                <div>
-                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
-                        <h3>{ _t("Setting:") } <code>{ this.state.editSetting }</code></h3>
-
-                        <div className='mx_DevTools_SettingsExplorer_warning'>
-                            <b>{ _t("Caution:") }</b> { _t(
-                                "This UI does NOT check the types of the values. Use at your own risk.",
-                            ) }
-                        </div>
-
-                        <div>
-                            { _t("Setting definition:") }
-                            <pre><code>{ JSON.stringify(SETTINGS[this.state.editSetting], null, 4) }</code></pre>
-                        </div>
-
-                        <div>
-                            <table>
-                                <thead>
-                                    <tr>
-                                        <th>{ _t("Level") }</th>
-                                        <th>{ _t("Settable at global") }</th>
-                                        <th>{ _t("Settable at room") }</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    { LEVEL_ORDER.map(lvl => (
-                                        <tr key={lvl}>
-                                            <td><code>{ lvl }</code></td>
-                                            { this.renderCanEditLevel(null, lvl) }
-                                            { this.renderCanEditLevel(room.roomId, lvl) }
-                                        </tr>
-                                    )) }
-                                </tbody>
-                            </table>
-                        </div>
-
-                        <div>
-                            <Field
-                                id="valExpl"
-                                label={_t("Values at explicit levels")}
-                                type="text"
-                                className="mx_DevTools_textarea"
-                                element="textarea"
-                                autoComplete="off"
-                                value={this.state.explicitValues}
-                                onChange={this.onExplValuesEdit}
-                            />
-                        </div>
-
-                        <div>
-                            <Field
-                                id="valExpl"
-                                label={_t("Values at explicit levels in this room")}
-                                type="text"
-                                className="mx_DevTools_textarea"
-                                element="textarea"
-                                autoComplete="off"
-                                value={this.state.explicitRoomValues}
-                                onChange={this.onExplRoomValuesEdit}
-                            />
-                        </div>
-
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <button onClick={this.onSaveClick}>{ _t("Save setting values") }</button>
-                        <button onClick={this.onBack}>{ _t("Back") }</button>
-                    </div>
-                </div>
-            );
-        } else if (this.state.viewSetting) {
-            return (
-                <div>
-                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
-                        <h3>{ _t("Setting:") } <code>{ this.state.viewSetting }</code></h3>
-
-                        <div>
-                            { _t("Setting definition:") }
-                            <pre><code>{ JSON.stringify(SETTINGS[this.state.viewSetting], null, 4) }</code></pre>
-                        </div>
-
-                        <div>
-                            { _t("Value:") }&nbsp;
-                            <code>{ this.renderSettingValue(
-                                SettingsStore.getValue(this.state.viewSetting),
-                            ) }</code>
-                        </div>
-
-                        <div>
-                            { _t("Value in this room:") }&nbsp;
-                            <code>{ this.renderSettingValue(
-                                SettingsStore.getValue(this.state.viewSetting, room.roomId),
-                            ) }</code>
-                        </div>
-
-                        <div>
-                            { _t("Values at explicit levels:") }
-                            <pre><code>{ this.renderExplicitSettingValues(
-                                this.state.viewSetting, null,
-                            ) }</code></pre>
-                        </div>
-
-                        <div>
-                            { _t("Values at explicit levels in this room:") }
-                            <pre><code>{ this.renderExplicitSettingValues(
-                                this.state.viewSetting, room.roomId,
-                            ) }</code></pre>
-                        </div>
-
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <button onClick={(e) => this.onEditClick(e, this.state.viewSetting)}>{
-                            _t("Edit Values")
-                        }</button>
-                        <button onClick={this.onBack}>{ _t("Back") }</button>
-                    </div>
-                </div>
-            );
-        }
-    }
-}
-
-type DevtoolsDialogEntry = React.JSXElementConstructor<any> & {
-    getLabel: () => string;
-};
-
-const Entries: DevtoolsDialogEntry[] = [
-    SendCustomEvent,
-    RoomStateExplorer,
-    SendAccountData,
-    AccountDataExplorer,
-    ServersInRoomList,
-    VerificationExplorer,
-    WidgetExplorer,
-    SettingsExplorer,
-];
-
 interface IProps {
     roomId: string;
-    onFinished: (finished: boolean) => void;
+    onFinished(finished: boolean): void;
 }
 
-interface IState {
-    mode?: DevtoolsDialogEntry;
-}
+type ToolInfo = [label: string, tool: Tool];
+
+const DevtoolsDialog: React.FC<IProps> = ({ roomId, onFinished }) => {
+    const [tool, setTool] = useState<ToolInfo>(null);
 
-@replaceableComponent("views.dialogs.DevtoolsDialog")
-export default class DevtoolsDialog extends React.PureComponent<IProps, IState> {
-    constructor(props) {
-        super(props);
+    let body: JSX.Element;
+    let onBack: () => void;
 
-        this.state = {
-            mode: null,
+    if (tool) {
+        onBack = () => {
+            setTool(null);
         };
-    }
 
-    private setMode(mode: DevtoolsDialogEntry) {
-        return () => {
-            this.setState({ mode });
+        const Tool = tool[1];
+        body = <Tool onBack={onBack} setTool={(label, tool) => setTool([label, tool])} />;
+    } else {
+        const onBack = () => {
+            onFinished(false);
         };
+        body = <BaseTool onBack={onBack}>
+            { Object.entries(Tools).map(([category, tools]) => (
+                <div key={category}>
+                    <h3>{ _t(categoryLabels[category]) }</h3>
+                    { tools.map(([label, tool]) => {
+                        const onClick = () => {
+                            setTool([label, tool]);
+                        };
+                        return <button className="mx_DevTools_button" key={label} onClick={onClick}>
+                            { _t(label) }
+                        </button>;
+                    }) }
+                </div>
+            )) }
+            <div>
+                <h3>{ _t("Options") }</h3>
+                <SettingsFlag name="developerMode" level={SettingLevel.ACCOUNT} />
+                <SettingsFlag name="showHiddenEventsInTimeline" level={SettingLevel.DEVICE} />
+            </div>
+        </BaseTool>;
     }
 
-    private onBack = () => {
-        this.setState({ mode: null });
-    };
-
-    private onCancel = () => {
-        this.props.onFinished(false);
-    };
-
-    render() {
-        let body;
-
-        if (this.state.mode) {
-            body = <MatrixClientContext.Consumer>
-                { (cli) => <React.Fragment>
-                    <div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div>
-                    <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
-                    <div className="mx_DevTools_label_bottom" />
-                    <this.state.mode onBack={this.onBack} room={cli.getRoom(this.props.roomId)} />
-                </React.Fragment> }
-            </MatrixClientContext.Consumer>;
-        } else {
-            const classes = "mx_DevTools_RoomStateExplorer_button";
-            body = <React.Fragment>
-                <div>
-                    <div className="mx_DevTools_label_left">{ _t('Toolbox') }</div>
-                    <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
+    const label = tool ? tool[0] : _t("Toolbox");
+    return (
+        <BaseDialog className="mx_QuestionDialog" onFinished={onFinished} title={_t("Developer Tools")}>
+            <MatrixClientContext.Consumer>
+                { (cli) => <>
+                    <div className="mx_DevTools_label_left">{ label }</div>
+                    <div className="mx_DevTools_label_right">{ _t("Room ID: %(roomId)s", { roomId }) }</div>
                     <div className="mx_DevTools_label_bottom" />
+                    <DevtoolsContext.Provider value={{ room: cli.getRoom(roomId) }}>
+                        { body }
+                    </DevtoolsContext.Provider>
+                </> }
+            </MatrixClientContext.Consumer>
+        </BaseDialog>
+    );
+};
 
-                    <div className="mx_Dialog_content">
-                        { Entries.map((Entry) => {
-                            const label = Entry.getLabel();
-                            const onClick = this.setMode(Entry);
-                            return <button className={classes} key={label} onClick={onClick}>{ label }</button>;
-                        }) }
-                    </div>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>{ _t('Cancel') }</button>
-                </div>
-            </React.Fragment>;
-        }
-
-        return (
-            <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
-                { body }
-            </BaseDialog>
-        );
-    }
-}
+export default DevtoolsDialog;
diff --git a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
deleted file mode 100644
index 6f13de78ee8..00000000000
--- a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { ChangeEvent } from 'react';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import BaseDialog from "./BaseDialog";
-import { _t } from "../../../languageHandler";
-import { IDialogProps } from "./IDialogProps";
-import Field from "../elements/Field";
-import AccessibleButton from "../elements/AccessibleButton";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
-import FlairStore from "../../../stores/FlairStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-interface IProps extends IDialogProps {
-    communityId: string;
-}
-
-interface IState {
-    name: string;
-    error: string;
-    busy: boolean;
-    currentAvatarUrl: string;
-    avatarFile: File;
-    avatarPreview: string;
-}
-
-// XXX: This is a lot of duplication from the create dialog, just in a different shape
-@replaceableComponent("views.dialogs.EditCommunityPrototypeDialog")
-export default class EditCommunityPrototypeDialog extends React.PureComponent<IProps, IState> {
-    private avatarUploadRef: React.RefObject<HTMLInputElement> = React.createRef();
-
-    constructor(props: IProps) {
-        super(props);
-
-        const profile = CommunityPrototypeStore.instance.getCommunityProfile(props.communityId);
-
-        this.state = {
-            name: profile?.name || "",
-            error: null,
-            busy: false,
-            avatarFile: null,
-            avatarPreview: null,
-            currentAvatarUrl: profile?.avatarUrl,
-        };
-    }
-
-    private onNameChange = (ev: ChangeEvent<HTMLInputElement>) => {
-        this.setState({ name: ev.target.value });
-    };
-
-    private onSubmit = async (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        if (this.state.busy) return;
-
-        // We'll create the community now to see if it's taken, leaving it active in
-        // the background for the user to look at while they invite people.
-        this.setState({ busy: true });
-        try {
-            let avatarUrl = this.state.currentAvatarUrl || ""; // must be a string for synapse to accept it
-            if (this.state.avatarFile) {
-                avatarUrl = await MatrixClientPeg.get().uploadContent(this.state.avatarFile);
-            }
-
-            await MatrixClientPeg.get().setGroupProfile(this.props.communityId, {
-                name: this.state.name,
-                avatar_url: avatarUrl,
-            });
-
-            // ask the flair store to update the profile too
-            await FlairStore.refreshGroupProfile(MatrixClientPeg.get(), this.props.communityId);
-
-            // we did it, so close the dialog
-            this.props.onFinished(true);
-        } catch (e) {
-            logger.error(e);
-            this.setState({
-                busy: false,
-                error: _t("There was an error updating your community. The server is unable to process your request."),
-            });
-        }
-    };
-
-    private onAvatarChanged = (e: ChangeEvent<HTMLInputElement>) => {
-        if (!e.target.files || !e.target.files.length) {
-            this.setState({ avatarFile: null });
-        } else {
-            this.setState({ busy: true });
-            const file = e.target.files[0];
-            const reader = new FileReader();
-            reader.onload = (ev: ProgressEvent<FileReader>) => {
-                this.setState({ avatarFile: file, busy: false, avatarPreview: ev.target.result as string });
-            };
-            reader.readAsDataURL(file);
-        }
-    };
-
-    private onChangeAvatar = () => {
-        if (this.avatarUploadRef.current) this.avatarUploadRef.current.click();
-    };
-
-    public render() {
-        let preview = <img src={this.state.avatarPreview} className="mx_EditCommunityPrototypeDialog_avatar" />;
-        if (!this.state.avatarPreview) {
-            if (this.state.currentAvatarUrl) {
-                const url = mediaFromMxc(this.state.currentAvatarUrl).srcHttp;
-                preview = <img src={url} className="mx_EditCommunityPrototypeDialog_avatar" />;
-            } else {
-                preview = <div className="mx_EditCommunityPrototypeDialog_placeholderAvatar" />;
-            }
-        }
-
-        return (
-            <BaseDialog
-                className="mx_EditCommunityPrototypeDialog"
-                onFinished={this.props.onFinished}
-                title={_t("Update community")}
-            >
-                <form onSubmit={this.onSubmit}>
-                    <div className="mx_Dialog_content">
-                        <div className="mx_EditCommunityPrototypeDialog_rowName">
-                            <Field
-                                value={this.state.name}
-                                onChange={this.onNameChange}
-                                placeholder={_t("Enter name")}
-                                label={_t("Enter name")}
-                            />
-                        </div>
-                        <div className="mx_EditCommunityPrototypeDialog_rowAvatar">
-                            <input
-                                type="file"
-                                style={{ display: "none" }}
-                                ref={this.avatarUploadRef}
-                                accept="image/*"
-                                onChange={this.onAvatarChanged}
-                            />
-                            <AccessibleButton
-                                onClick={this.onChangeAvatar}
-                                className="mx_EditCommunityPrototypeDialog_avatarContainer"
-                            >{ preview }</AccessibleButton>
-                            <div className="mx_EditCommunityPrototypeDialog_tip">
-                                <b>{ _t("Add image (optional)") }</b>
-                                <span>
-                                    { _t("An image will help people identify your community.") }
-                                </span>
-                            </div>
-                        </div>
-                        <AccessibleButton kind="primary" onClick={this.onSubmit} disabled={this.state.busy}>
-                            { _t("Save") }
-                        </AccessibleButton>
-                    </div>
-                </form>
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/ErrorDialog.tsx b/src/components/views/dialogs/ErrorDialog.tsx
index e19d93f918f..286124c6bf6 100644
--- a/src/components/views/dialogs/ErrorDialog.tsx
+++ b/src/components/views/dialogs/ErrorDialog.tsx
@@ -28,7 +28,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
 interface IProps {
@@ -44,7 +43,6 @@ interface IState {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.ErrorDialog")
 export default class ErrorDialog extends React.Component<IProps, IState> {
     public static defaultProps = {
         focus: true,
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
index 0ae736006d1..0a063df9c7b 100644
--- a/src/components/views/dialogs/ForwardDialog.tsx
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -16,15 +16,15 @@ limitations under the License.
 
 import React, { useEffect, useMemo, useState } from "react";
 import classnames from "classnames";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
-import { useFeatureEnabled, useSettingValue } from "../../../hooks/useSettings";
-import { UIFeature } from "../../../settings/UIFeature";
+import { useSettingValue } from "../../../hooks/useSettings";
 import { Layout } from "../../../settings/enums/Layout";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
@@ -43,11 +43,10 @@ import QueryMatcher from "../../../autocomplete/QueryMatcher";
 import TruncatedList from "../elements/TruncatedList";
 import EntityTile from "../rooms/EntityTile";
 import BaseAvatar from "../avatars/BaseAvatar";
-import SpaceStore from "../../../stores/spaces/SpaceStore";
-import { roomContextDetailsText } from "../../../Rooms";
 import { Action } from "../../../dispatcher/actions";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { ButtonEvent } from "../elements/AccessibleButton";
+import { roomContextDetailsText } from "../../../utils/i18n-helpers";
 
 const AVATAR_SIZE = 30;
 
@@ -62,7 +61,8 @@ interface IProps extends IDialogProps {
 
 interface IEntryProps {
     room: Room;
-    event: MatrixEvent;
+    type: EventType | string;
+    content: IContent;
     matrixClient: MatrixClient;
     onFinished(success: boolean): void;
 }
@@ -74,7 +74,7 @@ enum SendState {
     Failed,
 }
 
-const Entry: React.FC<IEntryProps> = ({ room, event, matrixClient: cli, onFinished }) => {
+const Entry: React.FC<IEntryProps> = ({ room, type, content, matrixClient: cli, onFinished }) => {
     const [sendState, setSendState] = useState<SendState>(SendState.CanSend);
 
     const jumpToRoom = (ev: ButtonEvent) => {
@@ -89,7 +89,7 @@ const Entry: React.FC<IEntryProps> = ({ room, event, matrixClient: cli, onFinish
     const send = async () => {
         setSendState(SendState.Sending);
         try {
-            await cli.sendEvent(room.roomId, event.getType(), event.getContent());
+            await cli.sendEvent(room.roomId, type, content);
             setSendState(SendState.Sent);
         } catch (e) {
             setSendState(SendState.Failed);
@@ -163,11 +163,18 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
         cli.getProfileInfo(userId).then(info => setProfileInfo(info));
     }, [cli, userId]);
 
+    const {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        "m.relates_to": _, // strip relations - in future we will attach a relation pointing at the original event
+        // We're taking a shallow copy here to avoid https://github.com/vector-im/element-web/issues/10924
+        ...content
+    } = event.getContent();
+
     // For the message preview we fake the sender as ourselves
     const mockEvent = new MatrixEvent({
         type: "m.room.message",
         sender: userId,
-        content: event.getContent(),
+        content,
         unsigned: {
             age: 97,
         },
@@ -190,16 +197,13 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
     const [query, setQuery] = useState("");
     const lcQuery = query.toLowerCase();
 
-    const spacesEnabled = SpaceStore.spacesEnabled;
-    const flairEnabled = useFeatureEnabled(UIFeature.Flair);
     const previewLayout = useSettingValue<Layout>("layout");
 
     let rooms = useMemo(() => sortRooms(
         cli.getVisibleRooms().filter(
-            room => room.getMyMembership() === "join" &&
-                !(spacesEnabled && room.isSpaceRoom()),
+            room => room.getMyMembership() === "join" && !room.isSpaceRoom(),
         ),
-    ), [cli, spacesEnabled]);
+    ), [cli]);
 
     if (lcQuery) {
         rooms = new QueryMatcher<Room>(rooms, {
@@ -241,7 +245,6 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
             <EventTile
                 mxEvent={mockEvent}
                 layout={previewLayout}
-                enableFlair={flairEnabled}
                 permalinkCreator={permalinkCreator}
                 as="div"
             />
@@ -264,7 +267,8 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
                                 <Entry
                                     key={room.roomId}
                                     room={room}
-                                    event={event}
+                                    type={event.getType()}
+                                    content={content}
                                     matrixClient={cli}
                                     onFinished={onFinished}
                                 />,
diff --git a/src/components/views/dialogs/HostSignupDialog.tsx b/src/components/views/dialogs/HostSignupDialog.tsx
index 0158640493a..91c29c68d1e 100644
--- a/src/components/views/dialogs/HostSignupDialog.tsx
+++ b/src/components/views/dialogs/HostSignupDialog.tsx
@@ -28,12 +28,12 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { HostSignupStore } from "../../../stores/HostSignupStore";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import {
-    IHostSignupConfig,
     IPostmessage,
     IPostmessageResponseData,
     PostmessageAction,
 } from "./HostSignupDialogTypes";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { IConfigOptions } from "../../../IConfigOptions";
+import { SnakedObject } from "../../../utils/SnakedObject";
 
 const HOST_SIGNUP_KEY = "host_signup";
 
@@ -45,10 +45,9 @@ interface IState {
     minimized: boolean;
 }
 
-@replaceableComponent("views.dialogs.HostSignupDialog")
 export default class HostSignupDialog extends React.PureComponent<IProps, IState> {
     private iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();
-    private readonly config: IHostSignupConfig;
+    private readonly config: SnakedObject<IConfigOptions["host_signup"]>;
 
     constructor(props: IProps) {
         super(props);
@@ -59,11 +58,11 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
             minimized: false,
         };
 
-        this.config = SdkConfig.get().hostSignup;
+        this.config = SdkConfig.getObject("host_signup");
     }
 
     private messageHandler = async (message: IPostmessage) => {
-        if (!this.config.url.startsWith(message.origin)) {
+        if (!this.config.get("url").startsWith(message.origin)) {
             return;
         }
         switch (message.data.action) {
@@ -142,7 +141,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
     };
 
     private sendMessage = (message: IPostmessageResponseData) => {
-        this.iframeRef.current.contentWindow.postMessage(message, this.config.url);
+        this.iframeRef.current.contentWindow.postMessage(message, this.config.get("url"));
     };
 
     private async sendAccountDetails() {
@@ -176,12 +175,16 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
     };
 
     private onAccountDetailsRequest = () => {
+        const cookiePolicyUrl = this.config.get("cookie_policy_url");
+        const privacyPolicyUrl = this.config.get("privacy_policy_url");
+        const tosUrl = this.config.get("terms_of_service_url");
+
         const textComponent = (
             <>
                 <p>
                     { _t("Continuing temporarily allows the %(hostSignupBrand)s setup process to access your " +
                         "account to fetch verified email addresses. This data is not stored.", {
-                        hostSignupBrand: this.config.brand,
+                        hostSignupBrand: this.config.get("brand"),
                     }) }
                 </p>
                 <p>
@@ -189,17 +192,17 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                         {},
                         {
                             cookiePolicyLink: () => (
-                                <a href={this.config.cookiePolicyUrl} target="_blank" rel="noreferrer noopener">
+                                <a href={cookiePolicyUrl} target="_blank" rel="noreferrer noopener">
                                     { _t("Cookie Policy") }
                                 </a>
                             ),
                             privacyPolicyLink: () => (
-                                <a href={this.config.privacyPolicyUrl} target="_blank" rel="noreferrer noopener">
+                                <a href={privacyPolicyUrl} target="_blank" rel="noreferrer noopener">
                                     { _t("Privacy Policy") }
                                 </a>
                             ),
                             termsOfServiceLink: () => (
-                                <a href={this.config.termsOfServiceUrl} target="_blank" rel="noreferrer noopener">
+                                <a href={tosUrl} target="_blank" rel="noreferrer noopener">
                                     { _t("Terms of Service") }
                                 </a>
                             ),
@@ -247,7 +250,7 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                                 <div className="mx_Dialog_header mx_Dialog_headerWithButton">
                                     <div className="mx_Dialog_title">
                                         { _t("%(hostSignupBrand)s Setup", {
-                                            hostSignupBrand: this.config.brand,
+                                            hostSignupBrand: this.config.get("brand"),
                                         }) }
                                     </div>
                                     <AccessibleButton
@@ -284,10 +287,10 @@ export default class HostSignupDialog extends React.PureComponent<IProps, IState
                                     title={_t(
                                         "Upgrade to %(hostSignupBrand)s",
                                         {
-                                            hostSignupBrand: this.config.brand,
+                                            hostSignupBrand: this.config.get("brand"),
                                         },
                                     )}
-                                    src={this.config.url}
+                                    src={this.config.get("url")}
                                     ref={this.iframeRef}
                                     sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
                                 />
diff --git a/src/components/views/dialogs/HostSignupDialogTypes.ts b/src/components/views/dialogs/HostSignupDialogTypes.ts
index 9f78592804a..46f0a70ce37 100644
--- a/src/components/views/dialogs/HostSignupDialogTypes.ts
+++ b/src/components/views/dialogs/HostSignupDialogTypes.ts
@@ -45,12 +45,3 @@ export interface IPostmessage {
     data: IPostmessageRequestData;
     origin: string;
 }
-
-export interface IHostSignupConfig {
-    brand: string;
-    cookiePolicyUrl: string;
-    domains: Array<string>;
-    privacyPolicyUrl: string;
-    termsOfServiceUrl: string;
-    url: string;
-}
diff --git a/src/components/views/dialogs/IncomingSasDialog.tsx b/src/components/views/dialogs/IncomingSasDialog.tsx
index d856412c671..2b15749c8d6 100644
--- a/src/components/views/dialogs/IncomingSasDialog.tsx
+++ b/src/components/views/dialogs/IncomingSasDialog.tsx
@@ -21,7 +21,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import VerificationComplete from "../verification/VerificationComplete";
 import VerificationCancelled from "../verification/VerificationCancelled";
@@ -54,7 +53,6 @@ interface IState {
     sas: IGeneratedSas;
 }
 
-@replaceableComponent("views.dialogs.IncomingSasDialog")
 export default class IncomingSasDialog extends React.Component<IProps, IState> {
     private showSasEvent: ISasEvent;
 
diff --git a/src/components/views/dialogs/InfoDialog.tsx b/src/components/views/dialogs/InfoDialog.tsx
index ddcea275a99..dd9c985f8e3 100644
--- a/src/components/views/dialogs/InfoDialog.tsx
+++ b/src/components/views/dialogs/InfoDialog.tsx
@@ -19,8 +19,9 @@ import React, { ReactNode, KeyboardEvent } from 'react';
 import classNames from "classnames";
 
 import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
 import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
 
 interface IProps extends IDialogProps {
     title?: string;
@@ -44,9 +45,6 @@ export default class InfoDialog extends React.Component<IProps> {
     };
 
     render() {
-        // FIXME: Using a regular import will break the app
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
             <BaseDialog
                 className="mx_InfoDialog"
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.tsx b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
index d5c08211da8..a48d808fed9 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.tsx
@@ -19,14 +19,12 @@ import React from 'react';
 import { _t } from "../../../languageHandler";
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
 
 interface IProps extends IDialogProps {}
 
-@replaceableComponent("views.dialogs.IntegrationsDisabledDialog")
 export default class IntegrationsDisabledDialog extends React.Component<IProps> {
     private onAcknowledgeClick = (): void => {
         this.props.onFinished();
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx b/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
index 0e7db93c531..73c7fbc6293 100644
--- a/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.tsx
@@ -18,14 +18,12 @@ import React from 'react';
 
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
 interface IProps extends IDialogProps {}
 
-@replaceableComponent("views.dialogs.IntegrationsImpossibleDialog")
 export default class IntegrationsImpossibleDialog extends React.Component<IProps> {
     private onAcknowledgeClick = (): void => {
         this.props.onFinished();
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.tsx b/src/components/views/dialogs/InteractiveAuthDialog.tsx
index c6a7d414bfb..46bad5fd0e1 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.tsx
+++ b/src/components/views/dialogs/InteractiveAuthDialog.tsx
@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
 import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { IDialogProps } from "./IDialogProps";
 
@@ -83,7 +82,6 @@ interface IState {
     uiaStagePhase: number | string;
 }
 
-@replaceableComponent("views.dialogs.InteractiveAuthDialog")
 export default class InteractiveAuthDialog extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index e2117eced72..978c176ab0a 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import classNames from 'classnames';
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
-import { IInvite3PID } from "matrix-js-sdk/src/@types/requests";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t, _td } from "../../../languageHandler";
@@ -30,30 +29,19 @@ import SdkConfig from "../../../SdkConfig";
 import * as Email from "../../../email";
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from "../../../utils/IdentityServerUtils";
 import { abbreviateUrl } from "../../../utils/UrlUtils";
-import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
-import Modal from "../../../Modal";
 import { humanizeTime } from "../../../utils/humanize";
-import createRoom, {
-    canEncryptToAllUsers,
-    findDMForUser,
-    privateShouldBeEncrypted,
-} from "../../../createRoom";
 import {
     IInviteResult,
     inviteMultipleToRoom,
     showAnyInviteErrors,
-    showCommunityInviteDialog,
 } from "../../../RoomInvite";
 import { Action } from "../../../dispatcher/actions";
 import { DefaultTagID } from "../../../stores/room-list/models";
 import RoomListStore from "../../../stores/room-list/RoomListStore";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
-import { getAddressType } from "../../../UserAddress";
 import BaseAvatar from '../avatars/BaseAvatar';
 import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import { compare, selectText } from '../../../utils/strings';
@@ -64,14 +52,16 @@ import QuestionDialog from "./QuestionDialog";
 import Spinner from "../elements/Spinner";
 import BaseDialog from "./BaseDialog";
 import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
-import SpaceStore from "../../../stores/spaces/SpaceStore";
 import CallHandler from "../../../CallHandler";
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 import CopyableText from "../elements/CopyableText";
 import { ScreenName } from '../../../PosthogTrackers';
-import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
+import { DirectoryMember, IDMUserTileProps, Member, startDm, ThreepidMember } from "../../../utils/direct-messages";
+import { AnyInviteKind, KIND_CALL_TRANSFER, KIND_DM, KIND_INVITE } from './InviteDialogTypes';
+import Modal from '../../../Modal';
+import dis from "../../../dispatcher/dispatcher";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -82,13 +72,6 @@ interface IRecentUser {
     lastActive: number;
 }
 
-export const KIND_DM = "dm";
-export const KIND_INVITE = "invite";
-// NB. This dialog needs the 'mx_InviteDialog_transferWrapper' wrapper class to have the correct
-// padding on the bottom (because all modals have 24px padding on all sides), so this needs to
-// be passed when creating the modal
-export const KIND_CALL_TRANSFER = "call_transfer";
-
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
 
@@ -97,90 +80,6 @@ enum TabId {
     DialPad = 'dialpad',
 }
 
-// This is the interface that is expected by various components in the Invite Dialog and RoomInvite.
-// It is a bit awkward because it also matches the RoomMember class from the js-sdk with some extra support
-// for 3PIDs/email addresses.
-export abstract class Member {
-    /**
-     * The display name of this Member. For users this should be their profile's display
-     * name or user ID if none set. For 3PIDs this should be the 3PID address (email).
-     */
-    public abstract get name(): string;
-
-    /**
-     * The ID of this Member. For users this should be their user ID. For 3PIDs this should
-     * be the 3PID address (email).
-     */
-    public abstract get userId(): string;
-
-    /**
-     * Gets the MXC URL of this Member's avatar. For users this should be their profile's
-     * avatar MXC URL or null if none set. For 3PIDs this should always be null.
-     */
-    public abstract getMxcAvatarUrl(): string;
-}
-
-class DirectoryMember extends Member {
-    private readonly _userId: string;
-    private readonly displayName?: string;
-    private readonly avatarUrl?: string;
-
-    // eslint-disable-next-line camelcase
-    constructor(userDirResult: { user_id: string, display_name?: string, avatar_url?: string }) {
-        super();
-        this._userId = userDirResult.user_id;
-        this.displayName = userDirResult.display_name;
-        this.avatarUrl = userDirResult.avatar_url;
-    }
-
-    // These next class members are for the Member interface
-    get name(): string {
-        return this.displayName || this._userId;
-    }
-
-    get userId(): string {
-        return this._userId;
-    }
-
-    getMxcAvatarUrl(): string {
-        return this.avatarUrl;
-    }
-}
-
-class ThreepidMember extends Member {
-    private readonly id: string;
-
-    constructor(id: string) {
-        super();
-        this.id = id;
-    }
-
-    // This is a getter that would be falsey on all other implementations. Until we have
-    // better type support in the react-sdk we can use this trick to determine the kind
-    // of 3PID we're dealing with, if any.
-    get isEmail(): boolean {
-        return this.id.includes('@');
-    }
-
-    // These next class members are for the Member interface
-    get name(): string {
-        return this.id;
-    }
-
-    get userId(): string {
-        return this.id;
-    }
-
-    getMxcAvatarUrl(): string {
-        return null;
-    }
-}
-
-interface IDMUserTileProps {
-    member: Member;
-    onRemove(member: Member): void;
-}
-
 class DMUserTile extends React.PureComponent<IDMUserTileProps> {
     private onRemove = (e) => {
         // Stop the browser from highlighting text
@@ -358,7 +257,7 @@ interface IInviteDialogProps {
 
     // The kind of invite being performed. Assumed to be KIND_DM if
     // not provided.
-    kind: string;
+    kind: AnyInviteKind;
 
     // The room ID this dialog is for. Only required for KIND_INVITE.
     roomId: string;
@@ -390,7 +289,6 @@ interface IInviteDialogState {
     errorText: string;
 }
 
-@replaceableComponent("views.dialogs.InviteDialog")
 export default class InviteDialog extends React.PureComponent<IInviteDialogProps, IInviteDialogState> {
     static defaultProps = {
         kind: KIND_DM,
@@ -412,7 +310,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             throw new Error("When using KIND_CALL_TRANSFER a call is required for an InviteDialog");
         }
 
-        const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get()['welcomeUserId']]);
+        const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get("welcome_user_id")]);
         if (props.roomId) {
             const room = MatrixClientPeg.get().getRoom(props.roomId);
             if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
@@ -666,72 +564,10 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
     private startDm = async () => {
         this.setState({ busy: true });
-        const client = MatrixClientPeg.get();
-        const targets = this.convertFilter();
-        const targetIds = targets.map(t => t.userId);
-
-        // Check if there is already a DM with these people and reuse it if possible.
-        let existingRoom: Room;
-        if (targetIds.length === 1) {
-            existingRoom = findDMForUser(client, targetIds[0]);
-        } else {
-            existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
-        }
-        if (existingRoom) {
-            dis.dispatch<ViewRoomPayload>({
-                action: Action.ViewRoom,
-                room_id: existingRoom.roomId,
-                should_peek: false,
-                joining: false,
-                metricsTrigger: "MessageUser",
-            });
-            this.props.onFinished(true);
-            return;
-        }
-
-        const createRoomOptions = { inlineErrors: true } as any; // XXX: Type out `createRoomOptions`
-
-        if (privateShouldBeEncrypted()) {
-            // Check whether all users have uploaded device keys before.
-            // If so, enable encryption in the new room.
-            const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
-            if (!has3PidMembers) {
-                const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
-                if (allHaveDeviceKeys) {
-                    createRoomOptions.encryption = true;
-                }
-            }
-        }
-
-        // Check if it's a traditional DM and create the room if required.
-        // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
         try {
-            const isSelf = targetIds.length === 1 && targetIds[0] === client.getUserId();
-            if (targetIds.length === 1 && !isSelf) {
-                createRoomOptions.dmUserId = targetIds[0];
-            }
-
-            if (targetIds.length > 1) {
-                createRoomOptions.createOpts = targetIds.reduce(
-                    (roomOptions, address) => {
-                        const type = getAddressType(address);
-                        if (type === 'email') {
-                            const invite: IInvite3PID = {
-                                id_server: client.getIdentityServerUrl(true),
-                                medium: 'email',
-                                address,
-                            };
-                            roomOptions.invite_3pid.push(invite);
-                        } else if (type === 'mx-user-id') {
-                            roomOptions.invite.push(address);
-                        }
-                        return roomOptions;
-                    },
-                    { invite: [], invite_3pid: [] },
-                );
-            }
-
-            await createRoom(createRoomOptions);
+            const cli = MatrixClientPeg.get();
+            const targets = this.convertFilter();
+            await startDm(cli, targets);
             this.props.onFinished(true);
         } catch (err) {
             logger.error(err);
@@ -739,6 +575,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 busy: false,
                 errorText: _t("We couldn't create your DM."),
             });
+        } finally {
+            this.setState({ busy: false });
         }
     };
 
@@ -1104,23 +942,12 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         this.props.onFinished(false);
     };
 
-    private onCommunityInviteClick = (e) => {
-        this.props.onFinished(false);
-        showCommunityInviteDialog(CommunityPrototypeStore.instance.getSelectedCommunityId());
-    };
-
     private renderSection(kind: "recents"|"suggestions") {
         let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
         let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
         const showMoreFn = kind === 'recents' ? this.showMoreRecents.bind(this) : this.showMoreSuggestions.bind(this);
         const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
         let sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
-        let sectionSubname = null;
-
-        if (kind === 'suggestions' && CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-            const communityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
-            sectionSubname = _t("May include members not in %(communityName)s", { communityName });
-        }
 
         if (this.props.kind === KIND_INVITE) {
             sectionName = kind === 'recents' ? _t("Recently Direct Messaged") : _t("Suggestions");
@@ -1180,9 +1007,11 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         let showMore = null;
         if (hasMore) {
             showMore = (
-                <AccessibleButton onClick={showMoreFn} kind="link">
-                    { _t("Show more") }
-                </AccessibleButton>
+                <div className="mx_InviteDialog_section_showMore">
+                    <AccessibleButton onClick={showMoreFn} kind="link">
+                        { _t("Show more") }
+                    </AccessibleButton>
+                </div>
             );
         }
 
@@ -1199,7 +1028,6 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         return (
             <div className='mx_InviteDialog_section'>
                 <h3>{ sectionName }</h3>
-                { sectionSubname ? <p className="mx_InviteDialog_subname">{ sectionSubname }</p> : null }
                 { tiles }
                 { showMore }
             </div>
@@ -1247,7 +1075,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
         const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
         if (defaultIdentityServerUrl) {
             return (
-                <div className="mx_AddressPickerDialog_identityServer">{ _t(
+                <div className="mx_InviteDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "<default>Use the default (%(defaultIdentityServerName)s)</default> " +
                     "or manage in <settings>Settings</settings>.",
@@ -1268,7 +1096,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             );
         } else {
             return (
-                <div className="mx_AddressPickerDialog_identityServer">{ _t(
+                <div className="mx_InviteDialog_identityServer">{ _t(
                     "Use an identity server to invite by email. " +
                     "Manage in <settings>Settings</settings>.",
                     {}, {
@@ -1377,35 +1205,6 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 );
             }
 
-            if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
-                const communityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
-                const inviteText = _t(
-                    "This won't invite them to %(communityName)s. " +
-                    "To invite someone to %(communityName)s, click <a>here</a>",
-                    { communityName }, {
-                        userId: () => {
-                            return (
-                                <a
-                                    href={makeUserPermalink(userId)}
-                                    rel="noreferrer noopener"
-                                    target="_blank"
-                                >{ userId }</a>
-                            );
-                        },
-                        a: (sub) => {
-                            return (
-                                <AccessibleButton
-                                    kind="link"
-                                    onClick={this.onCommunityInviteClick}
-                                >{ sub }</AccessibleButton>
-                            );
-                        },
-                    },
-                );
-                helpText = <React.Fragment>
-                    { helpText } { inviteText }
-                </React.Fragment>;
-            }
             buttonText = _t("Go");
             goButtonFn = this.startDm;
             extraSection = <div className="mx_InviteDialog_section_hidden_suggestions_disclaimer">
@@ -1423,7 +1222,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             </div>;
         } else if (this.props.kind === KIND_INVITE) {
             const room = MatrixClientPeg.get()?.getRoom(this.props.roomId);
-            const isSpace = SpaceStore.spacesEnabled && room?.isSpaceRoom();
+            const isSpace = room?.isSpaceRoom();
             title = isSpace
                 ? _t("Invite to %(spaceName)s", {
                     spaceName: room.name || _t("Unnamed Space"),
diff --git a/src/components/views/dialogs/InviteDialogTypes.ts b/src/components/views/dialogs/InviteDialogTypes.ts
new file mode 100644
index 00000000000..7eed739250c
--- /dev/null
+++ b/src/components/views/dialogs/InviteDialogTypes.ts
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export const KIND_DM = "dm";
+export const KIND_INVITE = "invite";
+// NB. This dialog needs the 'mx_InviteDialog_transferWrapper' wrapper class to have the correct
+// padding on the bottom (because all modals have 24px padding on all sides), so this needs to
+// be passed when creating the modal
+export const KIND_CALL_TRANSFER = "call_transfer";
+
+export type AnyInviteKind = typeof KIND_INVITE | typeof KIND_DM | typeof KIND_CALL_TRANSFER;
diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx
index 804987f53ad..25afc7916a4 100644
--- a/src/components/views/dialogs/LeaveSpaceDialog.tsx
+++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx
@@ -105,6 +105,7 @@ const LeaveSpaceDialog: React.FC<IProps> = ({ space, onFinished }) => {
         </div>
         <DialogButtons
             primaryButton={_t("Leave space")}
+            primaryButtonClass="danger"
             onPrimaryButtonClick={() => onFinished(true, roomsToLeave)}
             hasCancel={true}
             onCancel={() => onFinished(false)}
diff --git a/src/components/views/dialogs/LogoutDialog.tsx b/src/components/views/dialogs/LogoutDialog.tsx
index 11868f3820b..4131d7d455f 100644
--- a/src/components/views/dialogs/LogoutDialog.tsx
+++ b/src/components/views/dialogs/LogoutDialog.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Spinner from "../elements/Spinner";
@@ -41,7 +40,6 @@ interface IState {
     error?: string;
 }
 
-@replaceableComponent("views.dialogs.LogoutDialog")
 export default class LogoutDialog extends React.Component<IProps, IState> {
     static defaultProps = {
         onFinished: function() {},
@@ -81,11 +79,6 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
         }
     }
 
-    private onSettingsLinkClick = (): void => {
-        // close dialog
-        this.props.onFinished(true);
-    };
-
     private onExportE2eKeysClicked = (): void => {
         Modal.createTrackedDialogAsync('Export E2E Keys', '',
             import(
diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
index 6b94eb9c7a2..ef5a40a8b0c 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
@@ -24,7 +24,6 @@ import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import { IDialogProps } from "./IDialogProps";
 
@@ -33,7 +32,6 @@ interface IProps extends IDialogProps {
     device: DeviceInfo;
 }
 
-@replaceableComponent("views.dialogs.ManualDeviceKeyVerificationDialog")
 export default class ManualDeviceKeyVerificationDialog extends React.Component<IProps> {
     private onLegacyFinished = (confirm: boolean): void => {
         if (confirm) {
diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.tsx b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
index 005f77b05f2..2dedfb52937 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.tsx
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
@@ -25,7 +25,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { wantsDateSeparator } from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import ScrollPanel from "../../structures/ScrollPanel";
 import Spinner from "../elements/Spinner";
@@ -48,7 +47,6 @@ interface IState {
     isTwelveHour: boolean;
 }
 
-@replaceableComponent("views.dialogs.MessageEditHistoryDialog")
 export default class MessageEditHistoryDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
@@ -107,7 +105,7 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
         const pendingEvents = room.getPendingEvents();
         for (const e of newEvents) {
             const pendingRedaction = pendingEvents.find(pe => {
-                return pe.getType() === "m.room.redaction" && pe.getAssociatedId() === e.getId();
+                return pe.getType() === EventType.RoomRedaction && pe.getAssociatedId() === e.getId();
             });
             if (pendingRedaction) {
                 e.markLocallyRedacted(pendingRedaction);
diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 95e873cada4..84564c22cfb 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -39,7 +39,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import { arrayFastClone } from "../../../utils/arrays";
 import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ELEMENT_CLIENT_ID } from "../../../identifiers";
 import SettingsStore from "../../../settings/SettingsStore";
 
@@ -57,7 +56,6 @@ interface IState {
 
 const MAX_BUTTONS = 3;
 
-@replaceableComponent("views.dialogs.ModalWidgetDialog")
 export default class ModalWidgetDialog extends React.PureComponent<IProps, IState> {
     private readonly widget: Widget;
     private readonly possibleButtons: ModalButtonID[];
diff --git a/src/components/views/dialogs/QuestionDialog.tsx b/src/components/views/dialogs/QuestionDialog.tsx
index aaddff34ed3..a0389f75e3d 100644
--- a/src/components/views/dialogs/QuestionDialog.tsx
+++ b/src/components/views/dialogs/QuestionDialog.tsx
@@ -18,9 +18,10 @@ limitations under the License.
 import React from 'react';
 import classNames from "classnames";
 
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { IDialogProps } from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
 
 interface IProps extends IDialogProps {
     title?: string;
@@ -58,10 +59,6 @@ export default class QuestionDialog extends React.Component<IProps> {
     };
 
     public render(): JSX.Element {
-        // Converting these to imports breaks wrench tests
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         let primaryButtonClass = "";
         if (this.props.danger) {
             primaryButtonClass = "danger";
diff --git a/src/components/views/dialogs/ReportEventDialog.tsx b/src/components/views/dialogs/ReportEventDialog.tsx
index 29745bf7cd7..7a2d51889f8 100644
--- a/src/components/views/dialogs/ReportEventDialog.tsx
+++ b/src/components/views/dialogs/ReportEventDialog.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import { ensureDMExists } from "../../../createRoom";
@@ -23,7 +24,6 @@ import { IDialogProps } from "./IDialogProps";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import SdkConfig from '../../../SdkConfig';
 import Markdown from '../../../Markdown';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from "../../../settings/SettingsStore";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import BaseDialog from "./BaseDialog";
@@ -89,7 +89,6 @@ type Moderation = {
  *    a well-formed state event `m.room.moderation.moderated_by`
  *    /`org.matrix.msc3215.room.moderation.moderated_by`?
  */
-@replaceableComponent("views.dialogs.ReportEventDialog")
 export default class ReportEventDialog extends React.Component<IProps, IState> {
     // If the room supports moderation, the moderation information.
     private moderation?: Moderation;
@@ -215,7 +214,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
         try {
             const client = MatrixClientPeg.get();
             const ev = this.props.mxEvent;
-            if (this.moderation && this.state.nature != NonStandardValue.Admin) {
+            if (this.moderation && this.state.nature !== NonStandardValue.Admin) {
                 const nature: Nature = this.state.nature;
 
                 // Report to moderators through to the dedicated bot,
@@ -235,6 +234,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
             }
             this.props.onFinished(true);
         } catch (e) {
+            logger.error(e);
             this.setState({
                 busy: false,
                 err: e.message,
@@ -259,9 +259,8 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
             );
         }
 
-        const adminMessageMD =
-            SdkConfig.get().reportEvent &&
-            SdkConfig.get().reportEvent.adminMessageMD;
+        const adminMessageMD = SdkConfig
+            .getObject("report_event")?.get("admin_message_md", "adminMessageMD");
         let adminMessage;
         if (adminMessageMD) {
             const html = new Markdown(adminMessageMD).toHTML({ externalLinks: true });
@@ -272,7 +271,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
             // Display report-to-moderator dialog.
             // We let the user pick a nature.
             const client = MatrixClientPeg.get();
-            const homeServerName = SdkConfig.get()["validated_server_config"].hsName;
+            const homeServerName = SdkConfig.get("validated_server_config").hsName;
             let subtitle;
             switch (this.state.nature) {
                 case Nature.Disagreement:
diff --git a/src/components/views/dialogs/RoomSettingsDialog.tsx b/src/components/views/dialogs/RoomSettingsDialog.tsx
index 3806e9288ca..ce8d24cd3fd 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.tsx
+++ b/src/components/views/dialogs/RoomSettingsDialog.tsx
@@ -30,7 +30,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { Action } from '../../../dispatcher/actions';
 
@@ -51,7 +50,6 @@ interface IState {
     roomName: string;
 }
 
-@replaceableComponent("views.dialogs.RoomSettingsDialog")
 export default class RoomSettingsDialog extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.tsx b/src/components/views/dialogs/RoomUpgradeDialog.tsx
index bcca0e38290..8ff2181d75a 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.tsx
+++ b/src/components/views/dialogs/RoomUpgradeDialog.tsx
@@ -19,7 +19,6 @@ import { Room } from "matrix-js-sdk/src/models/room";
 
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { upgradeRoom } from "../../../utils/RoomUpgrade";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
@@ -35,7 +34,6 @@ interface IState {
     busy: boolean;
 }
 
-@replaceableComponent("views.dialogs.RoomUpgradeDialog")
 export default class RoomUpgradeDialog extends React.Component<IProps, IState> {
     private targetVersion: string;
 
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
index 0da8fb97d39..a34674ff63f 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
@@ -23,7 +23,6 @@ import SdkConfig from "../../../SdkConfig";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BugReportDialog from './BugReportDialog';
 import BaseDialog from "./BaseDialog";
@@ -50,7 +49,6 @@ interface IState {
     total?: number;
 }
 
-@replaceableComponent("views.dialogs.RoomUpgradeWarningDialog")
 export default class RoomUpgradeWarningDialog extends React.Component<IProps, IState> {
     private readonly isPrivate: boolean;
     private readonly currentVersion: string;
diff --git a/src/components/views/dialogs/ServerOfflineDialog.tsx b/src/components/views/dialogs/ServerOfflineDialog.tsx
index 6cf07f6bd60..de068d9a790 100644
--- a/src/components/views/dialogs/ServerOfflineDialog.tsx
+++ b/src/components/views/dialogs/ServerOfflineDialog.tsx
@@ -29,12 +29,10 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { IDialogProps } from "./IDialogProps";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
 
-@replaceableComponent("views.dialogs.ServerOfflineDialog")
 export default class ServerOfflineDialog extends React.PureComponent<IProps> {
     public componentDidMount() {
         EchoStore.instance.on(UPDATE_EVENT, this.onEchosUpdated);
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
index 0c22cd1e385..0761bb6b9dd 100644
--- a/src/components/views/dialogs/ServerPickerDialog.tsx
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -27,7 +27,6 @@ import Field from "../elements/Field";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import withValidation, { IFieldState } from "../elements/Validation";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     title?: string;
@@ -40,7 +39,6 @@ interface IState {
     otherHomeserver: string;
 }
 
-@replaceableComponent("views.dialogs.ServerPickerDialog")
 export default class ServerPickerDialog extends React.PureComponent<IProps, IState> {
     private readonly defaultServer: ValidatedServerConfig;
     private readonly fieldRef = createRef<Field>();
@@ -50,7 +48,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
         super(props);
 
         const config = SdkConfig.get();
-        this.defaultServer = config["validated_server_config"] as ValidatedServerConfig;
+        this.defaultServer = config["validated_server_config"];
         const { serverConfig } = this.props;
 
         let otherHomeserver = "";
diff --git a/src/components/views/dialogs/SeshatResetDialog.tsx b/src/components/views/dialogs/SeshatResetDialog.tsx
index 1c048dd9fac..369106188b1 100644
--- a/src/components/views/dialogs/SeshatResetDialog.tsx
+++ b/src/components/views/dialogs/SeshatResetDialog.tsx
@@ -17,12 +17,10 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
 
-@replaceableComponent("views.dialogs.SeshatResetDialog")
 export default class SeshatResetDialog extends React.PureComponent<IDialogProps> {
     render() {
         return (
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.tsx b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
index ad0c8e939a4..72b35671bac 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
@@ -21,7 +21,6 @@ import React from 'react';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BugReportDialog from "./BugReportDialog";
 import BaseDialog from "./BaseDialog";
@@ -32,7 +31,6 @@ interface IProps extends IDialogProps {
     error: Error;
 }
 
-@replaceableComponent("views.dialogs.SessionRestoreErrorDialog")
 export default class SessionRestoreErrorDialog extends React.Component<IProps> {
     private sendBugReport = (): void => {
         Modal.createTrackedDialog('Session Restore Error', 'Send Bug Report Dialog', BugReportDialog, {
diff --git a/src/components/views/dialogs/SetEmailDialog.tsx b/src/components/views/dialogs/SetEmailDialog.tsx
index 6e5f0cf0500..773f56db026 100644
--- a/src/components/views/dialogs/SetEmailDialog.tsx
+++ b/src/components/views/dialogs/SetEmailDialog.tsx
@@ -22,7 +22,6 @@ import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "../elements/Spinner";
 import ErrorDialog from "./ErrorDialog";
 import QuestionDialog from "./QuestionDialog";
@@ -44,7 +43,6 @@ interface IState {
  *
  * On success, `onFinished(true)` is called.
  */
-@replaceableComponent("views.dialogs.SetEmailDialog")
 export default class SetEmailDialog extends React.Component<IProps, IState> {
     private addThreepid: AddThreepid;
 
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 3262f61c73f..cb06d09d802 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -18,19 +18,17 @@ limitations under the License.
 import * as React from 'react';
 import { Room } from "matrix-js-sdk/src/models/room";
 import { User } from "matrix-js-sdk/src/models/user";
-import { Group } from "matrix-js-sdk/src/models/group";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import { _t } from '../../../languageHandler';
 import QRCode from "../elements/QRCode";
-import { RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink } from "../../../utils/permalinks/Permalinks";
+import { RoomPermalinkCreator, makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import { selectText } from "../../../utils/strings";
 import StyledCheckbox from '../elements/StyledCheckbox';
 import { IDialogProps } from "./IDialogProps";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import CopyableText from "../elements/CopyableText";
 
@@ -63,7 +61,7 @@ const socials = [
 ];
 
 interface IProps extends IDialogProps {
-    target: Room | User | Group | RoomMember | MatrixEvent;
+    target: Room | User | RoomMember | MatrixEvent;
     permalinkCreator: RoomPermalinkCreator;
 }
 
@@ -72,7 +70,6 @@ interface IState {
     permalinkCreator: RoomPermalinkCreator;
 }
 
-@replaceableComponent("views.dialogs.ShareDialog")
 export default class ShareDialog extends React.PureComponent<IProps, IState> {
     protected closeCopiedTooltip: () => void;
 
@@ -121,8 +118,6 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
             }
         } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
             matrixToUrl = makeUserPermalink(this.props.target.userId);
-        } else if (this.props.target instanceof Group) {
-            matrixToUrl = makeGroupPermalink(this.props.target.groupId);
         } else if (this.props.target instanceof MatrixEvent) {
             if (this.state.linkSpecificEvent) {
                 matrixToUrl = this.props.permalinkCreator.forEvent(this.props.target.getId());
@@ -153,14 +148,12 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
             }
         } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
             title = _t('Share User');
-        } else if (this.props.target instanceof Group) {
-            title = _t('Share Community');
         } else if (this.props.target instanceof MatrixEvent) {
             title = _t('Share Room Message');
             checkbox = <div>
                 <StyledCheckbox
                     checked={this.state.linkSpecificEvent}
-                    onClick={this.onLinkSpecificEventCheckboxClick}
+                    onChange={this.onLinkSpecificEventCheckboxClick}
                 >
                     { _t('Link to selected message') }
                 </StyledCheckbox>
diff --git a/src/components/views/dialogs/SpacePreferencesDialog.tsx b/src/components/views/dialogs/SpacePreferencesDialog.tsx
index d8a1afa342a..1d35aa30efe 100644
--- a/src/components/views/dialogs/SpacePreferencesDialog.tsx
+++ b/src/components/views/dialogs/SpacePreferencesDialog.tsx
@@ -26,10 +26,7 @@ import { useSettingValue } from "../../../hooks/useSettings";
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import RoomName from "../elements/RoomName";
-
-export enum SpacePreferenceTab {
-    Appearance = "SPACE_PREFERENCE_APPEARANCE_TAB",
-}
+import { SpacePreferenceTab } from "../../../dispatcher/payloads/OpenSpacePreferencesPayload";
 
 interface IProps extends IDialogProps {
     space: Room;
diff --git a/src/components/views/dialogs/SpotlightDialog.tsx b/src/components/views/dialogs/SpotlightDialog.tsx
index 21501f8e36f..f579e262875 100644
--- a/src/components/views/dialogs/SpotlightDialog.tsx
+++ b/src/components/views/dialogs/SpotlightDialog.tsx
@@ -53,19 +53,18 @@ import DMRoomMap from "../../../utils/DMRoomMap";
 import { mediaFromMxc } from "../../../customisations/Media";
 import BaseAvatar from "../avatars/BaseAvatar";
 import Spinner from "../elements/Spinner";
-import { roomContextDetailsText, spaceContextDetailsText } from "../../../Rooms";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import { Action } from "../../../dispatcher/actions";
 import Modal from "../../../Modal";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import RoomViewStore from "../../../stores/RoomViewStore";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
 import { showStartChatInviteDialog } from "../../../RoomInvite";
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import NotificationBadge from "../rooms/NotificationBadge";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import { BetaPill } from "../beta/BetaCard";
-import { UserTab } from "./UserSettingsDialog";
+import { UserTab } from "./UserTab";
 import BetaFeedbackDialog from "./BetaFeedbackDialog";
 import SdkConfig from "../../../SdkConfig";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -74,9 +73,11 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
 import { getCachedRoomIDForAlias } from "../../../RoomAliasCache";
+import { roomContextDetailsText, spaceContextDetailsText } from "../../../utils/i18n-helpers";
 
 const MAX_RECENT_SEARCHES = 10;
 const SECTION_LIMIT = 50; // only show 50 results per section for performance reasons
+const AVATAR_SIZE = 24;
 
 const Option: React.FC<ComponentProps<typeof RovingAccessibleButton>> = ({ inputRef, children, ...props }) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
@@ -358,7 +359,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", onFinished }) =>
                             viewRoom(result.room.roomId, true, ev.type !== "click");
                         }}
                     >
-                        <DecoratedRoomAvatar room={result.room} avatarSize={20} tooltipProps={{ tabIndex: -1 }} />
+                        <DecoratedRoomAvatar room={result.room} avatarSize={AVATAR_SIZE} tooltipProps={{ tabIndex: -1 }} />
                         { result.room.name }
                         <NotificationBadge notification={RoomNotificationStateStore.instance.getRoomState(result.room)} />
                         <ResultDetails room={result.room} />
@@ -426,9 +427,12 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", onFinished }) =>
                             <BaseAvatar
                                 name={room.name}
                                 idName={room.room_id}
-                                url={room.avatar_url ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(20) : null}
-                                width={20}
-                                height={20}
+                                url={room.avatar_url
+                                    ? mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(AVATAR_SIZE)
+                                    : null
+                                }
+                                width={AVATAR_SIZE}
+                                height={AVATAR_SIZE}
                             />
                             { room.name || room.canonical_alias }
                             { room.name && room.canonical_alias && <div className="mx_SpotlightDialog_result_details">
@@ -539,7 +543,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", onFinished }) =>
                                     viewRoom(room.roomId, true, ev.type !== "click");
                                 }}
                             >
-                                <DecoratedRoomAvatar room={room} avatarSize={20} tooltipProps={{ tabIndex: -1 }} />
+                                <DecoratedRoomAvatar room={room} avatarSize={AVATAR_SIZE} tooltipProps={{ tabIndex: -1 }} />
                                 { room.name }
                                 <NotificationBadge notification={RoomNotificationStateStore.instance.getRoomState(room)} />
                                 <ResultDetails room={room} />
@@ -555,8 +559,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", onFinished }) =>
                 <h4>{ _t("Recently viewed") }</h4>
                 <div>
                     { BreadcrumbsStore.instance.rooms
-                        .filter(r => r.roomId !== RoomViewStore.getRoomId())
-                        .slice(0, 10)
+                        .filter(r => r.roomId !== RoomViewStore.instance.getRoomId())
                         .map(room => (
                             <TooltipOption
                                 id={`mx_SpotlightDialog_button_recentlyViewed_${room.roomId}`}
diff --git a/src/components/views/dialogs/StorageEvictedDialog.tsx b/src/components/views/dialogs/StorageEvictedDialog.tsx
index acbb62b43d4..cd01fef2b8f 100644
--- a/src/components/views/dialogs/StorageEvictedDialog.tsx
+++ b/src/components/views/dialogs/StorageEvictedDialog.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import BugReportDialog from "./BugReportDialog";
@@ -28,7 +27,6 @@ import AccessibleButton from '../elements/AccessibleButton';
 
 interface IProps extends IDialogProps { }
 
-@replaceableComponent("views.dialogs.StorageEvictedDialog")
 export default class StorageEvictedDialog extends React.Component<IProps> {
     private sendBugReport = (ev: React.MouseEvent): void => {
         ev.preventDefault();
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx b/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
index 7ab425a5f6c..5a5d6e38229 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx
@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { dialogTermsInteractionCallback, TermsNotSignedError } from "../../../Terms";
 import * as ScalarMessaging from "../../../ScalarMessaging";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
 import ScalarAuthClient from "../../../ScalarAuthClient";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -55,7 +54,6 @@ interface IState {
     currentScalarClient: ScalarAuthClient;
 }
 
-@replaceableComponent("views.dialogs.TabbedIntegrationManagerDialog")
 export default class TabbedIntegrationManagerDialog extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/dialogs/TermsDialog.tsx b/src/components/views/dialogs/TermsDialog.tsx
index f2f713a75fe..aa3825ab3dd 100644
--- a/src/components/views/dialogs/TermsDialog.tsx
+++ b/src/components/views/dialogs/TermsDialog.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
 
 import { _t, pickBestLanguage } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "./BaseDialog";
 
@@ -66,7 +65,6 @@ interface IState {
     agreedUrls: any;
 }
 
-@replaceableComponent("views.dialogs.TermsDialog")
 export default class TermsDialog extends React.PureComponent<ITermsDialogProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/TextInputDialog.tsx b/src/components/views/dialogs/TextInputDialog.tsx
index 2667c131b96..7a13fd3d453 100644
--- a/src/components/views/dialogs/TextInputDialog.tsx
+++ b/src/components/views/dialogs/TextInputDialog.tsx
@@ -18,7 +18,6 @@ import React, { ChangeEvent, createRef } from 'react';
 
 import Field from "../elements/Field";
 import { _t, _td } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IFieldState, IValidationResult } from "../elements/Validation";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -43,7 +42,6 @@ interface IState {
     valid: boolean;
 }
 
-@replaceableComponent("views.dialogs.TextInputDialog")
 export default class TextInputDialog extends React.Component<IProps, IState> {
     private field = createRef<Field>();
 
diff --git a/src/components/views/dialogs/UploadConfirmDialog.tsx b/src/components/views/dialogs/UploadConfirmDialog.tsx
index 612903a6eec..c705da1ac3c 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.tsx
+++ b/src/components/views/dialogs/UploadConfirmDialog.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import filesize from "filesize";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getBlobSafeMimeType } from '../../../utils/blobs';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -31,10 +30,9 @@ interface IProps {
     onFinished: (uploadConfirmed: boolean, uploadAll?: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.UploadConfirmDialog")
 export default class UploadConfirmDialog extends React.Component<IProps> {
-    private objectUrl: string;
-    private mimeType: string;
+    private readonly objectUrl: string;
+    private readonly mimeType: string;
 
     static defaultProps = {
         totalFiles: 1,
@@ -69,7 +67,7 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
     };
 
     render() {
-        let title;
+        let title: string;
         if (this.props.totalFiles > 1 && this.props.currentIndex !== undefined) {
             title = _t(
                 "Upload files (%(current)s of %(total)s)",
@@ -82,23 +80,23 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
             title = _t('Upload files');
         }
 
-        let preview;
-        if (this.mimeType.startsWith('image/')) {
-            preview = <div className="mx_UploadConfirmDialog_previewOuter">
-                <div className="mx_UploadConfirmDialog_previewInner">
-                    <div><img className="mx_UploadConfirmDialog_imagePreview" src={this.objectUrl} /></div>
-                    <div>{ this.props.file.name } ({ filesize(this.props.file.size) })</div>
-                </div>
-            </div>;
+        let preview: JSX.Element;
+        let placeholder: JSX.Element;
+        if (this.mimeType.startsWith("image/")) {
+            preview = (
+                <img className="mx_UploadConfirmDialog_imagePreview" src={this.objectUrl} />
+            );
+        } else if (this.mimeType.startsWith("video/")) {
+            preview = (
+                <video className="mx_UploadConfirmDialog_imagePreview" src={this.objectUrl} playsInline controls={false} />
+            );
         } else {
-            preview = <div>
-                <div>
-                    <img className="mx_UploadConfirmDialog_fileIcon"
-                        src={require("../../../../res/img/feather-customised/files.svg").default}
-                    />
-                    { this.props.file.name } ({ filesize(this.props.file.size) })
-                </div>
-            </div>;
+            placeholder = (
+                <img
+                    className="mx_UploadConfirmDialog_fileIcon"
+                    src={require("../../../../res/img/feather-customised/files.svg").default}
+                />
+            );
         }
 
         let uploadAllButton;
@@ -109,14 +107,23 @@ export default class UploadConfirmDialog extends React.Component<IProps> {
         }
 
         return (
-            <BaseDialog className='mx_UploadConfirmDialog'
+            <BaseDialog
+                className="mx_UploadConfirmDialog"
                 fixedWidth={false}
                 onFinished={this.onCancelClick}
                 title={title}
-                contentId='mx_Dialog_content'
+                contentId="mx_Dialog_content"
             >
-                <div id='mx_Dialog_content'>
-                    { preview }
+                <div id="mx_Dialog_content">
+                    <div className="mx_UploadConfirmDialog_previewOuter">
+                        <div className="mx_UploadConfirmDialog_previewInner">
+                            { preview && <div>{ preview }</div> }
+                            <div>
+                                { placeholder }
+                                { this.props.file.name } ({ filesize(this.props.file.size) })
+                            </div>
+                        </div>
+                    </div>
                 </div>
 
                 <DialogButtons primaryButton={_t('Upload')}
diff --git a/src/components/views/dialogs/UploadFailureDialog.tsx b/src/components/views/dialogs/UploadFailureDialog.tsx
index 8226a82170c..8a25671ea09 100644
--- a/src/components/views/dialogs/UploadFailureDialog.tsx
+++ b/src/components/views/dialogs/UploadFailureDialog.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
@@ -35,7 +34,6 @@ interface IProps extends IDialogProps {
  * them. This is named fairly generically but the only thing we check right now is
  * the size of the file.
  */
-@replaceableComponent("views.dialogs.UploadFailureDialog")
 export default class UploadFailureDialog extends React.Component<IProps> {
     private onCancelClick = (): void => {
         this.props.onFinished(false);
diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
index dc87cdf7ec4..8f5e1a61088 100644
--- a/src/components/views/dialogs/UserSettingsDialog.tsx
+++ b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -28,30 +28,14 @@ import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserS
 import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
 import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab";
 import HelpUserSettingsTab from "../settings/tabs/user/HelpUserSettingsTab";
-import FlairUserSettingsTab from "../settings/tabs/user/FlairUserSettingsTab";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { IDialogProps } from "./IDialogProps";
 import SidebarUserSettingsTab from "../settings/tabs/user/SidebarUserSettingsTab";
 import KeyboardUserSettingsTab from "../settings/tabs/user/KeyboardUserSettingsTab";
-
-export enum UserTab {
-    General = "USER_GENERAL_TAB",
-    Appearance = "USER_APPEARANCE_TAB",
-    Flair = "USER_FLAIR_TAB",
-    Notifications = "USER_NOTIFICATIONS_TAB",
-    Preferences = "USER_PREFERENCES_TAB",
-    Keyboard = "USER_KEYBOARD_TAB",
-    Sidebar = "USER_SIDEBAR_TAB",
-    Voice = "USER_VOICE_TAB",
-    Security = "USER_SECURITY_TAB",
-    Labs = "USER_LABS_TAB",
-    Mjolnir = "USER_MJOLNIR_TAB",
-    Help = "USER_HELP_TAB",
-}
+import { UserTab } from "./UserTab";
 
 interface IProps extends IDialogProps {
     initialTabId?: UserTab;
@@ -61,7 +45,6 @@ interface IState {
     mjolnirEnabled: boolean;
 }
 
-@replaceableComponent("views.dialogs.UserSettingsDialog")
 export default class UserSettingsDialog extends React.Component<IProps, IState> {
     private mjolnirWatcher: string;
 
@@ -103,15 +86,6 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
             <AppearanceUserSettingsTab />,
             "UserSettingsAppearance",
         ));
-        if (SettingsStore.getValue(UIFeature.Flair)) {
-            tabs.push(new Tab(
-                UserTab.Flair,
-                _td("Flair"),
-                "mx_UserSettingsDialog_flairIcon",
-                <FlairUserSettingsTab />,
-                "UserSettingFlair",
-            ));
-        }
         tabs.push(new Tab(
             UserTab.Notifications,
             _td("Notifications"),
@@ -159,7 +133,7 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
             "UserSettingsSecurityPrivacy",
         ));
         // Show the Labs tab if enabled or if there are any active betas
-        if (SdkConfig.get()['showLabsSettings']
+        if (SdkConfig.get("show_labs_settings")
             || SettingsStore.getFeatureSettingNames().some(k => SettingsStore.getBetaInfo(k))
         ) {
             tabs.push(new Tab(
diff --git a/src/components/views/dialogs/UserTab.ts b/src/components/views/dialogs/UserTab.ts
new file mode 100644
index 00000000000..b5b2782c0d0
--- /dev/null
+++ b/src/components/views/dialogs/UserTab.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export enum UserTab {
+    General = "USER_GENERAL_TAB",
+    Appearance = "USER_APPEARANCE_TAB",
+    Notifications = "USER_NOTIFICATIONS_TAB",
+    Preferences = "USER_PREFERENCES_TAB",
+    Keyboard = "USER_KEYBOARD_TAB",
+    Sidebar = "USER_SIDEBAR_TAB",
+    Voice = "USER_VOICE_TAB",
+    Security = "USER_SECURITY_TAB",
+    Labs = "USER_LABS_TAB",
+    Mjolnir = "USER_MJOLNIR_TAB",
+    Help = "USER_HELP_TAB",
+}
diff --git a/src/components/views/dialogs/VerificationRequestDialog.tsx b/src/components/views/dialogs/VerificationRequestDialog.tsx
index f73cda91f44..8830ee29f7c 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.tsx
+++ b/src/components/views/dialogs/VerificationRequestDialog.tsx
@@ -20,7 +20,6 @@ import { User } from 'matrix-js-sdk/src/models/user';
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import EncryptionPanel from "../right_panel/EncryptionPanel";
 
@@ -35,7 +34,6 @@ interface IState {
     verificationRequest: VerificationRequest;
 }
 
-@replaceableComponent("views.dialogs.VerificationRequestDialog")
 export default class VerificationRequestDialog extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
index b794592b2fe..17be7d41506 100644
--- a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
@@ -32,7 +32,6 @@ import StyledCheckbox from "../elements/StyledCheckbox";
 import DialogButtons from "../elements/DialogButtons";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
     requestedCapabilities: Set<Capability>;
@@ -50,7 +49,6 @@ interface IState {
     rememberSelection: boolean;
 }
 
-@replaceableComponent("views.dialogs.WidgetCapabilitiesPromptDialog")
 export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<IProps, IState> {
     private eventPermissionsMap = new Map<Capability, WidgetEventCapability>();
 
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
index 4faf4e52371..68c2991ed8d 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx
@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from "../../../languageHandler";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { OIDCState, WidgetPermissionStore } from "../../../stores/widgets/WidgetPermissionStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -37,7 +36,6 @@ interface IState {
     rememberSelection: boolean;
 }
 
-@replaceableComponent("views.dialogs.WidgetOpenIDPermissionsDialog")
 export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/dialogs/devtools/AccountData.tsx b/src/components/views/dialogs/devtools/AccountData.tsx
new file mode 100644
index 00000000000..96daa62b0e6
--- /dev/null
+++ b/src/components/views/dialogs/devtools/AccountData.tsx
@@ -0,0 +1,117 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useMemo, useState } from "react";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import { EventEditor, EventViewer, eventTypeField, IEditorProps, stringify } from "./Event";
+import FilteredList from "./FilteredList";
+import { _t } from "../../../../languageHandler";
+
+export const AccountDataEventEditor = ({ mxEvent, onBack }: IEditorProps) => {
+    const cli = useContext(MatrixClientContext);
+
+    const fields = useMemo(() => [
+        eventTypeField(mxEvent?.getType()),
+    ], [mxEvent]);
+
+    const onSend = ([eventType]: string[], content?: IContent) => {
+        return cli.setAccountData(eventType, content);
+    };
+
+    const defaultContent = mxEvent ? stringify(mxEvent.getContent()) : undefined;
+    return <EventEditor fieldDefs={fields} defaultContent={defaultContent} onSend={onSend} onBack={onBack} />;
+};
+
+export const RoomAccountDataEventEditor = ({ mxEvent, onBack }: IEditorProps) => {
+    const context = useContext(DevtoolsContext);
+    const cli = useContext(MatrixClientContext);
+
+    const fields = useMemo(() => [
+        eventTypeField(mxEvent?.getType()),
+    ], [mxEvent]);
+
+    const onSend = ([eventType]: string[], content?: IContent) => {
+        return cli.setRoomAccountData(context.room.roomId, eventType, content);
+    };
+
+    const defaultContent = mxEvent ? stringify(mxEvent.getContent()) : undefined;
+    return <EventEditor fieldDefs={fields} defaultContent={defaultContent} onSend={onSend} onBack={onBack} />;
+};
+
+interface IProps extends IDevtoolsProps {
+    events: Record<string, MatrixEvent>;
+    Editor: React.FC<IEditorProps>;
+    actionLabel: string;
+}
+
+const BaseAccountDataExplorer = ({ events, Editor, actionLabel, onBack, setTool }: IProps) => {
+    const [query, setQuery] = useState("");
+    const [event, setEvent] = useState<MatrixEvent>(null);
+
+    if (event) {
+        const onBack = () => {
+            setEvent(null);
+        };
+        return <EventViewer mxEvent={event} onBack={onBack} Editor={Editor} />;
+    }
+
+    const onAction = async () => {
+        setTool(actionLabel, Editor);
+    };
+
+    return <BaseTool onBack={onBack} actionLabel={actionLabel} onAction={onAction}>
+        <FilteredList query={query} onChange={setQuery}>
+            {
+                Object.entries(events).map(([eventType, ev]) => {
+                    const onClick = () => {
+                        setEvent(ev);
+                    };
+
+                    return <button className="mx_DevTools_button" key={eventType} onClick={onClick}>
+                        { eventType }
+                    </button>;
+                })
+            }
+        </FilteredList>
+    </BaseTool>;
+};
+
+export const AccountDataExplorer = ({ onBack, setTool }: IDevtoolsProps) => {
+    const cli = useContext(MatrixClientContext);
+
+    return <BaseAccountDataExplorer
+        events={cli.store.accountData}
+        Editor={AccountDataEventEditor}
+        actionLabel={_t("Send custom account data event")}
+        onBack={onBack}
+        setTool={setTool}
+    />;
+};
+
+export const RoomAccountDataExplorer = ({ onBack, setTool }: IDevtoolsProps) => {
+    const context = useContext(DevtoolsContext);
+
+    return <BaseAccountDataExplorer
+        events={context.room.accountData}
+        Editor={RoomAccountDataEventEditor}
+        actionLabel={_t("Send custom room account data event")}
+        onBack={onBack}
+        setTool={setTool}
+    />;
+};
diff --git a/src/components/views/dialogs/devtools/BaseTool.tsx b/src/components/views/dialogs/devtools/BaseTool.tsx
new file mode 100644
index 00000000000..dcc3756064e
--- /dev/null
+++ b/src/components/views/dialogs/devtools/BaseTool.tsx
@@ -0,0 +1,88 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createContext, useState } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from "classnames";
+
+import { _t } from "../../../../languageHandler";
+import { XOR } from "../../../../@types/common";
+import { Tool } from "../DevtoolsDialog";
+
+export interface IDevtoolsProps {
+    onBack(): void;
+    setTool(label: string, tool: Tool): void;
+}
+
+interface IMinProps extends Pick<IDevtoolsProps, "onBack"> {
+    className?: string;
+}
+
+interface IProps extends IMinProps {
+    actionLabel: string;
+    onAction(): Promise<string | void>;
+}
+
+const BaseTool: React.FC<XOR<IMinProps, IProps>> = ({ className, actionLabel, onBack, onAction, children }) => {
+    const [message, setMessage] = useState<string>(null);
+
+    const onBackClick = () => {
+        if (message) {
+            setMessage(null);
+        } else {
+            onBack();
+        }
+    };
+
+    let actionButton: JSX.Element;
+    if (message) {
+        children = message;
+    } else if (onAction) {
+        const onActionClick = () => {
+            onAction().then((msg) => {
+                if (typeof msg === "string") {
+                    setMessage(msg);
+                }
+            });
+        };
+
+        actionButton = (
+            <button onClick={onActionClick}>
+                { actionLabel }
+            </button>
+        );
+    }
+
+    return <>
+        <div className={classNames("mx_DevTools_content", className)}>
+            { children }
+        </div>
+        <div className="mx_Dialog_buttons">
+            <button onClick={onBackClick}>
+                { _t("Back") }
+            </button>
+            { actionButton }
+        </div>
+    </>;
+};
+
+export default BaseTool;
+
+interface IContext {
+    room: Room;
+}
+
+export const DevtoolsContext = createContext<IContext>({} as IContext);
diff --git a/src/components/views/dialogs/devtools/Event.tsx b/src/components/views/dialogs/devtools/Event.tsx
new file mode 100644
index 00000000000..75baa690cda
--- /dev/null
+++ b/src/components/views/dialogs/devtools/Event.tsx
@@ -0,0 +1,209 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useMemo, useRef, useState } from "react";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { _t, _td } from "../../../../languageHandler";
+import Field from "../../elements/Field";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import withValidation from "../../elements/Validation";
+import SyntaxHighlight from "../../elements/SyntaxHighlight";
+
+export const stringify = (object: object): string => {
+    return JSON.stringify(object, null, 2);
+};
+
+interface IEventEditorProps extends Pick<IDevtoolsProps, "onBack"> {
+    fieldDefs: IFieldDef[]; // immutable
+    defaultContent?: string;
+    onSend(fields: string[], content?: IContent): Promise<unknown>;
+}
+
+interface IFieldDef {
+    id: string;
+    label: string; // _td
+    default?: string;
+}
+
+export const eventTypeField = (defaultValue?: string): IFieldDef => ({
+    id: "eventType",
+    label: _td("Event Type"),
+    default: defaultValue,
+});
+
+export const stateKeyField = (defaultValue?: string): IFieldDef => ({
+    id: "stateKey",
+    label: _td("State Key"),
+    default: defaultValue,
+});
+
+const validateEventContent = withValidation<any, Error | undefined>({
+    deriveData({ value }) {
+        try {
+            JSON.parse(value);
+        } catch (e) {
+            return e;
+        }
+    },
+    rules: [{
+        key: "validJson",
+        test: ({ value }, error) => {
+            if (!value) return true;
+            return !error;
+        },
+        invalid: (error) => _t("Doesn't look like valid JSON.") + " " + error,
+    }],
+});
+
+export const EventEditor = ({ fieldDefs, defaultContent = "{\n\n}", onSend, onBack }: IEventEditorProps) => {
+    const [fieldData, setFieldData] = useState<string[]>(fieldDefs.map(def => def.default ?? ""));
+    const [content, setContent] = useState<string>(defaultContent);
+    const contentField = useRef<Field>();
+
+    const fields = fieldDefs.map((def, i) => (
+        <Field
+            key={def.id}
+            id={def.id}
+            label={_t(def.label)}
+            size={42}
+            autoFocus={defaultContent === undefined && i === 0}
+            type="text"
+            autoComplete="on"
+            value={fieldData[i]}
+            onChange={ev => setFieldData(data => {
+                data[i] = ev.target.value;
+                return [...data];
+            })}
+        />
+    ));
+
+    const onAction = async () => {
+        const valid = await contentField.current.validate({});
+
+        if (!valid) {
+            contentField.current.focus();
+            contentField.current.validate({ focused: true });
+            return;
+        }
+
+        try {
+            const json = JSON.parse(content);
+            await onSend(fieldData, json);
+        } catch (e) {
+            return _t("Failed to send event!") + ` (${e.toString()})`;
+        }
+        return _t("Event sent!");
+    };
+
+    return <BaseTool
+        actionLabel={_t("Send")}
+        onAction={onAction}
+        onBack={onBack}
+    >
+        <div className="mx_DevTools_eventTypeStateKeyGroup">
+            { fields }
+        </div>
+
+        <Field
+            id="evContent"
+            label={_t("Event Content")}
+            type="text"
+            className="mx_DevTools_textarea"
+            autoComplete="off"
+            value={content}
+            onChange={ev => setContent(ev.target.value)}
+            element="textarea"
+            onValidate={validateEventContent}
+            ref={contentField}
+            autoFocus={!!defaultContent}
+        />
+    </BaseTool>;
+};
+
+export interface IEditorProps extends Pick<IDevtoolsProps, "onBack"> {
+    mxEvent?: MatrixEvent;
+}
+
+interface IViewerProps extends Required<IEditorProps> {
+    Editor: React.FC<Required<IEditorProps>>;
+}
+
+export const EventViewer = ({ mxEvent, onBack, Editor }: IViewerProps) => {
+    const [editing, setEditing] = useState(false);
+
+    if (editing) {
+        const onBack = () => {
+            setEditing(false);
+        };
+        return <Editor mxEvent={mxEvent} onBack={onBack} />;
+    }
+
+    const onAction = async () => {
+        setEditing(true);
+    };
+
+    return <BaseTool onBack={onBack} actionLabel={_t("Edit")} onAction={onAction}>
+        <SyntaxHighlight language="json">
+            { stringify(mxEvent.event) }
+        </SyntaxHighlight>
+    </BaseTool>;
+};
+
+// returns the id of the initial message, not the id of the previous edit
+const getBaseEventId = (baseEvent: MatrixEvent): string => {
+    // show the replacing event, not the original, if it is an edit
+    const mxEvent = baseEvent.replacingEvent() ?? baseEvent;
+    return mxEvent.getWireContent()["m.relates_to"]?.event_id ?? baseEvent.getId();
+};
+
+export const TimelineEventEditor = ({ mxEvent, onBack }: IEditorProps) => {
+    const context = useContext(DevtoolsContext);
+    const cli = useContext(MatrixClientContext);
+
+    const fields = useMemo(() => [
+        eventTypeField(mxEvent?.getType()),
+    ], [mxEvent]);
+
+    const onSend = ([eventType]: string[], content?: IContent) => {
+        return cli.sendEvent(context.room.roomId, eventType, content);
+    };
+
+    let defaultContent: string;
+
+    if (mxEvent) {
+        const originalContent = mxEvent.getContent();
+        // prefill an edit-message event, keep only the `body` and `msgtype` fields of originalContent
+        const bodyToStartFrom = originalContent["m.new_content"]?.body ?? originalContent.body; // prefill the last edit body, to start editing from there
+        const newContent = {
+            "body": ` * ${bodyToStartFrom}`,
+            "msgtype": originalContent.msgtype,
+            "m.new_content": {
+                body: bodyToStartFrom,
+                msgtype: originalContent.msgtype,
+            },
+            "m.relates_to": {
+                rel_type: "m.replace",
+                event_id: getBaseEventId(mxEvent),
+            },
+        };
+
+        defaultContent = stringify(newContent);
+    }
+
+    return <EventEditor fieldDefs={fields} defaultContent={defaultContent} onSend={onSend} onBack={onBack} />;
+};
diff --git a/src/components/views/dialogs/devtools/FilteredList.tsx b/src/components/views/dialogs/devtools/FilteredList.tsx
new file mode 100644
index 00000000000..34b1c9244a8
--- /dev/null
+++ b/src/components/views/dialogs/devtools/FilteredList.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useEffect, useState } from "react";
+
+import { _t } from "../../../../languageHandler";
+import Field from "../../elements/Field";
+import TruncatedList from "../../elements/TruncatedList";
+
+const INITIAL_LOAD_TILES = 20;
+const LOAD_TILES_STEP_SIZE = 50;
+
+interface IProps {
+    children: React.ReactElement[];
+    query: string;
+    onChange(value: string): void;
+}
+
+const FilteredList = ({ children, query, onChange }: IProps) => {
+    const [truncateAt, setTruncateAt] = useState<number>(INITIAL_LOAD_TILES);
+    const [filteredChildren, setFilteredChildren] = useState<React.ReactElement[]>(children);
+
+    useEffect(() => {
+        let filteredChildren = children;
+        if (query) {
+            const lcQuery = query.toLowerCase();
+            filteredChildren = children.filter((child) => child.key.toString().toLowerCase().includes(lcQuery));
+        }
+        setFilteredChildren(filteredChildren);
+        setTruncateAt(INITIAL_LOAD_TILES);
+    }, [children, query]);
+
+    const getChildren = (start: number, end: number): React.ReactElement[] => {
+        return filteredChildren.slice(start, end);
+    };
+
+    const getChildCount = (): number => {
+        return filteredChildren.length;
+    };
+
+    const createOverflowElement = (overflowCount: number, totalCount: number) => {
+        const showMore = () => {
+            setTruncateAt(num => num + LOAD_TILES_STEP_SIZE);
+        };
+
+        return <button className="mx_DevTools_button" onClick={showMore}>
+            { _t("and %(count)s others...", { count: overflowCount }) }
+        </button>;
+    };
+
+    return <>
+        <Field
+            label={_t('Filter results')}
+            autoFocus={true}
+            size={64}
+            type="text"
+            autoComplete="off"
+            value={query}
+            onChange={ev => onChange(ev.target.value)}
+            className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+            // force re-render so that autoFocus is applied when this component is re-used
+            key={children?.[0]?.key ?? ''}
+        />
+
+        { filteredChildren.length < 1
+            ? _t("No results found")
+            : <TruncatedList
+                getChildren={getChildren}
+                getChildCount={getChildCount}
+                truncateAt={truncateAt}
+                createOverflowElement={createOverflowElement}
+            />
+        }
+    </>;
+};
+
+export default FilteredList;
diff --git a/src/components/views/dialogs/devtools/RoomState.tsx b/src/components/views/dialogs/devtools/RoomState.tsx
new file mode 100644
index 00000000000..d8a6fc04089
--- /dev/null
+++ b/src/components/views/dialogs/devtools/RoomState.tsx
@@ -0,0 +1,132 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useEffect, useMemo, useState } from "react";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import classNames from "classnames";
+
+import { _t } from "../../../../languageHandler";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import { EventEditor, EventViewer, eventTypeField, stateKeyField, IEditorProps, stringify } from "./Event";
+import FilteredList from "./FilteredList";
+
+export const StateEventEditor = ({ mxEvent, onBack }: IEditorProps) => {
+    const context = useContext(DevtoolsContext);
+    const cli = useContext(MatrixClientContext);
+
+    const fields = useMemo(() => [
+        eventTypeField(mxEvent?.getType()),
+        stateKeyField(mxEvent?.getStateKey()),
+    ], [mxEvent]);
+
+    const onSend = ([eventType, stateKey]: string[], content?: IContent) => {
+        return cli.sendStateEvent(context.room.roomId, eventType, content, stateKey);
+    };
+
+    const defaultContent = mxEvent ? stringify(mxEvent.getContent()) : undefined;
+    return <EventEditor fieldDefs={fields} defaultContent={defaultContent} onSend={onSend} onBack={onBack} />;
+};
+
+interface IEventTypeProps extends Pick<IDevtoolsProps, "onBack"> {
+    eventType: string;
+}
+
+const RoomStateExplorerEventType = ({ eventType, onBack }: IEventTypeProps) => {
+    const context = useContext(DevtoolsContext);
+    const [query, setQuery] = useState("");
+    const [event, setEvent] = useState<MatrixEvent>(null);
+
+    const events = context.room.currentState.events.get(eventType);
+
+    useEffect(() => {
+        if (events.size === 1 && events.has("")) {
+            setEvent(events.get(""));
+        } else {
+            setEvent(null);
+        }
+    }, [events]);
+
+    if (event) {
+        const onBack = () => {
+            setEvent(null);
+        };
+        return <EventViewer mxEvent={event} onBack={onBack} Editor={StateEventEditor} />;
+    }
+
+    return <BaseTool onBack={onBack}>
+        <FilteredList query={query} onChange={setQuery}>
+            {
+                Array.from(events.entries()).map(([stateKey, ev]) => {
+                    const trimmed = stateKey.trim();
+                    const onClick = () => {
+                        setEvent(ev);
+                    };
+
+                    return <button
+                        className={classNames("mx_DevTools_button", {
+                            mx_DevTools_RoomStateExplorer_button_hasSpaces: trimmed.length !== stateKey.length,
+                            mx_DevTools_RoomStateExplorer_button_emptyString: !trimmed,
+                        })}
+                        key={stateKey}
+                        onClick={onClick}
+                    >
+                        { trimmed ? stateKey : _t("<%(count)s spaces>", { count: stateKey.length }) }
+                    </button>;
+                })
+            }
+        </FilteredList>
+    </BaseTool>;
+};
+
+export const RoomStateExplorer = ({ onBack, setTool }: IDevtoolsProps) => {
+    const context = useContext(DevtoolsContext);
+    const [query, setQuery] = useState("");
+    const [eventType, setEventType] = useState<string>(null);
+
+    const events = context.room.currentState.events;
+
+    if (eventType) {
+        const onBack = () => {
+            setEventType(null);
+        };
+        return <RoomStateExplorerEventType eventType={eventType} onBack={onBack} />;
+    }
+
+    const onAction = async () => {
+        setTool(_t("Send custom state event"), StateEventEditor);
+    };
+
+    return <BaseTool onBack={onBack} actionLabel={_t("Send custom state event")} onAction={onAction}>
+        <FilteredList query={query} onChange={setQuery}>
+            {
+                Array.from(events.keys()).map((eventType) => {
+                    const onClick = () => {
+                        setEventType(eventType);
+                    };
+
+                    return <button
+                        className="mx_DevTools_button"
+                        key={eventType}
+                        onClick={onClick}
+                    >
+                        { eventType }
+                    </button>;
+                })
+            }
+        </FilteredList>
+    </BaseTool>;
+};
diff --git a/src/components/views/dialogs/devtools/ServerInfo.tsx b/src/components/views/dialogs/devtools/ServerInfo.tsx
new file mode 100644
index 00000000000..23b6528eacc
--- /dev/null
+++ b/src/components/views/dialogs/devtools/ServerInfo.tsx
@@ -0,0 +1,95 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext } from "react";
+
+import BaseTool, { IDevtoolsProps } from "./BaseTool";
+import { _t } from "../../../../languageHandler";
+import { useAsyncMemo } from "../../../../hooks/useAsyncMemo";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import Spinner from "../../elements/Spinner";
+import SyntaxHighlight from "../../elements/SyntaxHighlight";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
+
+const FAILED_TO_LOAD = Symbol("failed-to-load");
+
+interface IServerWellKnown {
+    server: {
+        name: string;
+        version: string;
+    };
+}
+
+const ServerInfo = ({ onBack }: IDevtoolsProps) => {
+    const cli = useContext(MatrixClientContext);
+    const capabilities = useAsyncMemo(() => cli.getCapabilities(true).catch(() => FAILED_TO_LOAD), [cli]);
+    const clientVersions = useAsyncMemo(() => cli.getVersions().catch(() => FAILED_TO_LOAD), [cli]);
+    const serverVersions = useAsyncMemo<IServerWellKnown | symbol>(async () => {
+        let baseUrl = cli.getHomeserverUrl();
+
+        try {
+            const hsName = MatrixClientPeg.getHomeserverName();
+            // We don't use the js-sdk Autodiscovery module here as it only support client well-known, not server ones.
+            const response = await fetch(`https://${hsName}/.well-known/matrix/server`);
+            const json = await response.json();
+            if (json["m.server"]) {
+                baseUrl = `https://${json["m.server"]}`;
+            }
+        } catch (e) {
+            console.warn(e);
+        }
+
+        try {
+            const response = await fetch(`${baseUrl}/_matrix/federation/v1/version`);
+            return response.json();
+        } catch (e) {
+            console.warn(e);
+        }
+
+        return FAILED_TO_LOAD;
+    }, [cli]);
+
+    let body: JSX.Element;
+    if (!capabilities || !clientVersions || !serverVersions) {
+        body = <Spinner />;
+    } else {
+        body = <>
+            <h4>{ _t("Capabilities") }</h4>
+            { capabilities !== FAILED_TO_LOAD
+                ? <SyntaxHighlight language="json" children={JSON.stringify(capabilities, null, 4)} />
+                : <div>{ _t("Failed to load.") }</div>
+            }
+
+            <h4>{ _t("Client Versions") }</h4>
+            { clientVersions !== FAILED_TO_LOAD
+                ? <SyntaxHighlight language="json" children={JSON.stringify(clientVersions, null, 4)} />
+                : <div>{ _t("Failed to load.") }</div>
+            }
+
+            <h4>{ _t("Server Versions") }</h4>
+            { serverVersions !== FAILED_TO_LOAD
+                ? <SyntaxHighlight language="json" children={JSON.stringify(serverVersions, null, 4)} />
+                : <div>{ _t("Failed to load.") }</div>
+            }
+        </>;
+    }
+
+    return <BaseTool onBack={onBack}>
+        { body }
+    </BaseTool>;
+};
+
+export default ServerInfo;
diff --git a/src/components/views/dialogs/devtools/ServersInRoom.tsx b/src/components/views/dialogs/devtools/ServersInRoom.tsx
new file mode 100644
index 00000000000..b8947c3a527
--- /dev/null
+++ b/src/components/views/dialogs/devtools/ServersInRoom.tsx
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useMemo } from "react";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import { _t } from "../../../../languageHandler";
+
+const ServersInRoom = ({ onBack }: IDevtoolsProps) => {
+    const context = useContext(DevtoolsContext);
+
+    const servers = useMemo<Record<string, number>>(() => {
+        const servers: Record<string, number> = {};
+        context.room.currentState.getStateEvents(EventType.RoomMember).forEach(ev => {
+            if (ev.getContent().membership !== "join") return; // only count joined users
+            const server = ev.getSender().split(":")[1];
+            servers[server] = (servers[server] ?? 0) + 1;
+        });
+        return servers;
+    }, [context.room]);
+
+    return <BaseTool onBack={onBack}>
+        <table>
+            <thead>
+                <tr>
+                    <th>{ _t("Server") }</th>
+                    <th>{ _t("Number of users") }</th>
+                </tr>
+            </thead>
+            <tbody>
+                { Object.entries(servers).map(([server, numUsers]) => (
+                    <tr key={server}>
+                        <td>{ server }</td>
+                        <td>{ numUsers }</td>
+                    </tr>
+                )) }
+            </tbody>
+        </table>
+    </BaseTool>;
+};
+
+export default ServersInRoom;
diff --git a/src/components/views/dialogs/devtools/SettingExplorer.tsx b/src/components/views/dialogs/devtools/SettingExplorer.tsx
new file mode 100644
index 00000000000..1fe09675e17
--- /dev/null
+++ b/src/components/views/dialogs/devtools/SettingExplorer.tsx
@@ -0,0 +1,305 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2018-2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useMemo, useState } from "react";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { _t } from "../../../../languageHandler";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import AccessibleButton from "../../elements/AccessibleButton";
+import SettingsStore, { LEVEL_ORDER } from "../../../../settings/SettingsStore";
+import { SettingLevel } from "../../../../settings/SettingLevel";
+import { SETTINGS } from "../../../../settings/Settings";
+import Field from "../../elements/Field";
+
+const SettingExplorer = ({ onBack }: IDevtoolsProps) => {
+    const [setting, setSetting] = useState<string>(null);
+    const [editing, setEditing] = useState(false);
+
+    if (setting && editing) {
+        const onBack = () => {
+            setEditing(false);
+        };
+        return <EditSetting setting={setting} onBack={onBack} />;
+    } else if (setting) {
+        const onBack = () => {
+            setSetting(null);
+        };
+        const onEdit = async () => {
+            setEditing(true);
+        };
+        return <ViewSetting setting={setting} onBack={onBack} onEdit={onEdit} />;
+    } else {
+        const onView = (setting: string) => {
+            setSetting(setting);
+        };
+        const onEdit = (setting: string) => {
+            setSetting(setting);
+            setEditing(true);
+        };
+        return <SettingsList onBack={onBack} onView={onView} onEdit={onEdit} />;
+    }
+};
+
+export default SettingExplorer;
+
+interface ICanEditLevelFieldProps {
+    setting: string;
+    level: SettingLevel;
+    roomId?: string;
+}
+
+const CanEditLevelField = ({ setting, roomId, level }: ICanEditLevelFieldProps) => {
+    const canEdit = SettingsStore.canSetValue(setting, roomId, level);
+    const className = canEdit ? "mx_DevTools_SettingsExplorer_mutable" : "mx_DevTools_SettingsExplorer_immutable";
+    return <td className={className}><code>{ canEdit.toString() }</code></td>;
+};
+
+function renderExplicitSettingValues(setting: string, roomId: string): string {
+    const vals = {};
+    for (const level of LEVEL_ORDER) {
+        try {
+            vals[level] = SettingsStore.getValueAt(level, setting, roomId, true, true);
+            if (vals[level] === undefined) {
+                vals[level] = null;
+            }
+        } catch (e) {
+            logger.warn(e);
+        }
+    }
+    return JSON.stringify(vals, null, 4);
+}
+
+interface IEditSettingProps extends Pick<IDevtoolsProps, "onBack"> {
+    setting: string;
+}
+
+const EditSetting = ({ setting, onBack }: IEditSettingProps) => {
+    const context = useContext(DevtoolsContext);
+    const [explicitValue, setExplicitValue] = useState(renderExplicitSettingValues(setting, null));
+    const [explicitRoomValue, setExplicitRoomValue] =
+        useState(renderExplicitSettingValues(setting, context.room.roomId));
+
+    const onSave = async () => {
+        try {
+            const parsedExplicit = JSON.parse(explicitValue);
+            const parsedExplicitRoom = JSON.parse(explicitRoomValue);
+            for (const level of Object.keys(parsedExplicit)) {
+                logger.log(`[Devtools] Setting value of ${setting} at ${level} from user input`);
+                try {
+                    const val = parsedExplicit[level];
+                    await SettingsStore.setValue(setting, null, level as SettingLevel, val);
+                } catch (e) {
+                    logger.warn(e);
+                }
+            }
+
+            const roomId = context.room.roomId;
+            for (const level of Object.keys(parsedExplicit)) {
+                logger.log(`[Devtools] Setting value of ${setting} at ${level} in ${roomId} from user input`);
+                try {
+                    const val = parsedExplicitRoom[level];
+                    await SettingsStore.setValue(setting, roomId, level as SettingLevel, val);
+                } catch (e) {
+                    logger.warn(e);
+                }
+            }
+            onBack();
+        } catch (e) {
+            return _t("Failed to save settings.") + ` (${e.message})`;
+        }
+    };
+
+    return <BaseTool onBack={onBack} actionLabel={_t("Save setting values")} onAction={onSave}>
+        <h3>{ _t("Setting:") } <code>{ setting }</code></h3>
+
+        <div className="mx_DevTools_SettingsExplorer_warning">
+            <b>{ _t("Caution:") }</b> { _t("This UI does NOT check the types of the values. Use at your own risk.") }
+        </div>
+
+        <div>
+            { _t("Setting definition:") }
+            <pre><code>{ JSON.stringify(SETTINGS[setting], null, 4) }</code></pre>
+        </div>
+
+        <div>
+            <table>
+                <thead>
+                    <tr>
+                        <th>{ _t("Level") }</th>
+                        <th>{ _t("Settable at global") }</th>
+                        <th>{ _t("Settable at room") }</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    { LEVEL_ORDER.map(lvl => (
+                        <tr key={lvl}>
+                            <td><code>{ lvl }</code></td>
+                            <CanEditLevelField setting={setting} level={lvl} />
+                            <CanEditLevelField setting={setting} roomId={context.room.roomId} level={lvl} />
+                        </tr>
+                    )) }
+                </tbody>
+            </table>
+        </div>
+
+        <div>
+            <Field
+                id="valExpl"
+                label={_t("Values at explicit levels")}
+                type="text"
+                className="mx_DevTools_textarea"
+                element="textarea"
+                autoComplete="off"
+                value={explicitValue}
+                onChange={e => setExplicitValue(e.target.value)}
+            />
+        </div>
+
+        <div>
+            <Field
+                id="valExpl"
+                label={_t("Values at explicit levels in this room")}
+                type="text"
+                className="mx_DevTools_textarea"
+                element="textarea"
+                autoComplete="off"
+                value={explicitRoomValue}
+                onChange={e => setExplicitRoomValue(e.target.value)}
+            />
+        </div>
+    </BaseTool>;
+};
+
+interface IViewSettingProps extends Pick<IDevtoolsProps, "onBack"> {
+    setting: string;
+    onEdit(): Promise<void>;
+}
+
+const ViewSetting = ({ setting, onEdit, onBack }: IViewSettingProps) => {
+    const context = useContext(DevtoolsContext);
+
+    return <BaseTool onBack={onBack} actionLabel={_t("Edit values")} onAction={onEdit}>
+        <h3>{ _t("Setting:") } <code>{ setting }</code></h3>
+
+        <div>
+            { _t("Setting definition:") }
+            <pre><code>{ JSON.stringify(SETTINGS[setting], null, 4) }</code></pre>
+        </div>
+
+        <div>
+            { _t("Value:") }&nbsp;
+            <code>{ renderSettingValue(SettingsStore.getValue(setting)) }</code>
+        </div>
+
+        <div>
+            { _t("Value in this room:") }&nbsp;
+            <code>{ renderSettingValue(SettingsStore.getValue(setting, context.room.roomId)) }</code>
+        </div>
+
+        <div>
+            { _t("Values at explicit levels:") }
+            <pre><code>{ renderExplicitSettingValues(setting, null) }</code></pre>
+        </div>
+
+        <div>
+            { _t("Values at explicit levels in this room:") }
+            <pre><code>{ renderExplicitSettingValues(setting, context.room.roomId) }</code></pre>
+        </div>
+    </BaseTool>;
+};
+
+function renderSettingValue(val: any): string {
+    // Note: we don't .toString() a string because we want JSON.stringify to inject quotes for us
+    const toStringTypes = ["boolean", "number"];
+    if (toStringTypes.includes(typeof(val))) {
+        return val.toString();
+    } else {
+        return JSON.stringify(val);
+    }
+}
+
+interface ISettingsListProps extends Pick<IDevtoolsProps, "onBack"> {
+    onView(setting: string): void;
+    onEdit(setting: string): void;
+}
+
+const SettingsList = ({ onBack, onView, onEdit }: ISettingsListProps) => {
+    const context = useContext(DevtoolsContext);
+    const [query, setQuery] = useState("");
+
+    const allSettings = useMemo(() => {
+        let allSettings = Object.keys(SETTINGS);
+        if (query) {
+            const lcQuery = query.toLowerCase();
+            allSettings = allSettings.filter(setting => setting.toLowerCase().includes(lcQuery));
+        }
+        return allSettings;
+    }, [query]);
+
+    return <BaseTool onBack={onBack} className="mx_DevTools_SettingsExplorer">
+        <Field
+            label={_t("Filter results")}
+            autoFocus={true}
+            size={64}
+            type="text"
+            autoComplete="off"
+            value={query}
+            onChange={ev => setQuery(ev.target.value)}
+            className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+        />
+        <table>
+            <thead>
+                <tr>
+                    <th>{ _t("Setting ID") }</th>
+                    <th>{ _t("Value") }</th>
+                    <th>{ _t("Value in this room") }</th>
+                </tr>
+            </thead>
+            <tbody>
+                { allSettings.map(i => (
+                    <tr key={i}>
+                        <td>
+                            <AccessibleButton
+                                kind="link_inline"
+                                className="mx_DevTools_SettingsExplorer_setting"
+                                onClick={() => onView(i)}
+                            >
+                                <code>{ i }</code>
+                            </AccessibleButton>
+                            <AccessibleButton
+                                alt={_t("Edit setting")}
+                                onClick={() => onEdit(i)}
+                                className="mx_DevTools_SettingsExplorer_edit"
+                            >
+                                ✏
+                            </AccessibleButton>
+                        </td>
+                        <td>
+                            <code>{ renderSettingValue(SettingsStore.getValue(i)) }</code>
+                        </td>
+                        <td>
+                            <code>
+                                { renderSettingValue(SettingsStore.getValue(i, context.room.roomId)) }
+                            </code>
+                        </td>
+                    </tr>
+                )) }
+            </tbody>
+        </table>
+    </BaseTool>;
+};
diff --git a/src/components/views/dialogs/devtools/VerificationExplorer.tsx b/src/components/views/dialogs/devtools/VerificationExplorer.tsx
new file mode 100644
index 00000000000..157250be6ec
--- /dev/null
+++ b/src/components/views/dialogs/devtools/VerificationExplorer.tsx
@@ -0,0 +1,101 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useEffect, useState } from "react";
+import {
+    PHASE_CANCELLED,
+    PHASE_DONE,
+    PHASE_READY,
+    PHASE_REQUESTED,
+    PHASE_STARTED,
+    PHASE_UNSENT,
+    VerificationRequest,
+    VerificationRequestEvent,
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { CryptoEvent } from "matrix-js-sdk/src/crypto";
+
+import { useTypedEventEmitter, useTypedEventEmitterState } from "../../../../hooks/useEventEmitter";
+import { _t, _td } from "../../../../languageHandler";
+import MatrixClientContext from "../../../../contexts/MatrixClientContext";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+
+const PHASE_MAP = {
+    [PHASE_UNSENT]: _td("Unsent"),
+    [PHASE_REQUESTED]: _td("Requested"),
+    [PHASE_READY]: _td("Ready"),
+    [PHASE_DONE]: _td("Done"),
+    [PHASE_STARTED]: _td("Started"),
+    [PHASE_CANCELLED]: _td("Cancelled"),
+};
+
+const VerificationRequestExplorer: React.FC<{
+    txnId: string;
+    request: VerificationRequest;
+}> = ({ txnId, request }) => {
+    const [, updateState] = useState();
+    const [timeout, setRequestTimeout] = useState(request.timeout);
+
+    /* Re-render if something changes state */
+    useTypedEventEmitter(request, VerificationRequestEvent.Change, updateState);
+
+    /* Keep re-rendering if there's a timeout */
+    useEffect(() => {
+        if (request.timeout == 0) return;
+
+        /* Note that request.timeout is a getter, so its value changes */
+        const id = setInterval(() => {
+            setRequestTimeout(request.timeout);
+        }, 500);
+
+        return () => { clearInterval(id); };
+    }, [request]);
+
+    return (<div className="mx_DevTools_VerificationRequest">
+        <dl>
+            <dt>{ _t("Transaction") }</dt>
+            <dd>{ txnId }</dd>
+            <dt>{ _t("Phase") }</dt>
+            <dd>{ PHASE_MAP[request.phase] || request.phase }</dd> // TODO
+            <dt>{ _t("Timeout") }</dt>
+            <dd>{ Math.floor(timeout / 1000) }</dd>
+            <dt>{ _t("Methods") }</dt>
+            <dd>{ request.methods && request.methods.join(", ") }</dd>
+            <dt>{ _t("Requester") }</dt>
+            <dd>{ request.requestingUserId }</dd>
+            <dt>{ _t("Observe only") }</dt>
+            <dd>{ JSON.stringify(request.observeOnly) }</dd>
+        </dl>
+    </div>);
+};
+
+const VerificationExplorer = ({ onBack }: IDevtoolsProps) => {
+    const cli = useContext(MatrixClientContext);
+    const context = useContext(DevtoolsContext);
+
+    const requests = useTypedEventEmitterState(cli, CryptoEvent.VerificationRequest, () => {
+        return cli.crypto.inRoomVerificationRequests["requestsByRoomId"]?.get(context.room.roomId)
+            ?? new Map<string, VerificationRequest>();
+    });
+
+    return <BaseTool onBack={onBack}>
+        { Array.from(requests.entries()).reverse().map(([txnId, request]) =>
+            <VerificationRequestExplorer txnId={txnId} request={request} key={txnId} />,
+        ) }
+        { requests.size < 1 && _t("No verification requests found") }
+    </BaseTool>;
+};
+
+export default VerificationExplorer;
diff --git a/src/components/views/dialogs/devtools/WidgetExplorer.tsx b/src/components/views/dialogs/devtools/WidgetExplorer.tsx
new file mode 100644
index 00000000000..3d8f4b8471e
--- /dev/null
+++ b/src/components/views/dialogs/devtools/WidgetExplorer.tsx
@@ -0,0 +1,68 @@
+/*
+Copyright 2022 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useState } from "react";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { useEventEmitterState } from "../../../../hooks/useEventEmitter";
+import { _t } from "../../../../languageHandler";
+import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
+import WidgetStore, { IApp } from "../../../../stores/WidgetStore";
+import { UPDATE_EVENT } from "../../../../stores/AsyncStore";
+import FilteredList from "./FilteredList";
+import { StateEventEditor } from "./RoomState";
+
+const WidgetExplorer = ({ onBack }: IDevtoolsProps) => {
+    const context = useContext(DevtoolsContext);
+    const [query, setQuery] = useState("");
+    const [widget, setWidget] = useState<IApp>(null);
+
+    const widgets = useEventEmitterState(WidgetStore.instance, UPDATE_EVENT, () => {
+        return WidgetStore.instance.getApps(context.room.roomId);
+    });
+
+    if (widget && widgets.includes(widget)) {
+        const onBack = () => {
+            setWidget(null);
+        };
+
+        const allState = Array.from(
+            Array.from(context.room.currentState.events.values()).map((e: Map<string, MatrixEvent>) => {
+                return e.values();
+            }),
+        ).reduce((p, c) => { p.push(...c); return p; }, []);
+        const event = allState.find(ev => ev.getId() === widget.eventId);
+        if (!event) { // "should never happen"
+            return <BaseTool onBack={onBack}>
+                { _t("There was an error finding this widget.") }
+            </BaseTool>;
+        }
+
+        return <StateEventEditor mxEvent={event} onBack={onBack} />;
+    }
+
+    return <BaseTool onBack={onBack}>
+        <FilteredList query={query} onChange={setQuery}>
+            { widgets.map(w => (
+                <button className="mx_DevTools_button" key={w.url + w.eventId} onClick={() => setWidget(w)}>
+                    { w.url }
+                </button>
+            )) }
+        </FilteredList>
+    </BaseTool>;
+};
+
+export default WidgetExplorer;
diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index 090eac783e9..ac7eea8e2b6 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -20,7 +20,6 @@ import React, { ChangeEvent, FormEvent } from 'react';
 import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import * as sdk from '../../../../index';
 import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import Field from '../../elements/Field';
 import AccessibleButton from '../../elements/AccessibleButton';
@@ -28,6 +27,10 @@ import { _t } from '../../../../languageHandler';
 import { IDialogProps } from "../IDialogProps";
 import { accessSecretStorage } from "../../../../SecurityManager";
 import Modal from "../../../../Modal";
+import InteractiveAuthDialog from "../InteractiveAuthDialog";
+import DialogButtons from "../../elements/DialogButtons";
+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
@@ -172,7 +175,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         this.fileUpload.current.click();
     };
 
-    private onPassPhraseNext = async (ev: FormEvent<HTMLFormElement>) => {
+    private onPassPhraseNext = async (ev: FormEvent<HTMLFormElement> | React.MouseEvent) => {
         ev.preventDefault();
 
         if (this.state.passPhrase.length <= 0) return;
@@ -187,7 +190,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         }
     };
 
-    private onRecoveryKeyNext = async (ev: FormEvent<HTMLFormElement>) => {
+    private onRecoveryKeyNext = async (ev: FormEvent<HTMLFormElement> | React.MouseEvent) => {
         ev.preventDefault();
 
         if (!this.state.recoveryKeyValid) return;
@@ -230,8 +233,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                 const cli = MatrixClientPeg.get();
                 await cli.bootstrapCrossSigning({
                     authUploadDeviceSigningKeys: async (makeRequest) => {
-                        // XXX: Making this an import breaks the app.
-                        const InteractiveAuthDialog = sdk.getComponent("views.dialogs.InteractiveAuthDialog");
                         const { finished } = Modal.createTrackedDialog(
                             'Cross-signing keys dialog', '', InteractiveAuthDialog,
                             {
@@ -273,10 +274,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
     }
 
     render() {
-        // Caution: Making these an import will break tests.
-        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
-        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
-
         const hasPassphrase = (
             this.props.keyInfo &&
             this.props.keyInfo.passphrase &&
@@ -315,7 +312,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                 />
             </div>;
         } else if (hasPassphrase && !this.state.forceRecoveryKey) {
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
             title = _t("Security Phrase");
             titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_securePhraseTitle'];
 
@@ -408,6 +404,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                             <input type="file"
                                 className="mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput"
                                 ref={this.fileUpload}
+                                onClick={chromeFileInputFix}
                                 onChange={this.onRecoveryKeyFileChange}
                             />
                             <AccessibleButton kind="primary" onClick={this.onRecoveryKeyFileUploadClick}>
diff --git a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
index 3496d00feae..e5d2aee9269 100644
--- a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
+++ b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../../languageHandler";
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import BaseDialog from "../BaseDialog";
 import DialogButtons from "../../elements/DialogButtons";
 
@@ -25,7 +24,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.security.ConfirmDestroyCrossSigningDialog")
 export default class ConfirmDestroyCrossSigningDialog extends React.Component<IProps> {
     private onConfirm = (): void => {
         this.props.onFinished(true);
diff --git a/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx b/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
index f60f8a9c19c..ca5b1db9fbc 100644
--- a/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
+++ b/src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
@@ -27,7 +27,6 @@ import DialogButtons from '../../elements/DialogButtons';
 import BaseDialog from '../BaseDialog';
 import Spinner from '../../elements/Spinner';
 import InteractiveAuthDialog from '../InteractiveAuthDialog';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 
 interface IProps {
     accountPassword?: string;
@@ -46,7 +45,6 @@ interface IState {
  * cases, only a spinner is shown, but for more complex auth like SSO, the user
  * may need to complete some steps to proceed.
  */
-@replaceableComponent("views.dialogs.security.CreateCrossSigningDialog")
 export default class CreateCrossSigningDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
index 3db78f68776..719c31c48f1 100644
--- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
+++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
@@ -24,8 +24,11 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../SecurityManager';
-import * as sdk from '../../../../index';
 import { IDialogProps } from "../IDialogProps";
+import Spinner from '../../elements/Spinner';
+import DialogButtons from "../../elements/DialogButtons";
+import AccessibleButton from "../../elements/AccessibleButton";
+import BaseDialog from "../BaseDialog";
 
 enum RestoreType {
     Passphrase = "passphrase",
@@ -298,12 +301,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
     }
 
     public render(): JSX.Element {
-        // FIXME: Making these into imports will break tests
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent("elements.Spinner");
-
         const backupHasPassphrase = (
             this.state.backupInfo &&
             this.state.backupInfo.auth_data &&
diff --git a/src/components/views/dialogs/security/SetupEncryptionDialog.tsx b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
index 965924bf1f7..1a945405023 100644
--- a/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
+++ b/src/components/views/dialogs/security/SetupEncryptionDialog.tsx
@@ -20,7 +20,6 @@ import SetupEncryptionBody from '../../../structures/auth/SetupEncryptionBody';
 import BaseDialog from '../BaseDialog';
 import { _t } from '../../../../languageHandler';
 import { SetupEncryptionStore, Phase } from '../../../../stores/SetupEncryptionStore';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import { IDialogProps } from "../IDialogProps";
 
 function iconFromPhase(phase: Phase) {
@@ -36,7 +35,6 @@ interface IState {
     icon: string;
 }
 
-@replaceableComponent("views.dialogs.security.SetupEncryptionDialog")
 export default class SetupEncryptionDialog extends React.Component<IProps, IState> {
     private store: SetupEncryptionStore;
 
diff --git a/src/components/views/directory/NetworkDropdown.tsx b/src/components/views/directory/NetworkDropdown.tsx
index 43821aa8495..5a9e4100e1d 100644
--- a/src/components/views/directory/NetworkDropdown.tsx
+++ b/src/components/views/directory/NetworkDropdown.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React, { useEffect, useState } from "react";
 import { MatrixError } from "matrix-js-sdk/src/http-api";
-import { IProtocol } from "matrix-js-sdk/src/client";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { instanceForInstanceId } from '../../../utils/DirectoryUtils';
@@ -40,9 +39,9 @@ import TextInputDialog from "../dialogs/TextInputDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
 import UIStore from "../../../stores/UIStore";
 import { compare } from "../../../utils/strings";
-
-// XXX: We would ideally use a symbol here but we can't since we save this value to localStorage
-export const ALL_ROOMS = "ALL_ROOMS";
+import { SnakedObject } from "../../../utils/SnakedObject";
+import { IConfigOptions } from "../../../IConfigOptions";
+import { ALL_ROOMS, Protocols } from "../../../utils/DirectoryUtils";
 
 const SETTING_NAME = "room_directory_servers";
 
@@ -83,8 +82,6 @@ const validServer = withValidation<undefined, { error?: MatrixError }>({
     ],
 });
 
-export type Protocols = Record<string, IProtocol>;
-
 interface IProps {
     protocols: Protocols;
     selectedServerName: string;
@@ -122,11 +119,11 @@ const NetworkDropdown = ({ onOptionChange, protocols = {}, selectedServerName, s
     // we either show the button or the dropdown in its place.
     let content;
     if (menuDisplayed) {
-        const config = SdkConfig.get();
-        const roomDirectory = config.roomDirectory || {};
+        const roomDirectory = SdkConfig.getObject("room_directory")
+            ?? new SnakedObject<IConfigOptions["room_directory"]>({ servers: [] });
 
         const hsName = MatrixClientPeg.getHomeserverName();
-        const configServers = new Set<string>(roomDirectory.servers);
+        const configServers = new Set<string>(roomDirectory.get("servers"));
 
         // configured servers take preference over user-defined ones, if one occurs in both ignore the latter one.
         const removableServers = new Set(userDefinedServers.filter(s => !configServers.has(s) && s !== hsName));
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index bc96bfe7084..3db6d0dfb05 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -53,6 +53,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number;
     disabled?: boolean;
     className?: string;
+    triggerOnMouseDown?: boolean;
     onClick(e?: ButtonEvent): void | Promise<void>;
 }
 
@@ -78,13 +79,18 @@ export default function AccessibleButton({
     className,
     onKeyDown,
     onKeyUp,
+    triggerOnMouseDown,
     ...restProps
 }: IProps) {
     const newProps: IAccessibleButtonProps = restProps;
     if (disabled) {
         newProps["aria-disabled"] = true;
     } else {
-        newProps.onClick = onClick;
+        if (triggerOnMouseDown) {
+            newProps.onMouseDown = onClick;
+        } else {
+            newProps.onClick = onClick;
+        }
         // We need to consume enter onKeyDown and space onKeyUp
         // otherwise we are risking also activating other keyboard focusable elements
         // that might receive focus as a result of the AccessibleButtonClick action
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index be3bbcfdb9d..f0be8ba12d8 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -19,12 +19,11 @@ import React, { SyntheticEvent } from 'react';
 
 import AccessibleButton from "./AccessibleButton";
 import Tooltip, { Alignment } from './Tooltip';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     title: string;
     tooltip?: React.ReactNode;
-    label?: React.ReactNode;
+    label?: string;
     tooltipClassName?: string;
     forceHide?: boolean;
     yOffset?: number;
@@ -36,7 +35,6 @@ interface IState {
     hover: boolean;
 }
 
-@replaceableComponent("views.elements.AccessibleTooltipButton")
 export default class AccessibleTooltipButton extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/ActionButton.tsx b/src/components/views/elements/ActionButton.tsx
index 9b1484918f9..9d8038f99e1 100644
--- a/src/components/views/elements/ActionButton.tsx
+++ b/src/components/views/elements/ActionButton.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import AccessibleButton from './AccessibleButton';
 import dis from '../../../dispatcher/dispatcher';
 import Analytics from '../../../Analytics';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Tooltip from './Tooltip';
 
 interface IProps {
@@ -37,7 +36,6 @@ interface IState {
     showTooltip: boolean;
 }
 
-@replaceableComponent("views.elements.ActionButton")
 export default class ActionButton extends React.Component<IProps, IState> {
     static defaultProps: Partial<IProps> = {
         size: "25",
diff --git a/src/components/views/elements/AddressSelector.tsx b/src/components/views/elements/AddressSelector.tsx
index f1203fbee52..a084e690983 100644
--- a/src/components/views/elements/AddressSelector.tsx
+++ b/src/components/views/elements/AddressSelector.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 import React, { createRef } from 'react';
 import classNames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IUserAddress } from '../../../UserAddress';
 import AddressTile from './AddressTile';
 
@@ -41,7 +40,6 @@ interface IState {
     hover: boolean;
 }
 
-@replaceableComponent("views.elements.AddressSelector")
 export default class AddressSelector extends React.Component<IProps, IState> {
     private scrollElement = createRef<HTMLDivElement>();
     private addressListElement = createRef<HTMLDivElement>();
diff --git a/src/components/views/elements/AddressTile.tsx b/src/components/views/elements/AddressTile.tsx
index d8738e69f31..8aafa0381be 100644
--- a/src/components/views/elements/AddressTile.tsx
+++ b/src/components/views/elements/AddressTile.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import classNames from 'classnames';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { IUserAddress } from '../../../UserAddress';
 import BaseAvatar from '../avatars/BaseAvatar';
@@ -33,7 +32,6 @@ interface IProps {
     showAddress?: boolean;
 }
 
-@replaceableComponent("views.elements.AddressTile")
 export default class AddressTile extends React.Component<IProps> {
     static defaultProps: Partial<IProps> = {
         canDismiss: false,
diff --git a/src/components/views/elements/AppPermission.tsx b/src/components/views/elements/AppPermission.tsx
index 11bbd6204d7..fd53981bca3 100644
--- a/src/components/views/elements/AppPermission.tsx
+++ b/src/components/views/elements/AppPermission.tsx
@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../utils/WidgetUtils";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MemberAvatar from '../avatars/MemberAvatar';
 import BaseAvatar from '../avatars/BaseAvatar';
 import AccessibleButton from './AccessibleButton';
@@ -44,7 +43,6 @@ interface IState {
     widgetDomain: string;
 }
 
-@replaceableComponent("views.elements.AppPermission")
 export default class AppPermission extends React.Component<IProps, IState> {
     static defaultProps: Partial<IProps> = {
         onPermissionGranted: () => {},
diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index b4fe7681644..1eba26a3d4e 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -39,17 +39,17 @@ import { StopGapWidget } from "../../../stores/widgets/StopGapWidget";
 import { ElementWidgetActions } from "../../../stores/widgets/ElementWidgetActions";
 import WidgetContextMenu from "../context_menus/WidgetContextMenu";
 import WidgetAvatar from "../avatars/WidgetAvatar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import CallHandler from '../../../CallHandler';
 import { IApp } from "../../../stores/WidgetStore";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { OwnProfileStore } from '../../../stores/OwnProfileStore';
 import { UPDATE_EVENT } from '../../../stores/AsyncStore';
-import RoomViewStore from '../../../stores/RoomViewStore';
+import { RoomViewStore } from '../../../stores/RoomViewStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { Action } from '../../../dispatcher/actions';
+import { ElementWidgetCapabilities } from '../../../stores/widgets/ElementWidgetCapabilities';
 
 interface IProps {
     app: IApp;
@@ -101,7 +101,6 @@ interface IState {
     requiresClient: boolean;
 }
 
-@replaceableComponent("views.elements.AppTile")
 export default class AppTile extends React.Component<IProps, IState> {
     public static contextType = MatrixClientContext;
     context: ContextType<typeof MatrixClientContext>;
@@ -118,27 +117,6 @@ export default class AppTile extends React.Component<IProps, IState> {
         showLayoutButtons: true,
     };
 
-    // We track a count of all "live" `AppTile`s for a given widget ID.
-    // For this purpose, an `AppTile` is considered live from the time it is
-    // constructed until it is unmounted. This is used to aid logic around when
-    // to tear down the widget iframe. See `componentWillUnmount` for details.
-    private static liveTilesById: { [key: string]: number } = {};
-
-    public static addLiveTile(widgetId: string): void {
-        const refs = this.liveTilesById[widgetId] || 0;
-        this.liveTilesById[widgetId] = refs + 1;
-    }
-
-    public static removeLiveTile(widgetId: string): void {
-        const refs = this.liveTilesById[widgetId] || 0;
-        this.liveTilesById[widgetId] = refs - 1;
-    }
-
-    public static isLive(widgetId: string): boolean {
-        const refs = this.liveTilesById[widgetId] || 0;
-        return refs > 0;
-    }
-
     private contextMenuButton = createRef<any>();
     private iframe: HTMLIFrameElement; // ref to the iframe (callback style)
     private allowedWidgetsWatchRef: string;
@@ -150,10 +128,13 @@ export default class AppTile extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
-        AppTile.addLiveTile(this.props.app.id);
+        // Tiles in miniMode are floating, and therefore not docked
+        if (!this.props.miniMode) {
+            ActiveWidgetStore.instance.dockWidget(this.props.app.id, this.props.app.roomId);
+        }
 
         // The key used for PersistedElement
-        this.persistKey = getPersistKey(this.props.app.id);
+        this.persistKey = getPersistKey(WidgetUtils.getWidgetUid(this.props.app));
         try {
             this.sgWidget = new StopGapWidget(this.props);
             this.setupSgListeners();
@@ -189,10 +170,12 @@ export default class AppTile extends React.Component<IProps, IState> {
     };
 
     private onUserLeftRoom() {
-        const isActiveWidget = ActiveWidgetStore.instance.getWidgetPersistence(this.props.app.id);
+        const isActiveWidget = ActiveWidgetStore.instance.getWidgetPersistence(
+            this.props.app.id, this.props.app.roomId,
+        );
         if (isActiveWidget) {
             // We just left the room that the active widget was from.
-            if (this.props.room && RoomViewStore.getRoomId() !== this.props.room.roomId) {
+            if (this.props.room && RoomViewStore.instance.getRoomId() !== this.props.room.roomId) {
                 // If we are not actively looking at the room then destroy this widget entirely.
                 this.endWidgetActions();
             } else if (WidgetType.JITSI.matches(this.props.app.type)) {
@@ -200,7 +183,7 @@ export default class AppTile extends React.Component<IProps, IState> {
                 this.reload();
             } else {
                 // Otherwise just cancel its persistence.
-                ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
+                ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id, this.props.app.roomId);
             }
         }
     }
@@ -241,7 +224,7 @@ export default class AppTile extends React.Component<IProps, IState> {
 
         if (this.state.hasPermissionToLoad && !hasPermissionToLoad) {
             // Force the widget to be non-persistent (able to be deleted/forgotten)
-            ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
+            ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id, this.props.app.roomId);
             PersistedElement.destroyElement(this.persistKey);
             this.sgWidget?.stopMessaging();
         }
@@ -280,25 +263,14 @@ export default class AppTile extends React.Component<IProps, IState> {
     public componentWillUnmount(): void {
         this.unmounted = true;
 
-        // It might seem simplest to always tear down the widget itself here,
-        // and indeed that would be a bit easier to reason about... however, we
-        // support moving widgets between containers (e.g. top <-> center).
-        // During such a move, this component will unmount from the old
-        // container and remount in the new container. By keeping the widget
-        // iframe loaded across this transition, the widget doesn't notice that
-        // anything happened, which improves overall widget UX. During this kind
-        // of movement between containers, the new `AppTile` for the new
-        // container is constructed before the old one unmounts. By counting the
-        // mounted `AppTile`s for each widget, we know to only tear down the
-        // widget iframe when the last the `AppTile` unmounts.
-        AppTile.removeLiveTile(this.props.app.id);
-
-        // We also support a separate "persistence" mode where a single widget
-        // can request to be "sticky" and follow you across rooms in a PIP
-        // container.
-        const isActiveWidget = ActiveWidgetStore.instance.getWidgetPersistence(this.props.app.id);
-
-        if (!AppTile.isLive(this.props.app.id) && !isActiveWidget) {
+        if (!this.props.miniMode) {
+            ActiveWidgetStore.instance.undockWidget(this.props.app.id, this.props.app.roomId);
+        }
+
+        // Only tear down the widget if no other component is keeping it alive,
+        // because we support moving widgets between containers, in which case
+        // another component will keep it loaded throughout the transition
+        if (!ActiveWidgetStore.instance.isLive(this.props.app.id, this.props.app.roomId)) {
             this.endWidgetActions();
         }
 
@@ -408,7 +380,7 @@ export default class AppTile extends React.Component<IProps, IState> {
 
         // Delete the widget from the persisted store for good measure.
         PersistedElement.destroyElement(this.persistKey);
-        ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id);
+        ActiveWidgetStore.instance.destroyPersistentWidget(this.props.app.id, this.props.app.roomId);
 
         this.sgWidget?.stopMessaging({ forceDestroy: true });
     }
@@ -425,7 +397,7 @@ export default class AppTile extends React.Component<IProps, IState> {
 
     private onWidgetCapabilitiesNotified = (): void => {
         this.setState({
-            requiresClient: this.sgWidget.widgetApi.hasCapability(MatrixCapabilities.RequiresClient),
+            requiresClient: this.sgWidget.widgetApi.hasCapability(ElementWidgetCapabilities.RequiresClient),
         });
     };
 
diff --git a/src/components/views/elements/CopyableText.tsx b/src/components/views/elements/CopyableText.tsx
index d1632af3825..f95cbcbd168 100644
--- a/src/components/views/elements/CopyableText.tsx
+++ b/src/components/views/elements/CopyableText.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React, { useState } from "react";
+import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
 import { copyPlaintext } from "../../../utils/strings";
@@ -23,11 +24,12 @@ import { ButtonEvent } from "./AccessibleButton";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
 
 interface IProps {
-    children: React.ReactNode;
+    children?: React.ReactNode;
     getTextToCopy: () => string;
+    border?: boolean;
 }
 
-const CopyableText: React.FC<IProps> = ({ children, getTextToCopy }) => {
+const CopyableText: React.FC<IProps> = ({ children, getTextToCopy, border=true }) => {
     const [tooltip, setTooltip] = useState<string | undefined>(undefined);
 
     const onCopyClickInternal = async (e: ButtonEvent) => {
@@ -42,7 +44,11 @@ const CopyableText: React.FC<IProps> = ({ children, getTextToCopy }) => {
         }
     };
 
-    return <div className="mx_CopyableText">
+    const className = classNames("mx_CopyableText", {
+        mx_CopyableText_border: border,
+    });
+
+    return <div className={className}>
         { children }
         <AccessibleTooltipButton
             title={tooltip ?? _t("Copy")}
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
deleted file mode 100644
index e35e9ca9060..00000000000
--- a/src/components/views/elements/DNDTagTile.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* eslint new-cap: "off" */
-/*
-Copyright 2017 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import TagTile from './TagTile';
-import ContextMenu, { toRightOf, useContextMenu } from "../../structures/ContextMenu";
-import * as sdk from '../../../index';
-
-export default function DNDTagTile(props) {
-    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
-
-    let contextMenu = null;
-    if (menuDisplayed && handle.current) {
-        const elementRect = handle.current.getBoundingClientRect();
-        const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
-        contextMenu = (
-            <ContextMenu {...toRightOf(elementRect)} onFinished={closeMenu}>
-                <TagTileContextMenu tag={props.tag} onFinished={closeMenu} index={props.index} />
-            </ContextMenu>
-        );
-    }
-    return <>
-        <TagTile
-            {...props}
-            contextMenuButtonRef={handle}
-            menuDisplayed={menuDisplayed}
-            openMenu={openMenu}
-        />
-        { contextMenu }
-    </>;
-}
diff --git a/src/components/views/elements/DesktopBuildsNotice.tsx b/src/components/views/elements/DesktopBuildsNotice.tsx
index 8c600a152ff..cb664f02d01 100644
--- a/src/components/views/elements/DesktopBuildsNotice.tsx
+++ b/src/components/views/elements/DesktopBuildsNotice.tsx
@@ -22,7 +22,7 @@ import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "../dialogs/UserSettingsDialog";
+import { UserTab } from "../dialogs/UserTab";
 import AccessibleButton from "./AccessibleButton";
 
 export enum WarningKind {
@@ -59,21 +59,23 @@ export default function DesktopBuildsNotice({ isRoomEncrypted, kind }: IProps) {
         </>;
     }
 
-    const { desktopBuilds, brand } = SdkConfig.get();
+    const brand = SdkConfig.get("brand");
+    const desktopBuilds = SdkConfig.getObject("desktop_builds");
 
     let text = null;
     let logo = null;
-    if (desktopBuilds.available) {
-        logo = <img src={desktopBuilds.logo} />;
+    if (desktopBuilds.get("available")) {
+        logo = <img src={desktopBuilds.get("logo")} />;
+        const buildUrl = desktopBuilds.get("url");
         switch (kind) {
             case WarningKind.Files:
                 text = _t("Use the <a>Desktop app</a> to see all encrypted files", {}, {
-                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{ sub }</a>),
+                    a: sub => (<a href={buildUrl} target="_blank" rel="noreferrer noopener">{ sub }</a>),
                 });
                 break;
             case WarningKind.Search:
                 text = _t("Use the <a>Desktop app</a> to search encrypted messages", {}, {
-                    a: sub => (<a href={desktopBuilds.url} target="_blank" rel="noreferrer noopener">{ sub }</a>),
+                    a: sub => (<a href={buildUrl} target="_blank" rel="noreferrer noopener">{ sub }</a>),
                 });
                 break;
         }
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index 57bf24b7776..f355cc2a5ef 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -21,7 +21,6 @@ import { _t } from '../../../languageHandler';
 import BaseDialog from "..//dialogs/BaseDialog";
 import DialogButtons from "./DialogButtons";
 import AccessibleButton from './AccessibleButton';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TabbedView, { Tab, TabLocation } from '../../structures/TabbedView';
 import PlatformPeg from "../../../PlatformPeg";
 
@@ -90,7 +89,6 @@ export interface PickerIProps {
     onFinished(sourceId: string): void;
 }
 
-@replaceableComponent("views.elements.DesktopCapturerSourcePicker")
 export default class DesktopCapturerSourcePicker extends React.Component<
     PickerIProps,
     PickerIState
diff --git a/src/components/views/elements/DialogButtons.tsx b/src/components/views/elements/DialogButtons.tsx
index 480e3646300..2a3554e8763 100644
--- a/src/components/views/elements/DialogButtons.tsx
+++ b/src/components/views/elements/DialogButtons.tsx
@@ -19,7 +19,6 @@ limitations under the License.
 import React from "react";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The primary button which is styled differently and has default focus.
@@ -31,8 +30,9 @@ interface IProps {
     // If true, make the primary button a form submit button (input type="submit")
     primaryIsSubmit?: boolean;
 
-    // onClick handler for the primary button.
-    onPrimaryButtonClick?: (ev: React.MouseEvent) => void;
+    // onClick handler for the primary button. Note that the returned promise, if
+    // returning a promise, is not used.
+    onPrimaryButtonClick?: (ev: React.MouseEvent) => (void | Promise<void>);
 
     // should there be a cancel button? default: true
     hasCancel?: boolean;
@@ -61,7 +61,6 @@ interface IProps {
 /**
  * Basic container for buttons in modal dialogs.
  */
-@replaceableComponent("views.elements.DialogButtons")
 export default class DialogButtons extends React.Component<IProps> {
     public static defaultProps: Partial<IProps> = {
         hasCancel: true,
diff --git a/src/components/views/elements/DirectorySearchBox.tsx b/src/components/views/elements/DirectorySearchBox.tsx
index 015065f45ef..d4f20817e1e 100644
--- a/src/components/views/elements/DirectorySearchBox.tsx
+++ b/src/components/views/elements/DirectorySearchBox.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ChangeEvent, createRef } from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "./AccessibleButton";
 
 interface IProps {
@@ -34,7 +33,6 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.elements.DirectorySearchBox")
 export default class DirectorySearchBox extends React.Component<IProps, IState> {
     private input = createRef<HTMLInputElement>();
 
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
index e9e24a57e43..a6eb8323f3c 100644
--- a/src/components/views/elements/Draggable.tsx
+++ b/src/components/views/elements/Draggable.tsx
@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     className: string;
     dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState;
@@ -35,7 +33,6 @@ export interface ILocationState {
     currentY: number;
 }
 
-@replaceableComponent("views.elements.Draggable")
 export default class Draggable extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Dropdown.tsx b/src/components/views/elements/Dropdown.tsx
index 9f071cafa93..4f572875a57 100644
--- a/src/components/views/elements/Dropdown.tsx
+++ b/src/components/views/elements/Dropdown.tsx
@@ -20,7 +20,6 @@ import classnames from 'classnames';
 
 import AccessibleButton, { ButtonEvent } from './AccessibleButton';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
@@ -107,7 +106,6 @@ interface IState {
  * but somewhat simpler as react-select is 79KB of minified
  * javascript.
  */
-@replaceableComponent("views.elements.Dropdown")
 export default class Dropdown extends React.Component<IProps, IState> {
     private readonly buttonRef = createRef<HTMLDivElement>();
     private dropdownRootElement: HTMLDivElement = null;
diff --git a/src/components/views/elements/EditableItemList.tsx b/src/components/views/elements/EditableItemList.tsx
index a6d1d3f06ff..d33990b570f 100644
--- a/src/components/views/elements/EditableItemList.tsx
+++ b/src/components/views/elements/EditableItemList.tsx
@@ -19,7 +19,6 @@ import React from "react";
 import { _t } from '../../../languageHandler';
 import Field from "./Field";
 import AccessibleButton from "./AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IItemProps {
     index?: number;
@@ -107,7 +106,6 @@ interface IProps {
     onNewItemChanged?(item: string): void;
 }
 
-@replaceableComponent("views.elements.EditableItemList")
 export default class EditableItemList<P = {}> extends React.PureComponent<IProps & P> {
     protected onItemAdded = (e) => {
         e.stopPropagation();
diff --git a/src/components/views/elements/EditableText.tsx b/src/components/views/elements/EditableText.tsx
index 8a9e4ed91ae..344db02c3d9 100644
--- a/src/components/views/elements/EditableText.tsx
+++ b/src/components/views/elements/EditableText.tsx
@@ -19,7 +19,6 @@ import React, { createRef } from 'react';
 
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 enum Phases {
     Display = "display",
@@ -45,7 +44,6 @@ interface IState {
     phase: Phases;
 }
 
-@replaceableComponent("views.elements.EditableText")
 export default class EditableText extends React.Component<IProps, IState> {
     // we track value as an JS object field rather than in React state
     // as React doesn't play nice with contentEditable.
diff --git a/src/components/views/elements/EditableTextContainer.tsx b/src/components/views/elements/EditableTextContainer.tsx
index ede1e8a655d..d452cf10f03 100644
--- a/src/components/views/elements/EditableTextContainer.tsx
+++ b/src/components/views/elements/EditableTextContainer.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "./Spinner";
 import EditableText from "./EditableText";
 
@@ -56,7 +55,6 @@ interface IState {
  * similarly asynchronous way. If this is not provided, the initial value is
  * taken from the 'initialValue' property.
  */
-@replaceableComponent("views.elements.EditableTextContainer")
 export default class EditableTextContainer extends React.Component<IProps, IState> {
     private unmounted = false;
     public static defaultProps: Partial<IProps> = {
diff --git a/src/components/views/elements/EffectsOverlay.tsx b/src/components/views/elements/EffectsOverlay.tsx
index 5115d130cdf..c405d0c9a66 100644
--- a/src/components/views/elements/EffectsOverlay.tsx
+++ b/src/components/views/elements/EffectsOverlay.tsx
@@ -55,7 +55,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
         const onAction = (payload: { action: string }) => {
             const actionPrefix = 'effects.';
             if (payload.action.indexOf(actionPrefix) === 0) {
-                const effect = payload.action.substr(actionPrefix.length);
+                const effect = payload.action.slice(actionPrefix.length);
                 lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));
             }
         };
diff --git a/src/components/views/elements/ErrorBoundary.tsx b/src/components/views/elements/ErrorBoundary.tsx
index 057969437e4..91e56b82bea 100644
--- a/src/components/views/elements/ErrorBoundary.tsx
+++ b/src/components/views/elements/ErrorBoundary.tsx
@@ -22,7 +22,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BugReportDialog from '../dialogs/BugReportDialog';
 import AccessibleButton from './AccessibleButton';
 
@@ -34,7 +33,6 @@ interface IState {
  * This error boundary component can be used to wrap large content areas and
  * catch exceptions during rendering in the component tree below them.
  */
-@replaceableComponent("views.elements.ErrorBoundary")
 export default class ErrorBoundary extends React.PureComponent<{}, IState> {
     constructor(props) {
         super(props);
@@ -93,9 +91,12 @@ export default class ErrorBoundary extends React.PureComponent<{}, IState> {
                     ) }</p>
                     <p>{ _t(
                         "If you've submitted a bug via GitHub, debug logs can help " +
-                        "us track down the problem. Debug logs contain application " +
+                        "us track down the problem. ")
+                    }
+                    { _t(
+                        "Debug logs contain application " +
                         "usage data including your username, the IDs or aliases of " +
-                        "the rooms or groups you have visited, which UI elements you " +
+                        "the rooms you have visited, which UI elements you " +
                         "last interacted with, and the usernames of other users. " +
                         "They do not contain messages.",
                     ) }</p>
diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx
index 748c3b353b4..1fc99c774af 100644
--- a/src/components/views/elements/EventListSummary.tsx
+++ b/src/components/views/elements/EventListSummary.tsx
@@ -25,7 +25,6 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import GenericEventListSummary from "./GenericEventListSummary";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import { jsxJoin } from '../../../utils/ReactUtils';
 import { Layout } from '../../../settings/enums/Layout';
@@ -79,7 +78,6 @@ enum TransitionType {
 
 const SEP = ",";
 
-@replaceableComponent("views.elements.EventListSummary")
 export default class EventListSummary extends React.Component<IProps> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index 5e7c2a725b7..86f8eeaf20d 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -21,10 +21,7 @@ import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 
 import * as Avatar from '../../../Avatar';
 import EventTile from '../rooms/EventTile';
-import SettingsStore from "../../../settings/SettingsStore";
 import { Layout } from "../../../settings/enums/Layout";
-import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from './Spinner';
 
 interface IProps {
@@ -65,7 +62,6 @@ interface IState {
 
 const AVATAR_SIZE = 32;
 
-@replaceableComponent("views.elements.EventTilePreview")
 export default class EventTilePreview extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
@@ -133,7 +129,6 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
             <EventTile
                 mxEvent={event}
                 layout={this.props.layout}
-                enableFlair={SettingsStore.getValue(UIFeature.Flair)}
                 as="div"
             />
         </div>;
diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx
index 116951f9b9c..566eddbe07e 100644
--- a/src/components/views/elements/FacePile.tsx
+++ b/src/components/views/elements/FacePile.tsx
@@ -14,91 +14,46 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { HTMLAttributes, ReactNode, useContext } from "react";
-import { Room } from "matrix-js-sdk/src/models/room";
+import React, { FC, HTMLAttributes, ReactNode } from "react";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { sortBy } from "lodash";
 
 import MemberAvatar from "../avatars/MemberAvatar";
-import { _t } from "../../../languageHandler";
-import DMRoomMap from "../../../utils/DMRoomMap";
-import TextWithTooltip from "../elements/TextWithTooltip";
-import { useRoomMembers } from "../../../hooks/useRoomMembers";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-
-const DEFAULT_NUM_FACES = 5;
+import TooltipTarget from "./TooltipTarget";
+import TextWithTooltip from "./TextWithTooltip";
 
 interface IProps extends HTMLAttributes<HTMLSpanElement> {
-    room: Room;
-    onlyKnownUsers?: boolean;
-    numShown?: number;
+    members: RoomMember[];
+    faceSize: number;
+    overflow: boolean;
+    tooltip?: ReactNode;
+    children?: ReactNode;
 }
 
-const isKnownMember = (member: RoomMember) => !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length;
-
-const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, ...props }: IProps) => {
-    const cli = useContext(MatrixClientContext);
-    const isJoined = room.getMyMembership() === "join";
-    let members = useRoomMembers(room);
-    const count = members.length;
-
-    // sort users with an explicit avatar first
-    const iteratees = [member => member.getMxcAvatarUrl() ? 0 : 1];
-    if (onlyKnownUsers) {
-        members = members.filter(isKnownMember);
-    } else {
-        // sort known users first
-        iteratees.unshift(member => isKnownMember(member) ? 0 : 1);
-    }
-
-    // exclude ourselves from the shown members list
-    const shownMembers = sortBy(members.filter(m => m.userId !== cli.getUserId()), iteratees).slice(0, numShown);
-    if (shownMembers.length < 1) return null;
-
-    // We reverse the order of the shown faces in CSS to simplify their visual overlap,
-    // reverse members in tooltip order to make the order between the two match up.
-    const commaSeparatedMembers = shownMembers.map(m => m.rawDisplayName).reverse().join(", ");
+const FacePile: FC<IProps> = ({ members, faceSize, overflow, tooltip, children, ...props }) => {
+    const faces = members.map(
+        tooltip ?
+            m => <MemberAvatar key={m.userId} member={m} width={faceSize} height={faceSize} /> :
+            m => <TooltipTarget key={m.userId} label={m.name}>
+                <MemberAvatar member={m} width={faceSize} height={faceSize} viewUserOnClick={!props.onClick} />
+            </TooltipTarget>,
+    );
 
-    let tooltip: ReactNode;
-    if (props.onClick) {
-        let subText: string;
-        if (isJoined) {
-            subText = _t("Including you, %(commaSeparatedMembers)s", { commaSeparatedMembers });
-        } else {
-            subText = _t("Including %(commaSeparatedMembers)s", { commaSeparatedMembers });
-        }
-
-        tooltip = <div>
-            <div className="mx_Tooltip_title">
-                { _t("View all %(count)s members", { count }) }
-            </div>
-            <div className="mx_Tooltip_sub">
-                { subText }
-            </div>
-        </div>;
-    } else {
-        if (isJoined) {
-            tooltip = _t("%(count)s members including you, %(commaSeparatedMembers)s", {
-                count: count - 1,
-                commaSeparatedMembers,
-            });
-        } else {
-            tooltip = _t("%(count)s members including %(commaSeparatedMembers)s", {
-                count,
-                commaSeparatedMembers,
-            });
-        }
-    }
+    const pileContents = <>
+        { overflow ? <span className="mx_FacePile_more" /> : null }
+        { faces }
+    </>;
 
     return <div {...props} className="mx_FacePile">
-        <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
-            { members.length > numShown ? <span className="mx_FacePile_face mx_FacePile_more" /> : null }
-            { shownMembers.map(m =>
-                <MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" />) }
-        </TextWithTooltip>
-        { onlyKnownUsers && <span className="mx_FacePile_summary">
-            { _t("%(count)s people you know have already joined", { count: members.length }) }
-        </span> }
+        { tooltip ? (
+            <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
+                { pileContents }
+            </TextWithTooltip>
+        ) : (
+            <div className="mx_FacePile_faces">
+                { pileContents }
+            </div>
+        ) }
+        { children }
     </div>;
 };
 
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 578ecb3333b..3942a9eb1d4 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -18,9 +18,9 @@ import React, { InputHTMLAttributes, SelectHTMLAttributes, TextareaHTMLAttribute
 import classNames from 'classnames';
 import { debounce } from "lodash";
 
-import * as sdk from '../../../index';
 import { IFieldState, IValidationResult } from "./Validation";
 import { ComponentClass } from "../../../@types/common";
+import Tooltip from "./Tooltip";
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -295,8 +295,6 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         );
 
         // Handle displaying feedback on validity
-        // FIXME: Using an import will result in test failures
-        const Tooltip = sdk.getComponent("elements.Tooltip");
         let fieldTooltip;
         if (tooltipContent || this.state.feedback) {
             fieldTooltip = <Tooltip
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
deleted file mode 100644
index 0029f73ff03..00000000000
--- a/src/components/views/elements/Flair.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- Copyright 2017 New Vector Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import FlairStore from '../../../stores/FlairStore';
-import dis from '../../../dispatcher/dispatcher';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-class FlairAvatar extends React.Component {
-    constructor() {
-        super();
-        this.onClick = this.onClick.bind(this);
-    }
-
-    onClick(ev) {
-        ev.preventDefault();
-        // Don't trigger onClick of parent element
-        ev.stopPropagation();
-        dis.dispatch({
-            action: 'view_group',
-            group_id: this.props.groupProfile.groupId,
-        });
-    }
-
-    render() {
-        const httpUrl = mediaFromMxc(this.props.groupProfile.avatarUrl).getSquareThumbnailHttp(16);
-        const tooltip = this.props.groupProfile.name ?
-            `${this.props.groupProfile.name} (${this.props.groupProfile.groupId})`:
-            this.props.groupProfile.groupId;
-        return <img
-            src={httpUrl}
-            width="16"
-            height="16"
-            onClick={this.onClick}
-            title={tooltip} />;
-    }
-}
-
-FlairAvatar.propTypes = {
-    groupProfile: PropTypes.shape({
-        groupId: PropTypes.string.isRequired,
-        name: PropTypes.string,
-        avatarUrl: PropTypes.string.isRequired,
-    }),
-};
-
-FlairAvatar.contextType = MatrixClientContext;
-
-@replaceableComponent("views.elements.Flair")
-export default class Flair extends React.Component {
-    constructor() {
-        super();
-        this.state = {
-            profiles: [],
-        };
-    }
-
-    componentDidMount() {
-        this._unmounted = false;
-        this._generateAvatars(this.props.groups);
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-    }
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {  // eslint-disable-line camelcase
-        this._generateAvatars(newProps.groups);
-    }
-
-    async _getGroupProfiles(groups) {
-        const profiles = [];
-        for (const groupId of groups) {
-            let groupProfile = null;
-            try {
-                groupProfile = await FlairStore.getGroupProfileCached(this.context, groupId);
-            } catch (err) {
-                logger.error('Could not get profile for group', groupId, err);
-            }
-            profiles.push(groupProfile);
-        }
-        return profiles.filter((p) => p !== null);
-    }
-
-    async _generateAvatars(groups) {
-        if (!groups || groups.length === 0) {
-            return;
-        }
-        const profiles = await this._getGroupProfiles(groups);
-        if (!this.unmounted) {
-            this.setState({
-                profiles: profiles.filter((profile) => {
-                    return profile ? profile.avatarUrl : false;
-                }),
-            });
-        }
-    }
-
-    render() {
-        if (this.state.profiles.length === 0) {
-            return null;
-        }
-        const avatars = this.state.profiles.map((profile, index) => {
-            return <FlairAvatar key={index} groupProfile={profile} />;
-        });
-        return (
-            <span className="mx_Flair">
-                { avatars }
-            </span>
-        );
-    }
-}
-
-Flair.propTypes = {
-    groups: PropTypes.arrayOf(PropTypes.string),
-};
-
-Flair.contextType = MatrixClientContext;
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
index 13b0022e720..c0e37d93d74 100644
--- a/src/components/views/elements/IRCTimelineProfileResizer.tsx
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
 import Draggable, { ILocationState } from './Draggable';
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // Current room
@@ -33,7 +32,6 @@ interface IState {
     IRCLayoutRoot: HTMLElement;
 }
 
-@replaceableComponent("views.elements.IRCTimelineProfileResizer")
 export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index df9b128885a..fd24bc745a9 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -31,7 +31,6 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { formatFullDate } from "../../../DateUtils";
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from '../../../dispatcher/actions';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import { normalizeWheelEvent } from "../../../utils/Mouse";
 import { IDialogProps } from '../dialogs/IDialogProps';
@@ -90,7 +89,6 @@ interface IState {
     contextMenuDisplayed: boolean;
 }
 
-@replaceableComponent("views.elements.ImageView")
 export default class ImageView extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/InfoTooltip.tsx b/src/components/views/elements/InfoTooltip.tsx
index f77a07bd211..d34a6f9bb05 100644
--- a/src/components/views/elements/InfoTooltip.tsx
+++ b/src/components/views/elements/InfoTooltip.tsx
@@ -20,7 +20,6 @@ import classNames from 'classnames';
 
 import { Alignment } from './Tooltip';
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TooltipTarget from './TooltipTarget';
 
 export enum InfoTooltipKind {
@@ -35,7 +34,6 @@ interface ITooltipProps {
     kind?: InfoTooltipKind;
 }
 
-@replaceableComponent("views.elements.InfoTooltip")
 export default class InfoTooltip extends React.PureComponent<ITooltipProps> {
     constructor(props: ITooltipProps) {
         super(props);
diff --git a/src/components/views/elements/InlineSpinner.tsx b/src/components/views/elements/InlineSpinner.tsx
index 3a404430db0..385e317cda0 100644
--- a/src/components/views/elements/InlineSpinner.tsx
+++ b/src/components/views/elements/InlineSpinner.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     w?: number;
@@ -25,7 +24,6 @@ interface IProps {
     children?: React.ReactNode;
 }
 
-@replaceableComponent("views.elements.InlineSpinner")
 export default class InlineSpinner extends React.PureComponent<IProps> {
     static defaultProps = {
         w: 16,
diff --git a/src/components/views/elements/InviteReason.tsx b/src/components/views/elements/InviteReason.tsx
index 13a62d463cb..d3f7e340314 100644
--- a/src/components/views/elements/InviteReason.tsx
+++ b/src/components/views/elements/InviteReason.tsx
@@ -19,7 +19,6 @@ import React from "react";
 
 import { sanitizedHtmlNode } from "../../../HtmlUtils";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     reason: string;
@@ -30,7 +29,6 @@ interface IState {
     hidden: boolean;
 }
 
-@replaceableComponent("views.elements.InviteReason")
 export default class InviteReason extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/LabelledToggleSwitch.tsx b/src/components/views/elements/LabelledToggleSwitch.tsx
index 24647df5024..952c92ac427 100644
--- a/src/components/views/elements/LabelledToggleSwitch.tsx
+++ b/src/components/views/elements/LabelledToggleSwitch.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import ToggleSwitch from "./ToggleSwitch";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The value for the toggle switch
@@ -35,7 +34,6 @@ interface IProps {
     onChange(checked: boolean): void;
 }
 
-@replaceableComponent("views.elements.LabelledToggleSwitch")
 export default class LabelledToggleSwitch extends React.PureComponent<IProps> {
     render() {
         // This is a minimal version of a SettingsFlag
diff --git a/src/components/views/elements/LanguageDropdown.tsx b/src/components/views/elements/LanguageDropdown.tsx
index c6c52ee4e82..7d19dbfce18 100644
--- a/src/components/views/elements/LanguageDropdown.tsx
+++ b/src/components/views/elements/LanguageDropdown.tsx
@@ -20,7 +20,6 @@ import React from 'react';
 import * as languageHandler from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "./Spinner";
 import Dropdown from "./Dropdown";
 
@@ -42,7 +41,6 @@ interface IState {
     langs: string[];
 }
 
-@replaceableComponent("views.elements.LanguageDropdown")
 export default class LanguageDropdown extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/LazyRenderList.tsx b/src/components/views/elements/LazyRenderList.tsx
index 6a1920bec9a..d573a381045 100644
--- a/src/components/views/elements/LazyRenderList.tsx
+++ b/src/components/views/elements/LazyRenderList.tsx
@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 class ItemRange {
     constructor(
         public topCount: number,
@@ -84,7 +82,6 @@ interface IState {
     renderRange: ItemRange;
 }
 
-@replaceableComponent("views.elements.LazyRenderList")
 export default class LazyRenderList<T = any> extends React.Component<IProps<T>, IState> {
     public static defaultProps: Partial<IProps<unknown>> = {
         overflowItems: 20,
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
index a590427d232..43e66db09c1 100644
--- a/src/components/views/elements/MiniAvatarUploader.tsx
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -25,6 +25,7 @@ import { useTimeout } from "../../../hooks/useTimeout";
 import Analytics from "../../../Analytics";
 import { TranslatedString } from '../../../languageHandler';
 import RoomContext from "../../../contexts/RoomContext";
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 export const AVATAR_SIZE = 52;
 
@@ -62,6 +63,7 @@ const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAva
             type="file"
             ref={uploadRef}
             className="mx_MiniAvatarUploader_input"
+            onClick={chromeFileInputFix}
             onChange={async (ev) => {
                 if (!ev.target.files?.length) return;
                 setBusy(true);
diff --git a/src/components/views/elements/PersistedElement.tsx b/src/components/views/elements/PersistedElement.tsx
index 97a197d2bf3..cd8239a1f19 100644
--- a/src/components/views/elements/PersistedElement.tsx
+++ b/src/components/views/elements/PersistedElement.tsx
@@ -22,7 +22,6 @@ import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ActionPayload } from "../../../dispatcher/payloads";
 
 export const getPersistKey = (appId: string) => 'widget_' + appId;
@@ -70,7 +69,6 @@ interface IProps {
  * children are made visible and are positioned into a div that is given the same
  * bounding rect as the parent of PE.
  */
-@replaceableComponent("views.elements.PersistedElement")
 export default class PersistedElement extends React.Component<IProps> {
     private resizeObserver: ResizeObserver;
     private dispatcherRef: string;
diff --git a/src/components/views/elements/PersistentApp.tsx b/src/components/views/elements/PersistentApp.tsx
index 2961d7df01f..5851c1c614d 100644
--- a/src/components/views/elements/PersistentApp.tsx
+++ b/src/components/views/elements/PersistentApp.tsx
@@ -16,49 +16,53 @@ limitations under the License.
 */
 
 import React, { ContextType } from 'react';
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AppTile from "./AppTile";
 import { IApp } from '../../../stores/WidgetStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 interface IProps {
     persistentWidgetId: string;
+    persistentRoomId: string;
     pointerEvents?: string;
 }
 
-@replaceableComponent("views.elements.PersistentApp")
 export default class PersistentApp extends React.Component<IProps> {
     public static contextType = MatrixClientContext;
     context: ContextType<typeof MatrixClientContext>;
+    private room: Room;
 
-    private get app(): IApp {
-        const persistentWidgetInRoomId = ActiveWidgetStore.instance.getRoomId(this.props.persistentWidgetId);
-        const persistentWidgetInRoom = this.context.getRoom(persistentWidgetInRoomId);
+    constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
+        super(props, context);
+        this.room = context.getRoom(this.props.persistentRoomId);
+    }
 
+    private get app(): IApp | null {
         // get the widget data
-        const appEvent = WidgetUtils.getRoomWidgets(persistentWidgetInRoom).find((ev) => {
-            return ev.getStateKey() === ActiveWidgetStore.instance.getPersistentWidgetId();
-        });
-        return WidgetUtils.makeAppConfig(
-            appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(),
-            persistentWidgetInRoomId, appEvent.getId(),
+        const appEvent = WidgetUtils.getRoomWidgets(this.room).find(ev =>
+            ev.getStateKey() === this.props.persistentWidgetId,
         );
+
+        if (appEvent) {
+            return WidgetUtils.makeAppConfig(
+                appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(),
+                this.room.roomId, appEvent.getId(),
+            );
+        } else {
+            return null;
+        }
     }
 
     public render(): JSX.Element {
         const app = this.app;
         if (app) {
-            const persistentWidgetInRoomId = ActiveWidgetStore.instance.getRoomId(this.props.persistentWidgetId);
-            const persistentWidgetInRoom = this.context.getRoom(persistentWidgetInRoomId);
-
             return <AppTile
                 key={app.id}
                 app={app}
                 fullWidth={true}
-                room={persistentWidgetInRoom}
+                room={this.room}
                 userId={this.context.credentials.userId}
                 creatorUserId={app.creatorUserId}
                 widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 9bb67840d01..7d5a9973c7f 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -20,18 +20,15 @@ import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import PropTypes from 'prop-types';
 import { logger } from "matrix-js-sdk/src/logger";
 
-import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import FlairStore from "../../../stores/FlairStore";
 import { getPrimaryPermalinkEntity, parsePermalink } from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { Action } from "../../../dispatcher/actions";
-import { mediaFromMxc } from "../../../customisations/Media";
 import Tooltip from './Tooltip';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import RoomAvatar from "../avatars/RoomAvatar";
+import MemberAvatar from "../avatars/MemberAvatar";
 
-@replaceableComponent("views.elements.Pill")
 class Pill extends React.Component {
     static roomNotifPos(text) {
         return text.indexOf("@room");
@@ -43,7 +40,6 @@ class Pill extends React.Component {
 
     static TYPE_USER_MENTION = 'TYPE_USER_MENTION';
     static TYPE_ROOM_MENTION = 'TYPE_ROOM_MENTION';
-    static TYPE_GROUP_MENTION = 'TYPE_GROUP_MENTION';
     static TYPE_AT_ROOM_MENTION = 'TYPE_AT_ROOM_MENTION'; // '@room' mention
 
     static propTypes = {
@@ -69,8 +65,6 @@ class Pill extends React.Component {
 
         // The member related to the user pill
         member: null,
-        // The group related to the group pill
-        group: null,
         // The room related to the room pill
         room: null,
         // Is the user hovering the pill
@@ -98,11 +92,9 @@ class Pill extends React.Component {
             '@': Pill.TYPE_USER_MENTION,
             '#': Pill.TYPE_ROOM_MENTION,
             '!': Pill.TYPE_ROOM_MENTION,
-            '+': Pill.TYPE_GROUP_MENTION,
         }[prefix];
 
         let member;
-        let group;
         let room;
         switch (pillType) {
             case Pill.TYPE_AT_ROOM_MENTION: {
@@ -116,8 +108,8 @@ class Pill extends React.Component {
                     member = new RoomMember(null, resourceId);
                     this.doProfileLookup(resourceId, member);
                 }
-            }
                 break;
+            }
             case Pill.TYPE_ROOM_MENTION: {
                 const localRoom = resourceId[0] === '#' ?
                     MatrixClientPeg.get().getRooms().find((r) => {
@@ -130,23 +122,10 @@ class Pill extends React.Component {
                     // a room avatar and name.
                     // this.doRoomProfileLookup(resourceId, member);
                 }
-            }
                 break;
-            case Pill.TYPE_GROUP_MENTION: {
-                const cli = MatrixClientPeg.get();
-
-                try {
-                    group = await FlairStore.getGroupProfileCached(cli, resourceId);
-                } catch (e) { // if FlairStore failed, fall back to just groupId
-                    group = {
-                        groupId: resourceId,
-                        avatarUrl: null,
-                        name: null,
-                    };
-                }
             }
         }
-        this.setState({ resourceId, pillType, member, group, room });
+        this.setState({ resourceId, pillType, member, room });
     }
 
     componentDidMount() {
@@ -203,10 +182,6 @@ class Pill extends React.Component {
     };
 
     render() {
-        const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
-        const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-        const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
-
         const resource = this.state.resourceId;
 
         let avatar = null;
@@ -225,8 +200,8 @@ class Pill extends React.Component {
                     }
                     pillClass = 'mx_AtRoomPill';
                 }
-            }
                 break;
+            }
             case Pill.TYPE_USER_MENTION: {
                 // If this user is not a member of this room, default to the empty member
                 const member = this.state.member;
@@ -241,8 +216,8 @@ class Pill extends React.Component {
                     href = null;
                     onClick = this.onUserPillClicked;
                 }
-            }
                 break;
+            }
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
@@ -252,25 +227,8 @@ class Pill extends React.Component {
                     }
                 }
                 pillClass = 'mx_RoomPill';
-            }
                 break;
-            case Pill.TYPE_GROUP_MENTION: {
-                if (this.state.group) {
-                    const { avatarUrl, groupId, name } = this.state.group;
-
-                    linkText = groupId;
-                    if (this.props.shouldShowPillAvatar) {
-                        avatar = <BaseAvatar
-                            name={name || groupId}
-                            width={16}
-                            height={16}
-                            aria-hidden="true"
-                            url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(16) : null} />;
-                    }
-                    pillClass = 'mx_GroupPill';
-                }
             }
-                break;
         }
 
         const classes = classNames("mx_Pill", pillClass, {
diff --git a/src/components/views/elements/PowerSelector.tsx b/src/components/views/elements/PowerSelector.tsx
index 2cf028e2252..3a9e87d1581 100644
--- a/src/components/views/elements/PowerSelector.tsx
+++ b/src/components/views/elements/PowerSelector.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import * as Roles from '../../../Roles';
 import { _t } from '../../../languageHandler';
 import Field from "./Field";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 
@@ -55,7 +54,6 @@ interface IState {
     customLevel?: number;
 }
 
-@replaceableComponent("views.elements.PowerSelector")
 export default class PowerSelector extends React.Component<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         maxValue: Infinity,
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx
index b4f2606d598..11498c5a55d 100644
--- a/src/components/views/elements/ReplyChain.tsx
+++ b/src/components/views/elements/ReplyChain.tsx
@@ -20,21 +20,22 @@ import classNames from 'classnames';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { Relations } from 'matrix-js-sdk/src/models/relations';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
 import { makeUserPermalink, RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
 import { Layout } from "../../../settings/enums/Layout";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { getUserNameColorClass } from "../../../utils/FormattingUtils";
 import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from './Spinner';
 import ReplyTile from "../rooms/ReplyTile";
 import Pill from './Pill';
 import { ButtonEvent } from './AccessibleButton';
-import { getParentEventId } from '../../../utils/Reply';
+import { getParentEventId, shouldDisplayReply } from '../../../utils/Reply';
+import RoomContext from "../../../contexts/RoomContext";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 
 /**
  * This number is based on the previous behavior - if we have message of height
@@ -74,14 +75,15 @@ interface IState {
 // This component does no cycle detection, simply because the only way to make such a cycle would be to
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
 // be low as each event being loaded (after the first) is triggered by an explicit user action.
-@replaceableComponent("views.elements.ReplyChain")
 export default class ReplyChain extends React.Component<IProps, IState> {
-    static contextType = MatrixClientContext;
+    static contextType = RoomContext;
+    public context!: React.ContextType<typeof RoomContext>;
+
     private unmounted = false;
     private room: Room;
     private blockquoteRef = React.createRef<HTMLElement>();
 
-    constructor(props, context) {
+    constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
         super(props, context);
 
         this.state = {
@@ -91,7 +93,11 @@ export default class ReplyChain extends React.Component<IProps, IState> {
             err: false,
         };
 
-        this.room = this.context.getRoom(this.props.parentEv.getRoomId());
+        this.room = this.matrixClient.getRoom(this.props.parentEv.getRoomId());
+    }
+
+    private get matrixClient(): MatrixClient {
+        return MatrixClientPeg.get();
     }
 
     componentDidMount() {
@@ -158,7 +164,7 @@ export default class ReplyChain extends React.Component<IProps, IState> {
         try {
             // ask the client to fetch the event we want using the context API, only interface to do so is to ask
             // for a timeline with that event, but once it is loaded we can use findEventById to look up the ev map
-            await this.context.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId);
+            await this.matrixClient.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId);
         } catch (e) {
             // if it fails catch the error and return early, there's no point trying to find the event in this case.
             // Return null as it is falsey and thus should be treated as an error (as the event cannot be resolved).
@@ -197,7 +203,6 @@ export default class ReplyChain extends React.Component<IProps, IState> {
 
     render() {
         let header = null;
-
         if (this.state.err) {
             header = <blockquote className="mx_ReplyChain mx_ReplyChain_error">
                 {
@@ -205,9 +210,9 @@ export default class ReplyChain extends React.Component<IProps, IState> {
                         'it either does not exist or you do not have permission to view it.')
                 }
             </blockquote>;
-        } else if (this.state.loadedEv) {
+        } else if (this.state.loadedEv && shouldDisplayReply(this.state.events[0])) {
             const ev = this.state.loadedEv;
-            const room = this.context.getRoom(ev.getRoomId());
+            const room = this.matrixClient.getRoom(ev.getRoomId());
             header = <blockquote className={`mx_ReplyChain ${this.getReplyChainColorClass(ev)}`}>
                 {
                     _t('<a>In reply to</a> <pill>', {}, {
diff --git a/src/components/views/elements/RoomAliasField.tsx b/src/components/views/elements/RoomAliasField.tsx
index a8cf278a30c..e99b3b3ea79 100644
--- a/src/components/views/elements/RoomAliasField.tsx
+++ b/src/components/views/elements/RoomAliasField.tsx
@@ -18,7 +18,6 @@ import React, { createRef, KeyboardEventHandler } from "react";
 
 import { _t } from '../../../languageHandler';
 import withValidation from './Validation';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field, { IValidateOpts } from "./Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
@@ -39,7 +38,6 @@ interface IState {
 }
 
 // Controlled form component wrapping Field for inputting a room alias scoped to a given domain
-@replaceableComponent("views.elements.RoomAliasField")
 export default class RoomAliasField extends React.PureComponent<IProps, IState> {
     static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
diff --git a/src/components/views/elements/RoomFacePile.tsx b/src/components/views/elements/RoomFacePile.tsx
new file mode 100644
index 00000000000..0b88403fffd
--- /dev/null
+++ b/src/components/views/elements/RoomFacePile.tsx
@@ -0,0 +1,107 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { FC, HTMLAttributes, ReactNode, useContext } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { sortBy } from "lodash";
+
+import { _t } from "../../../languageHandler";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import FacePile from "./FacePile";
+import { useRoomMembers } from "../../../hooks/useRoomMembers";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+const DEFAULT_NUM_FACES = 5;
+
+const isKnownMember = (member: RoomMember) => !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length;
+
+interface IProps extends HTMLAttributes<HTMLSpanElement> {
+    room: Room;
+    onlyKnownUsers?: boolean;
+    numShown?: number;
+}
+
+const RoomFacePile: FC<IProps> = (
+    { room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, ...props },
+) => {
+    const cli = useContext(MatrixClientContext);
+    const isJoined = room.getMyMembership() === "join";
+    let members = useRoomMembers(room);
+    const count = members.length;
+
+    // sort users with an explicit avatar first
+    const iteratees = [member => member.getMxcAvatarUrl() ? 0 : 1];
+    if (onlyKnownUsers) {
+        members = members.filter(isKnownMember);
+    } else {
+        // sort known users first
+        iteratees.unshift(member => isKnownMember(member) ? 0 : 1);
+    }
+
+    // exclude ourselves from the shown members list
+    const shownMembers = sortBy(members.filter(m => m.userId !== cli.getUserId()), iteratees).slice(0, numShown);
+    if (shownMembers.length < 1) return null;
+
+    // We reverse the order of the shown faces in CSS to simplify their visual overlap,
+    // reverse members in tooltip order to make the order between the two match up.
+    const commaSeparatedMembers = shownMembers.map(m => m.name).reverse().join(", ");
+
+    let tooltip: ReactNode;
+    if (props.onClick) {
+        let subText: string;
+        if (isJoined) {
+            subText = _t("Including you, %(commaSeparatedMembers)s", { commaSeparatedMembers });
+        } else {
+            subText = _t("Including %(commaSeparatedMembers)s", { commaSeparatedMembers });
+        }
+
+        tooltip = <div>
+            <div className="mx_Tooltip_title">
+                { _t("View all %(count)s members", { count }) }
+            </div>
+            <div className="mx_Tooltip_sub">
+                { subText }
+            </div>
+        </div>;
+    } else {
+        if (isJoined) {
+            tooltip = _t("%(count)s members including you, %(commaSeparatedMembers)s", {
+                count: count - 1,
+                commaSeparatedMembers,
+            });
+        } else {
+            tooltip = _t("%(count)s members including %(commaSeparatedMembers)s", {
+                count,
+                commaSeparatedMembers,
+            });
+        }
+    }
+
+    return <FacePile
+        members={shownMembers}
+        faceSize={28}
+        overflow={members.length > numShown}
+        tooltip={tooltip}
+        {...props}
+    >
+        { onlyKnownUsers && <span className="mx_FacePile_summary">
+            { _t("%(count)s people you know have already joined", { count: members.length }) }
+        </span> }
+    </FacePile>;
+};
+
+export default RoomFacePile;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 4679e269bff..b11e74e1e27 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -18,6 +18,7 @@ import React from "react";
 import { chunk } from "lodash";
 import classNames from "classnames";
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Signup } from "matrix-analytics-events/types/typescript/Signup";
 
 import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";
@@ -25,6 +26,7 @@ import { _t } from "../../../languageHandler";
 import { IdentityProviderBrand, IIdentityProvider, ISSOFlow } from "../../../Login";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
 import { mediaFromMxc } from "../../../customisations/Media";
+import { PosthogAnalytics } from "../../../PosthogAnalytics";
 
 interface ISSOButtonProps extends Omit<IProps, "flow"> {
     idp: IIdentityProvider;
@@ -50,6 +52,26 @@ const getIcon = (brand: IdentityProviderBrand | string) => {
     }
 };
 
+const getAuthenticationType = (brand: IdentityProviderBrand | string): Signup["authenticationType"] => {
+    switch (brand) {
+        case IdentityProviderBrand.Apple:
+            return "Apple";
+        case IdentityProviderBrand.Facebook:
+            return "Facebook";
+        case IdentityProviderBrand.Github:
+            return "GitHub";
+        case IdentityProviderBrand.Gitlab:
+            return "GitLab";
+        case IdentityProviderBrand.Google:
+            return "Google";
+        // Not supported on the analytics SDK at the moment.
+        // case IdentityProviderBrand.Twitter:
+        //     return "Twitter";
+        default:
+            return "SSO";
+    }
+};
+
 const SSOButton: React.FC<ISSOButtonProps> = ({
     matrixClient,
     loginType,
@@ -62,6 +84,8 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
     const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
 
     const onClick = () => {
+        const authenticationType = getAuthenticationType(idp.brand);
+        PosthogAnalytics.instance.setAuthenticationType(authenticationType);
         PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
     };
 
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 8921dfe19b0..e7b2f9ccf00 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -41,11 +41,12 @@ const showPickerDialog = (
 };
 
 const onHelpClick = () => {
+    const brand = SdkConfig.get().brand;
     Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
         title: _t("Server Options"),
         description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
-            "a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
-            "a different homeserver."),
+            "a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on " +
+            "a different homeserver.", { brand }),
         button: _t("Dismiss"),
         hasCloseButton: false,
         fixedWidth: false,
@@ -53,7 +54,7 @@ const onHelpClick = () => {
 };
 
 const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }: IProps) => {
-    const disableCustomUrls = SdkConfig.get()["disable_custom_urls"];
+    const disableCustomUrls = SdkConfig.get("disable_custom_urls");
 
     let editBtn;
     if (!disableCustomUrls && onServerConfigChange) {
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index a0af045c269..3437440f00f 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -22,7 +22,6 @@ import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The setting must be a boolean
@@ -41,7 +40,6 @@ interface IState {
     value: boolean;
 }
 
-@replaceableComponent("views.elements.SettingsFlag")
 export default class SettingsFlag extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index a4c3147a730..a5103f2bd85 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -16,8 +16,6 @@ limitations under the License.
 
 import * as React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     // A callback for the selected value
     onSelectionChange: (value: number) => void;
@@ -36,7 +34,6 @@ interface IProps {
     disabled: boolean;
 }
 
-@replaceableComponent("views.elements.Slider")
 export default class Slider extends React.Component<IProps> {
     // offset is a terrible inverse approximation.
     // if the values represents some function f(x) = y where x is the
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 972dac909aa..126898a4ff1 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -20,7 +20,6 @@ import Dropdown from "../../views/elements/Dropdown";
 import PlatformPeg from "../../../PlatformPeg";
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "./Spinner";
 
 function languageMatchesSearchQuery(query, language) {
@@ -40,7 +39,6 @@ interface SpellCheckLanguagesDropdownIState {
     languages: any;
 }
 
-@replaceableComponent("views.elements.SpellCheckLanguagesDropdown")
 export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps,
                                                                          SpellCheckLanguagesDropdownIState> {
     constructor(props) {
diff --git a/src/components/views/elements/Spoiler.tsx b/src/components/views/elements/Spoiler.tsx
index 4613f8914bf..7d47bb030eb 100644
--- a/src/components/views/elements/Spoiler.tsx
+++ b/src/components/views/elements/Spoiler.tsx
@@ -16,8 +16,6 @@
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     reason?: string;
     contentHtml: string;
@@ -27,7 +25,6 @@ interface IState {
     visible: boolean;
 }
 
-@replaceableComponent("views.elements.Spoiler")
 export default class Spoiler extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
index 6fe59562bbe..333fbb8adbc 100644
--- a/src/components/views/elements/StyledCheckbox.tsx
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -18,8 +18,6 @@ import React from "react";
 import { randomString } from "matrix-js-sdk/src/randomstring";
 import classnames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 export enum CheckboxStyle {
     Solid = "solid",
     Outline = "outline",
@@ -34,7 +32,6 @@ interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 interface IState {
 }
 
-@replaceableComponent("views.elements.StyledCheckbox")
 export default class StyledCheckbox extends React.PureComponent<IProps, IState> {
     private id: string;
 
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index 25f525ebf47..14cc7d22ef4 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -17,8 +17,6 @@ limitations under the License.
 import React from 'react';
 import classnames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
     inputRef?: React.RefObject<HTMLInputElement>;
     outlined?: boolean;
@@ -31,7 +29,6 @@ interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 interface IState {
 }
 
-@replaceableComponent("views.elements.StyledRadioButton")
 export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
     public static readonly defaultProps = {
         className: '',
diff --git a/src/components/views/elements/SyntaxHighlight.tsx b/src/components/views/elements/SyntaxHighlight.tsx
index bc4b3111f3c..861eb18e83f 100644
--- a/src/components/views/elements/SyntaxHighlight.tsx
+++ b/src/components/views/elements/SyntaxHighlight.tsx
@@ -17,14 +17,11 @@ limitations under the License.
 import React from 'react';
 import hljs from 'highlight.js';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     language?: string;
     children: string;
 }
 
-@replaceableComponent("views.elements.SyntaxHighlight")
 export default class SyntaxHighlight extends React.PureComponent<IProps> {
     public render(): JSX.Element {
         const { children: content, language } = this.props;
diff --git a/src/components/views/elements/Tag.tsx b/src/components/views/elements/Tag.tsx
new file mode 100644
index 00000000000..c6887fd0e0a
--- /dev/null
+++ b/src/components/views/elements/Tag.tsx
@@ -0,0 +1,44 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+
+import AccessibleButton from "./AccessibleButton";
+import { Icon as CancelRounded } from "../../../../res/img/element-icons/cancel-rounded.svg";
+
+interface IProps {
+    icon?: () => JSX.Element;
+    label: string;
+    onDeleteClick?: () => void;
+    disabled?: boolean;
+}
+
+export const Tag = ({
+    icon,
+    label,
+    onDeleteClick,
+    disabled = false,
+}: IProps) => {
+    return <div className='mx_Tag'>
+        { icon?.() }
+        { label }
+        { onDeleteClick && (
+            <AccessibleButton className="mx_Tag_delete" onClick={onDeleteClick} disabled={disabled}>
+                <CancelRounded />
+            </AccessibleButton>
+        ) }
+    </div>;
+};
diff --git a/src/components/views/elements/TagComposer.tsx b/src/components/views/elements/TagComposer.tsx
index 9937020fff2..5d1bff84e8e 100644
--- a/src/components/views/elements/TagComposer.tsx
+++ b/src/components/views/elements/TagComposer.tsx
@@ -16,10 +16,10 @@ limitations under the License.
 
 import React, { ChangeEvent, FormEvent } from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field from "./Field";
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "./AccessibleButton";
+import { Tag } from "./Tag";
 
 interface IProps {
     tags: string[];
@@ -38,7 +38,6 @@ interface IState {
  * A simple, controlled, composer for entering string tags. Contains a simple
  * input, add button, and per-tag remove button.
  */
-@replaceableComponent("views.elements.TagComposer")
 export default class TagComposer extends React.PureComponent<IProps, IState> {
     public constructor(props: IProps) {
         super(props);
@@ -82,10 +81,13 @@ export default class TagComposer extends React.PureComponent<IProps, IState> {
                 </AccessibleButton>
             </form>
             <div className='mx_TagComposer_tags'>
-                { this.props.tags.map((t, i) => (<div className='mx_TagComposer_tag' key={i}>
-                    <span>{ t }</span>
-                    <AccessibleButton onClick={this.onRemove.bind(this, t)} disabled={this.props.disabled} />
-                </div>)) }
+                { this.props.tags.map((t, i) => (
+                    <Tag
+                        label={t}
+                        key={t}
+                        onDeleteClick={this.onRemove.bind(this, t)}
+                        disabled={this.props.disabled} />
+                )) }
             </div>
         </div>;
     }
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
deleted file mode 100644
index d8e85c26963..00000000000
--- a/src/components/views/elements/TagTile.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd.
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
-import * as FormattingUtils from '../../../utils/FormattingUtils';
-import FlairStore from '../../../stores/FlairStore';
-import GroupStore from '../../../stores/GroupStore';
-import GroupFilterOrderStore from '../../../stores/GroupFilterOrderStore';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import AccessibleButton from "./AccessibleButton";
-import SettingsStore from "../../../settings/SettingsStore";
-import { mediaFromMxc } from "../../../customisations/Media";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-// A class for a child of GroupFilterPanel (possibly wrapped in a DNDTagTile) that represents
-// a thing to click on for the user to filter the visible rooms in the RoomList to:
-//  - Rooms that are part of the group
-//  - Direct messages with members of the group
-// with the intention that this could be expanded to arbitrary tags in future.
-@replaceableComponent("views.elements.TagTile")
-export default class TagTile extends React.Component {
-    static propTypes = {
-        // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
-        // For now, only group IDs are handled.
-        tag: PropTypes.string,
-        contextMenuButtonRef: PropTypes.object,
-        openMenu: PropTypes.func,
-        menuDisplayed: PropTypes.bool,
-        selected: PropTypes.bool,
-    };
-
-    static contextType = MatrixClientContext;
-
-    state = {
-        // Whether the mouse is over the tile
-        hover: false,
-        // The profile data of the group if this.props.tag is a group ID
-        profile: null,
-    };
-
-    componentDidMount() {
-        this.unmounted = false;
-        if (this.props.tag[0] === '+') {
-            FlairStore.addListener('updateGroupProfile', this._onFlairStoreUpdated);
-            this._onFlairStoreUpdated();
-            // New rooms or members may have been added to the group, fetch async
-            this._refreshGroup(this.props.tag);
-        }
-    }
-
-    componentWillUnmount() {
-        this.unmounted = true;
-        if (this.props.tag[0] === '+') {
-            FlairStore.removeListener('updateGroupProfile', this._onFlairStoreUpdated);
-        }
-    }
-
-    _onFlairStoreUpdated = () => {
-        if (this.unmounted) return;
-        FlairStore.getGroupProfileCached(
-            this.context,
-            this.props.tag,
-        ).then((profile) => {
-            if (this.unmounted) return;
-            this.setState({ profile });
-        }).catch((err) => {
-            logger.warn('Could not fetch group profile for ' + this.props.tag, err);
-        });
-    };
-
-    _refreshGroup(groupId) {
-        GroupStore.refreshGroupRooms(groupId);
-        GroupStore.refreshGroupMembers(groupId);
-    }
-
-    onClick = e => {
-        e.preventDefault();
-        e.stopPropagation();
-        dis.dispatch({
-            action: 'select_tag',
-            tag: this.props.tag,
-            ctrlOrCmdKey: isOnlyCtrlOrCmdIgnoreShiftKeyEvent(e),
-            shiftKey: e.shiftKey,
-        });
-        if (this.props.tag[0] === '+') {
-            // New rooms or members may have been added to the group, fetch async
-            this._refreshGroup(this.props.tag);
-        }
-    };
-
-    onMouseOver = () => {
-        if (SettingsStore.getValue("feature_communities_v2_prototypes")) return;
-        this.setState({ hover: true });
-    };
-
-    onMouseLeave = () => {
-        this.setState({ hover: false });
-    };
-
-    openMenu = e => {
-        // Prevent the TagTile onClick event firing as well
-        e.stopPropagation();
-        e.preventDefault();
-        if (SettingsStore.getValue("feature_communities_v2_prototypes")) return;
-        this.setState({ hover: false });
-        this.props.openMenu();
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const profile = this.state.profile || {};
-        const name = profile.name || this.props.tag;
-        const avatarSize = 32;
-
-        const httpUrl = profile.avatarUrl
-            ? mediaFromMxc(profile.avatarUrl).getSquareThumbnailHttp(avatarSize)
-            : null;
-
-        const isPrototype = SettingsStore.getValue("feature_communities_v2_prototypes");
-        const className = classNames({
-            mx_TagTile: true,
-            mx_TagTile_prototype: isPrototype,
-            mx_TagTile_selected: this.props.selected && !isPrototype,
-            mx_TagTile_selected_prototype: this.props.selected && isPrototype,
-        });
-
-        const badge = GroupFilterOrderStore.getGroupBadge(this.props.tag);
-        let badgeElement;
-        if (badge && !this.state.hover && !this.props.menuDisplayed) {
-            const badgeClasses = classNames({
-                "mx_TagTile_badge": true,
-                "mx_TagTile_badgeHighlight": badge.highlight,
-            });
-            badgeElement = (<div className={badgeClasses}>{ FormattingUtils.formatCount(badge.count) }</div>);
-        }
-
-        const contextButton = this.state.hover || this.props.menuDisplayed ?
-            <AccessibleButton
-                className="mx_TagTile_context_button"
-                onClick={this.openMenu}
-                inputRef={this.props.contextMenuButtonRef}
-            >
-                { "\u00B7\u00B7\u00B7" }
-            </AccessibleButton> : <div ref={this.props.contextMenuButtonRef} />;
-
-        const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
-
-        return <AccessibleTooltipButton
-            className={className}
-            onClick={this.onClick}
-            onContextMenu={this.openMenu}
-            title={name}
-        >
-            <div
-                className="mx_TagTile_avatar"
-                onMouseOver={this.onMouseOver}
-                onMouseLeave={this.onMouseLeave}
-            >
-                <BaseAvatar
-                    name={name}
-                    idName={this.props.tag}
-                    url={httpUrl}
-                    width={avatarSize}
-                    height={avatarSize}
-                />
-                { contextButton }
-                { badgeElement }
-            </div>
-        </AccessibleTooltipButton>;
-    }
-}
diff --git a/src/components/views/elements/TextWithTooltip.tsx b/src/components/views/elements/TextWithTooltip.tsx
index 2b5926f3d77..c8fa5376b87 100644
--- a/src/components/views/elements/TextWithTooltip.tsx
+++ b/src/components/views/elements/TextWithTooltip.tsx
@@ -17,7 +17,6 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TooltipTarget from './TooltipTarget';
 
 interface IProps {
@@ -28,7 +27,6 @@ interface IProps {
     onClick?: (ev?: React.MouseEvent) => void;
 }
 
-@replaceableComponent("views.elements.TextWithTooltip")
 export default class TextWithTooltip extends React.Component<IProps> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 47b81c7a2ec..f32b7c35f42 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -21,7 +21,6 @@ import React, { CSSProperties } from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
 
 const MIN_TOOLTIP_HEIGHT = 25;
@@ -33,6 +32,8 @@ export enum Alignment {
     Top, // Centered
     Bottom, // Centered
     InnerBottom, // Inside the target, at the bottom
+    TopRight, // On top of the target, right aligned
+    TopCenter, // On top of the target, center aligned
 }
 
 export interface ITooltipProps {
@@ -55,7 +56,6 @@ export interface ITooltipProps {
         maxParentWidth?: number;
 }
 
-@replaceableComponent("views.elements.Tooltip")
 export default class Tooltip extends React.Component<ITooltipProps> {
     private tooltipContainer: HTMLElement;
     private parent: Element;
@@ -151,6 +151,16 @@ export default class Tooltip extends React.Component<ITooltipProps> {
                 style.top = baseTop + parentBox.height - 50;
                 style.left = horizontalCenter;
                 style.transform = "translate(-50%)";
+                break;
+            case Alignment.TopRight:
+                style.top = baseTop - 5;
+                style.right = width - parentBox.right - window.pageXOffset;
+                style.transform = "translate(5px, -100%)";
+                break;
+            case Alignment.TopCenter:
+                style.top = baseTop - 5;
+                style.left = horizontalCenter;
+                style.transform = "translate(-50%, -100%)";
         }
 
         return style;
diff --git a/src/components/views/elements/TooltipButton.tsx b/src/components/views/elements/TooltipButton.tsx
index e6b3f6c520e..c863ea31b9f 100644
--- a/src/components/views/elements/TooltipButton.tsx
+++ b/src/components/views/elements/TooltipButton.tsx
@@ -17,14 +17,12 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TooltipTarget from './TooltipTarget';
 
 interface IProps {
     helpText: React.ReactNode | string;
 }
 
-@replaceableComponent("views.elements.TooltipButton")
 export default class TooltipButton extends React.Component<IProps> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/TruncatedList.tsx b/src/components/views/elements/TruncatedList.tsx
index 31c5391b07e..56d05515df7 100644
--- a/src/components/views/elements/TruncatedList.tsx
+++ b/src/components/views/elements/TruncatedList.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The number of elements to show before truncating. If negative, no truncation is done.
@@ -38,7 +37,6 @@ interface IProps {
     createOverflowElement?: (overflowCount: number, totalCount: number) => React.ReactNode;
 }
 
-@replaceableComponent("views.elements.TruncatedList")
 export default class TruncatedList extends React.Component<IProps> {
     static defaultProps ={
         truncateAt: 2,
diff --git a/src/components/views/elements/UserTagTile.tsx b/src/components/views/elements/UserTagTile.tsx
deleted file mode 100644
index 6bd0d4daa86..00000000000
--- a/src/components/views/elements/UserTagTile.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-import * as fbEmitter from "fbemitter";
-import classNames from "classnames";
-
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
-import AccessibleTooltipButton from "./AccessibleTooltipButton";
-import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-interface IProps {
-}
-
-interface IState {
-    selected: boolean;
-}
-
-@replaceableComponent("views.elements.UserTagTile")
-export default class UserTagTile extends React.PureComponent<IProps, IState> {
-    private tagStoreRef: fbEmitter.EventSubscription;
-
-    constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            selected: GroupFilterOrderStore.getSelectedTags().length === 0,
-        };
-    }
-
-    public componentDidMount() {
-        this.tagStoreRef = GroupFilterOrderStore.addListener(this.onTagStoreUpdate);
-    }
-
-    public componentWillUnmount() {
-        this.tagStoreRef.remove();
-    }
-
-    private onTagStoreUpdate = () => {
-        const selected = GroupFilterOrderStore.getSelectedTags().length === 0;
-        this.setState({ selected });
-    };
-
-    private onTileClick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        // Deselect all tags
-        defaultDispatcher.dispatch({ action: "deselect_tags" });
-    };
-
-    public render() {
-        // XXX: We reuse TagTile classes for ease of demonstration - we should probably generify
-        // TagTile instead if we continue to use this component.
-        const className = classNames({
-            mx_TagTile: true,
-            mx_TagTile_prototype: true,
-            mx_TagTile_selected_prototype: this.state.selected,
-            mx_TagTile_home: true,
-        });
-        return (
-            <AccessibleTooltipButton
-                className={className}
-                onClick={this.onTileClick}
-                title={_t("Home")}
-            >
-                <div className="mx_TagTile_avatar">
-                    <div className="mx_TagTile_homeIcon" />
-                </div>
-            </AccessibleTooltipButton>
-        );
-    }
-}
diff --git a/src/components/views/elements/crypto/VerificationQRCode.tsx b/src/components/views/elements/crypto/VerificationQRCode.tsx
index a5efb1b6ce9..16f150af6b7 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.tsx
+++ b/src/components/views/elements/crypto/VerificationQRCode.tsx
@@ -17,14 +17,12 @@ limitations under the License.
 import React from "react";
 import { QRCodeData } from "matrix-js-sdk/src/crypto/verification/QRCode";
 
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import QRCode from "../QRCode";
 
 interface IProps {
     qrCodeData: QRCodeData;
 }
 
-@replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent<IProps> {
     public render(): JSX.Element {
         return (
diff --git a/src/components/views/emojipicker/Category.tsx b/src/components/views/emojipicker/Category.tsx
index 395ff1cbc80..7cd5b96bee8 100644
--- a/src/components/views/emojipicker/Category.tsx
+++ b/src/components/views/emojipicker/Category.tsx
@@ -21,7 +21,6 @@ import { CATEGORY_HEADER_HEIGHT, EMOJI_HEIGHT, EMOJIS_PER_ROW } from "./EmojiPic
 import LazyRenderList from "../elements/LazyRenderList";
 import { DATA_BY_CATEGORY, IEmoji } from "../../../emoji";
 import Emoji from './Emoji';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const OVERFLOW_ROWS = 3;
 
@@ -48,7 +47,6 @@ interface IProps {
     onMouseLeave(emoji: IEmoji): void;
 }
 
-@replaceableComponent("views.emojipicker.Category")
 class Category extends React.PureComponent<IProps> {
     private renderEmojiRow = (rowIndex: number) => {
         const { onClick, onMouseEnter, onMouseLeave, selectedEmojis, emojis } = this.props;
diff --git a/src/components/views/emojipicker/Emoji.tsx b/src/components/views/emojipicker/Emoji.tsx
index 48194ff7d79..91eada12b36 100644
--- a/src/components/views/emojipicker/Emoji.tsx
+++ b/src/components/views/emojipicker/Emoji.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 
 import { MenuItem } from "../../structures/ContextMenu";
 import { IEmoji } from "../../../emoji";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
@@ -29,7 +28,6 @@ interface IProps {
     onMouseLeave(emoji: IEmoji): void;
 }
 
-@replaceableComponent("views.emojipicker.Emoji")
 class Emoji extends React.PureComponent<IProps> {
     render() {
         const { onClick, onMouseEnter, onMouseLeave, emoji, selectedEmojis } = this.props;
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index d0c3b59d423..e064df405a4 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -26,7 +26,6 @@ import Search from "./Search";
 import Preview from "./Preview";
 import QuickReactions from "./QuickReactions";
 import Category, { ICategory, CategoryKey } from "./Category";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 export const CATEGORY_HEADER_HEIGHT = 20;
 export const EMOJI_HEIGHT = 35;
@@ -50,7 +49,6 @@ interface IState {
     viewportHeight: number;
 }
 
-@replaceableComponent("views.emojipicker.EmojiPicker")
 class EmojiPicker extends React.Component<IProps, IState> {
     private readonly recentlyUsed: IEmoji[];
     private readonly memoizedDataByCategory: Record<CategoryKey, IEmoji[]>;
@@ -196,8 +194,11 @@ class EmojiPicker extends React.Component<IProps, IState> {
     };
 
     private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean => {
-        return emoji.annotation.toLowerCase().includes(filter) ||
-            emoji.emoticon?.toLowerCase().includes(filter) ||
+        return emoji.label.toLowerCase().includes(filter) ||
+            (Array.isArray(emoji.emoticon)
+                ? emoji.emoticon.some((x) => x.includes(filter))
+                : emoji.emoticon?.includes(filter)
+            ) ||
             emoji.shortcodes.some(x => x.toLowerCase().includes(filter)) ||
             emoji.unicode.split(ZERO_WIDTH_JOINER).includes(filter);
     };
diff --git a/src/components/views/emojipicker/Header.tsx b/src/components/views/emojipicker/Header.tsx
index e364d87eaee..e430ac974b3 100644
--- a/src/components/views/emojipicker/Header.tsx
+++ b/src/components/views/emojipicker/Header.tsx
@@ -20,7 +20,6 @@ import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
 import { CategoryKey, ICategory } from "./Category";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
@@ -29,7 +28,6 @@ interface IProps {
     onAnchorClick(id: CategoryKey): void;
 }
 
-@replaceableComponent("views.emojipicker.Header")
 class Header extends React.PureComponent<IProps> {
     private findNearestEnabled(index: number, delta: number) {
         index += this.props.categories.length;
diff --git a/src/components/views/emojipicker/Preview.tsx b/src/components/views/emojipicker/Preview.tsx
index 02b5669caf4..bcbbec1feb1 100644
--- a/src/components/views/emojipicker/Preview.tsx
+++ b/src/components/views/emojipicker/Preview.tsx
@@ -18,16 +18,14 @@ limitations under the License.
 import React from 'react';
 
 import { IEmoji } from "../../../emoji";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
 }
 
-@replaceableComponent("views.emojipicker.Preview")
 class Preview extends React.PureComponent<IProps> {
     render() {
-        const { unicode, annotation, shortcodes: [shortcode] } = this.props.emoji;
+        const { unicode, label, shortcodes: [shortcode] } = this.props.emoji;
 
         return (
             <div className="mx_EmojiPicker_footer mx_EmojiPicker_preview">
@@ -36,7 +34,7 @@ class Preview extends React.PureComponent<IProps> {
                 </div>
                 <div className="mx_EmojiPicker_preview_text">
                     <div className="mx_EmojiPicker_name mx_EmojiPicker_preview_name">
-                        { annotation }
+                        { label }
                     </div>
                     <div className="mx_EmojiPicker_shortcode">
                         { shortcode }
diff --git a/src/components/views/emojipicker/QuickReactions.tsx b/src/components/views/emojipicker/QuickReactions.tsx
index cbd529a43c9..c0336a759de 100644
--- a/src/components/views/emojipicker/QuickReactions.tsx
+++ b/src/components/views/emojipicker/QuickReactions.tsx
@@ -20,7 +20,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import { getEmojiFromUnicode, IEmoji } from "../../../emoji";
 import Emoji from "./Emoji";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 // We use the variation-selector Heart in Quick Reactions for some reason
 const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => {
@@ -40,7 +39,6 @@ interface IState {
     hover?: IEmoji;
 }
 
-@replaceableComponent("views.emojipicker.QuickReactions")
 class QuickReactions extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
@@ -68,7 +66,7 @@ class QuickReactions extends React.Component<IProps, IState> {
                     { !this.state.hover
                         ? _t("Quick Reactions")
                         : <React.Fragment>
-                            <span className="mx_EmojiPicker_name">{ this.state.hover.annotation }</span>
+                            <span className="mx_EmojiPicker_name">{ this.state.hover.label }</span>
                             <span className="mx_EmojiPicker_shortcode">{ this.state.hover.shortcodes[0] }</span>
                         </React.Fragment>
                     }
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index df18949233a..c53f5a64f9b 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -23,7 +23,6 @@ import { EventType, RelationType } from 'matrix-js-sdk/src/@types/event';
 import EmojiPicker from "./EmojiPicker";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { Action } from '../../../dispatcher/actions';
 import RoomContext from "../../../contexts/RoomContext";
 import { FocusComposerPayload } from '../../../dispatcher/payloads/FocusComposerPayload';
@@ -38,7 +37,6 @@ interface IState {
     selectedEmojis: Set<string>;
 }
 
-@replaceableComponent("views.emojipicker.ReactionPicker")
 class ReactionPicker extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
diff --git a/src/components/views/emojipicker/Search.tsx b/src/components/views/emojipicker/Search.tsx
index 98273e926be..de094210109 100644
--- a/src/components/views/emojipicker/Search.tsx
+++ b/src/components/views/emojipicker/Search.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 
@@ -28,7 +27,6 @@ interface IProps {
     onEnter(): void;
 }
 
-@replaceableComponent("views.emojipicker.Search")
 class Search extends React.PureComponent<IProps> {
     private inputRef = React.createRef<HTMLInputElement>();
 
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
deleted file mode 100644
index 3139187709f..00000000000
--- a/src/components/views/groups/GroupInviteTile.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-Copyright 2017, 2018 New Vector Ltd
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-import { _t } from '../../../languageHandler';
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import ContextMenu, { ContextMenuButton, toRightOf } from "../../structures/ContextMenu";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-// XXX this class copies a lot from RoomTile.js
-@replaceableComponent("views.groups.GroupInviteTile")
-export default class GroupInviteTile extends React.Component {
-    static propTypes = {
-        group: PropTypes.object.isRequired,
-    };
-
-    static contextType = MatrixClientContext;
-
-    constructor(props, context) {
-        super(props, context);
-
-        this.state = {
-            hover: false,
-            badgeHover: false,
-            menuDisplayed: false,
-            selected: this.props.group.groupId === null, // XXX: this needs linking to LoggedInView/GroupView state
-        };
-    }
-
-    onClick = e => {
-        dis.dispatch({
-            action: 'view_group',
-            group_id: this.props.group.groupId,
-        });
-    };
-
-    onMouseEnter = () => {
-        const state = { hover: true };
-        // Only allow non-guests to access the context menu
-        if (!this.context.isGuest()) {
-            state.badgeHover = true;
-        }
-        this.setState(state);
-    };
-
-    onMouseLeave = () => {
-        this.setState({
-            badgeHover: false,
-            hover: false,
-        });
-    };
-
-    _showContextMenu(boundingClientRect) {
-        // Only allow non-guests to access the context menu
-        if (MatrixClientPeg.get().isGuest()) return;
-
-        const state = {
-            contextMenuPosition: boundingClientRect,
-        };
-
-        // If the badge is clicked, then no longer show tooltip
-        if (this.props.collapsed) {
-            state.hover = false;
-        }
-
-        this.setState(state);
-    }
-
-    onContextMenuButtonClick = e => {
-        // Prevent the RoomTile onClick event firing as well
-        e.stopPropagation();
-        e.preventDefault();
-
-        this._showContextMenu(e.target.getBoundingClientRect());
-    };
-
-    onContextMenu = e => {
-        // Prevent the native context menu
-        e.preventDefault();
-
-        this._showContextMenu({
-            right: e.clientX,
-            top: e.clientY,
-            height: 0,
-        });
-    };
-
-    closeMenu = () => {
-        this.setState({
-            contextMenuPosition: null,
-        });
-    };
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-
-        const groupName = this.props.group.name || this.props.group.groupId;
-        const httpAvatarUrl = this.props.group.avatarUrl
-            ? mediaFromMxc(this.props.group.avatarUrl).getSquareThumbnailHttp(24)
-            : null;
-
-        const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
-
-        const isMenuDisplayed = Boolean(this.state.contextMenuPosition);
-        const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', {
-            'mx_RoomTile_badgeShown': this.state.badgeHover || isMenuDisplayed,
-        });
-
-        // XXX: this is a workaround for Firefox giving this div a tabstop :( [tabIndex]
-        const label = <div title={this.props.group.groupId} className={nameClasses} tabIndex={-1} dir="auto">
-            { groupName }
-        </div>;
-
-        const badgeEllipsis = this.state.badgeHover || isMenuDisplayed;
-        const badgeClasses = classNames('mx_RoomTile_badge mx_RoomTile_highlight', {
-            'mx_RoomTile_badgeButton': badgeEllipsis,
-        });
-
-        const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
-
-        let tooltip;
-        if (this.props.collapsed && this.state.hover) {
-            const Tooltip = sdk.getComponent("elements.Tooltip");
-            tooltip = <Tooltip className="mx_RoomTile_tooltip" label={groupName} dir="auto" />;
-        }
-
-        const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
-            'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile_selected': this.state.selected,
-            'mx_GroupInviteTile': true,
-        });
-
-        let contextMenu;
-        if (isMenuDisplayed) {
-            const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu');
-            contextMenu = (
-                <ContextMenu {...toRightOf(this.state.contextMenuPosition)} onFinished={this.closeMenu}>
-                    <GroupInviteTileContextMenu group={this.props.group} onFinished={this.closeMenu} />
-                </ContextMenu>
-            );
-        }
-
-        return <React.Fragment>
-            <RovingTabIndexWrapper>
-                { ({ onFocus, isActive, ref }) =>
-                    <AccessibleButton
-                        onFocus={onFocus}
-                        tabIndex={isActive ? 0 : -1}
-                        inputRef={ref}
-                        className={classes}
-                        onClick={this.onClick}
-                        onMouseEnter={this.onMouseEnter}
-                        onMouseLeave={this.onMouseLeave}
-                        onContextMenu={this.onContextMenu}
-                    >
-                        <div className="mx_RoomTile_avatar">
-                            { av }
-                        </div>
-                        <div className="mx_RoomTile_nameContainer">
-                            { label }
-                            <ContextMenuButton
-                                className={badgeClasses}
-                                onClick={this.onContextMenuButtonClick}
-                                label={_t("Options")}
-                                isExpanded={isMenuDisplayed}
-                                tabIndex={isActive ? 0 : -1}
-                            >
-                                { badgeContent }
-                            </ContextMenuButton>
-                        </div>
-                        { tooltip }
-                    </AccessibleButton>
-                }
-            </RovingTabIndexWrapper>
-
-            { contextMenu }
-        </React.Fragment>;
-    }
-}
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
deleted file mode 100644
index cffdfa366cd..00000000000
--- a/src/components/views/groups/GroupMemberList.js
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd.
-Copyright 2017 New Vector Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import GroupStore from '../../../stores/GroupStore';
-import { showGroupInviteDialog } from '../../../GroupAddressPicker';
-import AccessibleButton from '../elements/AccessibleButton';
-import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
-
-const INITIAL_LOAD_NUM_MEMBERS = 30;
-
-@replaceableComponent("views.groups.GroupMemberList")
-export default class GroupMemberList extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-    };
-
-    state = {
-        members: null,
-        membersError: null,
-        invitedMembers: null,
-        invitedMembersError: null,
-        truncateAt: INITIAL_LOAD_NUM_MEMBERS,
-    };
-
-    componentDidMount() {
-        this._unmounted = false;
-        this._initGroupStore(this.props.groupId);
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-    }
-
-    _initGroupStore(groupId) {
-        GroupStore.registerListener(groupId, () => {
-            this._fetchMembers();
-        });
-        GroupStore.on('error', (err, errorGroupId, stateKey) => {
-            if (this._unmounted || groupId !== errorGroupId) return;
-            if (stateKey === GroupStore.STATE_KEY.GroupMembers) {
-                this.setState({
-                    membersError: err,
-                });
-            }
-            if (stateKey === GroupStore.STATE_KEY.GroupInvitedMembers) {
-                this.setState({
-                    invitedMembersError: err,
-                });
-            }
-        });
-    }
-
-    _fetchMembers() {
-        if (this._unmounted) return;
-        this.setState({
-            members: GroupStore.getGroupMembers(this.props.groupId),
-            invitedMembers: GroupStore.getGroupInvitedMembers(this.props.groupId),
-        });
-    }
-
-    _createOverflowTile = (overflowCount, totalCount) => {
-        // For now we'll pretend this is any entity. It should probably be a separate tile.
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        const text = _t("and %(count)s others...", { count: overflowCount });
-        return (
-            <EntityTile
-                className="mx_EntityTile_ellipsis"
-                avatarJsx={
-                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg").default} name="..." width={36} height={36} />
-                }
-                name={text}
-                presenceState="online"
-                suppressOnHover={true}
-                onClick={this._showFullMemberList}
-            />
-        );
-    };
-
-    _showFullMemberList = () => {
-        this.setState({
-            truncateAt: -1,
-        });
-    };
-
-    onSearchQueryChanged = ev => {
-        this.setState({ searchQuery: ev.target.value });
-    };
-
-    makeGroupMemberTiles(query, memberList, memberListError) {
-        if (memberListError) {
-            return <div className="warning">{ _t("Failed to load group members") }</div>;
-        }
-
-        const GroupMemberTile = sdk.getComponent("groups.GroupMemberTile");
-        const TruncatedList = sdk.getComponent("elements.TruncatedList");
-        query = (query || "").toLowerCase();
-        if (query) {
-            memberList = memberList.filter((m) => {
-                const matchesName = (m.displayname || "").toLowerCase().includes(query);
-                const matchesId = m.userId.toLowerCase().includes(query);
-
-                if (!matchesName && !matchesId) {
-                    return false;
-                }
-
-                return true;
-            });
-        }
-
-        const uniqueMembers = {};
-        memberList.forEach((m) => {
-            if (!uniqueMembers[m.userId]) uniqueMembers[m.userId] = m;
-        });
-        memberList = Object.keys(uniqueMembers).map((userId) => uniqueMembers[userId]);
-        // Descending sort on isPrivileged = true = 1 to isPrivileged = false = 0
-        memberList.sort((a, b) => {
-            if (a.isPrivileged === b.isPrivileged) {
-                const aName = a.displayname || a.userId;
-                const bName = b.displayname || b.userId;
-                if (aName < bName) {
-                    return -1;
-                } else if (aName > bName) {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            } else {
-                return a.isPrivileged ? -1 : 1;
-            }
-        });
-
-        const memberTiles = memberList.map((m) => {
-            return (
-                <GroupMemberTile key={m.userId} groupId={this.props.groupId} member={m} />
-            );
-        });
-
-        return <TruncatedList
-            className="mx_MemberList_wrapper"
-            truncateAt={this.state.truncateAt}
-            createOverflowElement={this._createOverflowTile}
-        >
-            { memberTiles }
-        </TruncatedList>;
-    }
-
-    onInviteToGroupButtonClick = () => {
-        showGroupInviteDialog(this.props.groupId).then(() => {
-            RightPanelStore.instance.setCard({
-                phase: RightPanelPhases.GroupMemberList,
-                state: { groupId: this.props.groupId },
-            });
-        });
-    };
-
-    render() {
-        if (this.state.fetching || this.state.fetchingInvitedMembers) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            return (<div className="mx_MemberList">
-                <Spinner />
-            </div>);
-        }
-
-        const inputBox = (
-            <input
-                className="mx_GroupMemberList_query mx_textinput"
-                id="mx_GroupMemberList_query"
-                type="text"
-                onChange={this.onSearchQueryChanged}
-                value={this.state.searchQuery}
-                placeholder={_t('Filter community members')}
-                autoComplete="off"
-            />
-        );
-
-        const joined = this.state.members ? <div className="mx_MemberList_joined">
-            {
-                this.makeGroupMemberTiles(
-                    this.state.searchQuery,
-                    this.state.members,
-                    this.state.membersError,
-                )
-            }
-        </div> : <div />;
-
-        const invited = (this.state.invitedMembers && this.state.invitedMembers.length > 0) ?
-            <div className="mx_MemberList_invited">
-                <h2>{ _t("Invited") }</h2>
-                {
-                    this.makeGroupMemberTiles(
-                        this.state.searchQuery,
-                        this.state.invitedMembers,
-                        this.state.invitedMembersError,
-                    )
-                }
-            </div> : <div />;
-
-        let inviteButton;
-        if (GroupStore.isUserPrivileged(this.props.groupId)) {
-            inviteButton = (
-                <AccessibleButton
-                    className="mx_MemberList_invite mx_MemberList_inviteCommunity"
-                    onClick={this.onInviteToGroupButtonClick}
-                >
-                    <span>{ _t('Invite to this community') }</span>
-                </AccessibleButton>
-            );
-        }
-
-        return (
-            <div className="mx_MemberList" role="tabpanel">
-                { inviteButton }
-                <AutoHideScrollbar>
-                    { joined }
-                    { invited }
-                </AutoHideScrollbar>
-                { inputBox }
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
deleted file mode 100644
index ec4da5a53fb..00000000000
--- a/src/components/views/groups/GroupMemberTile.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-import { GroupMemberType } from '../../../groups';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-@replaceableComponent("views.groups.GroupMemberTile")
-export default class GroupMemberTile extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-        member: GroupMemberType.isRequired,
-    };
-
-    static contextType = MatrixClientContext;
-
-    onClick = e => {
-        dis.dispatch({
-            action: 'view_group_user',
-            member: this.props.member,
-            groupId: this.props.groupId,
-        });
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const EntityTile = sdk.getComponent('rooms.EntityTile');
-
-        const name = this.props.member.displayname || this.props.member.userId;
-        const avatarUrl = this.props.member.avatarUrl
-            ? mediaFromMxc(this.props.member.avatarUrl).getSquareThumbnailHttp(36)
-            : null;
-
-        const av = (
-            <BaseAvatar
-                aria-hidden="true"
-                name={this.props.member.displayname || this.props.member.userId}
-                idName={this.props.member.userId}
-                width={36}
-                height={36}
-                url={avatarUrl}
-            />
-        );
-
-        return (
-            <EntityTile
-                name={name}
-                avatarJsx={av}
-                onClick={this.onClick}
-                suppressOnHover={true}
-                presenceState="online"
-                powerStatus={this.props.member.isPrivileged ? EntityTile.POWER_STATUS_ADMIN : null}
-            />
-        );
-    }
-}
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
deleted file mode 100644
index e2b0eb8687a..00000000000
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import * as sdk from '../../../index';
-import GroupStore from '../../../stores/GroupStore';
-import ToggleSwitch from "../elements/ToggleSwitch";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.groups.GroupPublicityTile")
-export default class GroupPublicityToggle extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-    };
-
-    state = {
-        busy: false,
-        ready: false,
-        isGroupPublicised: false, // assume false as <ToggleSwitch /> expects a boolean
-    };
-
-    componentDidMount() {
-        this._initGroupStore(this.props.groupId);
-    }
-
-    _initGroupStore(groupId) {
-        this._groupStoreToken = GroupStore.registerListener(groupId, () => {
-            this.setState({
-                isGroupPublicised: Boolean(GroupStore.getGroupPublicity(groupId)),
-                ready: GroupStore.isStateReady(groupId, GroupStore.STATE_KEY.Summary),
-            });
-        });
-    }
-
-    componentWillUnmount() {
-        if (this._groupStoreToken) this._groupStoreToken.unregister();
-    }
-
-    _onPublicityToggle = () => {
-        this.setState({
-            busy: true,
-            // Optimistic early update
-            isGroupPublicised: !this.state.isGroupPublicised,
-        });
-        GroupStore.setGroupPublicity(this.props.groupId, !this.state.isGroupPublicised).then(() => {
-            this.setState({
-                busy: false,
-            });
-        });
-    };
-
-    render() {
-        const GroupTile = sdk.getComponent('groups.GroupTile');
-        return <div className="mx_GroupPublicity_toggle">
-            <GroupTile groupId={this.props.groupId} showDescription={false} avatarHeight={40} />
-            <ToggleSwitch checked={this.state.isGroupPublicised}
-                disabled={!this.state.ready || this.state.busy}
-                onChange={this._onPublicityToggle} />
-        </div>;
-    }
-}
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
deleted file mode 100644
index fd6cf69cf97..00000000000
--- a/src/components/views/groups/GroupRoomInfo.js
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import dis from '../../../dispatcher/dispatcher';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import GroupStore from '../../../stores/GroupStore';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-@replaceableComponent("views.groups.GroupRoomInfo")
-export default class GroupRoomInfo extends React.Component {
-    static contextType = MatrixClientContext;
-
-    static propTypes = {
-        groupId: PropTypes.string,
-        groupRoomId: PropTypes.string,
-    };
-
-    state = {
-        isUserPrivilegedInGroup: null,
-        groupRoom: null,
-        groupRoomPublicityLoading: false,
-        groupRoomRemoveLoading: false,
-    };
-
-    componentDidMount() {
-        this._initGroupStore(this.props.groupId);
-    }
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(newProps) {
-        if (newProps.groupId !== this.props.groupId) {
-            this._unregisterGroupStore(this.props.groupId);
-            this._initGroupStore(newProps.groupId);
-        }
-    }
-
-    componentWillUnmount() {
-        this._unregisterGroupStore(this.props.groupId);
-    }
-
-    _initGroupStore(groupId) {
-        GroupStore.registerListener(groupId, this.onGroupStoreUpdated);
-    }
-
-    _unregisterGroupStore(groupId) {
-        GroupStore.unregisterListener(this.onGroupStoreUpdated);
-    }
-
-    _updateGroupRoom() {
-        this.setState({
-            groupRoom: GroupStore.getGroupRooms(this.props.groupId).find(
-                (r) => r.roomId === this.props.groupRoomId,
-            ),
-        });
-    }
-
-    onGroupStoreUpdated = () => {
-        this.setState({
-            isUserPrivilegedInGroup: GroupStore.isUserPrivileged(this.props.groupId),
-        });
-        this._updateGroupRoom();
-    };
-
-    _onRemove = e => {
-        const groupId = this.props.groupId;
-        const roomName = this.state.groupRoom.displayname;
-        e.preventDefault();
-        e.stopPropagation();
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        Modal.createTrackedDialog('Confirm removal of group from room', '', QuestionDialog, {
-            title: _t("Are you sure you want to remove '%(roomName)s' from %(groupId)s?", { roomName, groupId }),
-            description: _t("Removing a room from the community will also remove it from the community page."),
-            button: _t("Remove"),
-            onFinished: (proceed) => {
-                if (!proceed) return;
-                this.setState({ groupRoomRemoveLoading: true });
-                const groupId = this.props.groupId;
-                const roomId = this.props.groupRoomId;
-                GroupStore.removeRoomFromGroup(this.props.groupId, roomId).then(() => {
-                    dis.dispatch({
-                        action: "view_group_room_list",
-                    });
-                }).catch((err) => {
-                    logger.error(`Error whilst removing ${roomId} from ${groupId}`, err);
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
-                        title: _t("Failed to remove room from community"),
-                        description: _t(
-                            "Failed to remove '%(roomName)s' from %(groupId)s", { groupId, roomName },
-                        ),
-                    });
-                }).finally(() => {
-                    this.setState({ groupRoomRemoveLoading: false });
-                });
-            },
-        });
-    };
-
-    _onCancel = e => {
-        dis.dispatch({
-            action: "view_group_room_list",
-        });
-    };
-
-    _changeGroupRoomPublicity = e => {
-        const isPublic = e.target.value === "public";
-        this.setState({
-            groupRoomPublicityLoading: true,
-        });
-        const groupId = this.props.groupId;
-        const roomId = this.props.groupRoomId;
-        const roomName = this.state.groupRoom.displayname;
-        GroupStore.updateGroupRoomVisibility(this.props.groupId, roomId, isPublic).catch((err) => {
-            logger.error(`Error whilst changing visibility of ${roomId} in ${groupId} to ${isPublic}`, err);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to remove room from group', '', ErrorDialog, {
-                title: _t("Something went wrong!"),
-                description: _t(
-                    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.",
-                    { roomName, groupId },
-                ),
-            });
-        }).finally(() => {
-            this.setState({
-                groupRoomPublicityLoading: false,
-            });
-        });
-    };
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
-        if (this.state.groupRoomRemoveLoading || !this.state.groupRoom) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            return <div className="mx_MemberInfo">
-                <Spinner />
-            </div>;
-        }
-
-        let adminTools;
-        if (this.state.isUserPrivilegedInGroup) {
-            adminTools =
-                <div className="mx_MemberInfo_adminTools">
-                    <h3>{ _t("Admin Tools") }</h3>
-                    <div className="mx_MemberInfo_buttons">
-                        <AccessibleButton className="mx_MemberInfo_field" onClick={this._onRemove}>
-                            { _t('Remove from community') }
-                        </AccessibleButton>
-                    </div>
-                    <h3>
-                        { _t('Visibility in Room List') }
-                        { this.state.groupRoomPublicityLoading ?
-                            <InlineSpinner /> : <div />
-                        }
-                    </h3>
-                    <div>
-                        <label>
-                            <input type="radio"
-                                value="public"
-                                checked={this.state.groupRoom.isPublic}
-                                onChange={this._changeGroupRoomPublicity}
-                            />
-                            <div className="mx_MemberInfo_label_text">
-                                { _t('Visible to everyone') }
-                            </div>
-                        </label>
-                    </div>
-                    <div>
-                        <label>
-                            <input type="radio"
-                                value="private"
-                                checked={!this.state.groupRoom.isPublic}
-                                onChange={this._changeGroupRoomPublicity}
-                            />
-                            <div className="mx_MemberInfo_label_text">
-                                { _t('Only visible to community members') }
-                            </div>
-                        </label>
-                    </div>
-                </div>;
-        }
-
-        const avatarUrl = this.state.groupRoom.avatarUrl;
-        let avatarElement;
-        if (avatarUrl) {
-            const httpUrl = mediaFromMxc(avatarUrl).getSquareThumbnailHttp(800);
-            avatarElement = <div className="mx_MemberInfo_avatar"><img src={httpUrl} /></div>;
-        }
-
-        const groupRoomName = this.state.groupRoom.displayname;
-        return (
-            <div className="mx_MemberInfo" role="tabpanel">
-                <AutoHideScrollbar>
-                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
-                        <img src={require("../../../../res/img/cancel.svg").default} width="18" height="18" className="mx_filterFlipColor" />
-                    </AccessibleButton>
-                    { avatarElement }
-
-                    <h2>{ groupRoomName }</h2>
-
-                    <div className="mx_MemberInfo_profile">
-                        <div className="mx_MemberInfo_profileField">
-                            { this.state.groupRoom.canonicalAlias }
-                        </div>
-                    </div>
-
-                    { adminTools }
-                </AutoHideScrollbar>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
deleted file mode 100644
index 9a29cb57629..00000000000
--- a/src/components/views/groups/GroupRoomList.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import GroupStore from '../../../stores/GroupStore';
-import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
-import AccessibleButton from '../elements/AccessibleButton';
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-const INITIAL_LOAD_NUM_ROOMS = 30;
-
-@replaceableComponent("views.groups.GroupRoomList")
-export default class GroupRoomList extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-    };
-
-    state = {
-        rooms: null,
-        truncateAt: INITIAL_LOAD_NUM_ROOMS,
-        searchQuery: "",
-    };
-
-    componentDidMount() {
-        this._unmounted = false;
-        this._initGroupStore(this.props.groupId);
-    }
-
-    componentWillUnmount() {
-        this._unmounted = true;
-        this._unregisterGroupStore();
-    }
-
-    _unregisterGroupStore() {
-        GroupStore.unregisterListener(this.onGroupStoreUpdated);
-    }
-
-    _initGroupStore(groupId) {
-        GroupStore.registerListener(groupId, this.onGroupStoreUpdated);
-        // XXX: This should be more fluxy - let's get the error from GroupStore .getError or something
-        // XXX: This is also leaked - we should remove it when unmounting
-        GroupStore.on('error', (err, errorGroupId) => {
-            if (errorGroupId !== groupId) return;
-            this.setState({
-                rooms: null,
-            });
-        });
-    }
-
-    onGroupStoreUpdated = () => {
-        if (this._unmounted) return;
-        this.setState({
-            rooms: GroupStore.getGroupRooms(this.props.groupId),
-        });
-    };
-
-    _createOverflowTile = (overflowCount, totalCount) => {
-        // For now we'll pretend this is any entity. It should probably be a separate tile.
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        const text = _t("and %(count)s others...", { count: overflowCount });
-        return (
-            <EntityTile
-                className="mx_EntityTile_ellipsis"
-                avatarJsx={
-                    <BaseAvatar url={require("../../../../res/img/ellipsis.svg").default} name="..." width={36} height={36} />
-                }
-                name={text}
-                presenceState="online"
-                suppressOnHover={true}
-                onClick={this._showFullRoomList}
-            />
-        );
-    };
-
-    _showFullRoomList = () => {
-        this.setState({
-            truncateAt: -1,
-        });
-    };
-
-    onSearchQueryChanged = ev => {
-        this.setState({ searchQuery: ev.target.value });
-    };
-
-    onAddRoomToGroupButtonClick = () => {
-        showGroupAddRoomDialog(this.props.groupId).then(() => {
-            this.forceUpdate();
-        });
-    };
-
-    makeGroupRoomTiles(query) {
-        const GroupRoomTile = sdk.getComponent("groups.GroupRoomTile");
-        query = (query || "").toLowerCase();
-
-        let roomList = this.state.rooms;
-        if (query) {
-            roomList = roomList.filter((room) => {
-                const matchesName = (room.name || "").toLowerCase().includes(query);
-                const matchesAlias = (room.canonicalAlias || "").toLowerCase().includes(query);
-                return matchesName || matchesAlias;
-            });
-        }
-
-        roomList = roomList.map((groupRoom, index) => {
-            return (
-                <GroupRoomTile
-                    key={index}
-                    groupId={this.props.groupId}
-                    groupRoom={groupRoom} />
-            );
-        });
-
-        return roomList;
-    }
-
-    render() {
-        if (this.state.rooms === null) {
-            return null;
-        }
-
-        let inviteButton;
-        if (GroupStore.isUserPrivileged(this.props.groupId)) {
-            inviteButton = (
-                <AccessibleButton
-                    className="mx_MemberList_invite mx_MemberList_addRoomToCommunity"
-                    onClick={this.onAddRoomToGroupButtonClick}
-                >
-                    <span>{ _t('Add rooms to this community') }</span>
-                </AccessibleButton>
-            );
-        }
-        const inputBox = (
-            <input
-                className="mx_GroupRoomList_query mx_textinput"
-                id="mx_GroupRoomList_query"
-                type="text"
-                onChange={this.onSearchQueryChanged}
-                value={this.state.searchQuery}
-                placeholder={_t('Filter community rooms')}
-                autoComplete="off"
-            />
-        );
-
-        const TruncatedList = sdk.getComponent("elements.TruncatedList");
-        return (
-            <div className="mx_GroupRoomList" role="tabpanel">
-                { inviteButton }
-                <AutoHideScrollbar className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
-                    <TruncatedList
-                        className="mx_GroupRoomList_wrapper"
-                        truncateAt={this.state.truncateAt}
-                        createOverflowElement={this._createOverflowTile}
-                    >
-                        { this.makeGroupRoomTiles(this.state.searchQuery) }
-                    </TruncatedList>
-                </AutoHideScrollbar>
-                { inputBox }
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
deleted file mode 100644
index 3f95fac2630..00000000000
--- a/src/components/views/groups/GroupRoomTile.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-import { GroupRoomType } from '../../../groups';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-
-@replaceableComponent("views.groups.GroupRoomTile")
-class GroupRoomTile extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-        groupRoom: GroupRoomType.isRequired,
-    };
-
-    static contextType = MatrixClientContext;
-
-    onClick = e => {
-        dis.dispatch({
-            action: 'view_group_room',
-            groupId: this.props.groupId,
-            groupRoomId: this.props.groupRoom.roomId,
-        });
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const avatarUrl = this.props.groupRoom.avatarUrl
-            ? mediaFromMxc(this.props.groupRoom.avatarUrl).getSquareThumbnailHttp(36)
-            : null;
-
-        const av = (
-            <BaseAvatar
-                name={this.props.groupRoom.displayname}
-                width={36}
-                height={36}
-                url={avatarUrl}
-            />
-        );
-
-        return (
-            <AccessibleButton className="mx_GroupRoomTile" onClick={this.onClick}>
-                <div className="mx_GroupRoomTile_avatar">
-                    { av }
-                </div>
-                <div className="mx_GroupRoomTile_name">
-                    { this.props.groupRoom.displayname }
-                </div>
-            </AccessibleButton>
-        );
-    }
-}
-
-export default GroupRoomTile;
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
deleted file mode 100644
index fbdab54563e..00000000000
--- a/src/components/views/groups/GroupTile.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-import FlairStore from '../../../stores/FlairStore';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-import { _t } from "../../../languageHandler";
-import TagOrderActions from "../../../actions/TagOrderActions";
-import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
-
-@replaceableComponent("views.groups.GroupTile")
-class GroupTile extends React.Component {
-    static propTypes = {
-        groupId: PropTypes.string.isRequired,
-        // Whether to show the short description of the group on the tile
-        showDescription: PropTypes.bool,
-        // Height of the group avatar in pixels
-        avatarHeight: PropTypes.number,
-    };
-
-    static contextType = MatrixClientContext;
-
-    static defaultProps = {
-        showDescription: true,
-        avatarHeight: 50,
-    };
-
-    state = {
-        profile: null,
-    };
-
-    componentDidMount() {
-        FlairStore.getGroupProfileCached(this.context, this.props.groupId).then((profile) => {
-            this.setState({ profile });
-        }).catch((err) => {
-            logger.error('Error whilst getting cached profile for GroupTile', err);
-        });
-    }
-
-    onClick = e => {
-        e.preventDefault();
-        dis.dispatch({
-            action: 'view_group',
-            group_id: this.props.groupId,
-        });
-    };
-
-    onPinClick = e => {
-        e.preventDefault();
-        e.stopPropagation();
-        dis.dispatch(TagOrderActions.moveTag(this.context, this.props.groupId, 0));
-    };
-
-    onUnpinClick = e => {
-        e.preventDefault();
-        e.stopPropagation();
-        dis.dispatch(TagOrderActions.removeTag(this.context, this.props.groupId));
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const profile = this.state.profile || {};
-        const name = profile.name || this.props.groupId;
-        const avatarHeight = this.props.avatarHeight;
-        const descElement = this.props.showDescription ?
-            <div className="mx_GroupTile_desc">{ profile.shortDescription }</div> :
-            <div />;
-        const httpUrl = profile.avatarUrl
-            ? mediaFromMxc(profile.avatarUrl).getSquareThumbnailHttp(avatarHeight)
-            : null;
-
-        const avatarElement = (
-            <div className="mx_GroupTile_avatar">
-                <BaseAvatar
-                    name={name}
-                    idName={this.props.groupId}
-                    url={httpUrl}
-                    width={avatarHeight}
-                    height={avatarHeight} />
-            </div>
-        );
-
-        return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
-            { avatarElement }
-            <div className="mx_GroupTile_profile">
-                <div className="mx_GroupTile_name">{ name }</div>
-                { descElement }
-                <div className="mx_GroupTile_groupId">{ this.props.groupId }</div>
-                { !(GroupFilterOrderStore.getOrderedTags() || []).includes(this.props.groupId)
-                    ? <AccessibleButton kind="link" onClick={this.onPinClick}>
-                        { _t("Pin") }
-                    </AccessibleButton>
-                    : <AccessibleButton kind="link" onClick={this.onUnpinClick}>
-                        { _t("Unpin") }
-                    </AccessibleButton>
-                }
-            </div>
-        </AccessibleButton>;
-    }
-}
-
-export default GroupTile;
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
deleted file mode 100644
index 9a0bd6a5e0e..00000000000
--- a/src/components/views/groups/GroupUserSettings.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.groups.GroupUserSettings")
-export default class GroupUserSettings extends React.Component {
-    static contextType = MatrixClientContext;
-
-    state = {
-        error: null,
-        groups: null,
-    };
-
-    componentDidMount() {
-        this.context.getJoinedGroups().then((result) => {
-            this.setState({ groups: result.groups || [], error: null });
-        }, (err) => {
-            logger.error(err);
-            this.setState({ groups: null, error: err });
-        });
-    }
-
-    render() {
-        let text = "";
-        let groupPublicityToggles = null;
-        const groups = this.state.groups;
-
-        if (this.state.error) {
-            text = _t('Something went wrong when trying to get your communities.');
-        } else if (groups === null) {
-            text = _t('Loading...');
-        } else if (groups.length > 0) {
-            const GroupPublicityToggle = sdk.getComponent('groups.GroupPublicityToggle');
-            groupPublicityToggles = groups.map((groupId, index) => {
-                return <GroupPublicityToggle key={index} groupId={groupId} />;
-            });
-            text = _t('Display your community flair in rooms configured to show it.');
-        } else {
-            text = _t("You're not currently a member of any communities.");
-        }
-
-        return (
-            <div>
-                <p className="mx_SettingsTab_subsectionText">{ text }</p>
-                <div className='mx_SettingsTab_subsectionText'>
-                    { groupPublicityToggles }
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/location/EnableLiveShare.tsx b/src/components/views/location/EnableLiveShare.tsx
new file mode 100644
index 00000000000..30a48746867
--- /dev/null
+++ b/src/components/views/location/EnableLiveShare.tsx
@@ -0,0 +1,63 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useState } from 'react';
+
+import { _t } from '../../../languageHandler';
+import StyledLiveBeaconIcon from '../beacon/StyledLiveBeaconIcon';
+import AccessibleButton from '../elements/AccessibleButton';
+import LabelledToggleSwitch from '../elements/LabelledToggleSwitch';
+import Heading from '../typography/Heading';
+
+interface Props {
+    onSubmit: () => void;
+}
+
+export const EnableLiveShare: React.FC<Props> = ({
+    onSubmit,
+}) => {
+    const [isEnabled, setEnabled] = useState(false);
+    return (
+        <div data-test-id='location-picker-enable-live-share' className='mx_EnableLiveShare'>
+            <StyledLiveBeaconIcon className='mx_EnableLiveShare_icon' />
+            <Heading className='mx_EnableLiveShare_heading' size='h3'>{ _t('Live location sharing') }</Heading>
+            <p className='mx_EnableLiveShare_description'>
+                { _t(
+                    'Please note: this is a labs feature using a temporary implementation. ' +
+                    'This means you will not be able to delete your location history, ' +
+                    'and advanced users will be able to see your location history ' +
+                    'even after you stop sharing your live location with this room.',
+                ) }
+            </p>
+            <LabelledToggleSwitch
+                data-test-id='enable-live-share-toggle'
+                value={isEnabled}
+                onChange={setEnabled}
+                label={_t('Enable live location sharing')}
+            />
+            <AccessibleButton
+                data-test-id='enable-live-share-submit'
+                className='mx_EnableLiveShare_button'
+                element='button'
+                kind='primary'
+                onClick={onSubmit}
+                disabled={!isEnabled}
+            >
+                { _t('OK') }
+            </AccessibleButton>
+        </div>
+    );
+};
diff --git a/src/components/views/location/LiveDurationDropdown.tsx b/src/components/views/location/LiveDurationDropdown.tsx
new file mode 100644
index 00000000000..3c2df61514a
--- /dev/null
+++ b/src/components/views/location/LiveDurationDropdown.tsx
@@ -0,0 +1,72 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import { formatDuration } from '../../../DateUtils';
+import { _t } from '../../../languageHandler';
+import Dropdown from '../elements/Dropdown';
+
+const DURATION_MS = {
+    fifteenMins: 900000,
+    oneHour: 3600000,
+    eightHours: 28800000,
+};
+
+export const DEFAULT_DURATION_MS = DURATION_MS.fifteenMins;
+
+interface Props {
+    timeout: number;
+    onChange: (timeout: number) => void;
+}
+
+const getLabel = (durationMs: number) => {
+    return _t('Share for %(duration)s', { duration: formatDuration(durationMs) });
+};
+
+const LiveDurationDropdown: React.FC<Props> = ({ timeout, onChange }) => {
+    const options = Object.values(DURATION_MS).map((duration) =>
+        ({ key: duration.toString(), duration, label: getLabel(duration) }),
+    );
+
+    // timeout is not one of our default values
+    // eg it was set by another client
+    if (!Object.values(DURATION_MS).includes(timeout)) {
+        options.push({
+            key: timeout.toString(), duration: timeout, label: getLabel(timeout),
+        });
+    }
+
+    const onOptionChange = (key: string) => {
+        // stringified value back to number
+        onChange(+key);
+    };
+
+    return <Dropdown
+        id='live-duration'
+        data-test-id='live-duration-dropdown'
+        label={getLabel(timeout)}
+        value={timeout.toString()}
+        onOptionChange={onOptionChange}
+        className='mx_LiveDurationDropdown'
+    >
+        { options.map(({ key, label }) =>
+            <div data-test-id={`live-duration-option-${key}`} key={key}>{ label }</div>,
+        ) }
+    </Dropdown>;
+};
+
+export default LiveDurationDropdown;
diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx
index 150b8355e82..254ec335cbd 100644
--- a/src/components/views/location/LocationPicker.tsx
+++ b/src/components/views/location/LocationPicker.tsx
@@ -15,41 +15,41 @@ limitations under the License.
 */
 
 import React, { SyntheticEvent } from 'react';
-import maplibregl from 'maplibre-gl';
+import maplibregl, { MapMouseEvent } from 'maplibre-gl';
 import { logger } from "matrix-js-sdk/src/logger";
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import { ClientEvent, IClientWellKnown } from 'matrix-js-sdk/src/client';
 
-import DialogButtons from "../elements/DialogButtons";
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import MemberAvatar from '../avatars/MemberAvatar';
 import MatrixClientContext from '../../../contexts/MatrixClientContext';
 import Modal from '../../../Modal';
-import ErrorDialog from '../dialogs/ErrorDialog';
-import { findMapStyleUrl } from '../messages/MLocationBody';
+import SdkConfig from '../../../SdkConfig';
 import { tileServerFromWellKnown } from '../../../utils/WellKnownUtils';
+import { GenericPosition, genericPositionFromGeolocation, getGeoUri } from '../../../utils/beacon';
+import { LocationShareError, findMapStyleUrl } from '../../../utils/location';
+import ErrorDialog from '../dialogs/ErrorDialog';
+import AccessibleButton from '../elements/AccessibleButton';
+import { MapError } from './MapError';
+import LiveDurationDropdown, { DEFAULT_DURATION_MS } from './LiveDurationDropdown';
+import { LocationShareType, ShareLocationFn } from './shareLocation';
+import Marker from './Marker';
 
 export interface ILocationPickerProps {
     sender: RoomMember;
-    onChoose(uri: string, ts: number): unknown;
+    shareType: LocationShareType;
+    onChoose: ShareLocationFn;
     onFinished(ev?: SyntheticEvent): void;
 }
 
 interface IState {
-    position?: GeolocationPosition;
-    error: Error;
+    timeout: number;
+    position?: GenericPosition;
+    error?: LocationShareError;
 }
 
-/*
- * An older version of this file allowed manually picking a location on
- * the map to share, instead of sharing your current location.
- * Since the current designs do not cover this case, it was removed from
- * the code but you should be able to find it in the git history by
- * searching for the commit that remove manualPosition from this file.
- */
-
-@replaceableComponent("views.location.LocationPicker")
+const isSharingOwnLocation = (shareType: LocationShareType): boolean =>
+    shareType === LocationShareType.Own || shareType === LocationShareType.Live;
+
 class LocationPicker extends React.Component<ILocationPickerProps, IState> {
     public static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
@@ -62,6 +62,7 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
 
         this.state = {
             position: undefined,
+            timeout: DEFAULT_DURATION_MS,
             error: undefined,
         };
     }
@@ -88,23 +89,16 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
                 },
                 trackUserLocation: true,
             });
-            this.map.addControl(this.geolocate);
 
-            this.marker = new maplibregl.Marker({
-                element: document.getElementById(this.getMarkerId()),
-                anchor: 'bottom',
-                offset: [0, -1],
-            })
-                .setLngLat(new maplibregl.LngLat(0, 0))
-                .addTo(this.map);
+            this.map.addControl(this.geolocate);
 
             this.map.on('error', (e) => {
                 logger.error(
                     "Failed to load map: check map_style_url in config.json "
-                        + "has a valid URL and API key",
+                    + "has a valid URL and API key",
                     e.error,
                 );
-                this.setState({ error: e.error });
+                this.setState({ error: LocationShareError.MapStyleUrlNotReachable });
             });
 
             this.map.on('load', () => {
@@ -112,19 +106,43 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
             });
 
             this.geolocate.on('error', this.onGeolocateError);
-            this.geolocate.on('geolocate', this.onGeolocate);
+
+            if (isSharingOwnLocation(this.props.shareType)) {
+                this.geolocate.on('geolocate', this.onGeolocate);
+            }
+
+            if (this.props.shareType === LocationShareType.Pin) {
+                const navigationControl = new maplibregl.NavigationControl({
+                    showCompass: false, showZoom: true,
+                });
+                this.map.addControl(navigationControl, 'bottom-right');
+                this.map.on('click', this.onClick);
+            }
         } catch (e) {
             logger.error("Failed to render map", e);
-            this.setState({ error: e });
+            const errorType = e?.message === LocationShareError.MapStyleUrlNotConfigured ?
+                LocationShareError.MapStyleUrlNotConfigured :
+                LocationShareError.Default;
+            this.setState({ error: errorType });
         }
     }
 
     componentWillUnmount() {
         this.geolocate?.off('error', this.onGeolocateError);
         this.geolocate?.off('geolocate', this.onGeolocate);
+        this.map?.off('click', this.onClick);
         this.context.off(ClientEvent.ClientWellKnown, this.updateStyleUrl);
     }
 
+    private addMarkerToMap = () => {
+        this.marker = new maplibregl.Marker({
+            element: document.getElementById(this.getMarkerId()),
+            anchor: 'bottom',
+            offset: [0, -1],
+        }).setLngLat(new maplibregl.LngLat(0, 0))
+            .addTo(this.map);
+    };
+
     private updateStyleUrl = (clientWellKnown: IClientWellKnown) => {
         const style = tileServerFromWellKnown(clientWellKnown)?.["map_style_url"];
         if (style) {
@@ -133,7 +151,10 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
     };
 
     private onGeolocate = (position: GeolocationPosition) => {
-        this.setState({ position });
+        if (!this.marker) {
+            this.addMarkerToMap();
+        }
+        this.setState({ position: genericPositionFromGeolocation(position) });
         this.marker?.setLngLat(
             new maplibregl.LngLat(
                 position.coords.longitude,
@@ -142,89 +163,123 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
         );
     };
 
+    private onClick = (event: MapMouseEvent) => {
+        if (!this.marker) {
+            this.addMarkerToMap();
+        }
+        this.marker?.setLngLat(event.lngLat);
+        this.setState({
+            position: {
+                timestamp: Date.now(),
+                latitude: event.lngLat.lat,
+                longitude: event.lngLat.lng,
+            },
+        });
+    };
+
     private onGeolocateError = (e: GeolocationPositionError) => {
-        this.props.onFinished();
         logger.error("Could not fetch location", e);
-        Modal.createTrackedDialog(
-            'Could not fetch location',
-            '',
-            ErrorDialog,
-            {
-                title: _t("Could not fetch location"),
-                description: positionFailureMessage(e.code),
-            },
-        );
+        // close the dialog and show an error when trying to share own location
+        // pin drop location without permissions is ok
+        if (isSharingOwnLocation(this.props.shareType)) {
+            this.props.onFinished();
+            Modal.createTrackedDialog(
+                'Could not fetch location',
+                '',
+                ErrorDialog,
+                {
+                    title: _t("Could not fetch location"),
+                    description: positionFailureMessage(e.code),
+                },
+            );
+        }
+
+        if (this.geolocate) {
+            this.map?.removeControl(this.geolocate);
+        }
+    };
+
+    private onTimeoutChange = (timeout: number): void => {
+        this.setState({ timeout });
     };
 
     private onOk = () => {
-        const position = this.state.position;
+        const { timeout, position } = this.state;
 
-        this.props.onChoose(position ? getGeoUri(position) : undefined, position?.timestamp);
+        this.props.onChoose(
+            position ? { uri: getGeoUri(position), timestamp: position.timestamp, timeout } : {
+                timeout,
+            });
         this.props.onFinished();
     };
 
     render() {
-        const error = this.state.error ?
-            <div className="mx_LocationPicker_error">
-                { _t("Failed to load map") }
-            </div> : null;
+        if (this.state.error) {
+            return <div className="mx_LocationPicker mx_LocationPicker_hasError">
+                <MapError
+                    error={this.state.error}
+                    onFinished={this.props.onFinished} />
+            </div>;
+        }
 
         return (
             <div className="mx_LocationPicker">
                 <div id="mx_LocationPicker_map" />
-                { error }
+
+                { this.props.shareType === LocationShareType.Pin && <div className="mx_LocationPicker_pinText">
+                    <span>
+                        { this.state.position ? _t("Click to move the pin") : _t("Click to drop a pin") }
+                    </span>
+                </div>
+                }
                 <div className="mx_LocationPicker_footer">
                     <form onSubmit={this.onOk}>
-                        <DialogButtons
-                            primaryButton={_t('Share location')}
-                            primaryIsSubmit={true}
-                            onPrimaryButtonClick={this.onOk}
-                            hasCancel={false}
-                            primaryDisabled={!this.state.position}
-                        />
+                        { this.props.shareType === LocationShareType.Live &&
+                            <LiveDurationDropdown
+                                onChange={this.onTimeoutChange}
+                                timeout={this.state.timeout}
+                            />
+                        }
+                        <AccessibleButton
+                            data-test-id="location-picker-submit-button"
+                            type="submit"
+                            element='button'
+                            kind='primary'
+                            className='mx_LocationPicker_submitButton'
+                            disabled={!this.state.position}
+                            onClick={this.onOk}>
+                            { _t('Share location') }
+                        </AccessibleButton>
                     </form>
                 </div>
-                <div className="mx_MLocationBody_marker" id={this.getMarkerId()}>
-                    <div className="mx_MLocationBody_markerBorder">
-                        <MemberAvatar
-                            member={this.props.sender}
-                            width={27}
-                            height={27}
-                            viewUserOnClick={false}
-                        />
-                    </div>
-                    <div
-                        className="mx_MLocationBody_pointer"
+                <div id={this.getMarkerId()}>
+                    { /*
+                    maplibregl hijacks the div above to style the marker
+                    it must be in the dom when the map is initialised
+                    and keep a consistent class
+                    we want to hide the marker until it is set in the case of pin drop
+                    so hide the internal visible elements
+                    */ }
+
+                    { !!this.marker && <Marker
+                        roomMember={isSharingOwnLocation(this.props.shareType) ? this.props.sender : undefined}
+                        useMemberColor={this.props.shareType === LocationShareType.Live}
                     />
+                    }
                 </div>
             </div>
         );
     }
 }
 
-export function getGeoUri(position: GeolocationPosition): string {
-    const lat = position.coords.latitude;
-    const lon = position.coords.longitude;
-    const alt = (
-        Number.isFinite(position.coords.altitude)
-            ? `,${position.coords.altitude}`
-            : ""
-    );
-    const acc = (
-        Number.isFinite(position.coords.accuracy)
-            ? `;u=${ position.coords.accuracy }`
-            : ""
-    );
-    return `geo:${lat},${lon}${alt}${acc}`;
-}
-
 export default LocationPicker;
 
 function positionFailureMessage(code: number): string {
+    const brand = SdkConfig.get().brand;
     switch (code) {
         case 1: return _t(
-            "Element was denied permission to fetch your location. " +
-            "Please allow location access in your browser settings.",
+            "%(brand)s was denied permission to fetch your location. " +
+            "Please allow location access in your browser settings.", { brand },
         );
         case 2: return _t(
             "Failed to fetch your location. Please try again later.",
diff --git a/src/components/views/location/LocationShareMenu.tsx b/src/components/views/location/LocationShareMenu.tsx
index ab332517942..8be6c070db2 100644
--- a/src/components/views/location/LocationShareMenu.tsx
+++ b/src/components/views/location/LocationShareMenu.tsx
@@ -21,12 +21,17 @@ import { IEventRelation } from 'matrix-js-sdk/src/models/event';
 import MatrixClientContext from '../../../contexts/MatrixClientContext';
 import ContextMenu, { AboveLeftOf } from '../../structures/ContextMenu';
 import LocationPicker, { ILocationPickerProps } from "./LocationPicker";
-import { shareLocation } from './shareLocation';
+import { shareLiveLocation, shareLocation } from './shareLocation';
 import SettingsStore from '../../../settings/SettingsStore';
-import ShareType, { LocationShareType } from './ShareType';
 import ShareDialogButtons from './ShareDialogButtons';
+import ShareType from './ShareType';
+import { LocationShareType } from './shareLocation';
+import { OwnProfileStore } from '../../../stores/OwnProfileStore';
+import { EnableLiveShare } from './EnableLiveShare';
+import { useFeatureEnabled } from '../../../hooks/useSettings';
+import { SettingLevel } from '../../../settings/SettingLevel';
 
-type Props = Omit<ILocationPickerProps, 'onChoose'> & {
+type Props = Omit<ILocationPickerProps, 'onChoose' | 'shareType'> & {
     onFinished: (ev?: SyntheticEvent) => void;
     menuPosition: AboveLeftOf;
     openMenu: () => void;
@@ -35,14 +40,13 @@ type Props = Omit<ILocationPickerProps, 'onChoose'> & {
 };
 
 const getEnabledShareTypes = (): LocationShareType[] => {
-    const isPinDropLocationShareEnabled = SettingsStore.getValue("feature_location_share_pin_drop");
+    const enabledShareTypes = [LocationShareType.Own, LocationShareType.Live];
 
-    if (isPinDropLocationShareEnabled) {
-        return [LocationShareType.Own, LocationShareType.Pin];
+    if (SettingsStore.getValue("feature_location_share_pin_drop")) {
+        enabledShareTypes.push(LocationShareType.Pin);
     }
-    return [
-        LocationShareType.Own,
-    ];
+
+    return enabledShareTypes;
 };
 
 const LocationShareMenu: React.FC<Props> = ({
@@ -55,6 +59,7 @@ const LocationShareMenu: React.FC<Props> = ({
 }) => {
     const matrixClient = useContext(MatrixClientContext);
     const enabledShareTypes = getEnabledShareTypes();
+    const isLiveShareEnabled = useFeatureEnabled("feature_location_share_live");
 
     const multipleShareTypesEnabled = enabledShareTypes.length > 1;
 
@@ -62,19 +67,40 @@ const LocationShareMenu: React.FC<Props> = ({
         multipleShareTypesEnabled ? undefined : LocationShareType.Own,
     );
 
+    const displayName = OwnProfileStore.instance.displayName;
+
+    const onLocationSubmit = shareType === LocationShareType.Live ?
+        shareLiveLocation(matrixClient, roomId, displayName, openMenu) :
+        shareLocation(matrixClient, roomId, shareType, relation, openMenu);
+
+    const onLiveShareEnableSubmit = () => {
+        SettingsStore.setValue("feature_location_share_live", undefined, SettingLevel.DEVICE, true);
+    };
+
+    const shouldAdvertiseLiveLabsFlag = shareType === LocationShareType.Live && !isLiveShareEnabled;
+
     return <ContextMenu
         {...menuPosition}
         onFinished={onFinished}
         managed={false}
     >
         <div className="mx_LocationShareMenu">
-            { shareType ? <LocationPicker
-                sender={sender}
-                onChoose={shareLocation(matrixClient, roomId, relation, openMenu)}
-                onFinished={onFinished}
-            />
-                :
-                <ShareType setShareType={setShareType} enabledShareTypes={enabledShareTypes} /> }
+            { shouldAdvertiseLiveLabsFlag &&
+                <EnableLiveShare
+                    onSubmit={onLiveShareEnableSubmit}
+                />
+            }
+            { !shouldAdvertiseLiveLabsFlag && !!shareType &&
+                <LocationPicker
+                    sender={sender}
+                    shareType={shareType}
+                    onChoose={onLocationSubmit}
+                    onFinished={onFinished}
+                />
+            }
+            { !shareType &&
+                <ShareType setShareType={setShareType} enabledShareTypes={enabledShareTypes} />
+            }
             <ShareDialogButtons displayBack={!!shareType && multipleShareTypesEnabled} onBack={() => setShareType(undefined)} onCancel={onFinished} />
         </div>
     </ContextMenu>;
diff --git a/src/components/views/location/LocationViewDialog.tsx b/src/components/views/location/LocationViewDialog.tsx
index bc40255c216..9651b744584 100644
--- a/src/components/views/location/LocationViewDialog.tsx
+++ b/src/components/views/location/LocationViewDialog.tsx
@@ -16,13 +16,14 @@ limitations under the License.
 
 import React from 'react';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
-import { ClientEvent, IClientWellKnown, MatrixClient } from 'matrix-js-sdk/src/client';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "../dialogs/BaseDialog";
 import { IDialogProps } from "../dialogs/IDialogProps";
-import { createMap, LocationBodyContent, locationEventGeoUri, parseGeoUri } from '../messages/MLocationBody';
-import { tileServerFromWellKnown } from '../../../utils/WellKnownUtils';
+import { locationEventGeoUri, isSelfLocation } from '../../../utils/location';
+import Map from './Map';
+import SmartMarker from './SmartMarker';
+import ZoomButtons from './ZoomButtons';
 
 interface IProps extends IDialogProps {
     matrixClient: MatrixClient;
@@ -33,80 +34,58 @@ interface IState {
     error: Error;
 }
 
-@replaceableComponent("views.location.LocationViewDialog")
+/**
+ * Dialog to view m.location events maximised
+ */
 export default class LocationViewDialog extends React.Component<IProps, IState> {
-    private coords: GeolocationCoordinates;
-    private map?: maplibregl.Map;
-
     constructor(props: IProps) {
         super(props);
 
-        this.coords = parseGeoUri(locationEventGeoUri(this.props.mxEvent));
-        this.map = null;
         this.state = {
             error: undefined,
         };
     }
 
-    componentDidMount() {
-        if (this.state.error) {
-            return;
-        }
-
-        this.props.matrixClient.on(ClientEvent.ClientWellKnown, this.updateStyleUrl);
-
-        this.map = createMap(
-            this.coords,
-            true,
-            this.getBodyId(),
-            this.getMarkerId(),
-            (e: Error) => this.setState({ error: e }),
-        );
-    }
-
-    componentWillUnmount() {
-        this.props.matrixClient.off(ClientEvent.ClientWellKnown, this.updateStyleUrl);
-    }
-
-    private updateStyleUrl = (clientWellKnown: IClientWellKnown) => {
-        const style = tileServerFromWellKnown(clientWellKnown)?.["map_style_url"];
-        if (style) {
-            this.map?.setStyle(style);
-        }
-    };
-
     private getBodyId = () => {
         return `mx_LocationViewDialog_${this.props.mxEvent.getId()}`;
     };
 
-    private getMarkerId = () => {
-        return `mx_MLocationViewDialog_marker_${this.props.mxEvent.getId()}`;
-    };
-
-    private onZoomIn = () => {
-        this.map?.zoomIn();
-    };
-
-    private onZoomOut = () => {
-        this.map?.zoomOut();
+    private onError = (error) => {
+        this.setState({ error });
     };
 
     render() {
+        const { mxEvent } = this.props;
+
+        // only pass member to marker when should render avatar marker
+        const markerRoomMember = isSelfLocation(mxEvent.getContent()) ? mxEvent.sender : undefined;
+        const geoUri = locationEventGeoUri(mxEvent);
         return (
             <BaseDialog
                 className='mx_LocationViewDialog'
                 onFinished={this.props.onFinished}
                 fixedWidth={false}
             >
-                <LocationBodyContent
-                    mxEvent={this.props.mxEvent}
-                    bodyId={this.getBodyId()}
-                    markerId={this.getMarkerId()}
-                    error={this.state.error}
-                    zoomButtons={true}
-                    onZoomIn={this.onZoomIn}
-                    onZoomOut={this.onZoomOut}
-                />
+                <Map
+                    id={this.getBodyId()}
+                    centerGeoUri={geoUri}
+                    onError={this.onError}
+                    interactive
+                    className="mx_LocationViewDialog_map"
+                >
+                    {
+                        ({ map }) =>
+                            <>
+                                <SmartMarker
+                                    map={map}
+                                    id={`${this.getBodyId()}-marker`}
+                                    geoUri={geoUri}
+                                    roomMember={markerRoomMember}
+                                />
+                                <ZoomButtons map={map} />
+                            </>
+                    }
+                </Map>
             </BaseDialog>
         );
     }
diff --git a/src/components/views/location/Map.tsx b/src/components/views/location/Map.tsx
new file mode 100644
index 00000000000..b3e109f4538
--- /dev/null
+++ b/src/components/views/location/Map.tsx
@@ -0,0 +1,124 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { ReactNode, useContext, useEffect } from 'react';
+import classNames from 'classnames';
+import maplibregl from 'maplibre-gl';
+import { ClientEvent, IClientWellKnown } from 'matrix-js-sdk/src/matrix';
+import { logger } from 'matrix-js-sdk/src/logger';
+
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { parseGeoUri } from '../../../utils/location';
+import { tileServerFromWellKnown } from '../../../utils/WellKnownUtils';
+import { useMap } from '../../../utils/location/useMap';
+import { Bounds } from '../../../utils/beacon/bounds';
+
+const useMapWithStyle = ({ id, centerGeoUri, onError, interactive, bounds }) => {
+    const bodyId = `mx_Map_${id}`;
+
+    // style config
+    const context = useContext(MatrixClientContext);
+    const mapStyleUrl = useEventEmitterState(
+        context,
+        ClientEvent.ClientWellKnown,
+        (clientWellKnown: IClientWellKnown) => tileServerFromWellKnown(clientWellKnown)?.["map_style_url"],
+    );
+
+    const map = useMap({ interactive, bodyId, onError });
+
+    useEffect(() => {
+        if (mapStyleUrl && map) {
+            map.setStyle(mapStyleUrl);
+        }
+    }, [mapStyleUrl, map]);
+
+    useEffect(() => {
+        if (map && centerGeoUri) {
+            try {
+                const coords = parseGeoUri(centerGeoUri);
+                map.setCenter({ lon: coords.longitude, lat: coords.latitude });
+            } catch (error) {
+                logger.error('Could not set map center', centerGeoUri);
+            }
+        }
+    }, [map, centerGeoUri]);
+
+    useEffect(() => {
+        if (map && bounds) {
+            try {
+                const lngLatBounds = new maplibregl.LngLatBounds(
+                    [bounds.west, bounds.south],
+                    [bounds.east, bounds.north],
+                );
+                map.fitBounds(lngLatBounds, { padding: 100, maxZoom: 15 });
+            } catch (error) {
+                logger.error('Invalid map bounds', error);
+            }
+        }
+    }, [map, bounds]);
+
+    return {
+        map,
+        bodyId,
+    };
+};
+
+interface MapProps {
+    id: string;
+    interactive?: boolean;
+    centerGeoUri?: string;
+    bounds?: Bounds;
+    className?: string;
+    onClick?: () => void;
+    onError?: (error: Error) => void;
+    children?: (renderProps: {
+        map: maplibregl.Map;
+    }) => ReactNode;
+}
+
+const Map: React.FC<MapProps> = ({
+    bounds,
+    centerGeoUri,
+    children,
+    className,
+    id,
+    interactive,
+    onError, onClick,
+}) => {
+    const { map, bodyId } = useMapWithStyle({ centerGeoUri, onError, id, interactive, bounds });
+
+    const onMapClick = (
+        event: React.MouseEvent<HTMLDivElement, MouseEvent>,
+    ) => {
+        // Eat click events when clicking the attribution button
+        const target = event.target as Element;
+        if (target.classList.contains("maplibregl-ctrl-attrib-button")) {
+            return;
+        }
+
+        onClick && onClick();
+    };
+
+    return <div className={classNames('mx_Map', className)}
+        id={bodyId}
+        onClick={onMapClick}
+    >
+        { !!children && !!map && children({ map }) }
+    </div>;
+};
+
+export default Map;
diff --git a/src/components/views/location/MapError.tsx b/src/components/views/location/MapError.tsx
new file mode 100644
index 00000000000..7bbcbd0b90f
--- /dev/null
+++ b/src/components/views/location/MapError.tsx
@@ -0,0 +1,39 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import { Icon as WarningBadge } from '../../../../res/img/element-icons/warning-badge.svg';
+import { _t } from '../../../languageHandler';
+import { getLocationShareErrorMessage, LocationShareError } from '../../../utils/location';
+import AccessibleButton from '../elements/AccessibleButton';
+import Heading from '../typography/Heading';
+
+interface Props {
+    onFinished: () => void;
+    error: LocationShareError;
+}
+
+export const MapError: React.FC<Props> = ({
+    onFinished, error,
+}) => (<div data-test-id='location-picker-error' className="mx_MapError">
+    <WarningBadge className="mx_MapError_icon" />
+    <Heading className="mx_MapError_heading" size='h3'>{ _t("Unable to load map") }</Heading>
+    <p>
+        { getLocationShareErrorMessage(error) }
+    </p>
+    <AccessibleButton element='button' kind="primary" onClick={onFinished}>{ _t("OK") }</AccessibleButton>
+</div>);
diff --git a/src/components/views/location/Marker.tsx b/src/components/views/location/Marker.tsx
new file mode 100644
index 00000000000..bacade71cf4
--- /dev/null
+++ b/src/components/views/location/Marker.tsx
@@ -0,0 +1,59 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import classNames from 'classnames';
+import { RoomMember } from 'matrix-js-sdk/src/matrix';
+
+import { Icon as LocationIcon } from '../../../../res/img/element-icons/location.svg';
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
+import MemberAvatar from '../avatars/MemberAvatar';
+
+interface Props {
+    id?: string;
+    // renders MemberAvatar when provided
+    roomMember?: RoomMember;
+    // use member text color as background
+    useMemberColor?: boolean;
+}
+
+/**
+ * Generic location marker
+ */
+const Marker = React.forwardRef<HTMLDivElement, Props>(({ id, roomMember, useMemberColor }, ref) => {
+    const memberColorClass = useMemberColor && roomMember ? getUserNameColorClass(roomMember.userId) : '';
+    return <div
+        ref={ref}
+        id={id}
+        className={classNames("mx_Marker", memberColorClass, {
+            "mx_Marker_defaultColor": !memberColorClass,
+        })}
+    >
+        <div className="mx_Marker_border">
+            { roomMember ?
+                <MemberAvatar
+                    member={roomMember}
+                    width={36}
+                    height={36}
+                    viewUserOnClick={false}
+                />
+                : <LocationIcon className="mx_Marker_icon" />
+            }
+        </div>
+    </div>;
+});
+
+export default Marker;
diff --git a/src/components/views/location/ShareType.tsx b/src/components/views/location/ShareType.tsx
index 8e16660dcb6..6f4ad2d2646 100644
--- a/src/components/views/location/ShareType.tsx
+++ b/src/components/views/location/ShareType.tsx
@@ -19,12 +19,12 @@ import React, { HTMLAttributes, useContext } from 'react';
 import MatrixClientContext from '../../../contexts/MatrixClientContext';
 import { _t } from '../../../languageHandler';
 import { OwnProfileStore } from '../../../stores/OwnProfileStore';
-import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import BaseAvatar from '../avatars/BaseAvatar';
 import AccessibleButton from '../elements/AccessibleButton';
 import Heading from '../typography/Heading';
 import { Icon as LocationIcon } from '../../../../res/img/element-icons/location.svg';
-import { Icon as LiveLocationIcon } from '../../../../res/img/location/live-location.svg';
+import { LocationShareType } from './shareLocation';
+import StyledLiveBeaconIcon from '../beacon/StyledLiveBeaconIcon';
 
 const UserAvatar = () => {
     const matrixClient = useContext(MatrixClientContext);
@@ -33,9 +33,8 @@ const UserAvatar = () => {
     // 40 - 2px border
     const avatarSize = 36;
     const avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
-    const colorClass = getUserNameColorClass(userId);
 
-    return <div className={`mx_ShareType_option-icon ${LocationShareType.Own} ${colorClass}`}>
+    return <div className={`mx_ShareType_option-icon ${LocationShareType.Own}`}>
         <BaseAvatar
             idName={userId}
             name={displayName}
@@ -48,12 +47,6 @@ const UserAvatar = () => {
     </div>;
 };
 
-// TODO this will be defined somewhere better
-export enum LocationShareType {
-    Own = 'Own',
-    Pin = 'Pin',
-    Live = 'Live'
-}
 type ShareTypeOptionProps = HTMLAttributes<Element> & { label: string, shareType: LocationShareType };
 const ShareTypeOption: React.FC<ShareTypeOptionProps> = ({
     onClick, label, shareType, ...rest
@@ -61,14 +54,12 @@ const ShareTypeOption: React.FC<ShareTypeOptionProps> = ({
     element='button'
     className='mx_ShareType_option'
     onClick={onClick}
-    // not yet implemented
-    disabled={shareType !== LocationShareType.Own}
     {...rest}>
     { shareType === LocationShareType.Own && <UserAvatar /> }
     { shareType === LocationShareType.Pin &&
             <LocationIcon className={`mx_ShareType_option-icon ${LocationShareType.Pin}`} /> }
     { shareType === LocationShareType.Live &&
-            <LiveLocationIcon className={`mx_ShareType_option-icon ${LocationShareType.Live}`} /> }
+            <StyledLiveBeaconIcon className={`mx_ShareType_option-icon ${LocationShareType.Live}`} /> }
 
     { label }
 </AccessibleButton>;
diff --git a/src/components/views/location/SmartMarker.tsx b/src/components/views/location/SmartMarker.tsx
new file mode 100644
index 00000000000..c4a7c61e32b
--- /dev/null
+++ b/src/components/views/location/SmartMarker.tsx
@@ -0,0 +1,92 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useCallback, useEffect, useState } from 'react';
+import maplibregl from 'maplibre-gl';
+import { RoomMember } from 'matrix-js-sdk/src/matrix';
+
+import { createMarker, parseGeoUri } from '../../../utils/location';
+import Marker from './Marker';
+
+const useMapMarker = (
+    map: maplibregl.Map,
+    geoUri: string,
+): { marker?: maplibregl.Marker, onElementRef: (el: HTMLDivElement) => void } => {
+    const [marker, setMarker] = useState<maplibregl.Marker>();
+
+    const onElementRef = useCallback((element: HTMLDivElement) => {
+        if (marker || !element) {
+            return;
+        }
+        const coords = parseGeoUri(geoUri);
+        const newMarker = createMarker(coords, element);
+        newMarker.addTo(map);
+        setMarker(newMarker);
+    }, [marker, geoUri, map]);
+
+    useEffect(() => {
+        if (marker) {
+            const coords = parseGeoUri(geoUri);
+            marker.setLngLat({ lon: coords.longitude, lat: coords.latitude });
+        }
+    }, [marker, geoUri]);
+
+    useEffect(() => () => {
+        if (marker) {
+            marker.remove();
+        }
+    }, [marker]);
+
+    return {
+        marker,
+        onElementRef,
+    };
+};
+
+interface SmartMarkerProps {
+    map: maplibregl.Map;
+    geoUri: string;
+    id?: string;
+    // renders MemberAvatar when provided
+    roomMember?: RoomMember;
+    // use member text color as background
+    useMemberColor?: boolean;
+}
+
+/**
+ * Generic location marker
+ */
+const SmartMarker: React.FC<SmartMarkerProps> = ({ id, map, geoUri, roomMember, useMemberColor }) => {
+    const { onElementRef } = useMapMarker(map, geoUri);
+
+    return (
+        // maplibregl hijacks the Marker dom element
+        // and removes it from the dom when the maplibregl.Marker instance
+        // is removed
+        // wrap in a span so that react doesn't get confused
+        // when trying to unmount this component
+        <span>
+            <Marker
+                ref={onElementRef}
+                id={id}
+                roomMember={roomMember}
+                useMemberColor={useMemberColor}
+            />
+        </span>
+    );
+};
+
+export default SmartMarker;
diff --git a/src/components/views/location/ZoomButtons.tsx b/src/components/views/location/ZoomButtons.tsx
new file mode 100644
index 00000000000..80d2883ad6e
--- /dev/null
+++ b/src/components/views/location/ZoomButtons.tsx
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import maplibregl from 'maplibre-gl';
+
+import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
+import { Icon as PlusIcon } from '../../../../res/img/element-icons/plus-button.svg';
+import { Icon as MinusIcon } from '../../../../res/img/element-icons/minus-button.svg';
+
+interface Props {
+    map: maplibregl.Map;
+}
+
+const ZoomButtons: React.FC<Props> = ({ map }) => {
+    const onZoomIn = () => {
+        map.zoomIn();
+    };
+
+    const onZoomOut = () => {
+        map.zoomOut();
+    };
+
+    return <div className="mx_ZoomButtons">
+        <AccessibleButton
+            onClick={onZoomIn}
+            data-test-id='map-zoom-in-button'
+            title={_t("Zoom in")}
+            className='mx_ZoomButtons_button'
+        >
+            <PlusIcon className='mx_ZoomButtons_icon' />
+        </AccessibleButton>
+        <AccessibleButton
+            onClick={onZoomOut}
+            data-test-id='map-zoom-out-button'
+            title={_t("Zoom out")}
+            className='mx_ZoomButtons_button'
+        >
+            <MinusIcon className='mx_ZoomButtons_icon' />
+        </AccessibleButton>
+    </div>;
+};
+
+export default ZoomButtons;
diff --git a/src/components/views/location/shareLocation.ts b/src/components/views/location/shareLocation.ts
index bd98f2ea8b2..895f2c23c6c 100644
--- a/src/components/views/location/shareLocation.ts
+++ b/src/components/views/location/shareLocation.ts
@@ -14,48 +14,96 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { RelationType } from "matrix-js-sdk/src/@types/event";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
+import { makeLocationContent, makeBeaconInfoContent } from "matrix-js-sdk/src/content-helpers";
 import { logger } from "matrix-js-sdk/src/logger";
 import { IEventRelation } from "matrix-js-sdk/src/models/event";
+import { LocationAssetType } from "matrix-js-sdk/src/@types/location";
+import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
 import QuestionDialog from "../dialogs/QuestionDialog";
 import SdkConfig from "../../../SdkConfig";
+import { OwnBeaconStore } from "../../../stores/OwnBeaconStore";
+
+export enum LocationShareType {
+    Own = 'Own',
+    Pin = 'Pin',
+    Live = 'Live'
+}
+
+export type LocationShareProps = {
+    timeout?: number;
+    uri?: string;
+    timestamp?: number;
+};
+
+// default duration to 5min for now
+const DEFAULT_LIVE_DURATION = 300000;
+
+export type ShareLocationFn = (props: LocationShareProps) => Promise<void>;
+
+const handleShareError = (error: Error, openMenu: () => void, shareType: LocationShareType) => {
+    const errorMessage = shareType === LocationShareType.Live ?
+        "We couldn't start sharing your live location" :
+        "We couldn't send your location";
+    logger.error(errorMessage, error);
+    const analyticsAction = errorMessage;
+    const params = {
+        title: _t("We couldn't send your location"),
+        description: _t("%(brand)s could not send your location. Please try again later.", {
+            brand: SdkConfig.get().brand,
+        }),
+        button: _t('Try again'),
+        cancelButton: _t('Cancel'),
+        onFinished: (tryAgain: boolean) => {
+            if (tryAgain) {
+                openMenu();
+            }
+        },
+    };
+    Modal.createTrackedDialog(analyticsAction, '', QuestionDialog, params);
+};
+
+export const shareLiveLocation = (
+    client: MatrixClient, roomId: string, displayName: string, openMenu: () => void,
+): ShareLocationFn => async ({ timeout }) => {
+    const description = _t(`%(displayName)s's live location`, { displayName });
+    try {
+        await OwnBeaconStore.instance.createLiveBeacon(
+            roomId,
+            makeBeaconInfoContent(
+                timeout ?? DEFAULT_LIVE_DURATION,
+                true, /* isLive */
+                description,
+                LocationAssetType.Self,
+            ),
+        );
+    } catch (error) {
+        handleShareError(error, openMenu, LocationShareType.Live);
+    }
+};
 
 export const shareLocation = (
     client: MatrixClient,
     roomId: string,
+    shareType: LocationShareType,
     relation: IEventRelation | undefined,
     openMenu: () => void,
-) => async (uri: string, ts: number) => {
-    if (!uri) return false;
+): ShareLocationFn => async ({ uri, timestamp }) => {
+    if (!uri) return;
     try {
-        const text = textForLocation(uri, ts, null);
-        const threadId = relation?.rel_type === RelationType.Thread ? relation.event_id : null;
-        await client.sendMessage(roomId, threadId, makeLocationContent(text, uri, ts, null));
-    } catch (e) {
-        logger.error("We couldn't send your location", e);
-
-        const analyticsAction = "We couldn't send your location";
-        const params = {
-            title: _t("We couldn't send your location"),
-            description: _t("%(brand)s could not send your location. Please try again later.", {
-                brand: SdkConfig.get().brand,
-            }),
-            button: _t('Try again'),
-            cancelButton: _t('Cancel'),
-            onFinished: (tryAgain: boolean) => {
-                if (tryAgain) {
-                    openMenu();
-                }
-            },
-        };
-        Modal.createTrackedDialog(analyticsAction, '', QuestionDialog, params);
+        const threadId = relation?.rel_type === THREAD_RELATION_TYPE.name ? relation.event_id : null;
+        const assetType = shareType === LocationShareType.Pin ? LocationAssetType.Pin : LocationAssetType.Self;
+        await client.sendMessage(
+            roomId,
+            threadId,
+            makeLocationContent(undefined, uri, timestamp, undefined, assetType),
+        );
+    } catch (error) {
+        handleShareError(error, openMenu, shareType);
     }
-    return true;
 };
 
 export function textForLocation(
diff --git a/src/components/views/messages/DateSeparator.tsx b/src/components/views/messages/DateSeparator.tsx
index e7aeb3e1556..54dde16dac2 100644
--- a/src/components/views/messages/DateSeparator.tsx
+++ b/src/components/views/messages/DateSeparator.tsx
@@ -21,7 +21,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import { formatFullDateNoTime } from '../../../DateUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from '../../../dispatcher/actions';
@@ -61,7 +60,6 @@ interface IState {
     jumpToDateEnabled: boolean;
 }
 
-@replaceableComponent("views.messages.DateSeparator")
 export default class DateSeparator extends React.Component<IProps, IState> {
     private settingWatcherRef = null;
 
diff --git a/src/components/views/messages/DisambiguatedProfile.tsx b/src/components/views/messages/DisambiguatedProfile.tsx
new file mode 100644
index 00000000000..36850e916ea
--- /dev/null
+++ b/src/components/views/messages/DisambiguatedProfile.tsx
@@ -0,0 +1,69 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import classNames from 'classnames';
+
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
+import UserIdentifier from "../../../customisations/UserIdentifier";
+
+interface IProps {
+    member?: RoomMember;
+    fallbackName: string;
+    onClick?(): void;
+    colored?: boolean;
+    emphasizeDisplayName?: boolean;
+}
+
+export default class DisambiguatedProfile extends React.Component<IProps> {
+    render() {
+        const { fallbackName, member, colored, emphasizeDisplayName, onClick } = this.props;
+        const rawDisplayName = member?.rawDisplayName || fallbackName;
+        const mxid = member?.userId;
+
+        let colorClass;
+        if (colored) {
+            colorClass = getUserNameColorClass(fallbackName);
+        }
+
+        let mxidElement;
+        if (member?.disambiguate && mxid) {
+            mxidElement = (
+                <span className="mx_DisambiguatedProfile_mxid">
+                    { UserIdentifier.getDisplayUserIdentifier(
+                        mxid, { withDisplayName: true, roomId: member.roomId },
+                    ) }
+                </span>
+            );
+        }
+
+        const displayNameClasses = classNames({
+            "mx_DisambiguatedProfile_displayName": emphasizeDisplayName,
+            [colorClass]: true,
+        });
+
+        return (
+            <div className="mx_DisambiguatedProfile" onClick={onClick}>
+                <span className={displayNameClasses} dir="auto">
+                    { rawDisplayName }
+                </span>
+                { mxidElement }
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/messages/DownloadActionButton.tsx b/src/components/views/messages/DownloadActionButton.tsx
index b4ed4af0d3f..e9152579d7f 100644
--- a/src/components/views/messages/DownloadActionButton.tsx
+++ b/src/components/views/messages/DownloadActionButton.tsx
@@ -22,7 +22,6 @@ import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 import { RovingAccessibleTooltipButton } from "../../../accessibility/RovingTabIndex";
 import Spinner from "../elements/Spinner";
 import { _t, _td } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { FileDownloader } from "../../../utils/FileDownloader";
 
 interface IProps {
@@ -40,7 +39,6 @@ interface IState {
     tooltip: string;
 }
 
-@replaceableComponent("views.messages.DownloadActionButton")
 export default class DownloadActionButton extends React.PureComponent<IProps, IState> {
     private downloader = new FileDownloader();
 
diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index e0edbff046f..30922b62e5b 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -26,10 +26,10 @@ import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import RedactedBody from "./RedactedBody";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "../elements/AccessibleButton";
 import ConfirmAndWaitRedactDialog from "../dialogs/ConfirmAndWaitRedactDialog";
 import ViewSource from "../../structures/ViewSource";
+import SettingsStore from "../../../settings/SettingsStore";
 
 function getReplacedContent(event) {
     const originalContent = event.getOriginalContent();
@@ -49,7 +49,6 @@ interface IState {
     sendStatus: EventStatus;
 }
 
-@replaceableComponent("views.messages.EditHistoryMessage")
 export default class EditHistoryMessage extends React.PureComponent<IProps, IState> {
     private content = createRef<HTMLDivElement>();
     private pills: Element[] = [];
@@ -112,7 +111,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
 
     private renderActionBar(): JSX.Element {
         // hide the button when already redacted
-        let redactButton;
+        let redactButton: JSX.Element;
         if (!this.props.mxEvent.isRedacted() && !this.props.isBaseEvent && this.state.canRedact) {
             redactButton = (
                 <AccessibleButton onClick={this.onRedactClick}>
@@ -120,11 +119,16 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
                 </AccessibleButton>
             );
         }
-        const viewSourceButton = (
-            <AccessibleButton onClick={this.onViewSourceClick}>
-                { _t("View Source") }
-            </AccessibleButton>
-        );
+
+        let viewSourceButton: JSX.Element;
+        if (SettingsStore.getValue("developerMode")) {
+            viewSourceButton = (
+                <AccessibleButton onClick={this.onViewSourceClick}>
+                    { _t("View Source") }
+                </AccessibleButton>
+            );
+        }
+
         // disabled remove button when not allowed
         return (
             <div className="mx_MessageActionBar">
diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts
index 76c823b1851..2487f2c1a91 100644
--- a/src/components/views/messages/IBodyProps.ts
+++ b/src/components/views/messages/IBodyProps.ts
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React, { LegacyRef } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 
@@ -52,4 +53,6 @@ export interface IBodyProps {
 
     // helper function to access relations for this event
     getRelationsForEvent?: (eventId: string, relationType: string, eventType: string) => Relations;
+
+    ref?: React.RefObject<any> | LegacyRef<any>;
 }
diff --git a/src/components/views/messages/JumpToDatePicker.tsx b/src/components/views/messages/JumpToDatePicker.tsx
index 1af8fff8d49..925a741c188 100644
--- a/src/components/views/messages/JumpToDatePicker.tsx
+++ b/src/components/views/messages/JumpToDatePicker.tsx
@@ -77,7 +77,7 @@ const JumpToDatePicker: React.FC<IProps> = ({ ts, onDatePicked }: IProps) => {
             className="mx_JumpToDatePicker_form"
             onSubmit={onJumpToDateSubmit}
         >
-            <span className="mx_JumpToDatePicker_label">Jump to date</span>
+            <span className="mx_JumpToDatePicker_label">{ _t("Jump to date") }</span>
             <Field
                 componentClass={NativeOnChangeInput}
                 type="date"
diff --git a/src/components/views/messages/MAudioBody.tsx b/src/components/views/messages/MAudioBody.tsx
index 5af03135b5e..9d20c667e87 100644
--- a/src/components/views/messages/MAudioBody.tsx
+++ b/src/components/views/messages/MAudioBody.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { Playback } from "../../../audio/Playback";
 import InlineSpinner from '../elements/InlineSpinner';
 import { _t } from "../../../languageHandler";
@@ -35,7 +34,6 @@ interface IState {
     playback?: Playback;
 }
 
-@replaceableComponent("views.messages.MAudioBody")
 export default class MAudioBody extends React.PureComponent<IBodyProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
diff --git a/src/components/views/messages/MBeaconBody.tsx b/src/components/views/messages/MBeaconBody.tsx
new file mode 100644
index 00000000000..fb82cff29e2
--- /dev/null
+++ b/src/components/views/messages/MBeaconBody.tsx
@@ -0,0 +1,164 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext, useEffect, useState } from 'react';
+import { Beacon, BeaconEvent, MatrixEvent } from 'matrix-js-sdk/src/matrix';
+import { BeaconLocationState } from 'matrix-js-sdk/src/content-helpers';
+import { randomString } from 'matrix-js-sdk/src/randomstring';
+
+import { Icon as LocationMarkerIcon } from '../../../../res/img/element-icons/location.svg';
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import { useEventEmitterState } from '../../../hooks/useEventEmitter';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import { useBeacon } from '../../../utils/beacon';
+import { isSelfLocation } from '../../../utils/location';
+import { BeaconDisplayStatus, getBeaconDisplayStatus } from '../beacon/displayStatus';
+import BeaconStatus from '../beacon/BeaconStatus';
+import Spinner from '../elements/Spinner';
+import Map from '../location/Map';
+import SmartMarker from '../location/SmartMarker';
+import OwnBeaconStatus from '../beacon/OwnBeaconStatus';
+import BeaconViewDialog from '../beacon/BeaconViewDialog';
+import { IBodyProps } from "./IBodyProps";
+
+const useBeaconState = (beaconInfoEvent: MatrixEvent): {
+    beacon?: Beacon;
+    description?: string;
+    latestLocationState?: BeaconLocationState;
+    isLive?: boolean;
+} => {
+    const beacon = useBeacon(beaconInfoEvent);
+
+    const isLive = useEventEmitterState(
+        beacon,
+        BeaconEvent.LivenessChange,
+        () => beacon?.isLive);
+
+    const latestLocationState = useEventEmitterState(
+        beacon,
+        BeaconEvent.LocationUpdate,
+        () => beacon?.latestLocationState);
+
+    if (!beacon) {
+        return {};
+    }
+
+    const { description } = beacon.beaconInfo;
+
+    return {
+        beacon,
+        description,
+        isLive,
+        latestLocationState,
+    };
+};
+
+// multiple instances of same map might be in document
+// eg thread and main timeline, reply
+// maplibregl needs a unique id to attach the map instance to
+const useUniqueId = (eventId: string): string => {
+    const [id, setId] = useState(`${eventId}_${randomString(8)}`);
+
+    useEffect(() => {
+        setId(`${eventId}_${randomString(8)}`);
+    }, [eventId]);
+
+    return id;
+};
+
+const MBeaconBody: React.FC<IBodyProps> = React.forwardRef(({ mxEvent }, ref) => {
+    const {
+        beacon,
+        isLive,
+        latestLocationState,
+    } = useBeaconState(mxEvent);
+    const mapId = useUniqueId(mxEvent.getId());
+
+    const matrixClient = useContext(MatrixClientContext);
+    const [error, setError] = useState<Error>();
+    const displayStatus = getBeaconDisplayStatus(isLive, latestLocationState, error);
+    const markerRoomMember = isSelfLocation(mxEvent.getContent()) ? mxEvent.sender : undefined;
+    const isOwnBeacon = beacon?.beaconInfoOwner === matrixClient.getUserId();
+
+    const onClick = () => {
+        if (displayStatus !== BeaconDisplayStatus.Active) {
+            return;
+        }
+        Modal.createTrackedDialog(
+            'Beacon View',
+            '',
+            BeaconViewDialog,
+            {
+                roomId: mxEvent.getRoomId(),
+                matrixClient,
+                focusBeacon: beacon,
+            },
+            "mx_BeaconViewDialog_wrapper",
+            false, // isPriority
+            true, // isStatic
+        );
+    };
+
+    return (
+        <div className='mx_MBeaconBody' ref={ref}>
+            { displayStatus === BeaconDisplayStatus.Active ?
+                <Map
+                    id={mapId}
+                    centerGeoUri={latestLocationState.uri}
+                    onError={setError}
+                    onClick={onClick}
+                    className="mx_MBeaconBody_map"
+                >
+                    {
+                        ({ map }) =>
+                            <SmartMarker
+                                map={map}
+                                id={`${mapId}-marker`}
+                                geoUri={latestLocationState.uri}
+                                roomMember={markerRoomMember}
+                                useMemberColor
+                            />
+                    }
+                </Map>
+                : <div className='mx_MBeaconBody_map mx_MBeaconBody_mapFallback'>
+                    { displayStatus === BeaconDisplayStatus.Loading ?
+                        <Spinner h={32} w={32} /> :
+                        <LocationMarkerIcon className='mx_MBeaconBody_mapFallbackIcon' />
+                    }
+                </div>
+            }
+            { isOwnBeacon ?
+                <OwnBeaconStatus
+                    className='mx_MBeaconBody_chin'
+                    beacon={beacon}
+                    displayStatus={displayStatus}
+                    withIcon
+                /> :
+                <BeaconStatus
+                    className='mx_MBeaconBody_chin'
+                    beacon={beacon}
+                    displayStatus={displayStatus}
+                    label={_t('View live location')}
+                    withIcon
+                />
+            }
+        </div>
+    );
+});
+
+export default MBeaconBody;
+
diff --git a/src/components/views/messages/MFileBody.tsx b/src/components/views/messages/MFileBody.tsx
index 383a2cce2e0..2556616b7a5 100644
--- a/src/components/views/messages/MFileBody.tsx
+++ b/src/components/views/messages/MFileBody.tsx
@@ -21,7 +21,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromContent } from "../../../customisations/Media";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import { presentableTextForFile } from "../../../utils/FileUtils";
@@ -106,7 +105,6 @@ interface IState {
     decryptedBlob?: Blob;
 }
 
-@replaceableComponent("views.messages.MFileBody")
 export default class MFileBody extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
index 9bff9b7c709..73c59472fdd 100644
--- a/src/components/views/messages/MImageBody.tsx
+++ b/src/components/views/messages/MImageBody.tsx
@@ -27,22 +27,27 @@ import MFileBody from './MFileBody';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
-import InlineSpinner from '../elements/InlineSpinner';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import Spinner from '../elements/Spinner';
 import { Media, mediaFromContent } from "../../../customisations/Media";
-import { BLURHASH_FIELD } from "../../../ContentMessages";
+import { BLURHASH_FIELD, createThumbnail } from "../../../utils/image-media";
 import { IMediaEventContent } from '../../../customisations/models/IMediaEventContent';
 import ImageView from '../elements/ImageView';
 import { IBodyProps } from "./IBodyProps";
 import { ImageSize, suggestedSize as suggestedImageSize } from "../../../settings/enums/ImageSize";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
+import { blobIsAnimated, mayBeAnimated } from '../../../utils/Image';
+
+enum Placeholder {
+    NoImage,
+    Blurhash,
+}
 
 interface IState {
-    decryptedUrl?: string;
-    decryptedThumbnailUrl?: string;
-    decryptedBlob?: Blob;
-    error;
+    contentUrl?: string;
+    thumbUrl?: string;
+    isAnimated?: boolean;
+    error?: Error;
     imgError: boolean;
     imgLoaded: boolean;
     loadedImageDimensions?: {
@@ -51,10 +56,9 @@ interface IState {
     };
     hover: boolean;
     showImage: boolean;
-    placeholder: 'no-image' | 'blurhash';
+    placeholder: Placeholder;
 }
 
-@replaceableComponent("views.messages.MImageBody")
 export default class MImageBody extends React.Component<IBodyProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -68,16 +72,11 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         super(props);
 
         this.state = {
-            decryptedUrl: null,
-            decryptedThumbnailUrl: null,
-            decryptedBlob: null,
-            error: null,
             imgError: false,
             imgLoaded: false,
-            loadedImageDimensions: null,
             hover: false,
             showImage: SettingsStore.getValue("showImages"),
-            placeholder: 'no-image',
+            placeholder: Placeholder.NoImage,
         };
     }
 
@@ -86,7 +85,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         if (this.unmounted) return;
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
-        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        const reconnected = syncState !== SyncState.Error && prevState !== syncState;
         if (reconnected && this.state.imgError) {
             // Load the image again
             this.setState({
@@ -110,7 +109,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             }
 
             const content = this.props.mxEvent.getContent<IMediaEventContent>();
-            const httpUrl = this.getContentUrl();
+            const httpUrl = this.state.contentUrl;
             const params: Omit<ComponentProps<typeof ImageView>, "onFinished"> = {
                 src: httpUrl,
                 name: content.body?.length > 0 ? content.body : _t('Attachment'),
@@ -139,29 +138,24 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         }
     };
 
-    private isGif = (): boolean => {
-        const content = this.props.mxEvent.getContent();
-        return content.info?.mimetype === "image/gif";
-    };
-
-    private onImageEnter = (e: React.MouseEvent<HTMLImageElement>): void => {
+    protected onImageEnter = (e: React.MouseEvent<HTMLImageElement>): void => {
         this.setState({ hover: true });
 
-        if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
+        if (!this.state.showImage || !this.state.isAnimated || SettingsStore.getValue("autoplayGifs")) {
             return;
         }
         const imgElement = e.currentTarget;
-        imgElement.src = this.getContentUrl();
+        imgElement.src = this.state.contentUrl;
     };
 
-    private onImageLeave = (e: React.MouseEvent<HTMLImageElement>): void => {
+    protected onImageLeave = (e: React.MouseEvent<HTMLImageElement>): void => {
         this.setState({ hover: false });
 
-        if (!this.state.showImage || !this.isGif() || SettingsStore.getValue("autoplayGifs")) {
+        if (!this.state.showImage || !this.state.isAnimated || SettingsStore.getValue("autoplayGifs")) {
             return;
         }
         const imgElement = e.currentTarget;
-        imgElement.src = this.getThumbUrl();
+        imgElement.src = this.state.thumbUrl ?? this.state.contentUrl;
     };
 
     private onImageError = (): void => {
@@ -175,7 +169,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         this.clearBlurhashTimeout();
         this.props.onHeightChanged();
 
-        let loadedImageDimensions;
+        let loadedImageDimensions: IState["loadedImageDimensions"];
 
         if (this.image.current) {
             const { naturalWidth, naturalHeight } = this.image.current;
@@ -185,22 +179,17 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         this.setState({ imgLoaded: true, loadedImageDimensions });
     };
 
-    protected getContentUrl(): string {
-        const content: IMediaEventContent = this.props.mxEvent.getContent();
+    private getContentUrl(): string {
         // During export, the content url will point to the MSC, which will later point to a local url
-        if (this.props.forExport) return content.url || content.file?.url;
-        if (this.media.isEncrypted) {
-            return this.state.decryptedUrl;
-        } else {
-            return this.media.srcHttp;
-        }
+        if (this.props.forExport) return this.media.srcMxc;
+        return this.media.srcHttp;
     }
 
     private get media(): Media {
         return mediaFromContent(this.props.mxEvent.getContent());
     }
 
-    protected getThumbUrl(): string {
+    private getThumbUrl(): string {
         // FIXME: we let images grow as wide as you like, rather than capped to 800x600.
         // So either we need to support custom timeline widths here, or reimpose the cap, otherwise the
         // thumbnail resolution will be unnecessarily reduced.
@@ -210,85 +199,112 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
 
         const content = this.props.mxEvent.getContent<IMediaEventContent>();
         const media = mediaFromContent(content);
+        const info = content.info;
 
-        if (media.isEncrypted) {
-            // Don't use the thumbnail for clients wishing to autoplay gifs.
-            if (this.state.decryptedThumbnailUrl) {
-                return this.state.decryptedThumbnailUrl;
-            }
-            return this.state.decryptedUrl;
-        } else if (content.info && content.info.mimetype === "image/svg+xml" && media.hasThumbnail) {
-            // special case to return clientside sender-generated thumbnails for SVGs, if any,
-            // given we deliberately don't thumbnail them serverside to prevent
-            // billion lol attacks and similar
+        if (info?.mimetype === "image/svg+xml" && media.hasThumbnail) {
+            // Special-case to return clientside sender-generated thumbnails for SVGs, if any,
+            // given we deliberately don't thumbnail them serverside to prevent billion lol attacks and similar.
             return media.getThumbnailHttp(thumbWidth, thumbHeight, 'scale');
-        } else {
-            // we try to download the correct resolution
-            // for hi-res images (like retina screenshots).
-            // synapse only supports 800x600 thumbnails for now though,
-            // so we'll need to download the original image for this to work
-            // well for now. First, let's try a few cases that let us avoid
-            // downloading the original, including:
-            //   - When displaying a GIF, we always want to thumbnail so that we can
-            //     properly respect the user's GIF autoplay setting (which relies on
-            //     thumbnailing to produce the static preview image)
-            //   - On a low DPI device, always thumbnail to save bandwidth
-            //   - If there's no sizing info in the event, default to thumbnail
-            const info = content.info;
-            if (
-                this.isGif() ||
-                window.devicePixelRatio === 1.0 ||
-                (!info || !info.w || !info.h || !info.size)
-            ) {
-                return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
-            } else {
-                // we should only request thumbnails if the image is bigger than 800x600
-                // (or 1600x1200 on retina) otherwise the image in the timeline will just
-                // end up resampled and de-retina'd for no good reason.
-                // Ideally the server would pregen 1600x1200 thumbnails in order to provide retina
-                // thumbnails, but we don't do this currently in synapse for fear of disk space.
-                // As a compromise, let's switch to non-retina thumbnails only if the original
-                // image is both physically too large and going to be massive to load in the
-                // timeline (e.g. >1MB).
-
-                const isLargerThanThumbnail = (
-                    info.w > thumbWidth ||
-                    info.h > thumbHeight
-                );
-                const isLargeFileSize = info.size > 1 * 1024 * 1024; // 1mb
-
-                if (isLargeFileSize && isLargerThanThumbnail) {
-                    // image is too large physically and bytewise to clutter our timeline so
-                    // we ask for a thumbnail, despite knowing that it will be max 800x600
-                    // despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
-                    return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
-                } else {
-                    // download the original image otherwise, so we can scale it client side
-                    // to take pixelRatio into account.
-                    return media.srcHttp;
-                }
-            }
         }
+
+        // we try to download the correct resolution for hi-res images (like retina screenshots).
+        // Synapse only supports 800x600 thumbnails for now though,
+        // so we'll need to download the original image for this to work  well for now.
+        // First, let's try a few cases that let us avoid downloading the original, including:
+        //   - When displaying a GIF, we always want to thumbnail so that we can
+        //     properly respect the user's GIF autoplay setting (which relies on
+        //     thumbnailing to produce the static preview image)
+        //   - On a low DPI device, always thumbnail to save bandwidth
+        //   - If there's no sizing info in the event, default to thumbnail
+        if (
+            this.state.isAnimated ||
+            window.devicePixelRatio === 1.0 ||
+            (!info || !info.w || !info.h || !info.size)
+        ) {
+            return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
+        }
+
+        // We should only request thumbnails if the image is bigger than 800x600 (or 1600x1200 on retina) otherwise
+        // the image in the timeline will just end up resampled and de-retina'd for no good reason.
+        // Ideally the server would pre-gen 1600x1200 thumbnails in order to provide retina thumbnails,
+        // but we don't do this currently in synapse for fear of disk space.
+        // As a compromise, let's switch to non-retina thumbnails only if the original image is both
+        // physically too large and going to be massive to load in the timeline (e.g. >1MB).
+
+        const isLargerThanThumbnail = (
+            info.w > thumbWidth ||
+            info.h > thumbHeight
+        );
+        const isLargeFileSize = info.size > 1 * 1024 * 1024; // 1mb
+
+        if (isLargeFileSize && isLargerThanThumbnail) {
+            // image is too large physically and byte-wise to clutter our timeline so,
+            // we ask for a thumbnail, despite knowing that it will be max 800x600
+            // despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
+            return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
+        }
+
+        // download the original image otherwise, so we can scale it client side to take pixelRatio into account.
+        return media.srcHttp;
     }
 
     private async downloadImage() {
-        if (this.props.mediaEventHelper.media.isEncrypted && this.state.decryptedUrl === null) {
+        if (this.state.contentUrl) return; // already downloaded
+
+        let thumbUrl: string;
+        let contentUrl: string;
+        if (this.props.mediaEventHelper.media.isEncrypted) {
             try {
-                const thumbnailUrl = await this.props.mediaEventHelper.thumbnailUrl.value;
-                this.setState({
-                    decryptedUrl: await this.props.mediaEventHelper.sourceUrl.value,
-                    decryptedThumbnailUrl: thumbnailUrl,
-                    decryptedBlob: await this.props.mediaEventHelper.sourceBlob.value,
-                });
-            } catch (err) {
+                ([contentUrl, thumbUrl] = await Promise.all([
+                    this.props.mediaEventHelper.sourceUrl.value,
+                    this.props.mediaEventHelper.thumbnailUrl.value,
+                ]));
+            } catch (error) {
                 if (this.unmounted) return;
-                logger.warn("Unable to decrypt attachment: ", err);
+                logger.warn("Unable to decrypt attachment: ", error);
                 // Set a placeholder image when we can't decrypt the image.
-                this.setState({
-                    error: err,
+                this.setState({ error });
+            }
+        } else {
+            thumbUrl = this.getThumbUrl();
+            contentUrl = this.getContentUrl();
+        }
+
+        const content = this.props.mxEvent.getContent<IMediaEventContent>();
+        let isAnimated = mayBeAnimated(content.info?.mimetype);
+
+        // If there is no included non-animated thumbnail then we will generate our own, we can't depend on the server
+        // because 1. encryption and 2. we can't ask the server specifically for a non-animated thumbnail.
+        if (isAnimated && !SettingsStore.getValue("autoplayGifs")) {
+            if (!thumbUrl || !content?.info.thumbnail_info || mayBeAnimated(content.info.thumbnail_info.mimetype)) {
+                const img = document.createElement("img");
+                const loadPromise = new Promise((resolve, reject) => {
+                    img.onload = resolve;
+                    img.onerror = reject;
                 });
+                img.crossOrigin = "Anonymous"; // CORS allow canvas access
+                img.src = contentUrl;
+
+                await loadPromise;
+
+                const blob = await this.props.mediaEventHelper.sourceBlob.value;
+                if (!await blobIsAnimated(content.info.mimetype, blob)) {
+                    isAnimated = false;
+                }
+
+                if (isAnimated) {
+                    const thumb = await createThumbnail(img, img.width, img.height, content.info.mimetype, false);
+                    thumbUrl = URL.createObjectURL(thumb.thumbnail);
+                }
             }
         }
+
+        if (this.unmounted) return;
+        this.setState({
+            contentUrl,
+            thumbUrl,
+            isAnimated,
+        });
     }
 
     private clearBlurhashTimeout() {
@@ -317,7 +333,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             this.timeout = setTimeout(() => {
                 if (!this.state.imgLoaded || !this.state.imgError) {
                     this.setState({
-                        placeholder: 'blurhash',
+                        placeholder: Placeholder.Blurhash,
                     });
                 }
             }, 150);
@@ -333,6 +349,9 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         MatrixClientPeg.get().removeListener(ClientEvent.Sync, this.onClientSync);
         this.clearBlurhashTimeout();
         SettingsStore.unwatchSetting(this.sizeWatcher);
+        if (this.state.isAnimated && this.state.thumbUrl) {
+            URL.revokeObjectURL(this.state.thumbUrl);
+        }
     }
 
     protected messageContent(
@@ -341,12 +360,16 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         content: IMediaEventContent,
         forcedHeight?: number,
     ): JSX.Element {
+        if (!thumbUrl) thumbUrl = contentUrl; // fallback
+
         let infoWidth: number;
         let infoHeight: number;
+        let infoSvg = false;
 
-        if (content && content.info && content.info.w && content.info.h) {
+        if (content.info?.w && content.info?.h) {
             infoWidth = content.info.w;
             infoHeight = content.info.h;
+            infoSvg = content.info.mimetype.startsWith("image/svg");
         } else {
             // Whilst the image loads, display nothing. We also don't display a blurhash image
             // because we don't really know what size of image we'll end up with.
@@ -377,32 +400,17 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             infoHeight = this.state.loadedImageDimensions.naturalHeight;
         }
 
-        // The maximum size of the thumbnail as it is rendered as an <img>
-        // check for any height constraints
-        const imageSize = SettingsStore.getValue("Images.size") as ImageSize;
-        const isPortrait = infoWidth < infoHeight;
-        const suggestedAndPossibleWidth = Math.min(suggestedImageSize(imageSize, isPortrait).w, infoWidth);
-        const suggestedAndPossibleHeight = Math.min(suggestedImageSize(imageSize, isPortrait).h, infoHeight);
-        const aspectRatio = infoWidth / infoHeight;
-
-        let maxWidth: number;
-        let maxHeight: number;
-        const maxHeightConstraint = forcedHeight || this.props.maxImageHeight || suggestedAndPossibleHeight;
-        if (maxHeightConstraint * aspectRatio < suggestedAndPossibleWidth || imageSize === ImageSize.Large) {
-            // The width is dictated by the maximum height that was defined by the props or the function param `forcedHeight`
-            // If the thumbnail size is set to Large, we always let the size be dictated by the height.
-            maxWidth = maxHeightConstraint * aspectRatio;
-            // there is no need to check for infoHeight here since this is done with `maxHeightConstraint * aspectRatio < suggestedAndPossibleWidth`
-            maxHeight = maxHeightConstraint;
-        } else {
-            // height is dictated by suggestedWidth (based on the Image.size setting)
-            maxWidth = suggestedAndPossibleWidth;
-            maxHeight = suggestedAndPossibleWidth / aspectRatio;
-        }
+        // The maximum size of the thumbnail as it is rendered as an <img>,
+        // accounting for any height constraints
+        const { w: maxWidth, h: maxHeight } = suggestedImageSize(
+            SettingsStore.getValue("Images.size") as ImageSize,
+            { w: infoWidth, h: infoHeight },
+            forcedHeight ?? this.props.maxImageHeight,
+        );
 
-        let img = null;
-        let placeholder = null;
-        let gifLabel = null;
+        let img: JSX.Element;
+        let placeholder: JSX.Element;
+        let gifLabel: JSX.Element;
 
         if (!this.props.forExport && !this.state.imgLoaded) {
             placeholder = this.getPlaceholder(maxWidth, maxHeight);
@@ -419,15 +427,6 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
                     className="mx_MImageBody_thumbnail"
                     src={thumbUrl}
                     ref={this.image}
-                    // Force the image to be the full size of the container, even if the
-                    // pixel size is smaller. The problem here is that we don't know what
-                    // thumbnail size the HS is going to give us, but we have to commit to
-                    // a container size immediately and not change it when the image loads
-                    // or we'll get a scroll jump (or have to leave blank space).
-                    // This will obviously result in an upscaled image which will be a bit
-                    // blurry. The best fix would be for the HS to advertise what size thumbnails
-                    // it guarantees to produce.
-                    style={{ height: '100%' }}
                     alt={content.body}
                     onError={this.onImageError}
                     onLoad={this.onImageLoad}
@@ -442,49 +441,43 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             showPlaceholder = false; // because we're hiding the image, so don't show the placeholder.
         }
 
-        if (this.isGif() && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
+        if (this.state.isAnimated && !SettingsStore.getValue("autoplayGifs") && !this.state.hover) {
+            // XXX: Arguably we may want a different label when the animated image is WEBP and not GIF
             gifLabel = <p className="mx_MImageBody_gifLabel">GIF</p>;
         }
 
         const classes = classNames({
-            'mx_MImageBody_thumbnail': true,
-            'mx_MImageBody_thumbnail--blurhash': this.props.mxEvent.getContent().info?.[BLURHASH_FIELD],
+            'mx_MImageBody_placeholder': true,
+            'mx_MImageBody_placeholder--blurhash': this.props.mxEvent.getContent().info?.[BLURHASH_FIELD],
         });
 
-        // This has incredibly broken types.
-        const C = CSSTransition as any;
+        // many SVGs don't have an intrinsic size if used in <img> elements.
+        // due to this we have to set our desired width directly.
+        // this way if the image is forced to shrink, the height adapts appropriately.
+        const sizing = infoSvg ? { maxHeight, maxWidth, width: maxWidth } : { maxHeight, maxWidth };
+
         const thumbnail = (
             <div className="mx_MImageBody_thumbnail_container" style={{ maxHeight, maxWidth, aspectRatio: `${infoWidth}/${infoHeight}` }}>
                 <SwitchTransition mode="out-in">
-                    <C
+                    <CSSTransition
                         classNames="mx_rtg--fade"
                         key={`img-${showPlaceholder}`}
                         timeout={300}
                     >
-                        { /* This weirdly looking div is necessary here, otherwise SwitchTransition fails */ }
-                        <div>
-                            { showPlaceholder && <div
-                                className={classes}
-                                style={{
-                                    // Constrain width here so that spinner appears central to the loaded thumbnail
-                                    maxWidth,
-                                    maxHeight,
-                                    aspectRatio: `${infoWidth}/${infoHeight}`,
-                                }}
-                            >
-                                { placeholder }
-                            </div> }
-                        </div>
-                    </C>
+                        { showPlaceholder ? <div className={classes}>
+                            { placeholder }
+                        </div> : <></> /* Transition always expects a child */ }
+                    </CSSTransition>
                 </SwitchTransition>
 
-                <div style={{
-                    height: '100%',
-                }}>
+                <div style={sizing}>
                     { img }
                     { gifLabel }
                 </div>
 
+                { /* HACK: This div fills out space while the image loads, to prevent scroll jumps */ }
+                { !this.state.imgLoaded && <div style={{ height: maxHeight, width: maxWidth }} /> }
+
                 { this.state.hover && this.getTooltip() }
             </div>
         );
@@ -504,15 +497,13 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         const blurhash = this.props.mxEvent.getContent().info?.[BLURHASH_FIELD];
 
         if (blurhash) {
-            if (this.state.placeholder === 'no-image') {
-                return <div className="mx_no-image-placeholder" style={{ width: width, height: height }} />;
-            } else if (this.state.placeholder === 'blurhash') {
+            if (this.state.placeholder === Placeholder.NoImage) {
+                return null;
+            } else if (this.state.placeholder === Placeholder.Blurhash) {
                 return <Blurhash className="mx_Blurhash" hash={blurhash} width={width} height={height} />;
             }
         }
-        return (
-            <InlineSpinner w={32} h={32} />
-        );
+        return <Spinner w={32} h={32} />;
     }
 
     // Overidden by MStickerBody
@@ -525,13 +516,15 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
         if (this.props.forExport) return null;
         /*
          * In the room timeline or the thread context we don't need the download
-         * link as the message action bar will fullfil that
+         * link as the message action bar will fulfill that
          */
-        const hasMessageActionBar = this.context.timelineRenderingType === TimelineRenderingType.Room
-            || this.context.timelineRenderingType === TimelineRenderingType.Pinned
-            || this.context.timelineRenderingType === TimelineRenderingType.Search
-            || this.context.timelineRenderingType === TimelineRenderingType.Thread
-            || this.context.timelineRenderingType === TimelineRenderingType.ThreadsList;
+        const hasMessageActionBar = (
+            this.context.timelineRenderingType === TimelineRenderingType.Room ||
+            this.context.timelineRenderingType === TimelineRenderingType.Pinned ||
+            this.context.timelineRenderingType === TimelineRenderingType.Search ||
+            this.context.timelineRenderingType === TimelineRenderingType.Thread ||
+            this.context.timelineRenderingType === TimelineRenderingType.ThreadsList
+        );
         if (!hasMessageActionBar) {
             return <MFileBody {...this.props} showGenericPlaceholder={false} />;
         }
@@ -540,7 +533,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
     render() {
         const content = this.props.mxEvent.getContent<IMediaEventContent>();
 
-        if (this.state.error !== null) {
+        if (this.state.error) {
             return (
                 <div className="mx_MImageBody">
                     <img src={require("../../../../res/img/warning.svg").default} width="16" height="16" />
@@ -549,12 +542,12 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             );
         }
 
-        const contentUrl = this.getContentUrl();
-        let thumbUrl;
-        if (this.props.forExport || (this.isGif() && SettingsStore.getValue("autoplayGifs"))) {
+        const contentUrl = this.state.contentUrl;
+        let thumbUrl: string;
+        if (this.props.forExport || (this.state.isAnimated && SettingsStore.getValue("autoplayGifs"))) {
             thumbUrl = contentUrl;
         } else {
-            thumbUrl = this.getThumbUrl();
+            thumbUrl = this.state.thumbUrl ?? this.state.contentUrl;
         }
 
         const thumbnail = this.messageContent(contentUrl, thumbUrl, content);
diff --git a/src/components/views/messages/MImageReplyBody.tsx b/src/components/views/messages/MImageReplyBody.tsx
index dead57bab20..9edbcec304d 100644
--- a/src/components/views/messages/MImageReplyBody.tsx
+++ b/src/components/views/messages/MImageReplyBody.tsx
@@ -41,18 +41,15 @@ export default class MImageReplyBody extends MImageBody {
     }
 
     render() {
-        if (this.state.error !== null) {
+        if (this.state.error) {
             return super.render();
         }
 
         const content = this.props.mxEvent.getContent<IMediaEventContent>();
-
-        const contentUrl = this.getContentUrl();
-        const thumbnail = this.messageContent(contentUrl, this.getThumbUrl(), content, FORCED_IMAGE_HEIGHT);
+        const thumbnail = this.messageContent(this.state.contentUrl, this.state.thumbUrl, content, FORCED_IMAGE_HEIGHT);
         const fileBody = this.getFileBody();
         const sender = <SenderProfile
             mxEvent={this.props.mxEvent}
-            enableFlair={false}
         />;
 
         return <div className="mx_MImageReplyBody">
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 03448bf0d28..86796aac17e 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -22,14 +22,12 @@ import WidgetStore from "../../../stores/WidgetStore";
 import EventTileBubble from "./EventTileBubble";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     mxEvent: MatrixEvent;
     timestamp?: JSX.Element;
 }
 
-@replaceableComponent("views.messages.MJitsiWidgetEvent")
 export default class MJitsiWidgetEvent extends React.PureComponent<IProps> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/MKeyVerificationConclusion.tsx b/src/components/views/messages/MKeyVerificationConclusion.tsx
index 1e5312c4a5d..9f1be7e76e9 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.tsx
+++ b/src/components/views/messages/MKeyVerificationConclusion.tsx
@@ -28,7 +28,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import { getNameForEventRoom, userLabelForEventRoom } from '../../../utils/KeyVerificationStateObserver';
 import EventTileBubble from "./EventTileBubble";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     /* the MatrixEvent to show */
@@ -36,7 +35,6 @@ interface IProps {
     timestamp?: JSX.Element;
 }
 
-@replaceableComponent("views.messages.MKeyVerificationConclusion")
 export default class MKeyVerificationConclusion extends React.Component<IProps> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/messages/MKeyVerificationRequest.tsx b/src/components/views/messages/MKeyVerificationRequest.tsx
index 457fbfc819b..fb1210b33c3 100644
--- a/src/components/views/messages/MKeyVerificationRequest.tsx
+++ b/src/components/views/messages/MKeyVerificationRequest.tsx
@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import { getNameForEventRoom, userLabelForEventRoom } from '../../../utils/KeyVerificationStateObserver';
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import EventTileBubble from "./EventTileBubble";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from '../elements/AccessibleButton';
 import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
 
@@ -33,7 +32,6 @@ interface IProps {
     timestamp?: JSX.Element;
 }
 
-@replaceableComponent("views.messages.MKeyVerificationRequest")
 export default class MKeyVerificationRequest extends React.Component<IProps> {
     public componentDidMount() {
         const request = this.props.mxEvent.verificationRequest;
diff --git a/src/components/views/messages/MLocationBody.tsx b/src/components/views/messages/MLocationBody.tsx
index 0d3ce4eebdb..94abc1c7a88 100644
--- a/src/components/views/messages/MLocationBody.tsx
+++ b/src/components/views/messages/MLocationBody.tsx
@@ -15,93 +15,48 @@ limitations under the License.
 */
 
 import React from 'react';
-import maplibregl from 'maplibre-gl';
-import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
-import {
-    ASSET_NODE_TYPE,
-    LocationAssetType,
-    ILocationContent,
-    LOCATION_EVENT_TYPE,
-} from 'matrix-js-sdk/src/@types/location';
-import { ClientEvent, IClientWellKnown } from 'matrix-js-sdk/src/client';
 
-import SdkConfig from '../../../SdkConfig';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { IBodyProps } from "./IBodyProps";
 import { _t } from '../../../languageHandler';
-import MemberAvatar from '../avatars/MemberAvatar';
 import Modal from '../../../Modal';
-import LocationViewDialog from '../location/LocationViewDialog';
+import {
+    locationEventGeoUri,
+    getLocationShareErrorMessage,
+    LocationShareError,
+    isSelfLocation,
+} from '../../../utils/location';
+import MatrixClientContext from '../../../contexts/MatrixClientContext';
 import TooltipTarget from '../elements/TooltipTarget';
 import { Alignment } from '../elements/Tooltip';
-import AccessibleButton from '../elements/AccessibleButton';
-import { getTileServerWellKnown, tileServerFromWellKnown } from '../../../utils/WellKnownUtils';
-import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import LocationViewDialog from '../location/LocationViewDialog';
+import Map from '../location/Map';
+import SmartMarker from '../location/SmartMarker';
+import { IBodyProps } from "./IBodyProps";
 
 interface IState {
     error: Error;
 }
 
-@replaceableComponent("views.messages.MLocationBody")
 export default class MLocationBody extends React.Component<IBodyProps, IState> {
     public static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
-    private coords: GeolocationCoordinates;
-    private bodyId: string;
-    private markerId: string;
-    private map?: maplibregl.Map = null;
+    private mapId: string;
 
     constructor(props: IBodyProps) {
         super(props);
 
         const randomString = Math.random().toString(16).slice(2, 10);
+        // multiple instances of same map might be in document
+        // eg thread and main timeline, reply
         const idSuffix = `${props.mxEvent.getId()}_${randomString}`;
-        this.bodyId = `mx_MLocationBody_${idSuffix}`;
-        this.markerId = `mx_MLocationBody_marker_${idSuffix}`;
-        this.coords = parseGeoUri(locationEventGeoUri(this.props.mxEvent));
+        this.mapId = `mx_MLocationBody_${idSuffix}`;
 
         this.state = {
             error: undefined,
         };
     }
 
-    componentDidMount() {
-        if (this.state.error) {
-            return;
-        }
-
-        this.context.on(ClientEvent.ClientWellKnown, this.updateStyleUrl);
-
-        this.map = createMap(
-            this.coords,
-            false,
-            this.bodyId,
-            this.markerId,
-            (e: Error) => this.setState({ error: e }),
-        );
-    }
-
-    componentWillUnmount() {
-        this.context.off(ClientEvent.ClientWellKnown, this.updateStyleUrl);
-    }
-
-    private updateStyleUrl = (clientWellKnown: IClientWellKnown) => {
-        const style = tileServerFromWellKnown(clientWellKnown)?.["map_style_url"];
-        if (style) {
-            this.map?.setStyle(style);
-        }
-    };
-
-    private onClick = (
-        event: React.MouseEvent<HTMLDivElement, MouseEvent>,
-    ) => {
-        // Don't open map if we clicked the attribution button
-        const target = event.target as Element;
-        if (target.classList.contains("maplibregl-ctrl-attrib-button")) {
-            return;
-        }
-
+    private onClick = () => {
         Modal.createTrackedDialog(
             'Location View',
             '',
@@ -116,244 +71,88 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
         );
     };
 
+    private onError = (error) => {
+        this.setState({ error });
+    };
+
     render(): React.ReactElement<HTMLDivElement> {
-        return <LocationBodyContent
-            mxEvent={this.props.mxEvent}
-            bodyId={this.bodyId}
-            markerId={this.markerId}
-            error={this.state.error}
-            tooltip={_t("Expand map")}
-            onClick={this.onClick}
-        />;
+        return this.state.error ?
+            <LocationBodyFallbackContent error={this.state.error} event={this.props.mxEvent} /> :
+            <LocationBodyContent
+                mxEvent={this.props.mxEvent}
+                mapId={this.mapId}
+                onError={this.onError}
+                tooltip={_t("Expand map")}
+                onClick={this.onClick}
+            />;
     }
 }
 
-export function isSelfLocation(locationContent: ILocationContent): boolean {
-    const asset = ASSET_NODE_TYPE.findIn(locationContent) as { type: string };
-    const assetType = asset?.type ?? LocationAssetType.Self;
-    return assetType == LocationAssetType.Self;
-}
+export const LocationBodyFallbackContent: React.FC<{ event: MatrixEvent, error: Error }> = ({ error, event }) => {
+    const errorType = error?.message as LocationShareError;
+    const message = `${_t('Unable to load map')}: ${getLocationShareErrorMessage(errorType)}`;
+
+    const locationFallback = isSelfLocation(event.getContent()) ?
+        (_t('Shared their location: ') + event.getContent()?.body) :
+        (_t('Shared a location: ') + event.getContent()?.body);
+
+    return <div className="mx_EventTile_body">
+        <span className={errorType !== LocationShareError.MapStyleUrlNotConfigured ? "mx_EventTile_tileError" : ''}>
+            { message }
+        </span>
+        <br />
+        { locationFallback }
+    </div>;
+};
 
-interface ILocationBodyContentProps {
+interface LocationBodyContentProps {
     mxEvent: MatrixEvent;
-    bodyId: string;
-    markerId: string;
-    error: Error;
+    mapId: string;
     tooltip?: string;
-    onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
-    zoomButtons?: boolean;
-    onZoomIn?: () => void;
-    onZoomOut?: () => void;
+    onError: (error: Error) => void;
+    onClick?: () => void;
 }
-
-export function LocationBodyContent(props: ILocationBodyContentProps):
-        React.ReactElement<HTMLDivElement> {
-    const mapDiv = <div
-        id={props.bodyId}
-        onClick={props.onClick}
+export const LocationBodyContent: React.FC<LocationBodyContentProps> = ({
+    mxEvent,
+    mapId,
+    tooltip,
+    onError,
+    onClick,
+}) => {
+    // only pass member to marker when should render avatar marker
+    const markerRoomMember = isSelfLocation(mxEvent.getContent()) ? mxEvent.sender : undefined;
+    const geoUri = locationEventGeoUri(mxEvent);
+
+    const mapElement = (<Map
+        id={mapId}
+        centerGeoUri={geoUri}
+        onClick={onClick}
+        onError={onError}
         className="mx_MLocationBody_map"
-    />;
-
-    const markerContents = (
-        isSelfLocation(props.mxEvent.getContent())
-            ? <MemberAvatar
-                member={props.mxEvent.sender}
-                width={27}
-                height={27}
-                viewUserOnClick={false}
-            />
-            : <div className="mx_MLocationBody_markerContents" />
-    );
-
-    return <div className="mx_MLocationBody">
+    >
         {
-            props.error
-                ? <div className="mx_EventTile_tileError mx_EventTile_body">
-                    { _t("Failed to load map") }
-                </div>
-                : null
+            ({ map }) =>
+                <SmartMarker
+                    map={map}
+                    id={`${mapId}-marker`}
+                    geoUri={geoUri}
+                    roomMember={markerRoomMember}
+                />
         }
+    </Map>);
+
+    return <div className="mx_MLocationBody">
         {
-            props.tooltip
+            tooltip
                 ? <TooltipTarget
-                    label={props.tooltip}
+                    label={tooltip}
                     alignment={Alignment.InnerBottom}
                     maxParentWidth={450}
                 >
-                    { mapDiv }
+                    { mapElement }
                 </TooltipTarget>
-                : mapDiv
-        }
-        <div className="mx_MLocationBody_marker" id={props.markerId}>
-            <div className="mx_MLocationBody_markerBorder">
-                { markerContents }
-            </div>
-            <div
-                className="mx_MLocationBody_pointer"
-            />
-        </div>
-        {
-            props.zoomButtons
-                ? <ZoomButtons
-                    onZoomIn={props.onZoomIn}
-                    onZoomOut={props.onZoomOut}
-                />
-                : null
+                : mapElement
         }
     </div>;
-}
-
-interface IZoomButtonsProps {
-    onZoomIn: () => void;
-    onZoomOut: () => void;
-}
-
-function ZoomButtons(props: IZoomButtonsProps): React.ReactElement<HTMLDivElement> {
-    return <div className="mx_MLocationBody_zoomButtons">
-        <AccessibleButton
-            onClick={props.onZoomIn}
-            title={_t("Zoom in")}
-        >
-            <div className="mx_MLocationBody_zoomButton mx_MLocationBody_plusButton" />
-        </AccessibleButton>
-        <AccessibleButton
-            onClick={props.onZoomOut}
-            title={_t("Zoom out")}
-        >
-            <div className="mx_MLocationBody_zoomButton mx_MLocationBody_minusButton" />
-        </AccessibleButton>
-    </div>;
-}
-
-/**
- * Look up what map tile server style URL was provided in the homeserver's
- * .well-known location, or, failing that, in our local config, or, failing
- * that, defaults to the same tile server listed by matrix.org.
- */
-export function findMapStyleUrl(): string {
-    const mapStyleUrl = (
-        getTileServerWellKnown()?.map_style_url ??
-        SdkConfig.get().map_style_url
-    );
-
-    if (!mapStyleUrl) {
-        throw new Error(
-            "'map_style_url' missing from homeserver .well-known area, and " +
-            "missing from from config.json.",
-        );
-    }
-
-    return mapStyleUrl;
-}
-
-export function createMap(
-    coords: GeolocationCoordinates,
-    interactive: boolean,
-    bodyId: string,
-    markerId: string,
-    onError: (error: Error) => void,
-): maplibregl.Map {
-    try {
-        const styleUrl = findMapStyleUrl();
-        const coordinates = new maplibregl.LngLat(coords.longitude, coords.latitude);
-
-        const map = new maplibregl.Map({
-            container: bodyId,
-            style: styleUrl,
-            center: coordinates,
-            zoom: 15,
-            interactive,
-        });
-
-        new maplibregl.Marker({
-            element: document.getElementById(markerId),
-            anchor: 'bottom',
-            offset: [0, -1],
-        })
-            .setLngLat(coordinates)
-            .addTo(map);
-
-        map.on('error', (e) => {
-            logger.error(
-                "Failed to load map: check map_style_url in config.json has a "
-                + "valid URL and API key",
-                e.error,
-            );
-            onError(e.error);
-        });
+};
 
-        return map;
-    } catch (e) {
-        logger.error("Failed to render map", e);
-        onError(e);
-    }
-}
-
-/**
- * Find the geo-URI contained within a location event.
- */
-export function locationEventGeoUri(mxEvent: MatrixEvent): string {
-    // unfortunately we're stuck supporting legacy `content.geo_uri`
-    // events until the end of days, or until we figure out mutable
-    // events - so folks can read their old chat history correctly.
-    // https://github.com/matrix-org/matrix-doc/issues/3516
-    const content = mxEvent.getContent();
-    const loc = LOCATION_EVENT_TYPE.findIn(content) as { uri?: string };
-    return loc ? loc.uri : content['geo_uri'];
-}
-
-export function parseGeoUri(uri: string): GeolocationCoordinates {
-    function parse(s: string): number {
-        const ret = parseFloat(s);
-        if (Number.isNaN(ret)) {
-            return undefined;
-        } else {
-            return ret;
-        }
-    }
-
-    const m = uri.match(/^\s*geo:(.*?)\s*$/);
-    if (!m) return;
-    const parts = m[1].split(';');
-    const coords = parts[0].split(',');
-    let uncertainty: number;
-    for (const param of parts.slice(1)) {
-        const m = param.match(/u=(.*)/);
-        if (m) uncertainty = parse(m[1]);
-    }
-    return {
-        latitude: parse(coords[0]),
-        longitude: parse(coords[1]),
-        altitude: parse(coords[2]),
-        accuracy: uncertainty,
-        altitudeAccuracy: undefined,
-        heading: undefined,
-        speed: undefined,
-    };
-}
-
-function makeLink(coords: GeolocationCoordinates): string {
-    return (
-        "https://www.openstreetmap.org/" +
-        `?mlat=${coords.latitude}` +
-        `&mlon=${coords.longitude}` +
-        `#map=16/${coords.latitude}/${coords.longitude}`
-    );
-}
-
-export function createMapSiteLink(event: MatrixEvent): string {
-    const content: Object = event.getContent();
-    const mLocation = content[LOCATION_EVENT_TYPE.name];
-    if (mLocation !== undefined) {
-        const uri = mLocation["uri"];
-        if (uri !== undefined) {
-            return makeLink(parseGeoUri(uri));
-        }
-    } else {
-        const geoUri = content["geo_uri"];
-        if (geoUri) {
-            return makeLink(parseGeoUri(geoUri));
-        }
-    }
-    return null;
-}
diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx
index 3b05c09f7af..bea4266d2ea 100644
--- a/src/components/views/messages/MPollBody.tsx
+++ b/src/components/views/messages/MPollBody.tsx
@@ -32,7 +32,6 @@ import {
 import { RelatedRelations } from "matrix-js-sdk/src/models/related-relations";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Modal from '../../../Modal';
 import { IBodyProps } from "./IBodyProps";
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
@@ -210,7 +209,6 @@ export function launchPollEditor(mxEvent: MatrixEvent, getRelationsForEvent?: Ge
     }
 }
 
-@replaceableComponent("views.messages.MPollBody")
 export default class MPollBody extends React.Component<IBodyProps, IState> {
     public static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
index 192cf1dd97a..d754f04b08a 100644
--- a/src/components/views/messages/MStickerBody.tsx
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -17,11 +17,9 @@ limitations under the License.
 import React from 'react';
 
 import MImageBody from './MImageBody';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { BLURHASH_FIELD } from "../../../ContentMessages";
+import { BLURHASH_FIELD } from "../../../utils/image-media";
 import Tooltip from "../elements/Tooltip";
 
-@replaceableComponent("views.messages.MStickerBody")
 export default class MStickerBody extends MImageBody {
     // Mostly empty to prevent default behaviour of MImageBody
     protected onClick = (ev: React.MouseEvent) => {
@@ -41,11 +39,19 @@ export default class MStickerBody extends MImageBody {
         return <div className="mx_MStickerBody_wrapper" onClick={onClick}> { children } </div>;
     }
 
-    // Placeholder to show in place of the sticker image if
-    // img onLoad hasn't fired yet.
+    // Placeholder to show in place of the sticker image if img onLoad hasn't fired yet.
     protected getPlaceholder(width: number, height: number): JSX.Element {
         if (this.props.mxEvent.getContent().info?.[BLURHASH_FIELD]) return super.getPlaceholder(width, height);
-        return <img src={require("../../../../res/img/icons-show-stickers.svg").default} width="75" height="75" />;
+        return (
+            <img
+                className="mx_MStickerBody_placeholder"
+                src={require("../../../../res/img/icons-show-stickers.svg").default}
+                width="80"
+                height="80"
+                onMouseEnter={this.onImageEnter}
+                onMouseLeave={this.onImageLeave}
+            />
+        );
     }
 
     // Tooltip to show on mouse over
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 1b6bafd7d93..1ac389a6bc1 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -21,9 +21,8 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import InlineSpinner from '../elements/InlineSpinner';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromContent } from "../../../customisations/Media";
-import { BLURHASH_FIELD } from "../../../ContentMessages";
+import { BLURHASH_FIELD } from "../../../utils/image-media";
 import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent";
 import { IBodyProps } from "./IBodyProps";
 import MFileBody from "./MFileBody";
@@ -40,7 +39,6 @@ interface IState {
     blurhashUrl: string;
 }
 
-@replaceableComponent("views.messages.MVideoBody")
 export default class MVideoBody extends React.PureComponent<IBodyProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -62,38 +60,6 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
         };
     }
 
-    private suggestedDimensions(isPortrait): { w: number, h: number } {
-        return suggestedVideoSize(SettingsStore.getValue("Images.size") as ImageSize);
-    }
-
-    private thumbScale(
-        fullWidth: number,
-        fullHeight: number,
-        thumbWidth?: number,
-        thumbHeight?: number,
-    ): number {
-        if (!fullWidth || !fullHeight) {
-            // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
-            // log this because it's spammy
-            return undefined;
-        }
-
-        if (!thumbWidth || !thumbHeight) {
-            const dims = this.suggestedDimensions(fullWidth < fullHeight);
-            thumbWidth = dims.w;
-            thumbHeight = dims.h;
-        }
-
-        if (fullWidth < thumbWidth && fullHeight < thumbHeight) {
-            // no scaling needs to be applied
-            return 1;
-        }
-
-        // always scale the videos based on their width.
-        const widthMulti = thumbWidth / fullWidth;
-        return widthMulti;
-    }
-
     private getContentUrl(): string|null {
         const content = this.props.mxEvent.getContent<IMediaEventContent>();
         // During export, the content url will point to the MSC, which will later point to a local url
@@ -135,13 +101,10 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
 
         const canvas = document.createElement("canvas");
 
-        let width = info.w;
-        let height = info.h;
-        const scale = this.thumbScale(info.w, info.h);
-        if (scale) {
-            width = Math.floor(info.w * scale);
-            height = Math.floor(info.h * scale);
-        }
+        const { w: width, h: height } = suggestedVideoSize(
+            SettingsStore.getValue("Images.size") as ImageSize,
+            { w: info.w, h: info.h },
+        );
 
         canvas.width = width;
         canvas.height = height;
@@ -190,12 +153,21 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
                 } else {
                     logger.log("NOT preloading video");
                     const content = this.props.mxEvent.getContent<IMediaEventContent>();
+
+                    let mimetype = content?.info?.mimetype;
+
+                    // clobber quicktime muxed files to be considered MP4 so browsers
+                    // are willing to play them
+                    if (mimetype == "video/quicktime") {
+                        mimetype = "video/mp4";
+                    }
+
                     this.setState({
                         // For Chrome and Electron, we need to set some non-empty `src` to
                         // enable the play button. Firefox does not seem to care either
                         // way, so it's fine to do for all browsers.
-                        decryptedUrl: `data:${content?.info?.mimetype},`,
-                        decryptedThumbnailUrl: thumbnailUrl || `data:${content?.info?.mimetype},`,
+                        decryptedUrl: `data:${mimetype},`,
+                        decryptedThumbnailUrl: thumbnailUrl || `data:${mimetype},`,
                         decryptedBlob: null,
                     });
                 }
@@ -254,6 +226,18 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
         const content = this.props.mxEvent.getContent();
         const autoplay = SettingsStore.getValue("autoplayVideo");
 
+        let aspectRatio;
+        if (content.info?.w && content.info?.h) {
+            aspectRatio = `${content.info.w}/${content.info.h}`;
+        }
+        const { w: maxWidth, h: maxHeight } = suggestedVideoSize(
+            SettingsStore.getValue("Images.size") as ImageSize,
+            { w: content.info?.w, h: content.info?.h },
+        );
+
+        // HACK: This div fills out space while the video loads, to prevent scroll jumps
+        const spaceFiller = <div style={{ width: maxWidth, height: maxHeight }} />;
+
         if (this.state.error !== null) {
             return (
                 <span className="mx_MVideoBody">
@@ -267,53 +251,47 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
         if (!this.props.forExport && content.file !== undefined && this.state.decryptedUrl === null && autoplay) {
             // Need to decrypt the attachment
             // The attachment is decrypted in componentDidMount.
-            // For now add an img tag with a spinner.
+            // For now show a spinner.
             return (
                 <span className="mx_MVideoBody">
-                    <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner">
+                    <div className="mx_MVideoBody_container" style={{ maxWidth, maxHeight, aspectRatio }}>
                         <InlineSpinner />
                     </div>
+                    { spaceFiller }
                 </span>
             );
         }
 
         const contentUrl = this.getContentUrl();
         const thumbUrl = this.getThumbUrl();
-        const defaultDims = this.suggestedDimensions(false);
-        let height = defaultDims.h;
-        let width = defaultDims.w;
         let poster = null;
         let preload = "metadata";
-        if (content.info) {
-            const scale = this.thumbScale(content.info.w, content.info.h);
-            if (scale) {
-                width = Math.floor(content.info.w * scale);
-                height = Math.floor(content.info.h * scale);
-            }
-
-            if (thumbUrl) {
-                poster = thumbUrl;
-                preload = "none";
-            }
+        if (content.info && thumbUrl) {
+            poster = thumbUrl;
+            preload = "none";
         }
 
         const fileBody = this.getFileBody();
         return (
             <span className="mx_MVideoBody">
-                <video
-                    className="mx_MVideoBody"
-                    ref={this.videoRef}
-                    src={contentUrl}
-                    title={content.body}
-                    controls
-                    preload={preload}
-                    muted={autoplay}
-                    autoPlay={autoplay}
-                    height={height}
-                    width={width}
-                    poster={poster}
-                    onPlay={this.videoOnPlay}
-                />
+                <div className="mx_MVideoBody_container" style={{ maxWidth, maxHeight, aspectRatio }}>
+                    <video
+                        className="mx_MVideoBody"
+                        ref={this.videoRef}
+                        src={contentUrl}
+                        title={content.body}
+                        controls
+                        // Disable downloading as it doesn't work with e2ee video,
+                        // users should use the dedicated Download button in the Message Action Bar
+                        controlsList="nodownload"
+                        preload={preload}
+                        muted={autoplay}
+                        autoPlay={autoplay}
+                        poster={poster}
+                        onPlay={this.videoOnPlay}
+                    />
+                    { spaceFiller }
+                </div>
                 { fileBody }
             </span>
         );
diff --git a/src/components/views/messages/MVoiceMessageBody.tsx b/src/components/views/messages/MVoiceMessageBody.tsx
index 847f15bc9cd..65521225ba4 100644
--- a/src/components/views/messages/MVoiceMessageBody.tsx
+++ b/src/components/views/messages/MVoiceMessageBody.tsx
@@ -16,14 +16,12 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import InlineSpinner from '../elements/InlineSpinner';
 import { _t } from "../../../languageHandler";
 import RecordingPlayback from "../audio_messages/RecordingPlayback";
 import MAudioBody from "./MAudioBody";
 import MFileBody from "./MFileBody";
 
-@replaceableComponent("views.messages.MVoiceMessageBody")
 export default class MVoiceMessageBody extends MAudioBody {
     // A voice message is an audio file but rendered in a special way.
     public render() {
diff --git a/src/components/views/messages/MVoiceOrAudioBody.tsx b/src/components/views/messages/MVoiceOrAudioBody.tsx
index cec042a7ff1..fb6391087a1 100644
--- a/src/components/views/messages/MVoiceOrAudioBody.tsx
+++ b/src/components/views/messages/MVoiceOrAudioBody.tsx
@@ -17,12 +17,10 @@ limitations under the License.
 import React from "react";
 
 import MAudioBody from "./MAudioBody";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MVoiceMessageBody from "./MVoiceMessageBody";
 import { IBodyProps } from "./IBodyProps";
 import { isVoiceMessage } from "../../../utils/EventUtils";
 
-@replaceableComponent("views.messages.MVoiceOrAudioBody")
 export default class MVoiceOrAudioBody extends React.PureComponent<IBodyProps> {
     public render() {
         if (!this.props.forExport && isVoiceMessage(this.props.mxEvent)) {
diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx
index cb906fc926c..0effb252888 100644
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -16,22 +16,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactElement, useEffect } from 'react';
+import React, { ReactElement, useContext, useEffect } from 'react';
 import { EventStatus, MatrixEvent, MatrixEventEvent } from 'matrix-js-sdk/src/models/event';
 import classNames from 'classnames';
-import { MsgType } from 'matrix-js-sdk/src/@types/event';
+import { MsgType, RelationType } from 'matrix-js-sdk/src/@types/event';
+import { Thread } from 'matrix-js-sdk/src/models/thread';
 
 import type { Relations } from 'matrix-js-sdk/src/models/relations';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
-import { Action } from '../../../dispatcher/actions';
 import ContextMenu, { aboveLeftOf, ContextMenuTooltipButton, useContextMenu } from '../../structures/ContextMenu';
-import { isContentActionable, canEditContent, editEvent } from '../../../utils/EventUtils';
+import { isContentActionable, canEditContent, editEvent, canCancel } from '../../../utils/EventUtils';
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import Toolbar from "../../../accessibility/Toolbar";
 import { RovingAccessibleTooltipButton, useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import MessageContextMenu, { canCancel } from "../context_menus/MessageContextMenu";
+import MessageContextMenu from "../context_menus/MessageContextMenu";
 import Resend from "../../../Resend";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
@@ -40,9 +39,14 @@ import SettingsStore from '../../../settings/SettingsStore';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import ReplyChain from '../elements/ReplyChain';
 import ReactionPicker from "../emojipicker/ReactionPicker";
-import { CardContext } from '../right_panel/BaseCard';
+import { CardContext } from '../right_panel/context';
 import { showThread } from "../../../dispatcher/dispatch-actions/threads";
 import { shouldDisplayReply } from '../../../utils/Reply';
+import { Key } from "../../../Keyboard";
+import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
+import { UserTab } from '../dialogs/UserTab';
+import { Action } from '../../../dispatcher/actions';
+import SdkConfig from "../../../SdkConfig";
 
 interface IOptionsButtonProps {
     mxEvent: MatrixEvent;
@@ -152,6 +156,81 @@ const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusC
     </React.Fragment>;
 };
 
+interface IReplyInThreadButton {
+    mxEvent: MatrixEvent;
+}
+
+const ReplyInThreadButton = ({ mxEvent }: IReplyInThreadButton) => {
+    const context = useContext(CardContext);
+
+    const relationType = mxEvent?.getRelation()?.rel_type;
+    const hasARelation = !!relationType && relationType !== RelationType.Thread;
+    const firstTimeSeeingThreads = !localStorage.getItem("mx_seen_feature_thread");
+    const threadsEnabled = SettingsStore.getValue("feature_thread");
+
+    if (!threadsEnabled && !Thread.hasServerSideSupport) {
+        // hide the prompt if the user would only have degraded mode
+        return null;
+    }
+
+    const onClick = (): void => {
+        if (firstTimeSeeingThreads) {
+            localStorage.setItem("mx_seen_feature_thread", "true");
+        }
+
+        if (!SettingsStore.getValue("feature_thread")) {
+            dis.dispatch({
+                action: Action.ViewUserSettings,
+                initialTabId: UserTab.Labs,
+            });
+        } else if (mxEvent.isThreadRelation) {
+            showThread({
+                rootEvent: mxEvent.getThread().rootEvent,
+                initialEvent: mxEvent,
+                scroll_into_view: true,
+                highlighted: true,
+                push: context.isCard,
+            });
+        } else {
+            showThread({
+                rootEvent: mxEvent,
+                push: context.isCard,
+            });
+        }
+    };
+
+    return <RovingAccessibleTooltipButton
+        className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
+
+        disabled={hasARelation}
+        tooltip={<>
+            <div className="mx_Tooltip_title">
+                { !hasARelation
+                    ? _t("Reply in thread")
+                    : _t("Can't create a thread from an event with an existing relation") }
+            </div>
+            { !hasARelation && (
+                <div className="mx_Tooltip_sub">
+                    { SettingsStore.getValue("feature_thread")
+                        ? _t("Beta feature")
+                        : _t("Beta feature. Click to learn more.")
+                    }
+                </div>
+            ) }
+        </>}
+
+        title={!hasARelation
+            ? _t("Reply in thread")
+            : _t("Can't create a thread from an event with an existing relation")}
+
+        onClick={onClick}
+    >
+        { firstTimeSeeingThreads && !threadsEnabled && (
+            <div className="mx_Indicator" />
+        ) }
+    </RovingAccessibleTooltipButton>;
+};
+
 interface IMessageActionBarProps {
     mxEvent: MatrixEvent;
     reactions?: Relations;
@@ -164,12 +243,11 @@ interface IMessageActionBarProps {
     isQuoteExpanded?: boolean;
     getRelationsForEvent?: (
         eventId: string,
-        relationType: string,
+        relationType: RelationType | string,
         eventType: string
     ) => Relations;
 }
 
-@replaceableComponent("views.messages.MessageActionBar")
 export default class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
     public static contextType = RoomContext;
 
@@ -221,14 +299,6 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
         });
     };
 
-    private onThreadClick = (isCard: boolean): void => {
-        showThread({ rootEvent: this.props.mxEvent, push: isCard });
-        dis.dispatch({
-            action: Action.FocusSendMessageComposer,
-            context: TimelineRenderingType.Thread,
-        });
-    };
-
     private onEditClick = (): void => {
         editEvent(this.props.mxEvent, this.context.timelineRenderingType, this.props.getRelationsForEvent);
     };
@@ -238,14 +308,27 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
     ];
 
     private get showReplyInThreadAction(): boolean {
-        const isThreadEnabled = SettingsStore.getValue("feature_thread");
+        if (!SettingsStore.getValue("feature_thread") && !Thread.hasServerSideSupport) {
+            // hide the prompt if the user would only have degraded mode
+            return null;
+        }
+
+        if (!SettingsStore.getBetaInfo("feature_thread") &&
+            !SettingsStore.getValue("feature_thread") &&
+            !SdkConfig.get("show_labs_settings")
+        ) {
+            // Hide the beta prompt if there is no UI to enable it,
+            // e.g if config.json disables it and doesn't enable show labs flags
+            return false;
+        }
+
         const inNotThreadTimeline = this.context.timelineRenderingType !== TimelineRenderingType.Thread;
 
         const isAllowedMessageType = !this.forbiddenThreadHeadMsgType.includes(
             this.props.mxEvent.getContent().msgtype as MsgType,
         );
 
-        return isThreadEnabled && inNotThreadTimeline && isAllowedMessageType;
+        return inNotThreadTimeline && isAllowedMessageType;
     }
 
     /**
@@ -301,15 +384,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
             key="cancel"
         />;
 
-        const threadTooltipButton = <CardContext.Consumer key="thread">
-            { context =>
-                <RovingAccessibleTooltipButton
-                    className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
-                    title={_t("Reply in thread")}
-                    onClick={this.onThreadClick.bind(null, context.isCard)}
-                />
-            }
-        </CardContext.Consumer>;
+        const threadTooltipButton = <ReplyInThreadButton mxEvent={this.props.mxEvent} />;
 
         // We show a different toolbar for failed events, so detect that first.
         const mxEvent = this.props.mxEvent;
@@ -382,9 +457,18 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                     'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded,
                     'mx_MessageActionBar_collapseMessageButton': this.props.isQuoteExpanded,
                 });
+                const tooltip = <>
+                    <div className="mx_Tooltip_title">
+                        { this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes") }
+                    </div>
+                    <div className="mx_Tooltip_sub">
+                        { _t(ALTERNATE_KEY_NAME[Key.SHIFT]) + " + " + _t("Click") }
+                    </div>
+                </>;
                 toolbarOpts.push(<RovingAccessibleTooltipButton
                     className={expandClassName}
-                    title={this.props.isQuoteExpanded ? _t("Collapse quotes │ ⇧+click") : _t("Expand quotes │ ⇧+click")}
+                    title={this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes")}
+                    tooltip={tooltip}
                     onClick={this.props.toggleThreadExpanded}
                     key="expand"
                 />);
diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx
index 578b8874203..d52629b56d6 100644
--- a/src/components/views/messages/MessageEvent.tsx
+++ b/src/components/views/messages/MessageEvent.tsx
@@ -17,27 +17,36 @@ limitations under the License.
 import React, { createRef } from 'react';
 import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
 import { Relations } from 'matrix-js-sdk/src/models/relations';
-import { LOCATION_EVENT_TYPE } from 'matrix-js-sdk/src/@types/location';
+import { M_BEACON_INFO } from 'matrix-js-sdk/src/@types/beacon';
+import { M_LOCATION } from 'matrix-js-sdk/src/@types/location';
 import { M_POLL_START } from "matrix-events-sdk";
 
-import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import { Mjolnir } from "../../../mjolnir/Mjolnir";
 import RedactedBody from "./RedactedBody";
 import UnknownBody from "./UnknownBody";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IMediaBody } from "./IMediaBody";
-import { IOperableEventTile } from "../context_menus/MessageContextMenu";
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 import { ReactAnyComponent } from "../../../@types/common";
 import { IBodyProps } from "./IBodyProps";
 import MatrixClientContext from '../../../contexts/MatrixClientContext';
+import TextualBody from "./TextualBody";
+import MImageBody from "./MImageBody";
+import MFileBody from "./MFileBody";
+import MVoiceOrAudioBody from "./MVoiceOrAudioBody";
+import MVideoBody from "./MVideoBody";
+import MStickerBody from "./MStickerBody";
+import MPollBody from "./MPollBody";
+import MLocationBody from "./MLocationBody";
+import MjolnirBody from "./MjolnirBody";
+import MBeaconBody from "./MBeaconBody";
+import { IEventTileOps } from "../rooms/EventTile";
 
 // onMessageAllowed is handled internally
-interface IProps extends Omit<IBodyProps, "onMessageAllowed"> {
+interface IProps extends Omit<IBodyProps, "onMessageAllowed" | "mediaEventHelper"> {
     /* overrides for the msgtype-specific components, used by ReplyTile to override file rendering */
-    overrideBodyTypes?: Record<string, React.Component>;
-    overrideEventTypes?: Record<string, React.Component>;
+    overrideBodyTypes?: Record<string, typeof React.Component>;
+    overrideEventTypes?: Record<string, typeof React.Component>;
 
     // helper function to access relations for this event
     getRelationsForEvent?: (eventId: string, relationType: string, eventType: string) => Relations;
@@ -45,7 +54,10 @@ interface IProps extends Omit<IBodyProps, "onMessageAllowed"> {
     isSeeingThroughMessageHiddenForModeration?: boolean;
 }
 
-@replaceableComponent("views.messages.MessageEvent")
+export interface IOperableEventTile {
+    getEventTileOps(): IEventTileOps;
+}
+
 export default class MessageEvent extends React.Component<IProps> implements IMediaBody, IOperableEventTile {
     private body: React.RefObject<React.Component | IOperableEventTile> = createRef();
     private mediaHelper: MediaEventHelper;
@@ -72,23 +84,27 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
         }
     }
 
-    private get bodyTypes(): Record<string, React.Component> {
+    private get bodyTypes(): Record<string, typeof React.Component> {
         return {
-            [MsgType.Text]: sdk.getComponent('messages.TextualBody'),
-            [MsgType.Notice]: sdk.getComponent('messages.TextualBody'),
-            [MsgType.Emote]: sdk.getComponent('messages.TextualBody'),
-            [MsgType.Image]: sdk.getComponent('messages.MImageBody'),
-            [MsgType.File]: sdk.getComponent('messages.MFileBody'),
-            [MsgType.Audio]: sdk.getComponent('messages.MVoiceOrAudioBody'),
-            [MsgType.Video]: sdk.getComponent('messages.MVideoBody'),
+            [MsgType.Text]: TextualBody,
+            [MsgType.Notice]: TextualBody,
+            [MsgType.Emote]: TextualBody,
+            [MsgType.Image]: MImageBody,
+            [MsgType.File]: MFileBody,
+            [MsgType.Audio]: MVoiceOrAudioBody,
+            [MsgType.Video]: MVideoBody,
 
             ...(this.props.overrideBodyTypes || {}),
         };
     }
 
-    private get evTypes(): Record<string, React.Component> {
+    private get evTypes(): Record<string, React.ComponentType<Partial<IBodyProps>>> {
         return {
-            [EventType.Sticker]: sdk.getComponent('messages.MStickerBody'),
+            [EventType.Sticker]: MStickerBody,
+            [M_POLL_START.name]: MPollBody,
+            [M_POLL_START.altName]: MPollBody,
+            [M_BEACON_INFO.name]: MBeaconBody,
+            [M_BEACON_INFO.altName]: MBeaconBody,
 
             ...(this.props.overrideEventTypes || {}),
         };
@@ -110,7 +126,7 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
         const content = this.props.mxEvent.getContent();
         const type = this.props.mxEvent.getType();
         const msgtype = content.msgtype;
-        let BodyType: ReactAnyComponent = RedactedBody;
+        let BodyType: React.ComponentType<Partial<IBodyProps>> | ReactAnyComponent = RedactedBody;
         if (!this.props.mxEvent.isRedacted()) {
             // only resolve BodyType if event is not redacted
             if (type && this.evTypes[type]) {
@@ -125,17 +141,12 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
                 BodyType = UnknownBody;
             }
 
-            // TODO: move to eventTypes when Polls spec stabilises
-            if (M_POLL_START.matches(type)) {
-                BodyType = sdk.getComponent('messages.MPollBody');
-            }
-
             // TODO: move to eventTypes when location sharing spec stabilises
             if (
-                LOCATION_EVENT_TYPE.matches(type) ||
+                M_LOCATION.matches(type) ||
                 (type === EventType.RoomMessage && msgtype === MsgType.Location)
             ) {
-                BodyType = sdk.getComponent('messages.MLocationBody');
+                BodyType = MLocationBody;
             }
         }
 
@@ -149,7 +160,7 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
                 const serverBanned = Mjolnir.sharedInstance().isServerBanned(userDomain);
 
                 if (userBanned || serverBanned) {
-                    BodyType = sdk.getComponent('messages.MjolnirBody');
+                    BodyType = MjolnirBody;
                 }
             }
         }
diff --git a/src/components/views/messages/MessageTimestamp.tsx b/src/components/views/messages/MessageTimestamp.tsx
index cbf37f47f63..9b5c280705b 100644
--- a/src/components/views/messages/MessageTimestamp.tsx
+++ b/src/components/views/messages/MessageTimestamp.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 
 import { formatFullDate, formatTime, formatFullTime, formatRelativeTime } from '../../../DateUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     ts: number;
@@ -28,7 +27,6 @@ interface IProps {
     showRelative?: boolean;
 }
 
-@replaceableComponent("views.messages.MessageTimestamp")
 export default class MessageTimestamp extends React.Component<IProps> {
     public render() {
         const date = new Date(this.props.ts);
diff --git a/src/components/views/messages/MjolnirBody.tsx b/src/components/views/messages/MjolnirBody.tsx
index 14956554f19..b3ca769ba54 100644
--- a/src/components/views/messages/MjolnirBody.tsx
+++ b/src/components/views/messages/MjolnirBody.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from '../elements/AccessibleButton';
 
 interface IProps {
@@ -26,7 +25,6 @@ interface IProps {
     onMessageAllowed: () => void;
 }
 
-@replaceableComponent("views.messages.MjolnirBody")
 export default class MjolnirBody extends React.Component<IProps> {
     private onAllowClick = (e: React.MouseEvent): void => {
         e.preventDefault();
diff --git a/src/components/views/messages/ReactionsRow.tsx b/src/components/views/messages/ReactionsRow.tsx
index 7cce3238b7b..0c064746359 100644
--- a/src/components/views/messages/ReactionsRow.tsx
+++ b/src/components/views/messages/ReactionsRow.tsx
@@ -21,7 +21,6 @@ import { Relations, RelationsEvent } from "matrix-js-sdk/src/models/relations";
 
 import { _t } from '../../../languageHandler';
 import { isContentActionable } from '../../../utils/EventUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import ContextMenu, { aboveLeftOf, useContextMenu } from "../../structures/ContextMenu";
 import ReactionPicker from "../emojipicker/ReactionPicker";
@@ -74,7 +73,6 @@ interface IState {
     showAll: boolean;
 }
 
-@replaceableComponent("views.messages.ReactionsRow")
 export default class ReactionsRow extends React.PureComponent<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
diff --git a/src/components/views/messages/ReactionsRowButton.tsx b/src/components/views/messages/ReactionsRowButton.tsx
index 242428ed367..d3fcb2faa62 100644
--- a/src/components/views/messages/ReactionsRowButton.tsx
+++ b/src/components/views/messages/ReactionsRowButton.tsx
@@ -21,7 +21,6 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import dis from "../../../dispatcher/dispatcher";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ReactionsRowButtonTooltip from "./ReactionsRowButtonTooltip";
 import AccessibleButton from "../elements/AccessibleButton";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -46,7 +45,6 @@ interface IState {
     tooltipVisible: boolean;
 }
 
-@replaceableComponent("views.messages.ReactionsRowButton")
 export default class ReactionsRowButton extends React.PureComponent<IProps, IState> {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.tsx b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
index 9c43c0df77b..cb714d1fba5 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.tsx
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
@@ -20,7 +20,6 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { unicodeToShortcode } from '../../../HtmlUtils';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Tooltip from "../elements/Tooltip";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
@@ -34,7 +33,6 @@ interface IProps {
     visible: boolean;
 }
 
-@replaceableComponent("views.messages.ReactionsRowButtonTooltip")
 export default class ReactionsRowButtonTooltip extends React.PureComponent<IProps> {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/views/messages/RoomAvatarEvent.tsx b/src/components/views/messages/RoomAvatarEvent.tsx
index 9cb91c7c443..3cac4d29c51 100644
--- a/src/components/views/messages/RoomAvatarEvent.tsx
+++ b/src/components/views/messages/RoomAvatarEvent.tsx
@@ -23,7 +23,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import RoomAvatar from "../avatars/RoomAvatar";
 import ImageView from "../elements/ImageView";
@@ -33,7 +32,6 @@ interface IProps {
     mxEvent: MatrixEvent;
 }
 
-@replaceableComponent("views.messages.RoomAvatarEvent")
 export default class RoomAvatarEvent extends React.Component<IProps> {
     private onAvatarClick = (): void => {
         const cli = MatrixClientPeg.get();
diff --git a/src/components/views/messages/RoomCreate.tsx b/src/components/views/messages/RoomCreate.tsx
index c2d407c8b98..bd723a5c488 100644
--- a/src/components/views/messages/RoomCreate.tsx
+++ b/src/components/views/messages/RoomCreate.tsx
@@ -24,7 +24,6 @@ import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import EventTileBubble from "./EventTileBubble";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 
 interface IProps {
@@ -33,7 +32,6 @@ interface IProps {
     timestamp?: JSX.Element;
 }
 
-@replaceableComponent("views.messages.RoomCreate")
 export default class RoomCreate extends React.Component<IProps> {
     private onLinkClicked = (e: React.MouseEvent): void => {
         e.preventDefault();
diff --git a/src/components/views/messages/SenderProfile.tsx b/src/components/views/messages/SenderProfile.tsx
index ae6df373b38..da7d1206d11 100644
--- a/src/components/views/messages/SenderProfile.tsx
+++ b/src/components/views/messages/SenderProfile.tsx
@@ -17,14 +17,9 @@
 import React from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { MsgType } from "matrix-js-sdk/src/@types/event";
-import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 
-import Flair from '../elements/Flair';
-import FlairStore from '../../../stores/FlairStore';
-import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import UserIdentifier from '../../../customisations/UserIdentifier';
+import DisambiguatedProfile from "./DisambiguatedProfile";
 import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
 import SettingsStore from "../../../settings/SettingsStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -32,96 +27,24 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 interface IProps {
     mxEvent: MatrixEvent;
     onClick?(): void;
-    enableFlair: boolean;
 }
 
-interface IState {
-    userGroups: string[];
-    relatedGroups: string[];
-}
-
-@replaceableComponent("views.messages.SenderProfile")
-export default class SenderProfile extends React.Component<IProps, IState> {
-    static contextType = MatrixClientContext;
+export default class SenderProfile extends React.PureComponent<IProps> {
+    public static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
-    private unmounted = false;
-
-    constructor(props: IProps) {
-        super(props);
-        const senderId = this.props.mxEvent.getSender();
-
-        this.state = {
-            userGroups: FlairStore.cachedPublicisedGroups(senderId) || [],
-            relatedGroups: [],
-        };
-    }
-
-    componentDidMount() {
-        this.updateRelatedGroups();
-
-        if (this.state.userGroups.length === 0) {
-            this.getPublicisedGroups();
-        }
-
-        this.context.on(RoomStateEvent.Events, this.onRoomStateEvents);
-    }
-
-    componentWillUnmount() {
-        this.unmounted = true;
-        this.context.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
-    }
-
-    private async getPublicisedGroups() {
-        const userGroups = await FlairStore.getPublicisedGroupsCached(this.context, this.props.mxEvent.getSender());
-        if (this.unmounted) return;
-        this.setState({ userGroups });
-    }
-
-    private onRoomStateEvents = (event: MatrixEvent) => {
-        if (event.getType() === 'm.room.related_groups' && event.getRoomId() === this.props.mxEvent.getRoomId()) {
-            this.updateRelatedGroups();
-        }
-    };
-
-    private updateRelatedGroups() {
-        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
-        if (!room) return;
-
-        const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
-        this.setState({
-            relatedGroups: relatedGroupsEvent?.getContent().groups || [],
-        });
-    }
-
-    private getDisplayedGroups(userGroups?: string[], relatedGroups?: string[]) {
-        let displayedGroups = userGroups || [];
-        if (relatedGroups && relatedGroups.length > 0) {
-            displayedGroups = relatedGroups.filter((groupId) => {
-                return displayedGroups.includes(groupId);
-            });
-        } else {
-            displayedGroups = [];
-        }
-        return displayedGroups;
-    }
 
     render() {
-        const { mxEvent } = this.props;
-        const colorClass = getUserNameColorClass(mxEvent.getSender());
-        const { msgtype } = mxEvent.getContent();
+        const { mxEvent, onClick } = this.props;
+        const msgtype = mxEvent.getContent().msgtype;
 
         let member = mxEvent.sender;
         if (SettingsStore.getValue("feature_use_only_current_profiles")) {
             const room = MatrixClientPeg.get().getRoom(mxEvent.getRoomId());
             if (room) {
-                member = room.getMember(member.userId);
+                member = room.getMember(mxEvent.getSender());
             }
         }
 
-        const disambiguate = member?.disambiguate || mxEvent.sender?.disambiguate;
-        const displayName = member?.rawDisplayName || mxEvent.getSender() || "";
-        const mxid = member?.userId || mxEvent.getSender() || "";
-
         return <RoomContext.Consumer>
             { roomContext => {
                 if (msgtype === MsgType.Emote &&
@@ -130,34 +53,14 @@ export default class SenderProfile extends React.Component<IProps, IState> {
                     return null; // emote message must include the name so don't duplicate it
                 }
 
-                let mxidElement;
-                if (disambiguate) {
-                    mxidElement = (
-                        <span className="mx_SenderProfile_mxid">
-                            { UserIdentifier.getDisplayUserIdentifier(
-                                mxid, { withDisplayName: true, roomId: mxEvent.getRoomId() },
-                            ) }
-                        </span>
-                    );
-                }
-
-                let flair;
-                if (this.props.enableFlair) {
-                    const displayedGroups = this.getDisplayedGroups(
-                        this.state.userGroups, this.state.relatedGroups,
-                    );
-
-                    flair = <Flair key='flair' userId={mxEvent.getSender()} groups={displayedGroups} />;
-                }
-
                 return (
-                    <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
-                        <span className={`mx_SenderProfile_displayName ${colorClass}`}>
-                            { displayName }
-                        </span>
-                        { mxidElement }
-                        { flair }
-                    </div>
+                    <DisambiguatedProfile
+                        fallbackName={mxEvent.getSender() || ""}
+                        onClick={onClick}
+                        member={member}
+                        colored={true}
+                        emphasizeDisplayName={true}
+                    />
                 );
             } }
         </RoomContext.Consumer>;
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
index 9ec9980fb83..e8239097110 100644
--- a/src/components/views/messages/TextualBody.tsx
+++ b/src/components/views/messages/TextualBody.tsx
@@ -33,7 +33,6 @@ import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { isPermalinkHost, tryTransformPermalinkToLocalHref } from "../../../utils/permalinks/Permalinks";
 import { copyPlaintext } from "../../../utils/strings";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
 import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
 import { Action } from "../../../dispatcher/actions";
@@ -59,7 +58,6 @@ interface IState {
     widgetHidden: boolean;
 }
 
-@replaceableComponent("views.messages.TextualBody")
 export default class TextualBody extends React.Component<IBodyProps, IState> {
     private readonly contentRef = createRef<HTMLSpanElement>();
 
@@ -607,9 +605,14 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         if (this.props.highlightLink) {
             body = <a href={this.props.highlightLink}>{ body }</a>;
         } else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
-            body = <AccessibleButton kind="link_inline"
-                onClick={this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"])}
-            >{ body }</AccessibleButton>;
+            body = (
+                <AccessibleButton
+                    kind="link_inline"
+                    onClick={this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"])}
+                >
+                    { body }
+                </AccessibleButton>
+            );
         }
 
         let widgets;
@@ -651,9 +654,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
             );
         }
         return (
-            <div className="mx_MTextBody mx_EventTile_content"
-                onClick={this.onBodyLinkClick}
-            >
+            <div className="mx_MTextBody mx_EventTile_content" onClick={this.onBodyLinkClick}>
                 { body }
                 { widgets }
             </div>
diff --git a/src/components/views/messages/TextualEvent.tsx b/src/components/views/messages/TextualEvent.tsx
index 8fc116b5d01..fb217607fef 100644
--- a/src/components/views/messages/TextualEvent.tsx
+++ b/src/components/views/messages/TextualEvent.tsx
@@ -19,18 +19,16 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import RoomContext from "../../../contexts/RoomContext";
 import * as TextForEvent from "../../../TextForEvent";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     mxEvent: MatrixEvent;
 }
 
-@replaceableComponent("views.messages.TextualEvent")
 export default class TextualEvent extends React.Component<IProps> {
     static contextType = RoomContext;
 
     public render() {
-        const text = TextForEvent.textForEvent(this.props.mxEvent, true, this.context?.showHiddenEventsInTimeline);
+        const text = TextForEvent.textForEvent(this.props.mxEvent, true, this.context?.showHiddenEvents);
         if (!text) return null;
         return <div className="mx_TextualEvent">{ text }</div>;
     }
diff --git a/src/components/views/messages/TileErrorBoundary.tsx b/src/components/views/messages/TileErrorBoundary.tsx
index 9f3b751dd35..c30a68bb96e 100644
--- a/src/components/views/messages/TileErrorBoundary.tsx
+++ b/src/components/views/messages/TileErrorBoundary.tsx
@@ -21,7 +21,6 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BugReportDialog from '../dialogs/BugReportDialog';
 import AccessibleButton from '../elements/AccessibleButton';
 import SettingsStore from "../../../settings/SettingsStore";
@@ -37,7 +36,6 @@ interface IState {
     error: Error;
 }
 
-@replaceableComponent("views.messages.TileErrorBoundary")
 export default class TileErrorBoundary extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/UnknownBody.tsx b/src/components/views/messages/UnknownBody.tsx
index d9e70ff241f..cd1f06a788b 100644
--- a/src/components/views/messages/UnknownBody.tsx
+++ b/src/components/views/messages/UnknownBody.tsx
@@ -23,12 +23,12 @@ interface IProps {
     children?: React.ReactNode;
 }
 
-export default forwardRef(({ mxEvent, children }: IProps, ref: React.RefObject<HTMLSpanElement>) => {
+export default forwardRef(({ mxEvent, children }: IProps, ref: React.RefObject<HTMLDivElement>) => {
     const text = mxEvent.getContent().body;
     return (
-        <span className="mx_UnknownBody" ref={ref}>
+        <div className="mx_UnknownBody" ref={ref}>
             { text }
             { children }
-        </span>
+        </div>
     );
 });
diff --git a/src/components/views/messages/ViewSourceEvent.tsx b/src/components/views/messages/ViewSourceEvent.tsx
index ad833936e49..b4cca0b5cc8 100644
--- a/src/components/views/messages/ViewSourceEvent.tsx
+++ b/src/components/views/messages/ViewSourceEvent.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { MatrixEvent, MatrixEventEvent } from 'matrix-js-sdk/src/matrix';
 import classNames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -31,7 +30,6 @@ interface IState {
     expanded: boolean;
 }
 
-@replaceableComponent("views.messages.ViewSourceEvent")
 export default class ViewSourceEvent extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx
index 3d76f72b3f2..ae4a2942a28 100644
--- a/src/components/views/right_panel/BaseCard.tsx
+++ b/src/components/views/right_panel/BaseCard.tsx
@@ -22,8 +22,8 @@ import { _t } from "../../../languageHandler";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
 import { backLabelForPhase } from '../../../stores/right-panel/RightPanelStorePhases';
+import { CardContext } from './context';
 
-export const CardContext = React.createContext({ isCard: false });
 interface IProps {
     header?: ReactNode;
     footer?: ReactNode;
diff --git a/src/components/views/right_panel/EncryptionPanel.tsx b/src/components/views/right_panel/EncryptionPanel.tsx
index 2cfd4851e07..c2dfd7a379b 100644
--- a/src/components/views/right_panel/EncryptionPanel.tsx
+++ b/src/components/views/right_panel/EncryptionPanel.tsx
@@ -30,10 +30,10 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { ensureDMExists } from "../../../createRoom";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
 import Modal from "../../../Modal";
-import * as sdk from "../../../index";
 import { _t } from "../../../languageHandler";
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
+import ErrorDialog from "../dialogs/ErrorDialog";
 
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
@@ -84,8 +84,6 @@ const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {
-            // FIXME: Using an import will result in test failures
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog("Verification failed", "insecure", ErrorDialog, {
                 headerImage: require("../../../../res/img/e2e/warning.svg").default,
                 title: _t("Your messages are not secure"),
diff --git a/src/components/views/right_panel/GroupHeaderButtons.tsx b/src/components/views/right_panel/GroupHeaderButtons.tsx
deleted file mode 100644
index e2f3779c4c3..00000000000
--- a/src/components/views/right_panel/GroupHeaderButtons.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import { _t } from '../../../languageHandler';
-import HeaderButton from './HeaderButton';
-import HeaderButtons, { HeaderKind } from './HeaderButtons';
-import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
-import { Action } from "../../../dispatcher/actions";
-import { ActionPayload } from "../../../dispatcher/payloads";
-import { ViewUserPayload } from "../../../dispatcher/payloads/ViewUserPayload";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
-
-const GROUP_PHASES = [
-    RightPanelPhases.GroupMemberInfo,
-    RightPanelPhases.GroupMemberList,
-];
-const ROOM_PHASES = [
-    RightPanelPhases.GroupRoomList,
-    RightPanelPhases.GroupRoomInfo,
-];
-
-interface IProps {}
-
-@replaceableComponent("views.right_panel.GroupHeaderButtons")
-export default class GroupHeaderButtons extends HeaderButtons {
-    constructor(props: IProps) {
-        super(props, HeaderKind.Group);
-    }
-
-    protected onAction(payload: ActionPayload) {
-        if (payload.action === Action.ViewUser) {
-            if ((payload as ViewUserPayload).member) {
-                RightPanelStore.instance.setCards([
-                    { phase: RightPanelPhases.GroupRoomInfo },
-                    { phase: RightPanelPhases.GroupMemberList },
-                    { phase: RightPanelPhases.RoomMemberInfo, state: { member: payload.member } },
-                ]);
-            } else {
-                this.setPhase(RightPanelPhases.GroupMemberList);
-            }
-        } else if (payload.action === "view_group") {
-            this.setPhase(RightPanelPhases.GroupMemberList);
-        } else if (payload.action === "view_group_room") {
-            this.setPhase(
-                RightPanelPhases.GroupRoomInfo,
-                { groupRoomId: payload.groupRoomId, groupId: payload.groupId },
-            );
-        } else if (payload.action === "view_group_room_list") {
-            this.setPhase(RightPanelPhases.GroupRoomList);
-        } else if (payload.action === "view_group_member_list") {
-            this.setPhase(RightPanelPhases.GroupMemberList);
-        } else if (payload.action === "view_group_user") {
-            this.setPhase(RightPanelPhases.GroupMemberInfo, { member: payload.member });
-        }
-    }
-
-    private onMembersClicked = () => {
-        if (this.state.phase === RightPanelPhases.GroupMemberInfo) {
-            // send the active phase to trigger a toggle
-            this.setPhase(RightPanelPhases.GroupMemberInfo);
-        } else {
-            // This toggles for us, if needed
-            this.setPhase(RightPanelPhases.GroupMemberList);
-        }
-    };
-
-    private onRoomsClicked = () => {
-        // This toggles for us, if needed
-        this.setPhase(RightPanelPhases.GroupRoomList);
-    };
-
-    renderButtons() {
-        return <>
-            <HeaderButton
-                name="groupMembersButton"
-                title={_t('Members')}
-                isHighlighted={this.isPhase(GROUP_PHASES)}
-                onClick={this.onMembersClicked}
-                analytics={['Right Panel', 'Group Member List Button', 'click']}
-            />
-            <HeaderButton
-                name="roomsButton"
-                title={_t('Rooms')}
-                isHighlighted={this.isPhase(ROOM_PHASES)}
-                onClick={this.onRoomsClicked}
-                analytics={['Right Panel', 'Group Room List Button', 'click']}
-            />
-        </>;
-    }
-}
diff --git a/src/components/views/right_panel/HeaderButton.tsx b/src/components/views/right_panel/HeaderButton.tsx
index 7f6c22fbd3d..f422bede7ee 100644
--- a/src/components/views/right_panel/HeaderButton.tsx
+++ b/src/components/views/right_panel/HeaderButton.tsx
@@ -23,12 +23,12 @@ import classNames from 'classnames';
 
 import Analytics from '../../../Analytics';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ButtonEvent } from "../elements/AccessibleButton";
 
 interface IProps {
     // Whether this button is highlighted
     isHighlighted: boolean;
+    isUnread?: boolean;
     // click handler
     onClick: (ev: ButtonEvent) => void;
     // The parameters to track the click event
@@ -41,7 +41,6 @@ interface IProps {
 }
 
 // TODO: replace this, the composer buttons and the right panel buttons with a unified representation
-@replaceableComponent("views.right_panel.HeaderButton")
 export default class HeaderButton extends React.Component<IProps> {
     private onClick = (ev: ButtonEvent) => {
         Analytics.trackEvent(...this.props.analytics);
@@ -50,11 +49,12 @@ export default class HeaderButton extends React.Component<IProps> {
 
     public render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { isHighlighted, onClick, analytics, name, title, ...props } = this.props;
+        const { isHighlighted, isUnread = false, onClick, analytics, name, title, ...props } = this.props;
 
         const classes = classNames({
             mx_RightPanel_headerButton: true,
             mx_RightPanel_headerButton_highlight: isHighlighted,
+            mx_RightPanel_headerButton_unread: isUnread,
             [`mx_RightPanel_${name}`]: true,
         });
 
diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
index 3be4ba3598c..a152a8871f6 100644
--- a/src/components/views/right_panel/HeaderButtons.tsx
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -24,13 +24,11 @@ import dis from '../../../dispatcher/dispatcher';
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import { IRightPanelCardState } from '../../../stores/right-panel/RightPanelStoreIPanelState';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { UPDATE_EVENT } from '../../../stores/AsyncStore';
 import { NotificationColor } from '../../../stores/notifications/NotificationColor';
 
 export enum HeaderKind {
   Room = "room",
-  Group = "group",
 }
 
 interface IState {
@@ -41,7 +39,6 @@ interface IState {
 
 interface IProps {}
 
-@replaceableComponent("views.right_panel.HeaderButtons")
 export default abstract class HeaderButtons<P = {}> extends React.Component<IProps & P, IState> {
     private unmounted = false;
     private dispatcherRef: string;
@@ -91,9 +88,7 @@ export default abstract class HeaderButtons<P = {}> extends React.Component<IPro
 
     private onRightPanelStoreUpdate = () => {
         if (this.unmounted) return;
-        let phase = RightPanelStore.instance.currentCard.phase;
-        if (!RightPanelStore.instance.isOpenForGroup) {phase = null;}
-        this.setState({ phase });
+        this.setState({ phase: RightPanelStore.instance.currentCard.phase });
     };
 
     // XXX: Make renderButtons a prop
diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx
index 1b110a76c32..def09858638 100644
--- a/src/components/views/right_panel/PinnedMessagesCard.tsx
+++ b/src/components/views/right_panel/PinnedMessagesCard.tsx
@@ -31,6 +31,7 @@ import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
 import PinnedEventTile from "../rooms/PinnedEventTile";
 import { useRoomState } from "../../../hooks/useRoomState";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
+import { ReadPinsEventId } from "./types";
 
 interface IProps {
     room: Room;
@@ -56,8 +57,6 @@ export const usePinnedEvents = (room: Room): string[] => {
     return pinnedEvents;
 };
 
-export const ReadPinsEventId = "im.vector.room.read_pins";
-
 export const useReadPinnedEvents = (room: Room): Set<string> => {
     const [readPinnedEvents, setReadPinnedEvents] = useState<Set<string>>(new Set());
 
diff --git a/src/components/views/right_panel/RoomHeaderButtons.tsx b/src/components/views/right_panel/RoomHeaderButtons.tsx
index aa2a8ffd636..cb661d00a13 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.tsx
+++ b/src/components/views/right_panel/RoomHeaderButtons.tsx
@@ -29,7 +29,6 @@ import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePha
 import { Action } from "../../../dispatcher/actions";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { useSettingValue } from "../../../hooks/useSettings";
 import { useReadPinnedEvents, usePinnedEvents } from './PinnedMessagesCard';
 import { showThreadPanel } from "../../../dispatcher/dispatch-actions/threads";
@@ -61,6 +60,7 @@ const UnreadIndicator = ({ color }: IUnreadIndicatorProps) => {
     }
 
     const classes = classNames({
+        "mx_Indicator": true,
         "mx_RightPanel_headerButton_unreadIndicator": true,
         "mx_Indicator_bold": color === NotificationColor.Bold,
         "mx_Indicator_gray": color === NotificationColor.Grey,
@@ -93,6 +93,7 @@ const PinnedMessagesHeaderButton = ({ room, isHighlighted, onClick }: IHeaderBut
         name="pinnedMessagesButton"
         title={_t("Pinned messages")}
         isHighlighted={isHighlighted}
+        isUnread={!!unreadIndicator}
         onClick={onClick}
         analytics={["Right Panel", "Pinned Messages Button", "click"]}
     >
@@ -125,7 +126,6 @@ interface IProps {
     excludedRightPanelPhaseButtons?: Array<RightPanelPhases>;
 }
 
-@replaceableComponent("views.right_panel.RoomHeaderButtons")
 export default class RoomHeaderButtons extends HeaderButtons<IProps> {
     private static readonly THREAD_PHASES = [
         RightPanelPhases.ThreadPanel,
@@ -243,6 +243,7 @@ export default class RoomHeaderButtons extends HeaderButtons<IProps> {
                     title={_t("Threads")}
                     onClick={this.onThreadsPanelClicked}
                     isHighlighted={this.isPhase(RoomHeaderButtons.THREAD_PHASES)}
+                    isUnread={this.threadNotificationState.color > 0}
                     analytics={['Right Panel', 'Threads List Button', 'click']}>
                     <UnreadIndicator color={this.threadNotificationState.color} />
                 </HeaderButton>
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index b0cc55101a7..018d2c6927f 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -42,7 +42,7 @@ import { UIComponent, UIFeature } from "../../../settings/UIFeature";
 import { ChevronFace, ContextMenuTooltipButton, useContextMenu } from "../../structures/ContextMenu";
 import WidgetContextMenu from "../context_menus/WidgetContextMenu";
 import { useRoomMemberCount } from "../../../hooks/useRoomMembers";
-import { useSettingValue } from "../../../hooks/useSettings";
+import { useFeatureEnabled } from "../../../hooks/useSettings";
 import { usePinnedEvents } from "./PinnedMessagesCard";
 import { Container, MAX_PINNED, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import RoomName from "../elements/RoomName";
@@ -269,6 +269,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
     const isRoomEncrypted = useIsEncrypted(cli, room);
     const roomContext = useContext(RoomContext);
     const e2eStatus = roomContext.e2eStatus;
+    const isVideoRoom = useFeatureEnabled("feature_video_rooms") && room.isElementVideoRoom();
 
     const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || "";
     const header = <React.Fragment>
@@ -297,7 +298,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
     </React.Fragment>;
 
     const memberCount = useRoomMemberCount(room);
-    const pinningEnabled = useSettingValue("feature_pinning");
+    const pinningEnabled = useFeatureEnabled("feature_pinning");
     const pinCount = usePinnedEvents(pinningEnabled && room)?.length;
 
     return <BaseCard header={header} className="mx_RoomSummaryCard" onClose={onClose}>
@@ -308,18 +309,19 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
                     { memberCount }
                 </span>
             </Button>
-            <Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
+            { !isVideoRoom && <Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
                 { _t("Files") }
-            </Button>
-            { pinningEnabled && <Button className="mx_RoomSummaryCard_icon_pins" onClick={onRoomPinsClick}>
-                { _t("Pinned") }
-                { pinCount > 0 && <span className="mx_BaseCard_Button_sublabel">
-                    { pinCount }
-                </span> }
             </Button> }
-            <Button className="mx_RoomSummaryCard_icon_export" onClick={onRoomExportClick}>
+            { pinningEnabled && !isVideoRoom &&
+                <Button className="mx_RoomSummaryCard_icon_pins" onClick={onRoomPinsClick}>
+                    { _t("Pinned") }
+                    { pinCount > 0 && <span className="mx_BaseCard_Button_sublabel">
+                        { pinCount }
+                    </span> }
+                </Button> }
+            { !isVideoRoom && <Button className="mx_RoomSummaryCard_icon_export" onClick={onRoomExportClick}>
                 { _t("Export chat") }
-            </Button>
+            </Button> }
             <Button className="mx_RoomSummaryCard_icon_share" onClick={onShareRoomClick}>
                 { _t("Share room") }
             </Button>
@@ -330,6 +332,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
 
         {
             SettingsStore.getValue(UIFeature.Widgets)
+            && !isVideoRoom
             && shouldShowComponent(UIComponent.AddIntegrations)
             && <AppsSection room={room} />
         }
diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx
index 72f3d429694..7f6060ca2d7 100644
--- a/src/components/views/right_panel/TimelineCard.tsx
+++ b/src/components/views/right_panel/TimelineCard.tsx
@@ -33,10 +33,9 @@ import EditorStateTransfer from '../../../utils/EditorStateTransfer';
 import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
 import { ActionPayload } from '../../../dispatcher/payloads';
 import { Action } from '../../../dispatcher/actions';
-import RoomViewStore from '../../../stores/RoomViewStore';
+import { RoomViewStore } from '../../../stores/RoomViewStore';
 import ContentMessages from '../../../ContentMessages';
 import UploadBar from '../../structures/UploadBar';
 import SettingsStore from '../../../settings/SettingsStore';
@@ -71,7 +70,6 @@ interface IState {
     showReadReceipts?: boolean;
 }
 
-@replaceableComponent("structures.TimelineCard")
 export default class TimelineCard extends React.Component<IProps, IState> {
     static contextType = RoomContext;
 
@@ -94,7 +92,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.roomStoreToken = RoomViewStore.instance.addListener(this.onRoomViewStoreUpdate);
         this.dispatcherRef = dis.register(this.onAction);
         this.readReceiptsSettingWatcher = SettingsStore.watchSetting("showReadReceipts", null, (...[,,, value]) =>
             this.setState({ showReadReceipts: value as boolean }),
@@ -121,12 +119,12 @@ export default class TimelineCard extends React.Component<IProps, IState> {
 
     private onRoomViewStoreUpdate = async (initial?: boolean): Promise<void> => {
         const newState: Pick<IState, any> = {
-            // roomLoading: RoomViewStore.isRoomLoading(),
-            // roomLoadError: RoomViewStore.getRoomLoadError(),
+            // roomLoading: RoomViewStore.instance.isRoomLoading(),
+            // roomLoadError: RoomViewStore.instance.getRoomLoadError(),
 
-            initialEventId: RoomViewStore.getInitialEventId(),
-            isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
-            replyToEvent: RoomViewStore.getQuotingEvent(),
+            initialEventId: RoomViewStore.instance.getInitialEventId(),
+            isInitialEventHighlighted: RoomViewStore.instance.isInitialEventHighlighted(),
+            replyToEvent: RoomViewStore.instance.getQuotingEvent(),
         };
 
         this.setState(newState);
@@ -148,19 +146,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
         }
     };
 
-    private onUserScroll = (): void => {
-        if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
-            dis.dispatch<ViewRoomPayload>({
-                action: Action.ViewRoom,
-                room_id: this.props.room.roomId,
-                event_id: this.state.initialEventId,
-                highlighted: false,
-                replyingToEvent: this.state.replyToEvent,
-                metricsTrigger: undefined, // room doesn't change
-            });
-        }
-    };
-
     private onScroll = (): void => {
         const timelinePanel = this.timelinePanel.current;
         if (!timelinePanel) return;
@@ -173,6 +158,17 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                 atEndOfLiveTimeline: false,
             });
         }
+
+        if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
+            dis.dispatch<ViewRoomPayload>({
+                action: Action.ViewRoom,
+                room_id: this.props.room.roomId,
+                event_id: this.state.initialEventId,
+                highlighted: false,
+                replyingToEvent: this.state.replyToEvent,
+                metricsTrigger: undefined, // room doesn't change
+            });
+        }
     };
 
     private onMeasurement = (narrow: boolean): void => {
@@ -221,6 +217,9 @@ export default class TimelineCard extends React.Component<IProps, IState> {
 
         const isUploading = ContentMessages.sharedInstance().getCurrentUploads(this.props.composerRelation).length > 0;
 
+        const myMembership = this.props.room.getMyMembership();
+        const showComposer = myMembership === "join";
+
         return (
             <RoomContext.Provider value={{
                 ...this.context,
@@ -248,7 +247,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                             manageReadMarkers={false} // No RM support in the TimelineCard
                             sendReadReceiptOnLoad={true}
                             timelineSet={this.props.timelineSet}
-                            showUrlPreview={true}
+                            showUrlPreview={this.context.showUrlPreview}
                             // The right panel timeline (and therefore threads) don't support IRC layout at this time
                             layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
                             hideThreadedMessages={false}
@@ -262,7 +261,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                             resizeNotifier={this.props.resizeNotifier}
                             highlightedEventId={highlightedEventId}
                             onScroll={this.onScroll}
-                            onUserScroll={this.onUserScroll}
                         />
                     </div>
 
@@ -270,15 +268,17 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                         <UploadBar room={this.props.room} relation={this.props.composerRelation} />
                     ) }
 
-                    <MessageComposer
-                        room={this.props.room}
-                        relation={this.props.composerRelation}
-                        resizeNotifier={this.props.resizeNotifier}
-                        replyToEvent={this.state.replyToEvent}
-                        permalinkCreator={this.props.permalinkCreator}
-                        e2eStatus={this.props.e2eStatus}
-                        compact={true}
-                    />
+                    { showComposer && (
+                        <MessageComposer
+                            room={this.props.room}
+                            relation={this.props.composerRelation}
+                            resizeNotifier={this.props.resizeNotifier}
+                            replyToEvent={this.state.replyToEvent}
+                            permalinkCreator={this.props.permalinkCreator}
+                            e2eStatus={this.props.e2eStatus}
+                            compact={true}
+                        />
+                    ) }
                 </BaseCard>
             </RoomContext.Provider>
         );
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 37347c04bd3..c9685c24670 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -23,7 +23,6 @@ import { ClientEvent, MatrixClient } from 'matrix-js-sdk/src/client';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import { User } from 'matrix-js-sdk/src/models/user';
 import { Room } from 'matrix-js-sdk/src/models/room';
-import { EventTimeline } from 'matrix-js-sdk/src/models/event-timeline';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import { EventType } from "matrix-js-sdk/src/@types/event";
@@ -34,13 +33,12 @@ import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import createRoom, { findDMForUser, privateShouldBeEncrypted } from '../../../createRoom';
+import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
-import RoomViewStore from "../../../stores/RoomViewStore";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
 import MultiInviter from "../../../utils/MultiInviter";
-import GroupStore from "../../../stores/GroupStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import E2EIcon from "../rooms/E2EIcon";
 import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
@@ -51,7 +49,7 @@ import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
 import { legacyVerifyUser, verifyDevice, verifyUser } from '../../../verification';
 import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "../dialogs/UserSettingsDialog";
+import { UserTab } from "../dialogs/UserTab";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
 import { E2EStatus } from "../../../utils/ShieldUtils";
@@ -60,17 +58,16 @@ import Spinner from "../elements/Spinner";
 import PowerSelector from "../elements/PowerSelector";
 import MemberAvatar from "../avatars/MemberAvatar";
 import PresenceLabel from "../rooms/PresenceLabel";
+import BulkRedactDialog from "../dialogs/BulkRedactDialog";
 import ShareDialog from "../dialogs/ShareDialog";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
 import ConfirmUserActionDialog from "../dialogs/ConfirmUserActionDialog";
-import InfoDialog from "../dialogs/InfoDialog";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
 import { mediaFromMxc } from "../../../customisations/Media";
 import UIStore from "../../../stores/UIStore";
 import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
-import SpaceStore from "../../../stores/spaces/SpaceStore";
 import ConfirmSpaceUserActionDialog from "../dialogs/ConfirmSpaceUserActionDialog";
 import { bulkSpaceBehaviour } from "../../../utils/space";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
@@ -82,6 +79,8 @@ import { useUserStatusMessage } from "../../../hooks/useUserStatusMessage";
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 import PosthogTrackers from "../../../PosthogTrackers";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { findDMForUser } from "../../../utils/direct-messages";
+import { privateShouldBeEncrypted } from "../../../utils/rooms";
 
 export interface IDevice {
     deviceId: string;
@@ -179,7 +178,7 @@ function useHasCrossSigningKeys(cli: MatrixClient, member: User, canVerify: bool
     }, [cli, member, canVerify], undefined);
 }
 
-function DeviceItem({ userId, device }: {userId: string, device: IDevice}) {
+function DeviceItem({ userId, device }: { userId: string, device: IDevice }) {
     const cli = useContext(MatrixClientContext);
     const isMe = userId === cli.getUserId();
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
@@ -240,7 +239,7 @@ function DeviceItem({ userId, device }: {userId: string, device: IDevice}) {
     }
 }
 
-function DevicesSection({ devices, userId, loading }: {devices: IDevice[], userId: string, loading: boolean}) {
+function DevicesSection({ devices, userId, loading }: { devices: IDevice[], userId: string, loading: boolean }) {
     const cli = useContext(MatrixClientContext);
     const userTrust = cli.checkUserTrust(userId);
 
@@ -428,11 +427,10 @@ const UserOptionsSection: React.FC<{
         }
 
         if (canInvite && (member?.membership ?? 'leave') === 'leave' && shouldShowComponent(UIComponent.InviteUsers)) {
-            const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
+            const roomId = member && member.roomId ? member.roomId : RoomViewStore.instance.getRoomId();
             const onInviteUserButton = async (ev: ButtonEvent) => {
                 try {
-                    // We use a MultiInviter to re-use the invite logic, even though
-                    // we're only inviting one user.
+                    // We use a MultiInviter to re-use the invite logic, even though we're only inviting one user.
                     const inviter = new MultiInviter(roomId);
                     await inviter.invite([member.userId]).then(() => {
                         if (inviter.getCompletionState(member.userId) !== "invited") {
@@ -577,7 +575,9 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
             room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog,
             {
                 member,
-                action: member.membership === "invite" ? _t("Disinvite") : _t("Remove from chat"),
+                action: room.isSpaceRoom() ?
+                    member.membership === "invite" ? _t("Disinvite from space") : _t("Remove from space")
+                    : member.membership === "invite" ? _t("Disinvite from room") : _t("Remove from room"),
                 title: member.membership === "invite"
                     ? _t("Disinvite from %(roomName)s", { roomName: room.name })
                     : _t("Remove from %(roomName)s", { roomName: room.name }),
@@ -620,7 +620,10 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
         });
     };
 
-    const kickLabel = member.membership === "invite" ? _t("Disinvite") : _t("Remove from room");
+    const kickLabel = room.isSpaceRoom() ?
+        member.membership === "invite" ? _t("Disinvite from space") : _t("Remove from space")
+        : member.membership === "invite" ? _t("Disinvite from room") : _t("Remove from room");
+
     return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onKick}>
         { kickLabel }
     </AccessibleButton>;
@@ -629,75 +632,14 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
 const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
     const cli = useContext(MatrixClientContext);
 
-    const onRedactAllMessages = async () => {
-        const { roomId, userId } = member;
-        const room = cli.getRoom(roomId);
-        if (!room) {
-            return;
-        }
-        let timeline = room.getLiveTimeline();
-        let eventsToRedact = [];
-        while (timeline) {
-            eventsToRedact = timeline.getEvents().reduce((events, event) => {
-                if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction() &&
-                    event.getType() !== EventType.RoomCreate &&
-                    // Don't redact ACLs because that'll obliterate the room
-                    // See https://github.com/matrix-org/synapse/issues/4042 for details.
-                    event.getType() !== EventType.RoomServerAcl
-                ) {
-                    return events.concat(event);
-                } else {
-                    return events;
-                }
-            }, eventsToRedact);
-            timeline = timeline.getNeighbouringTimeline(EventTimeline.BACKWARDS);
-        }
-
-        const count = eventsToRedact.length;
-        const user = member.name;
-
-        if (count === 0) {
-            Modal.createTrackedDialog('No user messages found to remove', '', InfoDialog, {
-                title: _t("No recent messages by %(user)s found", { user }),
-                description:
-                    <div>
-                        <p>{ _t("Try scrolling up in the timeline to see if there are any earlier ones.") }</p>
-                    </div>,
-            });
-        } else {
-            const { finished } = Modal.createTrackedDialog('Remove recent messages by user', '', QuestionDialog, {
-                title: _t("Remove recent messages by %(user)s", { user }),
-                description:
-                    <div>
-                        <p>{ _t("You are about to remove %(count)s messages by %(user)s. " +
-                            "This cannot be undone. Do you wish to continue?", { count, user }) }</p>
-                        <p>{ _t("For a large amount of messages, this might take some time. " +
-                            "Please don't refresh your client in the meantime.") }</p>
-                    </div>,
-                button: _t("Remove %(count)s messages", { count }),
-            });
-
-            const [confirmed] = await finished;
-            if (!confirmed) {
-                return;
-            }
-
-            // Submitting a large number of redactions freezes the UI,
-            // so first yield to allow to rerender after closing the dialog.
-            await Promise.resolve();
+    const onRedactAllMessages = () => {
+        const room = cli.getRoom(member.roomId);
+        if (!room) return;
 
-            logger.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`);
-            await Promise.all(eventsToRedact.map(async event => {
-                try {
-                    await cli.redactEvent(roomId, event.getId());
-                } catch (err) {
-                    // log and swallow errors
-                    logger.error("Could not redact", event.getId());
-                    logger.error(err);
-                }
-            }));
-            logger.info(`Finished redacting recent ${count} messages for ${user} in ${roomId}`);
-        }
+        Modal.createTrackedDialog("Bulk Redact Dialog", "", BulkRedactDialog, {
+            matrixClient: cli,
+            room, member,
+        });
     };
 
     return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onRedactAllMessages}>
@@ -716,7 +658,9 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
             room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog,
             {
                 member,
-                action: isBanned ? _t("Unban") : _t("Ban"),
+                action: room.isSpaceRoom()
+                    ? (isBanned ? _t("Unban from space") : _t("Ban from space"))
+                    : (isBanned ? _t("Unban from room") : _t("Ban from room")),
                 title: isBanned
                     ? _t("Unban from %(roomName)s", { roomName: room.name })
                     : _t("Ban from %(roomName)s", { roomName: room.name }),
@@ -782,9 +726,13 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
         });
     };
 
-    let label = _t("Ban");
+    let label = room.isSpaceRoom()
+        ? _t("Ban from space")
+        : _t("Ban from room");
     if (isBanned) {
-        label = _t("Unban");
+        label = room.isSpaceRoom()
+            ? _t("Unban from space")
+            : _t("Unban from room");
     }
 
     const classes = classNames("mx_UserInfo_field", {
@@ -815,7 +763,7 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({ member, room, powerLevels,
         // if muting self, warn as it may be irreversible
         if (target === cli.getUserId()) {
             try {
-                if (!(await warnSelfDemote(SpaceStore.spacesEnabled && room?.isSpaceRoom()))) return;
+                if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
             } catch (e) {
                 logger.error("Failed to warn about self demotion: ", e);
                 return;
@@ -909,7 +857,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
             stopUpdating={stopUpdating}
         />;
     }
-    if (me.powerLevel >= redactPowerLevel && (!SpaceStore.spacesEnabled || !room.isSpaceRoom())) {
+    if (me.powerLevel >= redactPowerLevel && !room.isSpaceRoom()) {
         redactButton = (
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
@@ -947,99 +895,6 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     return <div />;
 };
 
-export interface GroupMember {
-    userId: string;
-    displayname?: string; // XXX: GroupMember objects are inconsistent :((
-    avatarUrl?: string;
-}
-
-const GroupAdminToolsSection: React.FC<{
-    groupId: string;
-    groupMember: GroupMember;
-    startUpdating(): void;
-    stopUpdating(): void;
-}> = ({ children, groupId, groupMember, startUpdating, stopUpdating }) => {
-    const cli = useContext(MatrixClientContext);
-
-    const [isPrivileged, setIsPrivileged] = useState(false);
-    const [isInvited, setIsInvited] = useState(false);
-
-    // Listen to group store changes
-    useEffect(() => {
-        let unmounted = false;
-
-        const onGroupStoreUpdated = () => {
-            if (unmounted) return;
-            setIsPrivileged(GroupStore.isUserPrivileged(groupId));
-            setIsInvited(GroupStore.getGroupInvitedMembers(groupId).some(
-                (m) => m.userId === groupMember.userId,
-            ));
-        };
-
-        GroupStore.registerListener(groupId, onGroupStoreUpdated);
-        onGroupStoreUpdated();
-        // Handle unmount
-        return () => {
-            unmounted = true;
-            GroupStore.unregisterListener(onGroupStoreUpdated);
-        };
-    }, [groupId, groupMember.userId]);
-
-    if (isPrivileged) {
-        const onKick = async () => {
-            const { finished } = Modal.createDialog(ConfirmUserActionDialog, {
-                matrixClient: cli,
-                groupMember,
-                action: isInvited ? _t('Disinvite') : _t('Remove from community'),
-                title: isInvited ? _t('Disinvite this user from community?')
-                    : _t('Remove this user from community?'),
-                danger: true,
-            });
-
-            const [proceed] = await finished;
-            if (!proceed) return;
-
-            startUpdating();
-            cli.removeUserFromGroup(groupId, groupMember.userId).then(() => {
-                // return to the user list
-                dis.dispatch({
-                    action: Action.ViewUser,
-                    member: null,
-                });
-            }).catch((e) => {
-                Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
-                    title: _t('Error'),
-                    description: isInvited ?
-                        _t('Failed to withdraw invitation') :
-                        _t('Failed to remove user from community'),
-                });
-                logger.log(e);
-            }).finally(() => {
-                stopUpdating();
-            });
-        };
-
-        const kickButton = (
-            <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onKick}>
-                { isInvited ? _t('Disinvite') : _t('Remove from community') }
-            </AccessibleButton>
-        );
-
-        // No make/revoke admin API yet
-        /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
-        giveModButton = <AccessibleButton className="mx_UserInfo_field" onClick={this.onModToggle}>
-            {giveOpLabel}
-        </AccessibleButton>;*/
-
-        return <GenericAdminToolsContainer>
-            { kickButton }
-            { children }
-        </GenericAdminToolsContainer>;
-    }
-
-    return <div />;
-};
-
 const useIsSynapseAdmin = (cli: MatrixClient) => {
     const [isAdmin, setIsAdmin] = useState(false);
     useEffect(() => {
@@ -1071,14 +926,9 @@ function useRoomPermissions(cli: MatrixClient, room: Room, user: RoomMember): IR
         canEdit: false,
         canInvite: false,
     });
-    const updateRoomPermissions = useCallback(() => {
-        if (!room) {
-            return;
-        }
 
-        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-        if (!powerLevelEvent) return;
-        const powerLevels = powerLevelEvent.getContent();
+    const updateRoomPermissions = useCallback(() => {
+        const powerLevels = room?.currentState.getStateEvents(EventType.RoomPowerLevels, "")?.getContent();
         if (!powerLevels) return;
 
         const me = room.getMember(cli.getUserId());
@@ -1090,17 +940,14 @@ function useRoomPermissions(cli: MatrixClient, room: Room, user: RoomMember): IR
 
         let modifyLevelMax = -1;
         if (canAffectUser) {
-            const editPowerLevel = (
-                (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
-                powerLevels.state_default
-            );
-            if (me.powerLevel >= editPowerLevel && (isMe || me.powerLevel > them.powerLevel)) {
+            const editPowerLevel = powerLevels.events?.[EventType.RoomPowerLevels] ?? powerLevels.state_default ?? 50;
+            if (me.powerLevel >= editPowerLevel) {
                 modifyLevelMax = me.powerLevel;
             }
         }
 
         setRoomPermissions({
-            canInvite: me.powerLevel >= powerLevels.invite,
+            canInvite: me.powerLevel >= (powerLevels.invite ?? 0),
             canEdit: modifyLevelMax >= 0,
             modifyLevelMax,
         });
@@ -1180,7 +1027,7 @@ const PowerLevelEditor: React.FC<{
 
         const myUserId = cli.getUserId();
         const myPower = powerLevelEvent.getContent().users[myUserId];
-        if (myPower && parseInt(myPower) === powerLevel) {
+        if (myPower && parseInt(myPower) <= powerLevel && myUserId !== target) {
             const { finished } = Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
                 title: _t("Warning!"),
                 description:
@@ -1194,10 +1041,10 @@ const PowerLevelEditor: React.FC<{
 
             const [confirmed] = await finished;
             if (!confirmed) return;
-        } else if (myUserId === target) {
+        } else if (myUserId === target && myPower && parseInt(myPower) > powerLevel) {
             // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
             try {
-                if (!(await warnSelfDemote(SpaceStore.spacesEnabled && room?.isSpaceRoom()))) return;
+                if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
             } catch (e) {
                 logger.error("Failed to warn about self demotion: ", e);
             }
@@ -1295,10 +1142,9 @@ export const useDevices = (userId: string) => {
 const BasicUserInfo: React.FC<{
     room: Room;
     member: User | RoomMember;
-    groupId: string;
     devices: IDevice[];
     isRoomEncrypted: boolean;
-}> = ({ room, member, groupId, devices, isRoomEncrypted }) => {
+}> = ({ room, member, devices, isRoomEncrypted }) => {
     const cli = useContext(MatrixClientContext);
 
     const powerLevels = useRoomPowerLevels(cli, room);
@@ -1400,16 +1246,6 @@ const BasicUserInfo: React.FC<{
                 { synapseDeactivateButton }
             </RoomAdminToolsContainer>
         );
-    } else if (groupId) {
-        adminToolsContainer = (
-            <GroupAdminToolsSection
-                groupId={groupId}
-                groupMember={member}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}>
-                { synapseDeactivateButton }
-            </GroupAdminToolsSection>
-        );
     } else if (synapseDeactivateButton) {
         adminToolsContainer = (
             <GenericAdminToolsContainer>
@@ -1429,10 +1265,10 @@ const BasicUserInfo: React.FC<{
     if (!isRoomEncrypted) {
         if (!cryptoEnabled) {
             text = _t("This client does not support end-to-end encryption.");
-        } else if (room && (!SpaceStore.spacesEnabled || !room.isSpaceRoom())) {
+        } else if (room && !room.isSpaceRoom()) {
             text = _t("Messages in this room are not end-to-end encrypted.");
         }
-    } else if (!SpaceStore.spacesEnabled || !room.isSpaceRoom()) {
+    } else if (!room.isSpaceRoom()) {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
@@ -1478,7 +1314,7 @@ const BasicUserInfo: React.FC<{
 
     let editDevices;
     if (member.userId == cli.getUserId()) {
-        editDevices = (<p>
+        editDevices = (<div>
             <AccessibleButton
                 className="mx_UserInfo_field"
                 onClick={() => {
@@ -1490,7 +1326,7 @@ const BasicUserInfo: React.FC<{
             >
                 { _t("Edit devices") }
             </AccessibleButton>
-        </p>);
+        </div>);
     }
 
     const securitySection = (
@@ -1514,7 +1350,7 @@ const BasicUserInfo: React.FC<{
             canInvite={roomPermissions.canInvite}
             isIgnored={isIgnored}
             member={member as RoomMember}
-            isSpace={SpaceStore.spacesEnabled && room?.isSpaceRoom()}
+            isSpace={room?.isSpaceRoom()}
         />
 
         { adminToolsContainer }
@@ -1523,7 +1359,7 @@ const BasicUserInfo: React.FC<{
     </React.Fragment>;
 };
 
-export type Member = User | RoomMember | GroupMember;
+export type Member = User | RoomMember;
 
 const UserInfoHeader: React.FC<{
     member: Member;
@@ -1575,7 +1411,7 @@ const UserInfoHeader: React.FC<{
         presenceCurrentlyActive = member.user.currentlyActive;
     }
 
-    const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+    const enablePresenceByHsUrl = SdkConfig.get("enable_presence_by_hs_url");
     let showPresence = true;
     if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
         showPresence = enablePresenceByHsUrl[cli.baseUrl];
@@ -1602,7 +1438,7 @@ const UserInfoHeader: React.FC<{
         e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
     }
 
-    const displayName = (member as RoomMember).rawDisplayName || (member as GroupMember).displayname;
+    const displayName = (member as RoomMember).rawDisplayName;
     return <React.Fragment>
         { avatarElement }
 
@@ -1611,7 +1447,7 @@ const UserInfoHeader: React.FC<{
                 <div>
                     <h2>
                         { e2eIcon }
-                        <span title={displayName} aria-label={displayName}>
+                        <span title={displayName} aria-label={displayName} dir="auto">
                             { displayName }
                         </span>
                     </h2>
@@ -1628,10 +1464,8 @@ const UserInfoHeader: React.FC<{
 
 interface IProps {
     user: Member;
-    groupId?: string;
     room?: Room;
     phase: RightPanelPhases.RoomMemberInfo
-        | RightPanelPhases.GroupMemberInfo
         | RightPanelPhases.SpaceMemberInfo
         | RightPanelPhases.EncryptionPanel;
     onClose(): void;
@@ -1641,7 +1475,6 @@ interface IProps {
 
 const UserInfo: React.FC<IProps> = ({
     user,
-    groupId,
     room,
     onClose,
     phase = RightPanelPhases.RoomMemberInfo,
@@ -1663,10 +1496,10 @@ const UserInfo: React.FC<IProps> = ({
     const classes = ["mx_UserInfo"];
 
     let cardState: IRightPanelCardState;
-    // We have no previousPhase for when viewing a UserInfo from a Group or without a Room at this time
+    // We have no previousPhase for when viewing a UserInfo without a Room at this time
     if (room && phase === RightPanelPhases.EncryptionPanel) {
         cardState = { member };
-    } else if (room?.isSpaceRoom() && SpaceStore.spacesEnabled) {
+    } else if (room?.isSpaceRoom()) {
         cardState = { spaceId: room.roomId };
     }
 
@@ -1677,13 +1510,11 @@ const UserInfo: React.FC<IProps> = ({
     let content;
     switch (phase) {
         case RightPanelPhases.RoomMemberInfo:
-        case RightPanelPhases.GroupMemberInfo:
         case RightPanelPhases.SpaceMemberInfo:
             content = (
                 <BasicUserInfo
                     room={room}
                     member={member as User}
-                    groupId={groupId as string}
                     devices={devices}
                     isRoomEncrypted={isRoomEncrypted}
                 />
@@ -1711,7 +1542,7 @@ const UserInfo: React.FC<IProps> = ({
     }
 
     let scopeHeader;
-    if (SpaceStore.spacesEnabled && room?.isSpaceRoom()) {
+    if (room?.isSpaceRoom()) {
         scopeHeader = <div data-test-id='space-header' className="mx_RightPanel_scopeHeader">
             <RoomAvatar room={room} height={32} width={32} />
             <RoomName room={room} />
diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx
index f08c1979624..65a24b21ad3 100644
--- a/src/components/views/right_panel/VerificationPanel.tsx
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -33,7 +33,6 @@ import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import E2EIcon, { E2EState } from "../rooms/E2EIcon";
 import Spinner from "../elements/Spinner";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "../elements/AccessibleButton";
 import VerificationShowSas from "../verification/VerificationShowSas";
 
@@ -54,7 +53,6 @@ interface IState {
     reciprocateQREvent?: ReciprocateQRCode["reciprocateQREvent"];
 }
 
-@replaceableComponent("views.right_panel.VerificationPanel")
 export default class VerificationPanel extends React.PureComponent<IProps, IState> {
     private hasVerifier: boolean;
 
diff --git a/src/components/views/right_panel/context.ts b/src/components/views/right_panel/context.ts
new file mode 100644
index 00000000000..5fe04b8670c
--- /dev/null
+++ b/src/components/views/right_panel/context.ts
@@ -0,0 +1,19 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+
+export const CardContext = React.createContext({ isCard: false });
diff --git a/header b/src/components/views/right_panel/types.ts
similarity index 83%
rename from header
rename to src/components/views/right_panel/types.ts
index 33b7fb9e80f..f7a6d60f55c 100644
--- a/header
+++ b/src/components/views/right_panel/types.ts
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018 New Vector Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,3 +13,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+export const ReadPinsEventId = "im.vector.room.read_pins";
diff --git a/src/components/views/room_settings/AliasSettings.tsx b/src/components/views/room_settings/AliasSettings.tsx
index ec84544aaec..df1d57661bc 100644
--- a/src/components/views/room_settings/AliasSettings.tsx
+++ b/src/components/views/room_settings/AliasSettings.tsx
@@ -26,7 +26,6 @@ import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import RoomPublishSetting from "./RoomPublishSetting";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RoomAliasField from "../elements/RoomAliasField";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import SettingsFieldset from "../settings/SettingsFieldset";
@@ -95,7 +94,6 @@ interface IState {
     newAltAlias?: string;
 }
 
-@replaceableComponent("views.room_settings.AliasSettings")
 export default class AliasSettings extends React.Component<IProps, IState> {
     public static contextType = MatrixClientContext;
     context: ContextType<typeof MatrixClientContext>;
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
deleted file mode 100644
index 737147f6644..00000000000
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Copyright 2017, 2019 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import Modal from '../../../Modal';
-import ErrorDialog from "../dialogs/ErrorDialog";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-const GROUP_ID_REGEX = /\+\S+:\S+/;
-
-@replaceableComponent("views.room_settings.RelatedGroupSettings")
-export default class RelatedGroupSettings extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-        canSetRelatedGroups: PropTypes.bool.isRequired,
-        relatedGroupsEvent: PropTypes.instanceOf(MatrixEvent),
-    };
-
-    static contextType = MatrixClientContext;
-
-    static defaultProps = {
-        canSetRelatedGroups: false,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            newGroupId: "",
-            newGroupsList: props.relatedGroupsEvent ? (props.relatedGroupsEvent.getContent().groups || []) : [],
-        };
-    }
-
-    updateGroups(newGroupsList) {
-        this.context.sendStateEvent(this.props.roomId, 'm.room.related_groups', {
-            groups: newGroupsList,
-        }, '').catch((err) => {
-            logger.error(err);
-            Modal.createTrackedDialog('Error updating flair', '', ErrorDialog, {
-                title: _t("Error updating flair"),
-                description: _t(
-                    "There was an error updating the flair for this room. The server may not allow it or " +
-                    "a temporary error occurred.",
-                ),
-            });
-        });
-    }
-
-    validateGroupId(groupId) {
-        if (!GROUP_ID_REGEX.test(groupId)) {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Invalid related community ID', '', ErrorDialog, {
-                title: _t('Invalid community ID'),
-                description: _t('\'%(groupId)s\' is not a valid community ID', { groupId }),
-            });
-            return false;
-        }
-        return true;
-    }
-
-    onNewGroupChanged = (newGroupId) => {
-        this.setState({ newGroupId });
-    };
-
-    onGroupAdded = (groupId) => {
-        if (groupId.length === 0 || !this.validateGroupId(groupId)) {
-            return;
-        }
-        const newGroupsList = [...this.state.newGroupsList, groupId];
-        this.setState({
-            newGroupsList: newGroupsList,
-            newGroupId: '',
-        });
-        this.updateGroups(newGroupsList);
-    };
-
-    onGroupDeleted = (index) => {
-        const group = this.state.newGroupsList[index];
-        const newGroupsList = this.state.newGroupsList.filter((g) => g !== group);
-        this.setState({ newGroupsList });
-        this.updateGroups(newGroupsList);
-    };
-
-    render() {
-        const localDomain = this.context.getDomain();
-        const EditableItemList = sdk.getComponent('elements.EditableItemList');
-        return <div>
-            <EditableItemList
-                id="relatedGroups"
-                items={this.state.newGroupsList}
-                className="mx_RelatedGroupSettings"
-                newItem={this.state.newGroupId}
-                canRemove={this.props.canSetRelatedGroups}
-                canEdit={this.props.canSetRelatedGroups}
-                onNewItemChanged={this.onNewGroupChanged}
-                onItemAdded={this.onGroupAdded}
-                onItemRemoved={this.onGroupDeleted}
-                itemsLabel={_t('Showing flair for these communities:')}
-                noItemsLabel={_t('This room is not showing flair for any communities')}
-                placeholder={_t(
-                    'New community ID (e.g. +foo:%(localDomain)s)', { localDomain },
-                )}
-            />
-        </div>;
-    }
-}
diff --git a/src/components/views/room_settings/RoomProfileSettings.tsx b/src/components/views/room_settings/RoomProfileSettings.tsx
index eb0c6ded1a6..85f5ab7600d 100644
--- a/src/components/views/room_settings/RoomProfileSettings.tsx
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -19,10 +19,10 @@ import React, { createRef } from 'react';
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import AccessibleButton from "../elements/AccessibleButton";
 import AvatarSetting from "../settings/AvatarSetting";
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 interface IProps {
     roomId: string;
@@ -43,7 +43,6 @@ interface IState {
 }
 
 // TODO: Merge with ProfileSettings?
-@replaceableComponent("views.room_settings.RoomProfileSettings")
 export default class RoomProfileSettings extends React.Component<IProps, IState> {
     private avatarUpload = createRef<HTMLInputElement>();
 
@@ -254,6 +253,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
                     type="file"
                     ref={this.avatarUpload}
                     className="mx_ProfileSettings_avatarUpload"
+                    onClick={chromeFileInputFix}
                     onChange={this.onAvatarChanged}
                     accept="image/*"
                 />
diff --git a/src/components/views/room_settings/RoomPublishSetting.tsx b/src/components/views/room_settings/RoomPublishSetting.tsx
index 19eab62a8a3..250635013d7 100644
--- a/src/components/views/room_settings/RoomPublishSetting.tsx
+++ b/src/components/views/room_settings/RoomPublishSetting.tsx
@@ -20,7 +20,6 @@ import { Visibility } from "matrix-js-sdk/src/@types/partials";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DirectoryCustomisations from '../../../customisations/Directory';
 
 interface IProps {
@@ -33,7 +32,6 @@ interface IState {
     isRoomPublished: boolean;
 }
 
-@replaceableComponent("views.room_settings.RoomPublishSetting")
 export default class RoomPublishSetting extends React.PureComponent<IProps, IState> {
     constructor(props, context) {
         super(props, context);
diff --git a/src/components/views/room_settings/UrlPreviewSettings.tsx b/src/components/views/room_settings/UrlPreviewSettings.tsx
index 7c94db16c3b..5810ea7ad73 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.tsx
+++ b/src/components/views/room_settings/UrlPreviewSettings.tsx
@@ -26,7 +26,6 @@ import dis from "../../../dispatcher/dispatcher";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { Action } from "../../../dispatcher/actions";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsFlag from "../elements/SettingsFlag";
 import SettingsFieldset from '../settings/SettingsFieldset';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -35,7 +34,6 @@ interface IProps {
     room: Room;
 }
 
-@replaceableComponent("views.room_settings.UrlPreviewSettings")
 export default class UrlPreviewSettings extends React.Component<IProps> {
     private onClickUserSettings = (e: React.MouseEvent): void => {
         e.preventDefault();
diff --git a/src/components/views/rooms/AppsDrawer.tsx b/src/components/views/rooms/AppsDrawer.tsx
index eebba4f67cc..22afea24902 100644
--- a/src/components/views/rooms/AppsDrawer.tsx
+++ b/src/components/views/rooms/AppsDrawer.tsx
@@ -32,7 +32,6 @@ import PercentageDistributor from "../../../resizer/distributors/percentage";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 import { clamp, percentageOf, percentageWithin } from "../../../utils/numbers";
 import { useStateCallback } from "../../../hooks/useStateCallback";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
 import { IApp } from "../../../stores/WidgetStore";
 import { ActionPayload } from "../../../dispatcher/payloads";
@@ -54,7 +53,6 @@ interface IState {
     resizing: boolean;
 }
 
-@replaceableComponent("views.rooms.AppsDrawer")
 export default class AppsDrawer extends React.Component<IProps, IState> {
     private unmounted = false;
     private resizeContainer: HTMLDivElement;
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index d8d65ca1138..58a659f537a 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -22,7 +22,6 @@ import { Room } from 'matrix-js-sdk/src/models/room';
 
 import Autocompleter, { ICompletion, ISelectionRange, IProviderCompletions } from '../../../autocomplete/Autocompleter';
 import SettingsStore from "../../../settings/SettingsStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RoomContext from '../../../contexts/RoomContext';
 
 const MAX_PROVIDER_MATCHES = 20;
@@ -50,7 +49,6 @@ interface IState {
     forceComplete: boolean;
 }
 
-@replaceableComponent("views.rooms.Autocomplete")
 export default class Autocomplete extends React.PureComponent<IProps, IState> {
     autocompleter: Autocompleter;
     queryRequested: string;
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 8c723429c5e..a7f9a12229b 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -29,7 +29,6 @@ import { UIFeature } from "../../../settings/UIFeature";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
 import CallViewForRoom from '../voip/CallViewForRoom';
 import { objectHasDiff } from "../../../utils/objects";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // js-sdk room object
@@ -51,7 +50,6 @@ interface IState {
     counters: Counter[];
 }
 
-@replaceableComponent("views.rooms.AuxPanel")
 export default class AuxPanel extends React.Component<IProps, IState> {
     static defaultProps = {
         showApps: true,
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 1d2f6a04837..e93119643fb 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -24,13 +24,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import EditorModel from '../../../editor/model';
 import HistoryManager from '../../../editor/history';
 import { Caret, setSelection } from '../../../editor/caret';
-import {
-    formatRangeAsQuote,
-    formatRangeAsCode,
-    toggleInlineFormat,
-    replaceRangeAndMoveCaret,
-    formatRangeAsLink,
-} from '../../../editor/operations';
+import { formatRange, replaceRangeAndMoveCaret, toggleInlineFormat } from '../../../editor/operations';
 import { getCaretOffsetAndText, getRangeForSelection } from '../../../editor/dom';
 import Autocomplete, { generateCompletionDomId } from '../rooms/Autocomplete';
 import { getAutoCompleteCreator, Type } from '../../../editor/parts';
@@ -46,10 +40,9 @@ import MessageComposerFormatBar, { Formatting } from "./MessageComposerFormatBar
 import DocumentOffset from "../../../editor/offset";
 import { IDiff } from "../../../editor/diff";
 import AutocompleteWrapperModel from "../../../editor/autocomplete";
-import DocumentPosition from "../../../editor/position";
+import DocumentPosition from '../../../editor/position';
 import { ICompletion } from "../../../autocomplete/Autocompleter";
 import { getKeyBindingsManager } from '../../../KeyBindingsManager';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ALTERNATE_KEY_NAME, KeyBindingAction } from '../../../accessibility/KeyboardShortcuts';
 import { _t } from "../../../languageHandler";
 
@@ -67,8 +60,11 @@ const SURROUND_WITH_DOUBLE_CHARACTERS = new Map([
     ["<", ">"],
 ]);
 
-function ctrlShortcutLabel(key: string): string {
-    return (IS_MAC ? "⌘" : _t(ALTERNATE_KEY_NAME[Key.CONTROL])) + "+" + key;
+function ctrlShortcutLabel(key: string, needsShift = false, needsAlt = false): string {
+    return (IS_MAC ? "⌘" : _t(ALTERNATE_KEY_NAME[Key.CONTROL])) +
+        (needsShift ? ("+" + _t(ALTERNATE_KEY_NAME[Key.SHIFT])) : "") +
+        (needsAlt ? ("+" + _t(ALTERNATE_KEY_NAME[Key.ALT])) : "") +
+        "+" + key;
 }
 
 function cloneSelection(selection: Selection): Partial<Selection> {
@@ -107,6 +103,7 @@ interface IProps {
 }
 
 interface IState {
+    useMarkdown: boolean;
     showPillAvatar: boolean;
     query?: string;
     showVisualBell?: boolean;
@@ -115,7 +112,6 @@ interface IState {
     surroundWith: boolean;
 }
 
-@replaceableComponent("views.rooms.BasicMessageEditor")
 export default class BasicMessageEditor extends React.Component<IProps, IState> {
     public readonly editorRef = createRef<HTMLDivElement>();
     private autocompleteRef = createRef<Autocomplete>();
@@ -129,6 +125,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
     private lastCaret: DocumentOffset;
     private lastSelection: ReturnType<typeof cloneSelection>;
 
+    private readonly useMarkdownHandle: string;
     private readonly emoticonSettingHandle: string;
     private readonly shouldShowPillAvatarSettingHandle: string;
     private readonly surroundWithHandle: string;
@@ -138,10 +135,13 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         super(props);
         this.state = {
             showPillAvatar: SettingsStore.getValue("Pill.shouldShowPillAvatar"),
+            useMarkdown: SettingsStore.getValue("MessageComposerInput.useMarkdown"),
             surroundWith: SettingsStore.getValue("MessageComposerInput.surroundWith"),
             showVisualBell: false,
         };
 
+        this.useMarkdownHandle = SettingsStore.watchSetting('MessageComposerInput.useMarkdown', null,
+            this.configureUseMarkdown);
         this.emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null,
             this.configureEmoticonAutoReplace);
         this.configureEmoticonAutoReplace();
@@ -348,7 +348,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
             parts = deserializedParts;
         } else {
             const text = event.clipboardData.getData("text/plain");
-            parts = parsePlainTextMessage(text, partCreator);
+            parts = parsePlainTextMessage(text, partCreator, { shouldEscape: false });
         }
         this.modifiedFlag = true;
         const range = getRangeForSelection(this.editorRef.current, model, document.getSelection());
@@ -369,7 +369,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
     private insertText(textToInsert: string, inputType = "insertText"): void {
         const sel = document.getSelection();
         const { caret, text } = getCaretOffsetAndText(this.editorRef.current, sel);
-        const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
+        const newText = text.slice(0, caret.offset) + textToInsert + text.slice(caret.offset);
         caret.offset += textToInsert.length;
         this.modifiedFlag = true;
         this.props.model.update(newText, inputType, caret);
@@ -447,7 +447,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
             }
         } else if (!selection.isCollapsed && !isEmpty) {
             this.hasTextSelected = true;
-            if (this.formatBarRef.current) {
+            if (this.formatBarRef.current && this.state.useMarkdown) {
                 const selectionRect = selection.getRangeAt(0).getBoundingClientRect();
                 this.formatBarRef.current.showAt(selectionRect);
             }
@@ -530,10 +530,18 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 this.onFormatAction(Formatting.Italics);
                 handled = true;
                 break;
+            case KeyBindingAction.FormatCode:
+                this.onFormatAction(Formatting.Code);
+                handled = true;
+                break;
             case KeyBindingAction.FormatQuote:
                 this.onFormatAction(Formatting.Quote);
                 handled = true;
                 break;
+            case KeyBindingAction.FormatLink:
+                this.onFormatAction(Formatting.InsertLink);
+                handled = true;
+                break;
             case KeyBindingAction.EditRedo:
                 if (this.historyManager.canRedo()) {
                     const { parts, caret } = this.historyManager.redo();
@@ -627,6 +635,14 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.setState({ completionIndex });
     };
 
+    private configureUseMarkdown = (): void => {
+        const useMarkdown = SettingsStore.getValue("MessageComposerInput.useMarkdown");
+        this.setState({ useMarkdown });
+        if (!useMarkdown && this.formatBarRef.current) {
+            this.formatBarRef.current.hide();
+        }
+    };
+
     private configureEmoticonAutoReplace = (): void => {
         this.props.model.setTransformCallback(this.transform);
     };
@@ -651,6 +667,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         this.editorRef.current.removeEventListener("input", this.onInput, true);
         this.editorRef.current.removeEventListener("compositionstart", this.onCompositionStart, true);
         this.editorRef.current.removeEventListener("compositionend", this.onCompositionEnd, true);
+        SettingsStore.unwatchSetting(this.useMarkdownHandle);
         SettingsStore.unwatchSetting(this.emoticonSettingHandle);
         SettingsStore.unwatchSetting(this.shouldShowPillAvatarSettingHandle);
         SettingsStore.unwatchSetting(this.surroundWithHandle);
@@ -690,37 +707,17 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         return caretPosition;
     }
 
-    private onFormatAction = (action: Formatting): void => {
-        const range = getRangeForSelection(this.editorRef.current, this.props.model, document.getSelection());
-        // trim the range as we want it to exclude leading/trailing spaces
-        range.trim();
-
-        if (range.length === 0) {
+    public onFormatAction = (action: Formatting): void => {
+        if (!this.state.useMarkdown) {
             return;
         }
 
+        const range: Range = getRangeForSelection(this.editorRef.current, this.props.model, document.getSelection());
+
         this.historyManager.ensureLastChangesPushed(this.props.model);
         this.modifiedFlag = true;
-        switch (action) {
-            case Formatting.Bold:
-                toggleInlineFormat(range, "**");
-                break;
-            case Formatting.Italics:
-                toggleInlineFormat(range, "_");
-                break;
-            case Formatting.Strikethrough:
-                toggleInlineFormat(range, "<del>", "</del>");
-                break;
-            case Formatting.Code:
-                formatRangeAsCode(range);
-                break;
-            case Formatting.Quote:
-                formatRangeAsQuote(range);
-                break;
-            case Formatting.InsertLink:
-                formatRangeAsLink(range);
-                break;
-        }
+
+        formatRange(range, action);
     };
 
     render() {
@@ -750,7 +747,9 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         const shortcuts = {
             [Formatting.Bold]: ctrlShortcutLabel("B"),
             [Formatting.Italics]: ctrlShortcutLabel("I"),
+            [Formatting.Code]: ctrlShortcutLabel("E"),
             [Formatting.Quote]: ctrlShortcutLabel(">"),
+            [Formatting.InsertLink]: ctrlShortcutLabel("L", true),
         };
 
         const { completionIndex } = this.state;
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
index 03f00cf8f33..de1bdc9c85b 100644
--- a/src/components/views/rooms/EditMessageComposer.tsx
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -35,7 +35,6 @@ import BasicMessageComposer, { REGEX_EMOTICON } from "./BasicMessageComposer";
 import { CommandCategories } from '../../../SlashCommands';
 import { Action } from "../../../dispatcher/actions";
 import { getKeyBindingsManager } from '../../../KeyBindingsManager';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SendHistoryManager from '../../../SendHistoryManager';
 import { ActionPayload } from "../../../dispatcher/payloads";
 import AccessibleButton from '../elements/AccessibleButton';
@@ -47,6 +46,7 @@ import { ComposerType } from "../../../dispatcher/payloads/ComposerInsertPayload
 import { getSlashCommand, isSlashCommand, runSlashCommand, shouldSendAnyway } from "../../../editor/commands";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
+import { editorRoomKey, editorStateKey } from "../../../Editing";
 
 function getHtmlReplyFallback(mxEvent: MatrixEvent): string {
     const html = mxEvent.getContent().formatted_body;
@@ -95,7 +95,10 @@ function createEditContent(
         body: `${plainPrefix} * ${body}`,
     };
 
-    const formattedBody = htmlSerializeIfNeeded(model, { forceHTML: isReply });
+    const formattedBody = htmlSerializeIfNeeded(model, {
+        forceHTML: isReply,
+        useMarkdown: SettingsStore.getValue("MessageComposerInput.useMarkdown"),
+    });
     if (formattedBody) {
         newContent.format = "org.matrix.custom.html";
         newContent.formatted_body = formattedBody;
@@ -122,7 +125,6 @@ interface IState {
     saveDisabled: boolean;
 }
 
-@replaceableComponent("views.rooms.EditMessageComposer")
 class EditMessageComposer extends React.Component<IEditMessageComposerProps, IState> {
     static contextType = RoomContext;
     context!: React.ContextType<typeof RoomContext>;
@@ -202,16 +204,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
                         timelineRenderingType: this.context.timelineRenderingType,
                     });
                 } else {
-                    this.clearStoredEditorState();
-                    dis.dispatch({
-                        action: Action.EditEvent,
-                        event: null,
-                        timelineRenderingType: this.context.timelineRenderingType,
-                    });
-                    dis.dispatch({
-                        action: Action.FocusSendMessageComposer,
-                        context: this.context.timelineRenderingType,
-                    });
+                    this.cancelEdit();
                 }
                 event.preventDefault();
                 break;
@@ -219,12 +212,25 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         }
     };
 
+    private endEdit(): void {
+        // close the event editing and focus composer
+        dis.dispatch({
+            action: Action.EditEvent,
+            event: null,
+            timelineRenderingType: this.context.timelineRenderingType,
+        });
+        dis.dispatch({
+            action: Action.FocusSendMessageComposer,
+            context: this.context.timelineRenderingType,
+        });
+    }
+
     private get editorRoomKey(): string {
-        return `mx_edit_room_${this.getRoom().roomId}_${this.context.timelineRenderingType}`;
+        return editorRoomKey(this.props.editState.getEvent().getRoomId(), this.context.timelineRenderingType);
     }
 
     private get editorStateKey(): string {
-        return `mx_edit_state_${this.props.editState.getEvent().getId()}`;
+        return editorStateKey(this.props.editState.getEvent().getId());
     }
 
     private get events(): MatrixEvent[] {
@@ -236,15 +242,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
 
     private cancelEdit = (): void => {
         this.clearStoredEditorState();
-        dis.dispatch({
-            action: Action.EditEvent,
-            event: null,
-            timelineRenderingType: this.context.timelineRenderingType,
-        });
-        dis.dispatch({
-            action: Action.FocusSendMessageComposer,
-            context: this.context.timelineRenderingType,
-        });
+        this.endEdit();
     };
 
     private get shouldSaveStoredEditorState(): boolean {
@@ -320,6 +318,9 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
             this.cancelPreviousPendingEdit();
             createRedactEventDialog({
                 mxEvent: editedEvent,
+                onCloseDialog: () => {
+                    this.cancelEdit();
+                },
             });
             return;
         }
@@ -357,16 +358,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
             }
         }
 
-        // close the event editing and focus composer
-        dis.dispatch({
-            action: Action.EditEvent,
-            event: null,
-            timelineRenderingType: this.context.timelineRenderingType,
-        });
-        dis.dispatch({
-            action: Action.FocusSendMessageComposer,
-            context: this.context.timelineRenderingType,
-        });
+        this.endEdit();
     };
 
     private cancelPreviousPendingEdit(): void {
@@ -415,7 +407,9 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         } else {
             // otherwise, either restore serialized parts from localStorage or parse the body of the event
             const restoredParts = this.restoreStoredEditorState(partCreator);
-            parts = restoredParts || parseEvent(editState.getEvent(), partCreator);
+            parts = restoredParts || parseEvent(editState.getEvent(), partCreator, {
+                shouldEscape: SettingsStore.getValue("MessageComposerInput.useMarkdown"),
+            });
             isRestored = !!restoredParts;
         }
         this.model = new EditorModel(parts, partCreator);
diff --git a/src/components/views/rooms/EntityTile.tsx b/src/components/views/rooms/EntityTile.tsx
index 8bd907f885e..dd8756f845f 100644
--- a/src/components/views/rooms/EntityTile.tsx
+++ b/src/components/views/rooms/EntityTile.tsx
@@ -22,7 +22,6 @@ import classNames from "classnames";
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t, _td } from '../../../languageHandler';
 import E2EIcon, { E2EState } from './E2EIcon';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseAvatar from '../avatars/BaseAvatar';
 import PresenceLabel from "./PresenceLabel";
 
@@ -64,6 +63,7 @@ function presenceClassForMember(presenceState: string, lastActiveAgo: number, sh
 
 interface IProps {
     name?: string;
+    nameJSX?: JSX.Element;
     title?: string;
     avatarJsx?: JSX.Element; // <BaseAvatar />
     className?: string;
@@ -84,7 +84,6 @@ interface IState {
     hover: boolean;
 }
 
-@replaceableComponent("views.rooms.EntityTile")
 export default class EntityTile extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onClick: () => {},
@@ -117,7 +116,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
         mainClassNames[presenceClass] = true;
 
         let nameEl;
-        const { name } = this.props;
+        const name = this.props.nameJSX || this.props.name;
 
         if (!this.props.suppressOnHover) {
             const activeAgo = this.props.presenceLastActiveAgo ?
@@ -134,7 +133,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
             }
             nameEl = (
                 <div className="mx_EntityTile_details">
-                    <div className="mx_EntityTile_name" dir="auto">
+                    <div className="mx_EntityTile_name">
                         { name }
                     </div>
                     { presenceLabel }
@@ -143,7 +142,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
         } else if (this.props.subtextLabel) {
             nameEl = (
                 <div className="mx_EntityTile_details">
-                    <div className="mx_EntityTile_name" dir="auto">
+                    <div className="mx_EntityTile_name">
                         { name }
                     </div>
                     <span className="mx_EntityTile_subtext">{ this.props.subtextLabel }</span>
@@ -151,7 +150,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
             );
         } else {
             nameEl = (
-                <div className="mx_EntityTile_name" dir="auto">{ name }</div>
+                <div className="mx_EntityTile_name">{ name }</div>
             );
         }
 
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index c184f8813f4..b74556ad5f0 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, MouseEvent } from 'react';
+import React, { createRef, forwardRef, MouseEvent, RefObject } from 'react';
 import classNames from "classnames";
-import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
 import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
@@ -25,28 +25,22 @@ import { Thread, ThreadEvent } from 'matrix-js-sdk/src/models/thread';
 import { logger } from "matrix-js-sdk/src/logger";
 import { NotificationCountType, Room, RoomEvent } from 'matrix-js-sdk/src/models/room';
 import { CallErrorCode } from "matrix-js-sdk/src/webrtc/call";
-import { M_POLL_START } from "matrix-events-sdk";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
 import { UserTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning';
 
 import ReplyChain from "../elements/ReplyChain";
 import { _t } from '../../../languageHandler';
-import { hasText } from "../../../TextForEvent";
-import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
 import { Layout } from "../../../settings/enums/Layout";
 import { formatTime } from "../../../DateUtils";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { ALL_RULE_TYPES } from "../../../mjolnir/BanList";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { E2EState } from "./E2EIcon";
-import { toRem } from "../../../utils/units";
-import { WidgetType } from "../../../widgets/WidgetType";
 import RoomAvatar from "../avatars/RoomAvatar";
-import { WIDGET_LAYOUT_EVENT_TYPE } from "../../../stores/widgets/WidgetLayoutStore";
+import MessageContextMenu from "../context_menus/MessageContextMenu";
+import { aboveRightOf } from '../../structures/ContextMenu';
 import { objectHasDiff } from "../../../utils/objects";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import Tooltip from "../elements/Tooltip";
+import Tooltip, { Alignment } from "../elements/Tooltip";
 import EditorStateTransfer from "../../../utils/EditorStateTransfer";
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
@@ -54,16 +48,16 @@ import NotificationBadge from "./NotificationBadge";
 import CallEventGrouper from "../../structures/CallEventGrouper";
 import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
 import { Action } from '../../../dispatcher/actions';
+import PlatformPeg from '../../../PlatformPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
 import SenderProfile from '../messages/SenderProfile';
 import MessageTimestamp from '../messages/MessageTimestamp';
 import TooltipButton from '../elements/TooltipButton';
-import ReadReceiptMarker, { IReadReceiptInfo } from "./ReadReceiptMarker";
+import { IReadReceiptInfo } from "./ReadReceiptMarker";
 import MessageActionBar from "../messages/MessageActionBar";
 import ReactionsRow from '../messages/ReactionsRow';
-import { getEventDisplayInfo } from '../../../utils/EventUtils';
+import { getEventDisplayInfo } from '../../../utils/EventRenderingUtils';
 import SettingsStore from "../../../settings/SettingsStore";
-import MKeyVerificationConclusion from "../messages/MKeyVerificationConclusion";
 import { showThread } from '../../../dispatcher/dispatch-actions/threads';
 import { MessagePreviewStore } from '../../../stores/room-list/MessagePreviewStore';
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
@@ -75,132 +69,20 @@ import { RoomNotificationStateStore } from '../../../stores/notifications/RoomNo
 import { NotificationStateEvents } from '../../../stores/notifications/NotificationState';
 import { NotificationColor } from '../../../stores/notifications/NotificationColor';
 import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
-import { CardContext } from '../right_panel/BaseCard';
-import { copyPlaintext } from '../../../utils/strings';
+import { copyPlaintext, getSelectedText } from '../../../utils/strings';
 import { DecryptionFailureTracker } from '../../../DecryptionFailureTracker';
 import RedactedBody from '../messages/RedactedBody';
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { shouldDisplayReply } from '../../../utils/Reply';
 import PosthogTrackers from "../../../PosthogTrackers";
 import TileErrorBoundary from '../messages/TileErrorBoundary';
+import { haveRendererForEvent, isMessageEvent, renderTile } from "../../../events/EventTileFactory";
+import ThreadSummary, { ThreadMessagePreview } from "./ThreadSummary";
+import { ReadReceiptGroup } from './ReadReceiptGroup';
+import { useTooltip } from "../../../utils/useTooltip";
 
 export type GetRelationsForEvent = (eventId: string, relationType: string, eventType: string) => Relations;
 
-const eventTileTypes = {
-    [EventType.RoomMessage]: 'messages.MessageEvent',
-    [EventType.Sticker]: 'messages.MessageEvent',
-    [M_POLL_START.name]: 'messages.MessageEvent',
-    [M_POLL_START.altName]: 'messages.MessageEvent',
-    [EventType.KeyVerificationCancel]: 'messages.MKeyVerificationConclusion',
-    [EventType.KeyVerificationDone]: 'messages.MKeyVerificationConclusion',
-    [EventType.CallInvite]: 'messages.CallEvent',
-};
-
-const stateEventTileTypes = {
-    [EventType.RoomEncryption]: 'messages.EncryptionEvent',
-    [EventType.RoomCanonicalAlias]: 'messages.TextualEvent',
-    [EventType.RoomCreate]: 'messages.RoomCreate',
-    [EventType.RoomMember]: 'messages.TextualEvent',
-    [EventType.RoomName]: 'messages.TextualEvent',
-    [EventType.RoomAvatar]: 'messages.RoomAvatarEvent',
-    [EventType.RoomThirdPartyInvite]: 'messages.TextualEvent',
-    [EventType.RoomHistoryVisibility]: 'messages.TextualEvent',
-    [EventType.RoomTopic]: 'messages.TextualEvent',
-    [EventType.RoomPowerLevels]: 'messages.TextualEvent',
-    [EventType.RoomPinnedEvents]: 'messages.TextualEvent',
-    [EventType.RoomServerAcl]: 'messages.TextualEvent',
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-    'im.vector.modular.widgets': 'messages.TextualEvent',
-    [WIDGET_LAYOUT_EVENT_TYPE]: 'messages.TextualEvent',
-    [EventType.RoomTombstone]: 'messages.TextualEvent',
-    [EventType.RoomJoinRules]: 'messages.TextualEvent',
-    [EventType.RoomGuestAccess]: 'messages.TextualEvent',
-    'm.room.related_groups': 'messages.TextualEvent', // legacy communities flair
-};
-
-const stateEventSingular = new Set([
-    EventType.RoomEncryption,
-    EventType.RoomCanonicalAlias,
-    EventType.RoomCreate,
-    EventType.RoomName,
-    EventType.RoomAvatar,
-    EventType.RoomHistoryVisibility,
-    EventType.RoomTopic,
-    EventType.RoomPowerLevels,
-    EventType.RoomPinnedEvents,
-    EventType.RoomServerAcl,
-    WIDGET_LAYOUT_EVENT_TYPE,
-    EventType.RoomTombstone,
-    EventType.RoomJoinRules,
-    EventType.RoomGuestAccess,
-    'm.room.related_groups',
-]);
-
-// Add all the Mjolnir stuff to the renderer
-for (const evType of ALL_RULE_TYPES) {
-    stateEventTileTypes[evType] = 'messages.TextualEvent';
-}
-
-export function getHandlerTile(ev: MatrixEvent): string {
-    const type = ev.getType();
-
-    // don't show verification requests we're not involved in,
-    // not even when showing hidden events
-    if (type === EventType.RoomMessage) {
-        const content = ev.getContent();
-        if (content && content.msgtype === MsgType.KeyVerificationRequest) {
-            const me = MatrixClientPeg.get()?.getUserId();
-            if (ev.getSender() !== me && content.to !== me) {
-                return undefined;
-            } else {
-                return "messages.MKeyVerificationRequest";
-            }
-        }
-    }
-    // these events are sent by both parties during verification, but we only want to render one
-    // tile once the verification concludes, so filter out the one from the other party.
-    if (type === EventType.KeyVerificationDone) {
-        const me = MatrixClientPeg.get()?.getUserId();
-        if (ev.getSender() !== me) {
-            return undefined;
-        }
-    }
-
-    // sometimes MKeyVerificationConclusion declines to render. Jankily decline to render and
-    // fall back to showing hidden events, if we're viewing hidden events
-    // XXX: This is extremely a hack. Possibly these components should have an interface for
-    // declining to render?
-    if (type === EventType.KeyVerificationCancel || type === EventType.KeyVerificationDone) {
-        if (!MKeyVerificationConclusion.shouldRender(ev, ev.verificationRequest)) {
-            return;
-        }
-    }
-
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-    if (type === "im.vector.modular.widgets") {
-        let type = ev.getContent()['type'];
-        if (!type) {
-            // deleted/invalid widget - try the past widget type
-            type = ev.getPrevContent()['type'];
-        }
-
-        if (WidgetType.JITSI.matches(type)) {
-            return "messages.MJitsiWidgetEvent";
-        }
-    }
-
-    if (ev.isState()) {
-        if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;
-        return stateEventTileTypes[type];
-    }
-
-    if (ev.isRedacted()) {
-        return "messages.MessageEvent";
-    }
-
-    return eventTileTypes[type];
-}
-
 // Our component structure for EventTiles on the timeline is:
 //
 // .-EventTile------------------------------------------------.
@@ -214,10 +96,19 @@ export function getHandlerTile(ev: MatrixEvent): string {
 
 export interface IReadReceiptProps {
     userId: string;
-    roomMember: RoomMember;
+    roomMember: RoomMember | null;
     ts: number;
 }
 
+export interface IEventTileOps {
+    isWidgetHidden(): boolean;
+    unhideWidget(): void;
+}
+
+export interface IEventTileType extends React.Component {
+    getEventTileOps?(): IEventTileOps;
+}
+
 interface IProps {
     // the MatrixEvent to show
     mxEvent: MatrixEvent;
@@ -292,9 +183,6 @@ interface IProps {
     // which layout to use
     layout?: Layout;
 
-    // whether or not to show flair at all
-    enableFlair?: boolean;
-
     // whether or not to show read receipts
     showReadReceipts?: boolean;
 
@@ -334,9 +222,6 @@ interface IProps {
 interface IState {
     // Whether the action bar is focused.
     actionBarFocused: boolean;
-    // Whether all read receipts are being displayed. If not, only display
-    // a truncation of them.
-    allReadAvatars: boolean;
     // Whether the event's sender has been verified.
     verified: string;
     // Whether onRequestKeysClick has been called since mounting.
@@ -345,22 +230,24 @@ interface IState {
     reactions: Relations;
 
     hover: boolean;
+
+    // Position of the context menu
+    contextMenu?: {
+        position: Pick<DOMRect, "top" | "left" | "bottom">;
+        showPermalink?: boolean;
+    };
+
     isQuoteExpanded?: boolean;
 
     thread: Thread;
-    threadReplyCount: number;
-    threadLastReply: MatrixEvent;
-    threadLastSender: RoomMember | null;
     threadNotification?: NotificationCountType;
 }
 
 // MUST be rendered within a RoomContext with a set timelineRenderingType
-@replaceableComponent("views.rooms.EventTile")
-export default class EventTile extends React.Component<IProps, IState> {
+export class UnwrappedEventTile extends React.Component<IProps, IState> {
     private suppressReadReceiptAnimation: boolean;
     private isListeningForReceipts: boolean;
-    // TODO: Types
-    private tile = React.createRef<unknown>();
+    private tile = React.createRef<IEventTileType>();
     private replyChain = React.createRef<ReplyChain>();
     private threadState: ThreadNotificationState;
 
@@ -384,22 +271,18 @@ export default class EventTile extends React.Component<IProps, IState> {
         this.state = {
             // Whether the action bar is focused.
             actionBarFocused: false,
-            // Whether all read receipts are being displayed. If not, only display
-            // a truncation of them.
-            allReadAvatars: false,
             // Whether the event's sender has been verified.
             verified: null,
             // Whether onRequestKeysClick has been called since mounting.
             previouslyRequestedKeys: false,
             // The Relations model from the JS SDK for reactions to `mxEvent`
             reactions: this.getReactions(),
+            // Context menu position
+            contextMenu: null,
 
             hover: false,
 
             thread,
-            threadReplyCount: thread?.length,
-            threadLastReply: thread?.replyToEvent,
-            threadLastSender: thread?.replyToEvent?.sender,
         };
 
         // don't do RR animations until we are mounted
@@ -512,13 +395,10 @@ export default class EventTile extends React.Component<IProps, IState> {
             }
         }
 
-        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
-        room?.on(ThreadEvent.New, this.onNewThread);
+        client.decryptEventIfNeeded(this.props.mxEvent);
 
-        if (this.state.threadLastReply?.isEncrypted()) {
-            this.state.threadLastReply.once(MatrixEventEvent.Decrypted, this.onEventDecryption);
-            MatrixClientPeg.get().decryptEventIfNeeded(this.state.threadLastReply);
-        }
+        const room = client.getRoom(this.props.mxEvent.getRoomId());
+        room?.on(ThreadEvent.New, this.onNewThread);
     }
 
     private setupNotificationListener = (thread: Thread): void => {
@@ -556,12 +436,7 @@ export default class EventTile extends React.Component<IProps, IState> {
             this.setupNotificationListener(thread);
         }
 
-        this.setState({
-            threadLastReply: thread?.replyToEvent,
-            threadLastSender: thread?.replyToEvent?.sender,
-            threadReplyCount: thread?.length,
-            thread,
-        });
+        this.setState({ thread });
     };
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -601,7 +476,6 @@ export default class EventTile extends React.Component<IProps, IState> {
         if (this.threadState) {
             this.threadState.off(NotificationStateEvents.Update, this.onThreadStateUpdate);
         }
-        this.state.threadLastReply?.removeListener(MatrixEventEvent.Decrypted, this.onEventDecryption);
     }
 
     componentDidUpdate(prevProps: IProps, prevState: IState, snapshot) {
@@ -610,20 +484,8 @@ export default class EventTile extends React.Component<IProps, IState> {
             MatrixClientPeg.get().on(RoomEvent.Receipt, this.onRoomReceipt);
             this.isListeningForReceipts = true;
         }
-
-        if (this.state.threadLastReply !== prevState.threadLastReply) {
-            if (this.state.threadLastReply.isEncrypted()) {
-                this.state.threadLastReply.once(MatrixEventEvent.Decrypted, this.onEventDecryption);
-                MatrixClientPeg.get().decryptEventIfNeeded(this.state.threadLastReply);
-            }
-            prevState.threadLastReply?.removeListener(MatrixEventEvent.Decrypted, this.onEventDecryption);
-        }
     }
 
-    private onEventDecryption = () => {
-        this.forceUpdate();
-    };
-
     private onNewThread = (thread: Thread) => {
         if (thread.id === this.props.mxEvent.getId()) {
             this.updateThread(thread);
@@ -644,7 +506,7 @@ export default class EventTile extends React.Component<IProps, IState> {
          * when we are at the sync stage
          */
         const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
-        const thread = room?.threads.get(this.props.mxEvent.getId());
+        const thread = room?.threads?.get(this.props.mxEvent.getId());
 
         return thread || null;
     }
@@ -655,66 +517,29 @@ export default class EventTile extends React.Component<IProps, IState> {
         }
 
         return <div className="mx_ThreadPanel_replies">
-            <span className="mx_ThreadPanel_repliesSummary">
+            <span className="mx_ThreadPanel_ThreadsAmount">
                 { this.state.thread.length }
             </span>
-            { this.renderThreadLastMessagePreview() }
+            <ThreadMessagePreview thread={this.state.thread} />
         </div>;
     }
 
-    private renderThreadLastMessagePreview(): JSX.Element | null {
-        const { threadLastReply } = this.state;
-        const threadMessagePreview = MessagePreviewStore.instance.generatePreviewForEvent(threadLastReply);
-
-        const sender = this.state.thread?.roomState.getSentinelMember(threadLastReply.getSender());
-        return <>
-            <MemberAvatar
-                member={sender}
-                fallbackUserId={threadLastReply.getSender()}
-                width={24}
-                height={24}
-                className="mx_ThreadInfo_avatar"
-            />
-            { threadMessagePreview && (
-                <div className="mx_ThreadInfo_content">
-                    <span className="mx_ThreadInfo_message-preview">
-                        { threadMessagePreview }
-                    </span>
-                </div>
-            ) }
-        </>;
-    }
-
     private renderThreadInfo(): React.ReactNode {
+        if (this.state.thread?.id === this.props.mxEvent.getId()) {
+            return <ThreadSummary mxEvent={this.props.mxEvent} thread={this.state.thread} />;
+        }
+
         if (this.context.timelineRenderingType === TimelineRenderingType.Search && this.props.mxEvent.threadRootId) {
-            return (
-                <p className="mx_ThreadSummaryIcon">{ _t("From a thread") }</p>
-            );
-        } else if (this.state.threadReplyCount && this.state.thread.id === this.props.mxEvent.getId()) {
-            let count: string | number = this.state.threadReplyCount;
-            if (!this.context.narrow) {
-                count = _t("%(count)s reply", {
-                    count: this.state.threadReplyCount,
-                });
+            if (this.props.highlightLink) {
+                return (
+                    <a className="mx_ThreadSummaryIcon" href={this.props.highlightLink}>
+                        { _t("From a thread") }
+                    </a>
+                );
             }
+
             return (
-                <CardContext.Consumer>
-                    { context =>
-                        <AccessibleButton
-                            className="mx_ThreadInfo"
-                            onClick={(ev: ButtonEvent) => {
-                                showThread({ rootEvent: this.props.mxEvent, push: context.isCard });
-                                PosthogTrackers.trackInteraction("WebRoomTimelineThreadSummaryButton", ev);
-                            }}
-                            aria-label={_t("Open thread")}
-                        >
-                            <span className="mx_ThreadInfo_threads-amount">
-                                { count }
-                            </span>
-                            { this.renderThreadLastMessagePreview() }
-                        </AccessibleButton>
-                    }
-                </CardContext.Consumer>
+                <p className="mx_ThreadSummaryIcon">{ _t("From a thread") }</p>
             );
         }
     }
@@ -732,6 +557,8 @@ export default class EventTile extends React.Component<IProps, IState> {
     };
 
     private copyLinkToThread = async (evt: ButtonEvent): Promise<void> => {
+        evt.preventDefault();
+        evt.stopPropagation();
         const { permalinkCreator, mxEvent } = this.props;
         const matrixToUrl = permalinkCreator.forEvent(mxEvent.getId());
         await copyPlaintext(matrixToUrl);
@@ -899,108 +726,6 @@ export default class EventTile extends React.Component<IProps, IState> {
         return actions.tweaks.highlight;
     }
 
-    private toggleAllReadAvatars = () => {
-        this.setState({
-            allReadAvatars: !this.state.allReadAvatars,
-        });
-    };
-
-    private getReadAvatars() {
-        if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
-            return <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
-        }
-
-        const MAX_READ_AVATARS = this.props.layout == Layout.Bubble
-            ? 2
-            : 5;
-
-        // return early if there are no read receipts
-        if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
-            // We currently must include `mx_EventTile_readAvatars` in the DOM
-            // of all events, as it is the positioned parent of the animated
-            // read receipts. We can't let it unmount when a receipt moves
-            // events, so for now we mount it for all events. Without it, the
-            // animation will start from the top of the timeline (because it
-            // lost its container).
-            // See also https://github.com/vector-im/element-web/issues/17561
-            return (
-                <div className="mx_EventTile_msgOption">
-                    <span className="mx_EventTile_readAvatars" />
-                </div>
-            );
-        }
-
-        const avatars = [];
-        const receiptOffset = 15;
-        let left = 0;
-
-        const receipts = this.props.readReceipts;
-
-        for (let i = 0; i < receipts.length; ++i) {
-            const receipt = receipts[i];
-
-            let hidden = true;
-            if ((i < MAX_READ_AVATARS) || this.state.allReadAvatars) {
-                hidden = false;
-            }
-            // TODO: we keep the extra read avatars in the dom to make animation simpler
-            // we could optimise this to reduce the dom size.
-
-            // If hidden, set offset equal to the offset of the final visible avatar or
-            // else set it proportional to index
-            left = (hidden ? MAX_READ_AVATARS - 1 : i) * -receiptOffset;
-
-            const userId = receipt.userId;
-            let readReceiptInfo: IReadReceiptInfo;
-
-            if (this.props.readReceiptMap) {
-                readReceiptInfo = this.props.readReceiptMap[userId];
-                if (!readReceiptInfo) {
-                    readReceiptInfo = {};
-                    this.props.readReceiptMap[userId] = readReceiptInfo;
-                }
-            }
-
-            // add to the start so the most recent is on the end (ie. ends up rightmost)
-            avatars.unshift(
-                <ReadReceiptMarker
-                    key={userId}
-                    member={receipt.roomMember}
-                    fallbackUserId={userId}
-                    leftOffset={left}
-                    hidden={hidden}
-                    readReceiptInfo={readReceiptInfo}
-                    checkUnmounting={this.props.checkUnmounting}
-                    suppressAnimation={this.suppressReadReceiptAnimation}
-                    onClick={this.toggleAllReadAvatars}
-                    timestamp={receipt.ts}
-                    showTwelveHour={this.props.isTwelveHour}
-                />,
-            );
-        }
-
-        let remText: JSX.Element;
-        if (!this.state.allReadAvatars) {
-            const remainder = receipts.length - MAX_READ_AVATARS;
-            if (remainder > 0) {
-                remText = <span className="mx_EventTile_readAvatarRemainder"
-                    onClick={this.toggleAllReadAvatars}
-                    style={{ right: "calc(" + toRem(-left) + " + " + receiptOffset + "px)" }}
-                    aria-live="off">{ remainder }+
-                </span>;
-            }
-        }
-
-        return (
-            <div className="mx_EventTile_msgOption">
-                <span className="mx_EventTile_readAvatars">
-                    { remText }
-                    { avatars }
-                </span>
-            </div>
-        );
-    }
-
     private onSenderProfileClick = () => {
         dis.dispatch<ComposerInsertPayload>({
             action: Action.ComposerInsert,
@@ -1086,10 +811,10 @@ export default class EventTile extends React.Component<IProps, IState> {
     private onActionBarFocusChange = (actionBarFocused: boolean) => {
         this.setState({ actionBarFocused });
     };
-    // TODO: Types
-    private getTile: () => any | null = () => this.tile.current;
 
-    private getReplyChain = () => this.replyChain.current;
+    private getTile: () => IEventTileType = () => this.tile.current;
+
+    private getReplyChain = (): ReplyChain => this.replyChain.current;
 
     private getReactions = () => {
         if (
@@ -1111,6 +836,57 @@ export default class EventTile extends React.Component<IProps, IState> {
         });
     };
 
+    private onContextMenu = (ev: React.MouseEvent): void => {
+        this.showContextMenu(ev);
+    };
+
+    private onTimestampContextMenu = (ev: React.MouseEvent): void => {
+        this.showContextMenu(ev, true);
+    };
+
+    private showContextMenu(ev: React.MouseEvent, showPermalink?: boolean): void {
+        // Return if message right-click context menu isn't enabled
+        if (!SettingsStore.getValue("feature_message_right_click_context_menu")) return;
+
+        // Return if we're in a browser and click either an a tag or we have
+        // selected text, as in those cases we want to use the native browser
+        // menu
+        const clickTarget = ev.target as HTMLElement;
+        if (
+            !PlatformPeg.get().allowOverridingNativeContextMenus() &&
+            (clickTarget.tagName === "a" || clickTarget.closest("a") || getSelectedText())
+        ) return;
+
+        // There is no way to copy non-PNG images into clipboard, so we can't
+        // have our own handling for copying images, so we leave it to the
+        // Electron layer (webcontents-handler.ts)
+        if (ev.target instanceof HTMLImageElement) return;
+
+        // We don't want to show the menu when editing a message
+        if (this.props.editState) return;
+
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            contextMenu: {
+                position: {
+                    left: ev.clientX,
+                    top: ev.clientY,
+                    bottom: ev.clientY,
+                },
+                showPermalink: showPermalink,
+            },
+            actionBarFocused: true,
+        });
+    }
+
+    private onCloseMenu = (): void => {
+        this.setState({
+            contextMenu: null,
+            actionBarFocused: false,
+        });
+    };
+
     private setQuoteExpanded = (expanded: boolean) => {
         this.setState({
             isQuoteExpanded: expanded,
@@ -1129,22 +905,45 @@ export default class EventTile extends React.Component<IProps, IState> {
         return false;
     }
 
-    private renderEvent() {
+    private renderContextMenu(): React.ReactFragment {
+        if (!this.state.contextMenu) return null;
+
+        const tile = this.getTile();
+        const replyChain = this.getReplyChain();
+        const eventTileOps = tile?.getEventTileOps ? tile.getEventTileOps() : undefined;
+        const collapseReplyChain = replyChain?.canCollapse() ? replyChain.collapse : undefined;
+
+        return (
+            <MessageContextMenu
+                {...aboveRightOf(this.state.contextMenu.position)}
+                mxEvent={this.props.mxEvent}
+                permalinkCreator={this.props.permalinkCreator}
+                eventTileOps={eventTileOps}
+                collapseReplyChain={collapseReplyChain}
+                onFinished={this.onCloseMenu}
+                rightClick={true}
+                reactions={this.state.reactions}
+                showPermalink={this.state.contextMenu.showPermalink}
+            />
+        );
+    }
+
+    public render() {
         const msgtype = this.props.mxEvent.getContent().msgtype;
         const eventType = this.props.mxEvent.getType() as EventType;
         const {
-            tileHandler,
+            hasRenderer,
             isBubbleMessage,
             isInfoMessage,
             isLeftAlignedBubbleMessage,
             noBubbleEvent,
             isSeeingThroughMessageHiddenForModeration,
-        } = getEventDisplayInfo(this.props.mxEvent, this.shouldHideEvent());
+        } = getEventDisplayInfo(this.props.mxEvent, this.context.showHiddenEvents, this.shouldHideEvent());
         const { isQuoteExpanded } = this.state;
 
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
-        if (!tileHandler) {
+        if (!hasRenderer) {
             const { mxEvent } = this.props;
             logger.warn(`Event type not supported: type:${eventType} isState:${mxEvent.isState()}`);
             return <div className="mx_EventTile mx_EventTile_info mx_MNoticeBody">
@@ -1154,7 +953,6 @@ export default class EventTile extends React.Component<IProps, IState> {
             </div>;
         }
 
-        const EventTileType = sdk.getComponent(tileHandler);
         const isProbablyMedia = MediaEventHelper.isEligible(this.props.mxEvent);
 
         const lineClasses = classNames("mx_EventTile_line", {
@@ -1177,6 +975,7 @@ export default class EventTile extends React.Component<IProps, IState> {
         let isContinuation = this.props.continuation;
         if (this.context.timelineRenderingType !== TimelineRenderingType.Room &&
             this.context.timelineRenderingType !== TimelineRenderingType.Search &&
+            this.context.timelineRenderingType !== TimelineRenderingType.Thread &&
             this.props.layout !== Layout.Bubble
         ) {
             isContinuation = false;
@@ -1193,7 +992,7 @@ export default class EventTile extends React.Component<IProps, IState> {
             // Note: we keep the `sending` state class for tests, not for our styles
             mx_EventTile_sending: !isEditing && isSending,
             mx_EventTile_highlight: this.shouldHighlight(),
-            mx_EventTile_selected: this.props.isSelectedEvent,
+            mx_EventTile_selected: this.props.isSelectedEvent || this.state.contextMenu,
             mx_EventTile_continuation: isContinuation || eventType === EventType.CallInvite,
             mx_EventTile_last: this.props.last,
             mx_EventTile_lastInSection: this.props.lastInSection,
@@ -1223,17 +1022,20 @@ export default class EventTile extends React.Component<IProps, IState> {
             ? undefined
             : this.props.mxEvent.getId();
 
-        let avatar;
-        let sender;
-        let avatarSize;
-        let needsSenderProfile;
+        let avatar: JSX.Element;
+        let sender: JSX.Element;
+        let avatarSize: number;
+        let needsSenderProfile: boolean;
 
-        if (this.context.timelineRenderingType === TimelineRenderingType.Notification ||
-            this.context.timelineRenderingType === TimelineRenderingType.ThreadsList
-        ) {
+        if (this.context.timelineRenderingType === TimelineRenderingType.Notification) {
             avatarSize = 24;
             needsSenderProfile = true;
-        } else if (tileHandler === 'messages.RoomCreate' || isBubbleMessage) {
+        } else if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList ||
+            (this.context.timelineRenderingType === TimelineRenderingType.Thread && !this.props.continuation)
+        ) {
+            avatarSize = 32;
+            needsSenderProfile = true;
+        } else if (eventType === EventType.RoomCreate || isBubbleMessage) {
             avatarSize = 0;
             needsSenderProfile = false;
         } else if (isInfoMessage) {
@@ -1288,12 +1090,10 @@ export default class EventTile extends React.Component<IProps, IState> {
                 sender = <SenderProfile
                     onClick={this.onSenderProfileClick}
                     mxEvent={this.props.mxEvent}
-                    enableFlair={this.props.enableFlair}
                 />;
             } else {
                 sender = <SenderProfile
                     mxEvent={this.props.mxEvent}
-                    enableFlair={this.props.enableFlair}
                 />;
             }
         }
@@ -1315,7 +1115,8 @@ export default class EventTile extends React.Component<IProps, IState> {
             && (this.props.alwaysShowTimestamps
             || this.props.last
             || this.state.hover
-            || this.state.actionBarFocused);
+            || this.state.actionBarFocused
+            || Boolean(this.state.contextMenu));
 
         // Thread panel shows the timestamp of the last reply in that thread
         const ts = this.context.timelineRenderingType !== TimelineRenderingType.ThreadsList
@@ -1386,6 +1187,7 @@ export default class EventTile extends React.Component<IProps, IState> {
             href={permalink}
             onClick={this.onPermalinkClicked}
             aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
+            onContextMenu={this.onTimestampContextMenu}
         >
             { timestamp }
         </a>;
@@ -1399,16 +1201,25 @@ export default class EventTile extends React.Component<IProps, IState> {
 
         let msgOption;
         if (this.props.showReadReceipts) {
-            const readAvatars = this.getReadAvatars();
-            msgOption = readAvatars;
+            if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
+                msgOption = <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
+            } else {
+                msgOption = <ReadReceiptGroup
+                    readReceipts={this.props.readReceipts ?? []}
+                    readReceiptMap={this.props.readReceiptMap ?? {}}
+                    checkUnmounting={this.props.checkUnmounting}
+                    suppressAnimation={this.suppressReadReceiptAnimation}
+                    isTwelveHour={this.props.isTwelveHour}
+                />;
+            }
         }
 
-        const renderTarget = this.context.timelineRenderingType === TimelineRenderingType.Thread
-            ? RelationType.Thread
-            : undefined;
-
-        const replyChain = haveTileForEvent(this.props.mxEvent) && shouldDisplayReply(this.props.mxEvent, renderTarget)
-            ? <ReplyChain
+        let replyChain;
+        if (
+            haveRendererForEvent(this.props.mxEvent, this.context.showHiddenEvents) &&
+            shouldDisplayReply(this.props.mxEvent)
+        ) {
+            replyChain = <ReplyChain
                 parentEv={this.props.mxEvent}
                 onHeightChanged={this.props.onHeightChanged}
                 ref={this.replyChain}
@@ -1419,8 +1230,8 @@ export default class EventTile extends React.Component<IProps, IState> {
                 isQuoteExpanded={isQuoteExpanded}
                 setQuoteExpanded={this.setQuoteExpanded}
                 getRelationsForEvent={this.props.getRelationsForEvent}
-            />
-            : null;
+            />;
+        }
 
         const isOwnEvent = this.props.mxEvent?.sender?.userId === MatrixClientPeg.get().getUserId();
 
@@ -1441,22 +1252,30 @@ export default class EventTile extends React.Component<IProps, IState> {
                     </div>,
                     <div className="mx_EventTile_senderDetails" key="mx_EventTile_senderDetails">
                         { avatar }
-                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                        <a
+                            href={permalink}
+                            onClick={this.onPermalinkClicked}
+                            onContextMenu={this.onTimestampContextMenu}
+                        >
                             { sender }
                             { timestamp }
                         </a>
                     </div>,
-                    <div className={lineClasses} key="mx_EventTile_line">
-                        <EventTileType ref={this.tile}
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            onHeightChanged={this.props.onHeightChanged}
-                            editState={this.props.editState}
-                            getRelationsForEvent={this.props.getRelationsForEvent}
-                            isSeeingThroughMessageHiddenForModeration={isSeeingThroughMessageHiddenForModeration}
-                        />
+                    <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                        { this.renderContextMenu() }
+                        { renderTile(TimelineRenderingType.Notification, {
+                            ...this.props,
+
+                            // overrides
+                            ref: this.tile,
+                            isSeeingThroughMessageHiddenForModeration,
+
+                            // appease TS
+                            highlights: this.props.highlights,
+                            highlightLink: this.props.highlightLink,
+                            onHeightChanged: this.props.onHeightChanged,
+                            permalinkCreator: this.props.permalinkCreator,
+                        }, this.context.showHiddenEvents) }
                     </div>,
                 ]);
             }
@@ -1482,25 +1301,28 @@ export default class EventTile extends React.Component<IProps, IState> {
                     </div>,
                     <div className="mx_EventTile_senderDetails" key="mx_EventTile_senderDetails">
                         { avatar }
-                        <a href={permalink} onClick={this.onPermalinkClicked}>
-                            { sender }
-                        </a>
+                        { sender }
                     </div>,
-                    <div className={lineClasses} key="mx_EventTile_line">
+                    <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                        { this.renderContextMenu() }
                         { replyChain }
-                        <EventTileType ref={this.tile}
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            onHeightChanged={this.props.onHeightChanged}
-                            editState={this.props.editState}
-                            replacingEventId={this.props.replacingEventId}
-                            getRelationsForEvent={this.props.getRelationsForEvent}
-                            isSeeingThroughMessageHiddenForModeration={isSeeingThroughMessageHiddenForModeration}
-                        />
+                        { renderTile(TimelineRenderingType.Thread, {
+                            ...this.props,
+
+                            // overrides
+                            ref: this.tile,
+                            isSeeingThroughMessageHiddenForModeration,
+
+                            // appease TS
+                            highlights: this.props.highlights,
+                            highlightLink: this.props.highlightLink,
+                            onHeightChanged: this.props.onHeightChanged,
+                            permalinkCreator: this.props.permalinkCreator,
+                        }, this.context.showHiddenEvents) }
                         { actionBar }
-                        { timestamp }
+                        <a href={permalink} onClick={this.onPermalinkClicked}>
+                            { timestamp }
+                        </a>
                     </div>,
                     reactionsRow,
                 ]);
@@ -1569,17 +1391,21 @@ export default class EventTile extends React.Component<IProps, IState> {
                     "aria-atomic": true,
                     "data-scroll-tokens": scrollToken,
                 }, [
-                    <div className={lineClasses} key="mx_EventTile_line">
-                        <EventTileType ref={this.tile}
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            onHeightChanged={this.props.onHeightChanged}
-                            editState={this.props.editState}
-                            getRelationsForEvent={this.props.getRelationsForEvent}
-                            isSeeingThroughMessageHiddenForModeration={isSeeingThroughMessageHiddenForModeration}
-                        />
+                    <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                        { this.renderContextMenu() }
+                        { renderTile(TimelineRenderingType.File, {
+                            ...this.props,
+
+                            // overrides
+                            ref: this.tile,
+                            isSeeingThroughMessageHiddenForModeration,
+
+                            // appease TS
+                            highlights: this.props.highlights,
+                            highlightLink: this.props.highlightLink,
+                            onHeightChanged: this.props.onHeightChanged,
+                            permalinkCreator: this.props.permalinkCreator,
+                        }, this.context.showHiddenEvents) }
                     </div>,
                     <a
                         className="mx_EventTile_senderDetailsLink"
@@ -1587,7 +1413,10 @@ export default class EventTile extends React.Component<IProps, IState> {
                         href={permalink}
                         onClick={this.onPermalinkClicked}
                     >
-                        <div className="mx_EventTile_senderDetails">
+                        <div
+                            className="mx_EventTile_senderDetails"
+                            onContextMenu={this.onTimestampContextMenu}
+                        >
                             { sender }
                             { timestamp }
                         </div>
@@ -1615,26 +1444,25 @@ export default class EventTile extends React.Component<IProps, IState> {
                         { sender }
                         { ircPadlock }
                         { avatar }
-                        <div className={lineClasses} key="mx_EventTile_line">
+                        <div className={lineClasses} key="mx_EventTile_line" onContextMenu={this.onContextMenu}>
+                            { this.renderContextMenu() }
                             { groupTimestamp }
                             { groupPadlock }
                             { replyChain }
-                            <EventTileType
-                                ref={this.tile}
-                                mxEvent={this.props.mxEvent}
-                                forExport={this.props.forExport}
-                                replacingEventId={this.props.replacingEventId}
-                                editState={this.props.editState}
-                                highlights={this.props.highlights}
-                                highlightLink={this.props.highlightLink}
-                                showUrlPreview={this.props.showUrlPreview}
-                                permalinkCreator={this.props.permalinkCreator}
-                                onHeightChanged={this.props.onHeightChanged}
-                                callEventGrouper={this.props.callEventGrouper}
-                                getRelationsForEvent={this.props.getRelationsForEvent}
-                                isSeeingThroughMessageHiddenForModeration={isSeeingThroughMessageHiddenForModeration}
-                                timestamp={bubbleTimestamp}
-                            />
+                            { renderTile(this.context.timelineRenderingType, {
+                                ...this.props,
+
+                                // overrides
+                                ref: this.tile,
+                                isSeeingThroughMessageHiddenForModeration,
+                                timestamp: bubbleTimestamp,
+
+                                // appease TS
+                                highlights: this.props.highlights,
+                                highlightLink: this.props.highlightLink,
+                                onHeightChanged: this.props.onHeightChanged,
+                                permalinkCreator: this.props.permalinkCreator,
+                            }, this.context.showHiddenEvents) }
                             { keyRequestInfo }
                             { actionBar }
                             { this.props.layout === Layout.IRC && <>
@@ -1652,38 +1480,15 @@ export default class EventTile extends React.Component<IProps, IState> {
             }
         }
     }
-
-    public render() {
-        return <TileErrorBoundary mxEvent={this.props.mxEvent} layout={this.props.layout}>
-            { this.renderEvent() }
-        </TileErrorBoundary>;
-    }
 }
 
-// XXX this'll eventually be dynamic based on the fields once we have extensible event types
-const messageTypes = [EventType.RoomMessage, EventType.Sticker];
-function isMessageEvent(ev: MatrixEvent): boolean {
-    return (messageTypes.includes(ev.getType() as EventType)) || M_POLL_START.matches(ev.getType());
-}
-
-export function haveTileForEvent(e: MatrixEvent, showHiddenEvents?: boolean): boolean {
-    // Only show "Message deleted" tile for plain message events, encrypted events,
-    // and state events as they'll likely still contain enough keys to be relevant.
-    if (e.isRedacted() && !e.isEncrypted() && !isMessageEvent(e) && !e.isState()) return false;
-
-    // No tile for replacement events since they update the original tile
-    if (e.isRelation(RelationType.Replace)) return false;
-
-    const handler = getHandlerTile(e);
-    if (handler === undefined) return false;
-    if (handler === 'messages.TextualEvent') {
-        return hasText(e, showHiddenEvents);
-    } else if (handler === 'messages.RoomCreate') {
-        return Boolean(e.getContent()['predecessor']);
-    } else {
-        return true;
-    }
-}
+// Wrap all event tiles with the tile error boundary so that any throws even during construction are captured
+const SafeEventTile = forwardRef((props: IProps, ref: RefObject<UnwrappedEventTile>) => {
+    return <TileErrorBoundary mxEvent={props.mxEvent} layout={props.layout}>
+        <UnwrappedEventTile ref={ref} {...props} />
+    </TileErrorBoundary>;
+});
+export default SafeEventTile;
 
 function E2ePadlockUndecryptable(props) {
     return (
@@ -1771,66 +1576,51 @@ interface ISentReceiptProps {
     messageState: string; // TODO: Types for message sending state
 }
 
-interface ISentReceiptState {
-    hover: boolean;
-}
-
-class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptState> {
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            hover: false,
-        };
+function SentReceipt({ messageState }: ISentReceiptProps) {
+    const isSent = !messageState || messageState === 'sent';
+    const isFailed = messageState === 'not_sent';
+    const receiptClasses = classNames({
+        'mx_EventTile_receiptSent': isSent,
+        'mx_EventTile_receiptSending': !isSent && !isFailed,
+    });
+
+    let nonCssBadge = null;
+    if (isFailed) {
+        nonCssBadge = (
+            <NotificationBadge notification={StaticNotificationState.RED_EXCLAMATION} />
+        );
     }
 
-    onHoverStart = () => {
-        this.setState({ hover: true });
-    };
-
-    onHoverEnd = () => {
-        this.setState({ hover: false });
-    };
-
-    render() {
-        const isSent = !this.props.messageState || this.props.messageState === 'sent';
-        const isFailed = this.props.messageState === 'not_sent';
-        const receiptClasses = classNames({
-            'mx_EventTile_receiptSent': isSent,
-            'mx_EventTile_receiptSending': !isSent && !isFailed,
-        });
-
-        let nonCssBadge = null;
-        if (isFailed) {
-            nonCssBadge = <NotificationBadge
-                notification={StaticNotificationState.RED_EXCLAMATION}
-            />;
-        }
-
-        let tooltip = null;
-        if (this.state.hover) {
-            let label = _t("Sending your message...");
-            if (this.props.messageState === 'encrypting') {
-                label = _t("Encrypting your message...");
-            } else if (isSent) {
-                label = _t("Your message was sent");
-            } else if (isFailed) {
-                label = _t("Failed to send");
-            }
-            // The yOffset is somewhat arbitrary - it just brings the tooltip down to be more associated
-            // with the read receipt.
-            tooltip = <Tooltip className="mx_EventTile_readAvatars_receiptTooltip" label={label} yOffset={3} />;
-        }
+    let label = _t("Sending your message...");
+    if (messageState === 'encrypting') {
+        label = _t("Encrypting your message...");
+    } else if (isSent) {
+        label = _t("Your message was sent");
+    } else if (isFailed) {
+        label = _t("Failed to send");
+    }
+    const [{ showTooltip, hideTooltip }, tooltip] = useTooltip({
+        label: label,
+        alignment: Alignment.TopRight,
+    });
 
-        return (
-            <div className="mx_EventTile_msgOption">
-                <span className="mx_EventTile_readAvatars">
-                    <span className={receiptClasses} onMouseEnter={this.onHoverStart} onMouseLeave={this.onHoverEnd}>
-                        { nonCssBadge }
-                        { tooltip }
+    return (
+        <div className="mx_EventTile_msgOption">
+            <div className="mx_ReadReceiptGroup">
+                <div
+                    className="mx_ReadReceiptGroup_button"
+                    onMouseOver={showTooltip}
+                    onMouseLeave={hideTooltip}
+                    onFocus={showTooltip}
+                    onBlur={hideTooltip}>
+                    <span className="mx_ReadReceiptGroup_container">
+                        <span className={receiptClasses}>
+                            { nonCssBadge }
+                        </span>
                     </span>
-                </span>
+                </div>
+                { tooltip }
             </div>
-        );
-    }
+        </div>
+    );
 }
diff --git a/src/components/views/rooms/ExtraTile.tsx b/src/components/views/rooms/ExtraTile.tsx
index 47862d71a59..313ae28b1f8 100644
--- a/src/components/views/rooms/ExtraTile.tsx
+++ b/src/components/views/rooms/ExtraTile.tsx
@@ -79,12 +79,12 @@ export default class ExtraTile extends React.Component<IProps, IState> {
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
         const nameClasses = classNames({
-            "mx_RoomTile_name": true,
-            "mx_RoomTile_nameHasUnreadEvents": this.props.notificationState?.isUnread,
+            "mx_RoomTile_title": true,
+            "mx_RoomTile_titleHasUnreadEvents": this.props.notificationState?.isUnread,
         });
 
         let nameContainer = (
-            <div className="mx_RoomTile_nameContainer">
+            <div className="mx_RoomTile_titleContainer">
                 <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
                     { name }
                 </div>
@@ -110,9 +110,13 @@ export default class ExtraTile extends React.Component<IProps, IState> {
                     <div className="mx_RoomTile_avatarContainer">
                         { this.props.avatar }
                     </div>
-                    { nameContainer }
-                    <div className="mx_RoomTile_badgeContainer">
-                        { badge }
+                    <div className="mx_RoomTile_details">
+                        <div className="mx_RoomTile_primaryDetails">
+                            { nameContainer }
+                            <div className="mx_RoomTile_badgeContainer">
+                                { badge }
+                            </div>
+                        </div>
                     </div>
                 </Button>
             </React.Fragment>
diff --git a/src/components/views/rooms/LinkPreviewWidget.tsx b/src/components/views/rooms/LinkPreviewWidget.tsx
index 5e7154dc8ac..d14c504dd8c 100644
--- a/src/components/views/rooms/LinkPreviewWidget.tsx
+++ b/src/components/views/rooms/LinkPreviewWidget.tsx
@@ -23,7 +23,6 @@ import { linkifyElement } from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import ImageView from '../elements/ImageView';
 
@@ -33,7 +32,6 @@ interface IProps {
     mxEvent: MatrixEvent; // the Event associated with the preview
 }
 
-@replaceableComponent("views.rooms.LinkPreviewWidget")
 export default class LinkPreviewWidget extends React.Component<IProps> {
     private readonly description = createRef<HTMLDivElement>();
     private image = createRef<HTMLImageElement>();
diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx
index 27377c567be..c0f40bb9b99 100644
--- a/src/components/views/rooms/MemberList.tsx
+++ b/src/components/views/rooms/MemberList.tsx
@@ -33,11 +33,9 @@ import SdkConfig from '../../../SdkConfig';
 import dis from '../../../dispatcher/dispatcher';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import BaseCard from "../right_panel/BaseCard";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from "../../../settings/SettingsStore";
 import TruncatedList from '../elements/TruncatedList';
 import Spinner from "../elements/Spinner";
@@ -46,7 +44,6 @@ import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import EntityTile from "./EntityTile";
 import MemberTile from "./MemberTile";
 import BaseAvatar from '../avatars/BaseAvatar';
-import SpaceStore from "../../../stores/spaces/SpaceStore";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
 import PosthogTrackers from "../../../PosthogTrackers";
@@ -76,7 +73,6 @@ interface IState {
     truncateAtInvited: number;
 }
 
-@replaceableComponent("views.rooms.MemberList")
 export default class MemberList extends React.Component<IProps, IState> {
     private showPresence = true;
     private mounted = false;
@@ -95,7 +91,7 @@ export default class MemberList extends React.Component<IProps, IState> {
         }
 
         cli.on(ClientEvent.Room, this.onRoom); // invites & joining after peek
-        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+        const enablePresenceByHsUrl = SdkConfig.get("enable_presence_by_hs_url");
         const hsUrl = MatrixClientPeg.get().baseUrl;
         this.showPresence = enablePresenceByHsUrl?.[hsUrl] ?? true;
     }
@@ -278,7 +274,7 @@ export default class MemberList extends React.Component<IProps, IState> {
 
             this.sortNames.set(
                 member,
-                (member.name[0] === '@' ? member.name.substr(1) : member.name).replace(SORT_REGEX, ""),
+                (member.name[0] === '@' ? member.name.slice(1) : member.name).replace(SORT_REGEX, ""),
             );
 
             // XXX: this user may have no lastPresenceTs value!
@@ -523,10 +519,7 @@ export default class MemberList extends React.Component<IProps, IState> {
 
         if (room?.getMyMembership() === 'join' && shouldShowComponent(UIComponent.InviteUsers)) {
             let inviteButtonText = _t("Invite to this room");
-            const chat = CommunityPrototypeStore.instance.getSelectedCommunityGeneralChat();
-            if (chat && chat.roomId === this.props.roomId) {
-                inviteButtonText = _t("Invite to this community");
-            } else if (SpaceStore.spacesEnabled && room.isSpaceRoom()) {
+            if (room.isSpaceRoom()) {
                 inviteButtonText = _t("Invite to this space");
             }
 
@@ -566,7 +559,7 @@ export default class MemberList extends React.Component<IProps, IState> {
         );
 
         let scopeHeader;
-        if (SpaceStore.spacesEnabled && room?.isSpaceRoom()) {
+        if (room?.isSpaceRoom()) {
             scopeHeader = <div className="mx_RightPanel_scopeHeader">
                 <RoomAvatar room={room} height={32} width={32} />
                 <RoomName room={room} />
@@ -603,7 +596,7 @@ export default class MemberList extends React.Component<IProps, IState> {
             return;
         }
 
-        // call AddressPickerDialog
+        // open the room inviter
         dis.dispatch({
             action: 'view_invite',
             roomId: this.props.roomId,
diff --git a/src/components/views/rooms/MemberTile.tsx b/src/components/views/rooms/MemberTile.tsx
index 36d6555d210..b652771a43e 100644
--- a/src/components/views/rooms/MemberTile.tsx
+++ b/src/components/views/rooms/MemberTile.tsx
@@ -30,9 +30,9 @@ import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EntityTile, { PowerStatus } from "./EntityTile";
 import MemberAvatar from "./../avatars/MemberAvatar";
+import DisambiguatedProfile from "../messages/DisambiguatedProfile";
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps {
@@ -46,7 +46,6 @@ interface IState {
     e2eStatus: string;
 }
 
-@replaceableComponent("views.rooms.MemberTile")
 export default class MemberTile extends React.Component<IProps, IState> {
     private userLastModifiedTime: number;
     private memberLastModifiedTime: number;
@@ -258,6 +257,13 @@ export default class MemberTile extends React.Component<IProps, IState> {
             e2eStatus = this.state.e2eStatus;
         }
 
+        const nameJSX = (
+            <DisambiguatedProfile
+                member={member}
+                fallbackName={name || ""}
+            />
+        );
+
         return (
             <EntityTile
                 {...this.props}
@@ -268,6 +274,7 @@ export default class MemberTile extends React.Component<IProps, IState> {
                 avatarJsx={av}
                 title={this.getPowerLabel()}
                 name={name}
+                nameJSX={nameJSX}
                 powerStatus={powerStatus}
                 showPresence={this.props.showPresence}
                 subtextLabel={statusMessage}
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 6b6cbc538bb..aed4536aa0c 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -19,8 +19,9 @@ import classNames from 'classnames';
 import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { EventType, RelationType } from 'matrix-js-sdk/src/@types/event';
+import { EventType } from 'matrix-js-sdk/src/@types/event';
 import { Optional } from "matrix-events-sdk";
+import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
 
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -34,7 +35,6 @@ import { aboveLeftOf, AboveLeftOf } from "../../structures/ContextMenu";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import ReplyPreview from "./ReplyPreview";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
 import { VoiceRecordingStore } from "../../../stores/VoiceRecordingStore";
 import { RecordingState, VoiceRecording } from "../../../audio/VoiceRecording";
@@ -90,7 +90,6 @@ interface IState {
     showPollsButton: boolean;
 }
 
-@replaceableComponent("views.rooms.MessageComposer")
 export default class MessageComposer extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private messageComposerInput = createRef<SendMessageComposerClass>();
@@ -258,7 +257,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
 
     private renderPlaceholderText = () => {
         if (this.props.replyToEvent) {
-            const replyingToThread = this.props.relation?.rel_type === RelationType.Thread;
+            const replyingToThread = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name;
             if (replyingToThread && this.props.e2eStatus) {
                 return _t('Reply to encrypted thread…');
             } else if (replyingToThread) {
@@ -341,6 +340,10 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         });
     };
 
+    private toggleStickerPickerOpen = () => {
+        this.setStickerPickerOpen(!this.state.isStickerPickerOpen);
+    };
+
     private toggleButtonMenu = (): void => {
         this.setState({
             isMenuOpen: !this.state.isMenuOpen,
@@ -373,6 +376,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
                     replyToEvent={this.props.replyToEvent}
                     onChange={this.onChange}
                     disabled={this.state.haveRecording}
+                    toggleStickerPickerOpen={this.toggleStickerPickerOpen}
                 />,
             );
 
@@ -421,7 +425,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
             />;
         }
 
-        const threadId = this.props.relation?.rel_type === RelationType.Thread
+        const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
             ? this.props.relation.event_id
             : null;
 
diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 8171d9cb892..17c87b15ca2 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -20,7 +20,7 @@ import { M_POLL_START } from "matrix-events-sdk";
 import React, { createContext, ReactElement, useContext, useRef } from 'react';
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import { RelationType } from 'matrix-js-sdk/src/@types/event';
+import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
 
 import { _t } from '../../../languageHandler';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
@@ -37,6 +37,7 @@ import ContentMessages from '../../../ContentMessages';
 import MatrixClientContext from '../../../contexts/MatrixClientContext';
 import RoomContext from '../../../contexts/RoomContext';
 import { useDispatcher } from "../../../hooks/useDispatcher";
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 interface IProps {
     addEmoji: (emoji: string) => boolean;
@@ -101,11 +102,11 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
 
     return <UploadButtonContextProvider roomId={roomId} relation={props.relation}>
         { mainButtons }
-        <AccessibleTooltipButton
+        { moreButtons.length > 0 && <AccessibleTooltipButton
             className={moreOptionsClasses}
             onClick={props.toggleButtonMenu}
             title={_t("More options")}
-        />
+        /> }
         { props.isMenuOpen && (
             <ContextMenu
                 onFinished={props.toggleButtonMenu}
@@ -236,6 +237,7 @@ const UploadButtonContextProvider: React.FC<IUploadButtonProps> = ({ roomId, rel
             type="file"
             style={uploadInputStyle}
             multiple
+            onClick={chromeFileInputFix}
             onChange={onUploadFileInputChange}
         />
     </UploadButtonContext.Provider>;
@@ -318,7 +320,7 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
                 },
             );
         } else {
-            const threadId = this.props.relation?.rel_type === RelationType.Thread
+            const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
                 ? this.props.relation.event_id
                 : null;
 
@@ -339,7 +341,7 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
 
     public render() {
         // do not allow sending polls within threads at this time
-        if (this.props.relation?.rel_type === RelationType.Thread) return null;
+        if (this.props.relation?.rel_type === THREAD_RELATION_TYPE.name) return null;
 
         return (
             <CollapsibleButton
diff --git a/src/components/views/rooms/MessageComposerFormatBar.tsx b/src/components/views/rooms/MessageComposerFormatBar.tsx
index d3038b89e2d..3258ce51afb 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.tsx
+++ b/src/components/views/rooms/MessageComposerFormatBar.tsx
@@ -19,7 +19,6 @@ import classNames from 'classnames';
 
 import { _t } from '../../../languageHandler';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 export enum Formatting {
     Bold = "bold",
@@ -39,7 +38,6 @@ interface IState {
     visible: boolean;
 }
 
-@replaceableComponent("views.rooms.MessageComposerFormatBar")
 export default class MessageComposerFormatBar extends React.PureComponent<IProps, IState> {
     private readonly formatBarRef = createRef<HTMLDivElement>();
 
@@ -56,9 +54,9 @@ export default class MessageComposerFormatBar extends React.PureComponent<IProps
             <FormatButton label={_t("Bold")} onClick={() => this.props.onAction(Formatting.Bold)} icon="Bold" shortcut={this.props.shortcuts.bold} visible={this.state.visible} />
             <FormatButton label={_t("Italics")} onClick={() => this.props.onAction(Formatting.Italics)} icon="Italic" shortcut={this.props.shortcuts.italics} visible={this.state.visible} />
             <FormatButton label={_t("Strikethrough")} onClick={() => this.props.onAction(Formatting.Strikethrough)} icon="Strikethrough" visible={this.state.visible} />
-            <FormatButton label={_t("Code block")} onClick={() => this.props.onAction(Formatting.Code)} icon="Code" visible={this.state.visible} />
+            <FormatButton label={_t("Code block")} onClick={() => this.props.onAction(Formatting.Code)} icon="Code" shortcut={this.props.shortcuts.code} visible={this.state.visible} />
             <FormatButton label={_t("Quote")} onClick={() => this.props.onAction(Formatting.Quote)} icon="Quote" shortcut={this.props.shortcuts.quote} visible={this.state.visible} />
-            <FormatButton label={_t("Insert link")} onClick={() => this.props.onAction(Formatting.InsertLink)} icon="InsertLink" visible={this.state.visible} />
+            <FormatButton label={_t("Insert link")} onClick={() => this.props.onAction(Formatting.InsertLink)} icon="InsertLink" shortcut={this.props.shortcuts.insert_link} visible={this.state.visible} />
         </div>);
     }
 
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 667145d0a90..363e687c9f9 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -33,12 +33,12 @@ import { ViewUserPayload } from "../../../dispatcher/payloads/ViewUserPayload";
 import { Action } from "../../../dispatcher/actions";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import { showSpaceInvite } from "../../../utils/space";
-import { privateShouldBeEncrypted } from "../../../createRoom";
 import EventTileBubble from "../messages/EventTileBubble";
 import { ROOM_SECURITY_TAB } from "../dialogs/RoomSettingsDialog";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
+import { privateShouldBeEncrypted } from "../../../utils/rooms";
 
 function hasExpectedEncryptionSettings(matrixClient: MatrixClient, room: Room): boolean {
     const isEncrypted: boolean = matrixClient.isRoomEncrypted(room.roomId);
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 09a35125d24..51745209aae 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -22,7 +22,6 @@ import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import { XOR } from "../../../@types/common";
 import { NotificationState, NotificationStateEvents } from "../../../stores/notifications/NotificationState";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Tooltip from "../elements/Tooltip";
 import { _t } from "../../../languageHandler";
 import { NotificationColor } from "../../../stores/notifications/NotificationColor";
@@ -55,7 +54,6 @@ interface IState {
     showTooltip: boolean;
 }
 
-@replaceableComponent("views.rooms.NotificationBadge")
 export default class NotificationBadge extends React.PureComponent<XOR<IProps, IClickableProps>, IState> {
     private countWatcherRef: string;
 
diff --git a/src/components/views/rooms/PinnedEventTile.tsx b/src/components/views/rooms/PinnedEventTile.tsx
index 28742565408..8f6247b5f6d 100644
--- a/src/components/views/rooms/PinnedEventTile.tsx
+++ b/src/components/views/rooms/PinnedEventTile.tsx
@@ -29,7 +29,6 @@ import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from '../../../languageHandler';
 import { formatDate } from '../../../DateUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { getUserNameColorClass } from "../../../utils/FormattingUtils";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
@@ -42,7 +41,6 @@ interface IProps {
 
 const AVATAR_SIZE = 24;
 
-@replaceableComponent("views.rooms.PinnedEventTile")
 export default class PinnedEventTile extends React.Component<IProps> {
     public static contextType = MatrixClientContext;
 
@@ -80,18 +78,22 @@ export default class PinnedEventTile extends React.Component<IProps> {
                 await Promise.all(
                     [M_POLL_RESPONSE.name, M_POLL_RESPONSE.altName, M_POLL_END.name, M_POLL_END.altName]
                         .map(async eventType => {
-                            const { events } = await this.context.relations(
-                                roomId, eventId, RelationType.Reference, eventType,
-                            );
-
                             const relations = new Relations(RelationType.Reference, eventType, room);
+                            relations.setTargetEvent(this.props.event);
+
                             if (!this.relations.has(RelationType.Reference)) {
                                 this.relations.set(RelationType.Reference, new Map<string, Relations>());
                             }
                             this.relations.get(RelationType.Reference).set(eventType, relations);
 
-                            relations.setTargetEvent(this.props.event);
-                            events.forEach(event => relations.addEvent(event));
+                            let nextBatch: string | undefined;
+                            do {
+                                const page = await this.context.relations(
+                                    roomId, eventId, RelationType.Reference, eventType, { from: nextBatch },
+                                );
+                                nextBatch = page.nextBatch;
+                                page.events.forEach(event => relations.addEvent(event));
+                            } while (nextBatch);
                         }),
                 );
             } catch (err) {
diff --git a/src/components/views/rooms/PresenceLabel.tsx b/src/components/views/rooms/PresenceLabel.tsx
index be324a84379..91361db7700 100644
--- a/src/components/views/rooms/PresenceLabel.tsx
+++ b/src/components/views/rooms/PresenceLabel.tsx
@@ -15,9 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
+import { UnstableValue } from "matrix-js-sdk/src/NamespacedValue";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+const BUSY_PRESENCE_NAME = new UnstableValue("busy", "org.matrix.msc3026.busy");
 
 interface IProps {
     // number of milliseconds ago this user was last active.
@@ -30,7 +32,6 @@ interface IProps {
     presenceState?: string;
 }
 
-@replaceableComponent("views.rooms.PresenceLabel")
 export default class PresenceLabel extends React.Component<IProps> {
     static defaultProps = {
         activeAgo: -1,
@@ -62,6 +63,11 @@ export default class PresenceLabel extends React.Component<IProps> {
     }
 
     private getPrettyPresence(presence: string, activeAgo: number, currentlyActive: boolean): string {
+        // for busy presence, we ignore the 'currentlyActive' flag: they're busy whether
+        // they're active or not. It can be set while the user is active in which case
+        // the 'active ago' ends up being 0.
+        if (BUSY_PRESENCE_NAME.matches(presence)) return _t("Busy");
+
         if (!currentlyActive && activeAgo !== undefined && activeAgo > 0) {
             const duration = this.getDuration(activeAgo);
             if (presence === "online") return _t("Online for %(duration)s", { duration: duration });
diff --git a/src/components/views/rooms/PublicRoomTile.tsx b/src/components/views/rooms/PublicRoomTile.tsx
new file mode 100644
index 00000000000..a0f3b89fae2
--- /dev/null
+++ b/src/components/views/rooms/PublicRoomTile.tsx
@@ -0,0 +1,179 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useCallback, useContext, useEffect, useState } from "react";
+import { IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client";
+
+import BaseAvatar from "../avatars/BaseAvatar";
+import { mediaFromMxc } from "../../../customisations/Media";
+import { linkifyAndSanitizeHtml } from "../../../HtmlUtils";
+import { getDisplayAliasForRoom } from "../../structures/RoomDirectory";
+import AccessibleButton from "../elements/AccessibleButton";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { _t } from "../../../languageHandler";
+
+const MAX_NAME_LENGTH = 80;
+const MAX_TOPIC_LENGTH = 800;
+
+interface IProps {
+    room: IPublicRoomsChunkRoom;
+    removeFromDirectory?: (room: IPublicRoomsChunkRoom) => void;
+    showRoom: (room: IPublicRoomsChunkRoom, roomAlias?: string, autoJoin?: boolean, shouldPeek?: boolean) => void;
+}
+
+export const PublicRoomTile = ({
+    room,
+    showRoom,
+    removeFromDirectory,
+}: IProps) => {
+    const client = useContext(MatrixClientContext);
+
+    const [avatarUrl, setAvatarUrl] = useState<string | null>(null);
+    const [name, setName] = useState("");
+    const [topic, setTopic] = useState("");
+
+    const [hasJoinedRoom, setHasJoinedRoom] = useState(false);
+
+    const isGuest = client.isGuest();
+
+    useEffect(() => {
+        const clientRoom = client.getRoom(room.room_id);
+
+        setHasJoinedRoom(clientRoom?.getMyMembership() === "join");
+
+        let name = room.name || getDisplayAliasForRoom(room) || _t('Unnamed room');
+        if (name.length > MAX_NAME_LENGTH) {
+            name = `${name.substring(0, MAX_NAME_LENGTH)}...`;
+        }
+        setName(name);
+
+        let topic = room.topic || '';
+        // Additional truncation based on line numbers is done via CSS,
+        // but to ensure that the DOM is not polluted with a huge string
+        // we give it a hard limit before rendering.
+        if (topic.length > MAX_TOPIC_LENGTH) {
+            topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
+        }
+        topic = linkifyAndSanitizeHtml(topic);
+        setTopic(topic);
+        if (room.avatar_url) {
+            setAvatarUrl(mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(32));
+        }
+    }, [room, client]);
+
+    const onRoomClicked = useCallback((ev: React.MouseEvent) => {
+        // If room was shift-clicked, remove it from the room directory
+        if (ev.shiftKey) {
+            ev.preventDefault();
+            removeFromDirectory?.(room);
+        }
+    }, [room, removeFromDirectory]);
+
+    const onPreviewClick = useCallback((ev: React.MouseEvent) => {
+        showRoom(room, null, false, true);
+        ev.stopPropagation();
+    }, [room, showRoom]);
+
+    const onViewClick = useCallback((ev: React.MouseEvent) => {
+        showRoom(room);
+        ev.stopPropagation();
+    }, [room, showRoom]);
+
+    const onJoinClick = useCallback((ev: React.MouseEvent) => {
+        showRoom(room, null, true);
+        ev.stopPropagation();
+    }, [room, showRoom]);
+
+    let previewButton;
+    let joinOrViewButton;
+
+    // Element Web currently does not allow guests to join rooms, so we
+    // instead show them preview buttons for all rooms. If the room is not
+    // world readable, a modal will appear asking you to register first. If
+    // it is readable, the preview appears as normal.
+    if (!hasJoinedRoom && (room.world_readable || isGuest)) {
+        previewButton = (
+            <AccessibleButton kind="secondary" onClick={onPreviewClick}>
+                { _t("Preview") }
+            </AccessibleButton>
+        );
+    }
+    if (hasJoinedRoom) {
+        joinOrViewButton = (
+            <AccessibleButton kind="secondary" onClick={onViewClick}>
+                { _t("View") }
+            </AccessibleButton>
+        );
+    } else if (!isGuest) {
+        joinOrViewButton = (
+            <AccessibleButton kind="primary" onClick={onJoinClick}>
+                { _t("Join") }
+            </AccessibleButton>
+        );
+    }
+
+    return <div
+        role="listitem"
+        className="mx_RoomDirectory_listItem"
+    >
+        <div
+            onMouseDown={onRoomClicked}
+            className="mx_RoomDirectory_roomAvatar"
+        >
+            <BaseAvatar
+                width={32}
+                height={32}
+                resizeMethod='crop'
+                name={name}
+                idName={name}
+                url={avatarUrl}
+            />
+        </div>
+        <div
+            onMouseDown={onRoomClicked}
+            className="mx_RoomDirectory_roomDescription"
+        >
+            <div className="mx_RoomDirectory_name">
+                { name }
+            </div>&nbsp;
+            <div
+                className="mx_RoomDirectory_topic"
+                dangerouslySetInnerHTML={{ __html: topic }}
+            />
+            <div className="mx_RoomDirectory_alias">
+                { getDisplayAliasForRoom(room) }
+            </div>
+        </div>
+        <div
+            onMouseDown={onRoomClicked}
+            className="mx_RoomDirectory_roomMemberCount"
+        >
+            { room.num_joined_members }
+        </div>
+        <div
+            onMouseDown={onRoomClicked}
+            className="mx_RoomDirectory_preview"
+        >
+            { previewButton }
+        </div>
+        <div
+            onMouseDown={onRoomClicked}
+            className="mx_RoomDirectory_join"
+        >
+            { joinOrViewButton }
+        </div>
+    </div>;
+};
diff --git a/src/components/views/rooms/ReadReceiptGroup.tsx b/src/components/views/rooms/ReadReceiptGroup.tsx
new file mode 100644
index 00000000000..31a2a59dd30
--- /dev/null
+++ b/src/components/views/rooms/ReadReceiptGroup.tsx
@@ -0,0 +1,281 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { PropsWithChildren, useRef } from "react";
+import { User } from "matrix-js-sdk/src/matrix";
+
+import ReadReceiptMarker, { IReadReceiptInfo } from "./ReadReceiptMarker";
+import { IReadReceiptProps } from "./EventTile";
+import AccessibleButton from "../elements/AccessibleButton";
+import MemberAvatar from "../avatars/MemberAvatar";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import { Alignment } from "../elements/Tooltip";
+import { formatDate } from "../../../DateUtils";
+import { Action } from "../../../dispatcher/actions";
+import dis from "../../../dispatcher/dispatcher";
+import ContextMenu, { aboveLeftOf, MenuItem, useContextMenu } from "../../structures/ContextMenu";
+import { useTooltip } from "../../../utils/useTooltip";
+import { _t } from "../../../languageHandler";
+import { useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
+
+// #20547 Design specified that we should show the three latest read receipts
+const MAX_READ_AVATARS_PLUS_N = 3;
+// #21935 If we’ve got just 4, don’t show +1, just show all of them
+const MAX_READ_AVATARS = MAX_READ_AVATARS_PLUS_N + 1;
+
+const READ_AVATAR_OFFSET = 10;
+export const READ_AVATAR_SIZE = 16;
+
+interface Props {
+    readReceipts: IReadReceiptProps[];
+    readReceiptMap: { [userId: string]: IReadReceiptInfo };
+    checkUnmounting: () => boolean;
+    suppressAnimation: boolean;
+    isTwelveHour: boolean;
+}
+
+interface IAvatarPosition {
+    hidden: boolean;
+    position: number;
+}
+
+function determineAvatarPosition(index: number, count: number, max: number): IAvatarPosition {
+    const firstVisible = Math.max(0, count - max);
+
+    if (index >= firstVisible) {
+        return {
+            hidden: false,
+            position: index - firstVisible,
+        };
+    } else {
+        return {
+            hidden: true,
+            position: 0,
+        };
+    }
+}
+
+export function ReadReceiptGroup(
+    { readReceipts, readReceiptMap, checkUnmounting, suppressAnimation, isTwelveHour }: Props,
+) {
+    const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+    const [{ showTooltip, hideTooltip }, tooltip] = useTooltip({
+        label: _t("Seen by %(count)s people", { count: readReceipts.length }),
+        alignment: Alignment.TopRight,
+    });
+
+    // return early if there are no read receipts
+    if (readReceipts.length === 0) {
+        // We currently must include `mx_ReadReceiptGroup_container` in
+        // the DOM of all events, as it is the positioned parent of the
+        // animated read receipts. We can't let it unmount when a receipt
+        // moves events, so for now we mount it for all events. Without
+        // it, the animation will start from the top of the timeline
+        // (because it lost its container).
+        // See also https://github.com/vector-im/element-web/issues/17561
+        return (
+            <div className="mx_EventTile_msgOption">
+                <div className="mx_ReadReceiptGroup">
+                    <div className="mx_ReadReceiptGroup_button">
+                        <span className="mx_ReadReceiptGroup_container" />
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
+    // If we are above MAX_READ_AVATARS, we’ll have to remove a few to have space for the +n count.
+    const maxAvatars = readReceipts.length > MAX_READ_AVATARS
+        ? MAX_READ_AVATARS_PLUS_N
+        : MAX_READ_AVATARS;
+
+    const avatars = readReceipts.map((receipt, index) => {
+        const { hidden, position } = determineAvatarPosition(index, readReceipts.length, maxAvatars);
+
+        const userId = receipt.userId;
+        let readReceiptInfo: IReadReceiptInfo;
+
+        if (readReceiptMap) {
+            readReceiptInfo = readReceiptMap[userId];
+            if (!readReceiptInfo) {
+                readReceiptInfo = {};
+                readReceiptMap[userId] = readReceiptInfo;
+            }
+        }
+
+        return (
+            <ReadReceiptMarker
+                key={userId}
+                member={receipt.roomMember}
+                fallbackUserId={userId}
+                offset={position * READ_AVATAR_OFFSET}
+                hidden={hidden}
+                readReceiptInfo={readReceiptInfo}
+                checkUnmounting={checkUnmounting}
+                suppressAnimation={suppressAnimation}
+                timestamp={receipt.ts}
+                showTwelveHour={isTwelveHour}
+            />
+        );
+    });
+
+    let remText: JSX.Element;
+    const remainder = readReceipts.length - maxAvatars;
+    if (remainder > 0) {
+        remText = (
+            <span className="mx_ReadReceiptGroup_remainder" aria-live="off">
+                +{ remainder }
+            </span>
+        );
+    }
+
+    let contextMenu;
+    if (menuDisplayed) {
+        const buttonRect = button.current.getBoundingClientRect();
+        contextMenu = (
+            <ContextMenu
+                menuClassName="mx_ReadReceiptGroup_popup"
+                onFinished={closeMenu}
+                {...aboveLeftOf(buttonRect)}>
+                <AutoHideScrollbar>
+                    <SectionHeader className="mx_ReadReceiptGroup_title">
+                        { _t("Seen by %(count)s people", { count: readReceipts.length }) }
+                    </SectionHeader>
+                    { readReceipts.map(receipt => (
+                        <ReadReceiptPerson
+                            key={receipt.userId}
+                            {...receipt}
+                            isTwelveHour={isTwelveHour}
+                            onAfterClick={closeMenu}
+                        />
+                    )) }
+                </AutoHideScrollbar>
+            </ContextMenu>
+        );
+    }
+
+    return (
+        <div className="mx_EventTile_msgOption">
+            <div className="mx_ReadReceiptGroup">
+                <AccessibleButton
+                    className="mx_ReadReceiptGroup_button"
+                    inputRef={button}
+                    onClick={openMenu}
+                    onMouseOver={showTooltip}
+                    onMouseLeave={hideTooltip}
+                    onFocus={showTooltip}
+                    onBlur={hideTooltip}>
+                    { remText }
+                    <span
+                        className="mx_ReadReceiptGroup_container"
+                        style={{
+                            width: Math.min(maxAvatars, readReceipts.length) * READ_AVATAR_OFFSET +
+                                READ_AVATAR_SIZE - READ_AVATAR_OFFSET,
+                        }}
+                    >
+                        { avatars }
+                    </span>
+                </AccessibleButton>
+                { tooltip }
+                { contextMenu }
+            </div>
+        </div>
+    );
+}
+
+interface ReadReceiptPersonProps extends IReadReceiptProps {
+    isTwelveHour: boolean;
+    onAfterClick?: () => void;
+}
+
+function ReadReceiptPerson({ userId, roomMember, ts, isTwelveHour, onAfterClick }: ReadReceiptPersonProps) {
+    const [{ showTooltip, hideTooltip }, tooltip] = useTooltip({
+        alignment: Alignment.TopCenter,
+        tooltipClassName: "mx_ReadReceiptGroup_person--tooltip",
+        label: (
+            <>
+                <div className="mx_Tooltip_title">
+                    { roomMember?.rawDisplayName ?? userId }
+                </div>
+                <div className="mx_Tooltip_sub">
+                    { userId }
+                </div>
+            </>
+        ),
+    });
+
+    return (
+        <MenuItem
+            className="mx_ReadReceiptGroup_person"
+            onClick={() => {
+                dis.dispatch({
+                    action: Action.ViewUser,
+                    // XXX: We should be using a real member object and not assuming what the receiver wants.
+                    // The ViewUser action leads to the RightPanelStore, and RightPanelStoreIPanelState defines the
+                    // member property of IRightPanelCardState as `RoomMember | User`, so we’re fine for now, but we
+                    // should definitely clean this up later
+                    member: roomMember ?? { userId } as User,
+                    push: false,
+                });
+                onAfterClick?.();
+            }}
+            onMouseOver={showTooltip}
+            onMouseLeave={hideTooltip}
+            onFocus={showTooltip}
+            onBlur={hideTooltip}
+            onWheel={hideTooltip}
+        >
+            <MemberAvatar
+                member={roomMember}
+                fallbackUserId={userId}
+                width={24}
+                height={24}
+                aria-hidden="true"
+                aria-live="off"
+                resizeMethod="crop"
+                hideTitle
+            />
+            <div className="mx_ReadReceiptGroup_name">
+                <p>{ roomMember?.name ?? userId }</p>
+                <p className="mx_ReadReceiptGroup_secondary">
+                    { formatDate(new Date(ts), isTwelveHour) }
+                </p>
+            </div>
+            { tooltip }
+        </MenuItem>
+    );
+}
+
+interface ISectionHeaderProps {
+    className?: string;
+}
+
+function SectionHeader({ className, children }: PropsWithChildren<ISectionHeaderProps>) {
+    const ref = useRef<HTMLHeadingElement>();
+    const [onFocus] = useRovingTabIndex(ref);
+
+    return (
+        <h3
+            className={className}
+            role="menuitem"
+            onFocus={onFocus}
+            tabIndex={-1}
+            ref={ref}
+        >
+            { children }
+        </h3>
+    );
+}
diff --git a/src/components/views/rooms/ReadReceiptMarker.tsx b/src/components/views/rooms/ReadReceiptMarker.tsx
index c83d6e18810..934fd7af7ab 100644
--- a/src/components/views/rooms/ReadReceiptMarker.tsx
+++ b/src/components/views/rooms/ReadReceiptMarker.tsx
@@ -19,29 +19,27 @@ import React, { createRef, RefObject } from 'react';
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { logger } from "matrix-js-sdk/src/logger";
 
-import { _t } from '../../../languageHandler';
-import { formatDate } from '../../../DateUtils';
 import NodeAnimator from "../../../NodeAnimator";
 import { toPx } from "../../../utils/units";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MemberAvatar from '../avatars/MemberAvatar';
+import { READ_AVATAR_SIZE } from "./ReadReceiptGroup";
 
 export interface IReadReceiptInfo {
     top?: number;
-    left?: number;
+    right?: number;
     parent?: Element;
 }
 
 interface IProps {
     // the RoomMember to show the RR for
-    member?: RoomMember;
+    member?: RoomMember | null;
     // userId to fallback the avatar to
     // if the member hasn't been loaded yet
     fallbackUserId: string;
 
     // number of pixels to offset the avatar from the right of its parent;
     // typically a negative value.
-    leftOffset?: number;
+    offset: number;
 
     // true to hide the avatar (it will still be animated)
     hidden?: boolean;
@@ -57,9 +55,6 @@ interface IProps {
     // are being unmounted.
     checkUnmounting?: () => boolean;
 
-    // callback for clicks on this RR
-    onClick?: (e: React.MouseEvent) => void;
-
     // Timestamp when the receipt was read
     timestamp?: number;
 
@@ -74,17 +69,12 @@ interface IState {
 
 interface IReadReceiptMarkerStyle {
     top: number;
-    left: number;
+    right: number;
 }
 
-@replaceableComponent("views.rooms.ReadReceiptMarker")
 export default class ReadReceiptMarker extends React.PureComponent<IProps, IState> {
     private avatar: React.RefObject<HTMLDivElement | HTMLImageElement | HTMLSpanElement> = createRef();
 
-    static defaultProps = {
-        leftOffset: 0,
-    };
-
     constructor(props: IProps) {
         super(props);
 
@@ -112,10 +102,7 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
             return;
         }
 
-        const avatarNode = this.avatar.current;
-        rrInfo.top = avatarNode.offsetTop;
-        rrInfo.left = avatarNode.offsetLeft;
-        rrInfo.parent = avatarNode.offsetParent;
+        this.buildReadReceiptInfo(rrInfo);
     }
 
     public componentDidMount(): void {
@@ -127,49 +114,92 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
     }
 
     public componentDidUpdate(prevProps: IProps): void {
-        const differentLeftOffset = prevProps.leftOffset !== this.props.leftOffset;
+        const differentOffset = prevProps.offset !== this.props.offset;
         const visibilityChanged = prevProps.hidden !== this.props.hidden;
-        if (differentLeftOffset || visibilityChanged) {
+        if (differentOffset || visibilityChanged) {
             this.animateMarker();
         }
     }
 
-    private animateMarker(): void {
-        // treat new RRs as though they were off the top of the screen
-        let oldTop = -15;
+    private buildReadReceiptInfo(target: IReadReceiptInfo = {}): IReadReceiptInfo {
+        const element = this.avatar.current;
+        // this is the mx_ReadReceiptsGroup_container
+        const horizontalContainer = element.offsetParent;
+        if (!horizontalContainer || !(horizontalContainer instanceof HTMLElement)) {
+            // this seems to happen sometimes for reasons I don't understand
+            // the docs for `offsetParent` say it may be null if `display` is
+            // `none`, but I can't see why that would happen.
+            logger.warn(
+                `ReadReceiptMarker for ${this.props.fallbackUserId} has no valid horizontalContainer`,
+            );
 
-        const oldInfo = this.props.readReceiptInfo;
-        if (oldInfo && oldInfo.parent) {
-            oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top;
+            target.top = 0;
+            target.right = 0;
+            target.parent = null;
+            return;
         }
+        // this is the mx_ReadReceiptsGroup
+        const verticalContainer = horizontalContainer.offsetParent;
+        if (!verticalContainer || !(verticalContainer instanceof HTMLElement)) {
+            // this seems to happen sometimes for reasons I don't understand
+            // the docs for `offsetParent` say it may be null if `display` is
+            // `none`, but I can't see why that would happen.
+            logger.warn(
+                `ReadReceiptMarker for ${this.props.fallbackUserId} has no valid verticalContainer`,
+            );
 
-        const newElement = this.avatar.current;
-        let startTopOffset;
-        if (!newElement.offsetParent) {
+            target.top = 0;
+            target.right = 0;
+            target.parent = null;
+            return;
+        }
+
+        target.top = element.offsetTop;
+        target.right = element.getBoundingClientRect().right - horizontalContainer.getBoundingClientRect().right;
+        target.parent = verticalContainer;
+        return target;
+    }
+
+    private readReceiptPosition(info: IReadReceiptInfo): number {
+        if (!info.parent) {
             // this seems to happen sometimes for reasons I don't understand
             // the docs for `offsetParent` say it may be null if `display` is
             // `none`, but I can't see why that would happen.
             logger.warn(
-                `ReadReceiptMarker for ${this.props.fallbackUserId} in has no offsetParent`,
+                `ReadReceiptMarker for ${this.props.fallbackUserId} has no offsetParent`,
             );
-            startTopOffset = 0;
-        } else {
-            startTopOffset = oldTop - newElement.offsetParent.getBoundingClientRect().top;
+            return 0;
         }
 
-        const startStyles = [];
+        return info.top + info.parent.getBoundingClientRect().top;
+    }
 
-        if (oldInfo && oldInfo.left) {
+    private animateMarker(): void {
+        const oldInfo = this.props.readReceiptInfo;
+        const newInfo = this.buildReadReceiptInfo();
+
+        const newPosition = this.readReceiptPosition(newInfo);
+        const oldPosition = oldInfo
             // start at the old height and in the old h pos
-            startStyles.push({ top: startTopOffset+"px",
-                left: toPx(oldInfo.left) });
-        }
+            ? this.readReceiptPosition(oldInfo)
+            // treat new RRs as though they were off the top of the screen
+            : -READ_AVATAR_SIZE;
 
-        startStyles.push({ top: startTopOffset+'px', left: '0' });
+        const startStyles = [];
+        if (oldInfo && oldInfo.right) {
+            startStyles.push({
+                top: oldPosition - newPosition,
+                right: oldInfo.right,
+            });
+        }
+        startStyles.push({
+            top: oldPosition - newPosition,
+            right: 0,
+        });
 
         this.setState({
             suppressDisplay: false,
-            startStyles: startStyles,
+            startStyles,
         });
     }
 
@@ -179,29 +209,10 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
         }
 
         const style = {
-            left: toPx(this.props.leftOffset),
+            right: toPx(this.props.offset),
             top: '0px',
         };
 
-        let title;
-        if (this.props.timestamp) {
-            const dateString = formatDate(new Date(this.props.timestamp), this.props.showTwelveHour);
-            if (!this.props.member || this.props.fallbackUserId === this.props.member.rawDisplayName) {
-                title = _t(
-                    "Seen by %(userName)s at %(dateTime)s",
-                    { userName: this.props.fallbackUserId,
-                        dateTime: dateString },
-                );
-            } else {
-                title = _t(
-                    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-                    { displayName: this.props.member.rawDisplayName,
-                        userName: this.props.fallbackUserId,
-                        dateTime: dateString },
-                );
-            }
-        }
-
         return (
             <NodeAnimator startStyles={this.state.startStyles}>
                 <MemberAvatar
@@ -213,9 +224,9 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
                     height={14}
                     resizeMethod="crop"
                     style={style}
-                    title={title}
-                    onClick={this.props.onClick}
                     inputRef={this.avatar as RefObject<HTMLImageElement>}
+                    hideTitle
+                    tabIndex={-1}
                 />
             </NodeAnimator>
         );
diff --git a/src/components/views/rooms/RecentlyViewedButton.tsx b/src/components/views/rooms/RecentlyViewedButton.tsx
index 5a5ec1520e8..9fd71d50e2e 100644
--- a/src/components/views/rooms/RecentlyViewedButton.tsx
+++ b/src/components/views/rooms/RecentlyViewedButton.tsx
@@ -23,10 +23,10 @@ import { useEventEmitterState } from "../../../hooks/useEventEmitter";
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
 import InteractiveTooltip, { Direction } from "../elements/InteractiveTooltip";
-import { roomContextDetailsText } from "../../../Rooms";
 import { Action } from "../../../dispatcher/actions";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { roomContextDetailsText } from "../../../utils/i18n-helpers";
 
 const RecentlyViewedButton = () => {
     const tooltipRef = useRef<InteractiveTooltip>();
diff --git a/src/components/views/rooms/ReplyPreview.tsx b/src/components/views/rooms/ReplyPreview.tsx
index 69c0e14a454..72340e99819 100644
--- a/src/components/views/rooms/ReplyPreview.tsx
+++ b/src/components/views/rooms/ReplyPreview.tsx
@@ -20,7 +20,6 @@ import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ReplyTile from './ReplyTile';
 import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
 
@@ -37,7 +36,6 @@ interface IProps {
     replyToEvent: MatrixEvent;
 }
 
-@replaceableComponent("views.rooms.ReplyPreview")
 export default class ReplyPreview extends React.Component<IProps> {
     public static contextType = RoomContext;
 
diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx
index c64f5126a98..2b973abfca5 100644
--- a/src/components/views/rooms/ReplyTile.tsx
+++ b/src/components/views/rooms/ReplyTile.tsx
@@ -27,12 +27,12 @@ import { Action } from '../../../dispatcher/actions';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import SenderProfile from "../messages/SenderProfile";
 import MImageReplyBody from "../messages/MImageReplyBody";
-import * as sdk from '../../../index';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-import { getEventDisplayInfo, isVoiceMessage } from '../../../utils/EventUtils';
+import { isVoiceMessage } from '../../../utils/EventUtils';
+import { getEventDisplayInfo } from "../../../utils/EventRenderingUtils";
 import MFileBody from "../messages/MFileBody";
 import MVoiceMessageBody from "../messages/MVoiceMessageBody";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { renderReplyTile } from "../../../events/EventTileFactory";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -46,7 +46,6 @@ interface IProps {
     );
 }
 
-@replaceableComponent("views.rooms.ReplyTile")
 export default class ReplyTile extends React.PureComponent<IProps> {
     private anchorElement = createRef<HTMLAnchorElement>();
 
@@ -111,10 +110,12 @@ export default class ReplyTile extends React.PureComponent<IProps> {
         const msgType = mxEvent.getContent().msgtype;
         const evType = mxEvent.getType() as EventType;
 
-        const { tileHandler, isInfoMessage, isSeeingThroughMessageHiddenForModeration } = getEventDisplayInfo(mxEvent);
+        const {
+            hasRenderer, isInfoMessage, isSeeingThroughMessageHiddenForModeration,
+        } = getEventDisplayInfo(mxEvent, false /* Replies are never hidden, so this should be fine */);
         // This shouldn't happen: the caller should check we support this type
         // before trying to instantiate us
-        if (!tileHandler) {
+        if (!hasRenderer) {
             const { mxEvent } = this.props;
             logger.warn(`Event type not supported: type:${mxEvent.getType()} isState:${mxEvent.isState()}`);
             return <div className="mx_ReplyTile mx_ReplyTile_info mx_MNoticeBody">
@@ -122,8 +123,6 @@ export default class ReplyTile extends React.PureComponent<IProps> {
             </div>;
         }
 
-        const EventTileType = sdk.getComponent(tileHandler);
-
         const classes = classNames("mx_ReplyTile", {
             mx_ReplyTile_info: isInfoMessage && !mxEvent.isRedacted(),
             mx_ReplyTile_audio: msgType === MsgType.Audio,
@@ -137,26 +136,25 @@ export default class ReplyTile extends React.PureComponent<IProps> {
 
         let sender;
         const needsSenderProfile = (
-            !isInfoMessage &&
-            msgType !== MsgType.Image &&
-            tileHandler !== EventType.RoomCreate &&
-            evType !== EventType.Sticker
+            !isInfoMessage
+            && msgType !== MsgType.Image
+            && evType !== EventType.Sticker
+            && evType !== EventType.RoomCreate
         );
 
         if (needsSenderProfile) {
             sender = <SenderProfile
                 mxEvent={mxEvent}
-                enableFlair={false}
             />;
         }
 
-        const msgtypeOverrides = {
+        const msgtypeOverrides: Record<string, typeof React.Component> = {
             [MsgType.Image]: MImageReplyBody,
             // Override audio and video body with file body. We also hide the download/decrypt button using CSS
             [MsgType.Audio]: isVoiceMessage(mxEvent) ? MVoiceMessageBody : MFileBody,
             [MsgType.Video]: MFileBody,
         };
-        const evOverrides = {
+        const evOverrides: Record<string, typeof React.Component> = {
             // Use MImageReplyBody so that the sticker isn't taking up a lot of space
             [EventType.Sticker]: MImageReplyBody,
         };
@@ -165,20 +163,23 @@ export default class ReplyTile extends React.PureComponent<IProps> {
             <div className={classes}>
                 <a href={permalink} onClick={this.onClick} ref={this.anchorElement}>
                     { sender }
-                    <EventTileType
-                        ref="tile"
-                        mxEvent={mxEvent}
-                        highlights={this.props.highlights}
-                        highlightLink={this.props.highlightLink}
-                        onHeightChanged={this.props.onHeightChanged}
-                        showUrlPreview={false}
-                        overrideBodyTypes={msgtypeOverrides}
-                        overrideEventTypes={evOverrides}
-                        replacingEventId={mxEvent.replacingEventId()}
-                        maxImageHeight={96}
-                        getRelationsForEvent={this.props.getRelationsForEvent}
-                        isSeeingThroughMessageHiddenForModeration={isSeeingThroughMessageHiddenForModeration}
-                    />
+                    { renderReplyTile({
+                        ...this.props,
+
+                        // overrides
+                        ref: null,
+                        showUrlPreview: false,
+                        overrideBodyTypes: msgtypeOverrides,
+                        overrideEventTypes: evOverrides,
+                        maxImageHeight: 96,
+                        isSeeingThroughMessageHiddenForModeration,
+
+                        // appease TS
+                        highlights: this.props.highlights,
+                        highlightLink: this.props.highlightLink,
+                        onHeightChanged: this.props.onHeightChanged,
+                        permalinkCreator: this.props.permalinkCreator,
+                    }, false /* showHiddenEvents shouldn't be relevant */) }
                 </a>
             </div>
         );
diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx
index f4fc41c4593..af06f41bf49 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs.tsx
@@ -26,7 +26,6 @@ import Analytics from "../../../Analytics";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { useRovingTabIndex } from "../../../accessibility/RovingTabIndex";
 import Toolbar from "../../../accessibility/Toolbar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { Action } from "../../../dispatcher/actions";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -71,7 +70,6 @@ const RoomBreadcrumbTile = ({ room, onClick }: { room: Room, onClick: (ev: Butto
     );
 };
 
-@replaceableComponent("views.rooms.RoomBreadcrumbs")
 export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState> {
     private isMounted = true;
 
diff --git a/src/components/views/rooms/RoomDetailList.tsx b/src/components/views/rooms/RoomDetailList.tsx
deleted file mode 100644
index 50a8f69d5ec..00000000000
--- a/src/components/views/rooms/RoomDetailList.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { Room } from 'matrix-js-sdk/src/matrix';
-import classNames from 'classnames';
-
-import dis from '../../../dispatcher/dispatcher';
-import { Action } from '../../../dispatcher/actions';
-import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import RoomDetailRow from "./RoomDetailRow";
-import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-
-interface IProps {
-    rooms?: Room[];
-    className?: string;
-}
-
-@replaceableComponent("views.rooms.RoomDetailList")
-export default class RoomDetailList extends React.Component<IProps> {
-    private getRows(): JSX.Element[] {
-        if (!this.props.rooms) return [];
-        return this.props.rooms.map((room, index) => {
-            return <RoomDetailRow key={index} room={room} onClick={this.onDetailsClick} />;
-        });
-    }
-
-    private onDetailsClick = (ev: React.MouseEvent, room: Room): void => {
-        dis.dispatch<ViewRoomPayload>({
-            action: Action.ViewRoom,
-            room_id: room.roomId,
-            room_alias: room.getCanonicalAlias() || (room.getAltAliases() || [])[0],
-            metricsTrigger: undefined, // Deprecated groups
-        });
-    };
-
-    public render(): JSX.Element {
-        const rows = this.getRows();
-        let rooms;
-        if (rows.length === 0) {
-            rooms = <i>{ _t('No rooms to show') }</i>;
-        } else {
-            rooms = <table className="mx_RoomDirectory_table">
-                <tbody>
-                    { this.getRows() }
-                </tbody>
-            </table>;
-        }
-        return <div className={classNames("mx_RoomDetailList", this.props.className)}>
-            { rooms }
-        </div>;
-    }
-}
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
deleted file mode 100644
index 99ba4104318..00000000000
--- a/src/components/views/rooms/RoomDetailRow.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-Copyright 2017-2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { createRef } from 'react';
-import PropTypes from 'prop-types';
-
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import { linkifyElement } from '../../../HtmlUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { mediaFromMxc } from "../../../customisations/Media";
-import { getDisplayAliasForAliasSet } from '../../../Rooms';
-
-export function getDisplayAliasForRoom(room) {
-    return getDisplayAliasForAliasSet(room.canonicalAlias, room.aliases);
-}
-
-export const roomShape = PropTypes.shape({
-    name: PropTypes.string,
-    topic: PropTypes.string,
-    roomId: PropTypes.string,
-    avatarUrl: PropTypes.string,
-    numJoinedMembers: PropTypes.number,
-    canonicalAlias: PropTypes.string,
-    aliases: PropTypes.arrayOf(PropTypes.string),
-
-    worldReadable: PropTypes.bool,
-    guestCanJoin: PropTypes.bool,
-});
-
-@replaceableComponent("views.rooms.RoomDetailRow")
-export default class RoomDetailRow extends React.Component {
-    static propTypes = {
-        room: roomShape,
-        // passes ev, room as args
-        onClick: PropTypes.func,
-        onMouseDown: PropTypes.func,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this._topic = createRef();
-    }
-
-    componentDidMount() {
-        this._linkifyTopic();
-    }
-
-    componentDidUpdate() {
-        this._linkifyTopic();
-    }
-
-    _linkifyTopic() {
-        if (this._topic.current) {
-            linkifyElement(this._topic.current);
-        }
-    }
-
-    onClick = (ev) => {
-        ev.preventDefault();
-        if (this.props.onClick) {
-            this.props.onClick(ev, this.props.room);
-        }
-    };
-
-    onTopicClick = (ev) => {
-        // When clicking a link in the topic, prevent the event being propagated
-        // to `onClick`.
-        ev.stopPropagation();
-    };
-
-    render() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-
-        const room = this.props.room;
-        const name = room.name || getDisplayAliasForRoom(room) || _t('Unnamed room');
-
-        const guestRead = room.worldReadable ? (
-            <div className="mx_RoomDirectory_perm">{ _t('World readable') }</div>
-        ) : <div />;
-        const guestJoin = room.guestCanJoin ? (
-            <div className="mx_RoomDirectory_perm">{ _t('Guests can join') }</div>
-        ) : <div />;
-
-        const perms = (guestRead || guestJoin) ? (<div className="mx_RoomDirectory_perms">
-            { guestRead }&nbsp;
-            { guestJoin }
-        </div>) : <div />;
-
-        let avatarUrl = null;
-        if (room.avatarUrl) avatarUrl = mediaFromMxc(room.avatarUrl).getSquareThumbnailHttp(24);
-
-        return <tr key={room.roomId} onClick={this.onClick} onMouseDown={this.props.onMouseDown}>
-            <td className="mx_RoomDirectory_roomAvatar">
-                <BaseAvatar
-                    width={24}
-                    height={24}
-                    resizeMethod='crop'
-                    name={name}
-                    idName={name}
-                    url={avatarUrl} />
-            </td>
-            <td className="mx_RoomDirectory_roomDescription">
-                <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
-                { perms }
-                <div className="mx_RoomDirectory_topic" ref={this._topic} onClick={this.onTopicClick}>
-                    { room.topic }
-                </div>
-                <div className="mx_RoomDirectory_alias">{ getDisplayAliasForRoom(room) }</div>
-            </td>
-            <td className="mx_RoomDirectory_roomMemberCount">
-                { room.numJoinedMembers }
-            </td>
-        </tr>;
-    }
-}
diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx
index c0a07181114..9983b6f39c3 100644
--- a/src/components/views/rooms/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader.tsx
@@ -30,7 +30,6 @@ import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import RoomTopic from "../elements/RoomTopic";
 import RoomName from "../elements/RoomName";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { E2EStatus } from '../../../utils/ShieldUtils';
 import { IOOBData } from '../../../stores/ThreepidInviteStore';
 import { SearchScope } from './SearchBar';
@@ -41,6 +40,7 @@ import { RoomNotificationStateStore } from '../../../stores/notifications/RoomNo
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import { NotificationStateEvents } from '../../../stores/notifications/NotificationState';
 import RoomContext from "../../../contexts/RoomContext";
+import RoomLiveShareWarning from '../beacon/RoomLiveShareWarning';
 
 export interface ISearchInfo {
     searchTerm: string;
@@ -53,6 +53,7 @@ interface IProps {
     oobData?: IOOBData;
     inRoom: boolean;
     onSearchClick: () => void;
+    onInviteClick: () => void;
     onForgetClick: () => void;
     onCallPlaced: (type: CallType) => void;
     onAppsClick: () => void;
@@ -66,7 +67,6 @@ interface IState {
     contextMenuPosition?: DOMRect;
 }
 
-@replaceableComponent("views.rooms.RoomHeader")
 export default class RoomHeader extends React.Component<IProps, IState> {
     static defaultProps = {
         editing: false,
@@ -205,6 +205,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
         const buttons: JSX.Element[] = [];
 
         if (this.props.inRoom &&
+            this.props.onCallPlaced &&
             !this.context.tombstone &&
             SettingsStore.getValue("showCallButtonsInComposer")
         ) {
@@ -255,6 +256,16 @@ export default class RoomHeader extends React.Component<IProps, IState> {
             buttons.push(searchButton);
         }
 
+        if (this.props.onInviteClick && this.props.inRoom) {
+            const inviteButton = <AccessibleTooltipButton
+                className="mx_RoomHeader_button mx_RoomHeader_inviteButton"
+                onClick={this.props.onInviteClick}
+                title={_t("Invite")}
+                key="invite"
+            />;
+            buttons.push(inviteButton);
+        }
+
         const rightRow =
             <div className="mx_RoomHeader_buttons">
                 { buttons }
@@ -273,6 +284,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
                     { rightRow }
                     <RoomHeaderButtons room={this.props.room} excludedRightPanelPhaseButtons={this.props.excludedRightPanelPhaseButtons} />
                 </div>
+                <RoomLiveShareWarning roomId={this.props.room.roomId} />
             </div>
         );
     }
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 36284a47b41..a7bc539a304 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React, { ComponentType, createRef, ReactComponentElement, RefObject } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 import * as fbEmitter from "fbemitter";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 
@@ -23,20 +24,17 @@ import { _t, _td } from "../../../languageHandler";
 import { IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
 import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
-import RoomViewStore from "../../../stores/RoomViewStore";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
 import { ITagMap } from "../../../stores/room-list/algorithms/models";
-import { DefaultTagID, isCustomTag, TagID } from "../../../stores/room-list/models";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import RoomSublist, { IAuxButtonProps } from "./RoomSublist";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import GroupAvatar from "../avatars/GroupAvatar";
 import ExtraTile from "./ExtraTile";
-import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 import { Action } from "../../../dispatcher/actions";
 import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
-import CustomRoomTagStore from "../../../stores/CustomRoomTagStore";
 import { arrayFastClone, arrayHasDiff } from "../../../utils/arrays";
 import { objectShallowClone, objectWithOnly } from "../../../utils/objects";
 import IconizedContextMenu, {
@@ -44,7 +42,6 @@ import IconizedContextMenu, {
     IconizedContextMenuOptionList,
 } from "../context_menus/IconizedContextMenu";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import {
     isMetaSpace,
@@ -55,7 +52,6 @@ import {
     UPDATE_SUGGESTED_ROOMS,
 } from "../../../stores/spaces";
 import { shouldShowSpaceInvite, showAddExistingRooms, showCreateNewRoom, showSpaceInvite } from "../../../utils/space";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RoomAvatar from "../avatars/RoomAvatar";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
@@ -90,15 +86,11 @@ export const TAG_ORDER: TagID[] = [
     DefaultTagID.Favourite,
     DefaultTagID.DM,
     DefaultTagID.Untagged,
-
-    // -- Custom Tags Placeholder --
-
     DefaultTagID.LowPriority,
     DefaultTagID.ServerNotice,
     DefaultTagID.Suggested,
     DefaultTagID.Archived,
 ];
-const CUSTOM_TAGS_BEFORE_TAG = DefaultTagID.LowPriority;
 const ALWAYS_VISIBLE_TAGS: TagID[] = [
     DefaultTagID.DM,
     DefaultTagID.Untagged,
@@ -150,6 +142,7 @@ const DmAuxButton = ({ tabIndex, dispatcher = defaultDispatcher }: IAuxButtonPro
                             e.stopPropagation();
                             closeMenu();
                             defaultDispatcher.dispatch({ action: "view_create_chat" });
+                            PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateChatItem", e);
                         }}
                     /> }
                     { showInviteUsers && <IconizedContextMenuOption
@@ -186,7 +179,10 @@ const DmAuxButton = ({ tabIndex, dispatcher = defaultDispatcher }: IAuxButtonPro
     } else if (!activeSpace && showCreateRooms) {
         return <AccessibleTooltipButton
             tabIndex={tabIndex}
-            onClick={() => dispatcher.dispatch({ action: 'view_create_chat' })}
+            onClick={(e) => {
+                dispatcher.dispatch({ action: 'view_create_chat' });
+                PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateChatItem", e);
+            }}
             className="mx_RoomSublist_auxButton"
             tooltipClassName="mx_RoomSublist_addRoomTooltip"
             aria-label={_t("Start chat")}
@@ -230,8 +226,8 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
                 showCreateRoom
                     ? (<>
                         <IconizedContextMenuOption
-                            label={_t("Create new room")}
-                            iconClassName="mx_RoomList_iconCreateNewRoom"
+                            label={_t("New room")}
+                            iconClassName="mx_RoomList_iconNewRoom"
                             onClick={(e) => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -243,6 +239,19 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
                             tooltip={canAddRooms ? undefined
                                 : _t("You do not have permissions to create new rooms in this space")}
                         />
+                        { SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
+                            label={_t("New video room")}
+                            iconClassName="mx_RoomList_iconNewVideoRoom"
+                            onClick={(e) => {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                closeMenu();
+                                showCreateNewRoom(activeSpace, RoomType.ElementVideo);
+                            }}
+                            disabled={!canAddRooms}
+                            tooltip={canAddRooms ? undefined
+                                : _t("You do not have permissions to create new rooms in this space")}
+                        /> }
                         <IconizedContextMenuOption
                             label={_t("Add existing room")}
                             iconClassName="mx_RoomList_iconAddExistingRoom"
@@ -262,26 +271,40 @@ const UntaggedAuxButton = ({ tabIndex }: IAuxButtonProps) => {
         </IconizedContextMenuOptionList>;
     } else if (menuDisplayed) {
         contextMenuContent = <IconizedContextMenuOptionList first>
-            { showCreateRoom && <IconizedContextMenuOption
-                label={_t("Create new room")}
-                iconClassName="mx_RoomList_iconCreateNewRoom"
-                onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    closeMenu();
-                    defaultDispatcher.dispatch({ action: "view_create_room" });
-                    PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateRoomItem", e);
-                }}
-            /> }
+            { showCreateRoom && <>
+                <IconizedContextMenuOption
+                    label={_t("New room")}
+                    iconClassName="mx_RoomList_iconNewRoom"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        closeMenu();
+                        defaultDispatcher.dispatch({ action: "view_create_room" });
+                        PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateRoomItem", e);
+                    }}
+                />
+                { SettingsStore.getValue("feature_video_rooms") && <IconizedContextMenuOption
+                    label={_t("New video room")}
+                    iconClassName="mx_RoomList_iconNewVideoRoom"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        closeMenu();
+                        defaultDispatcher.dispatch({
+                            action: "view_create_room",
+                            type: RoomType.ElementVideo,
+                        });
+                    }}
+                /> }
+            </> }
             <IconizedContextMenuOption
-                label={CommunityPrototypeStore.instance.getSelectedCommunityId()
-                    ? _t("Explore community rooms")
-                    : _t("Explore public rooms")}
+                label={_t("Explore public rooms")}
                 iconClassName="mx_RoomList_iconExplore"
                 onClick={(e) => {
                     e.preventDefault();
                     e.stopPropagation();
                     closeMenu();
+                    PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuExploreRoomsItem", e);
                     defaultDispatcher.fire(Action.ViewRoomDirectory);
                 }}
             />
@@ -359,22 +382,8 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
     },
 };
 
-function customTagAesthetics(tagId: TagID): ITagAesthetics {
-    if (tagId.startsWith("u.")) {
-        tagId = tagId.substring(2);
-    }
-    return {
-        sectionLabel: _td("Custom Tag"),
-        sectionLabelRaw: tagId,
-        isInvite: false,
-        defaultHidden: false,
-    };
-}
-
-@replaceableComponent("views.rooms.RoomList")
 export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef;
-    private customTagStoreRef;
     private roomStoreToken: fbEmitter.EventSubscription;
     private treeRef = createRef<HTMLDivElement>();
 
@@ -393,10 +402,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     public componentDidMount(): void {
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.roomStoreToken = RoomViewStore.instance.addListener(this.onRoomViewStoreUpdate);
         SpaceStore.instance.on(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
-        this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
         this.updateLists(); // trigger the first update
     }
 
@@ -404,20 +412,19 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
         defaultDispatcher.unregister(this.dispatcherRef);
-        if (this.customTagStoreRef) this.customTagStoreRef.remove();
         if (this.roomStoreToken) this.roomStoreToken.remove();
     }
 
     private onRoomViewStoreUpdate = () => {
         this.setState({
-            currentRoomId: RoomViewStore.getRoomId(),
+            currentRoomId: RoomViewStore.instance.getRoomId(),
         });
     };
 
     private onAction = (payload: ActionPayload) => {
         if (payload.action === Action.ViewRoomDelta) {
             const viewRoomDeltaPayload = payload as ViewRoomDeltaPayload;
-            const currentRoomId = RoomViewStore.getRoomId();
+            const currentRoomId = RoomViewStore.instance.getRoomId();
             const room = this.getRoomDelta(currentRoomId, viewRoomDeltaPayload.delta, viewRoomDeltaPayload.unread);
             if (room) {
                 defaultDispatcher.dispatch<ViewRoomPayload>({
@@ -463,12 +470,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     private updateLists = () => {
         const newLists = RoomListStore.instance.orderedLists;
         const previousListIds = Object.keys(this.state.sublists);
-        const newListIds = Object.keys(newLists).filter(t => {
-            if (!isCustomTag(t)) return true; // always include non-custom tags
-
-            // if the tag is custom though, only include it if it is enabled
-            return CustomRoomTagStore.getTags()[t];
-        });
+        const newListIds = Object.keys(newLists);
 
         const isNameFiltering = !!RoomListStore.instance.getFirstNameFilterCondition();
         let doUpdate = this.state.isNameFiltering !== isNameFiltering || arrayHasDiff(previousListIds, newListIds);
@@ -499,9 +501,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         }
     };
 
-    private onStartChat = () => {
+    private onStartChat = (ev: ButtonEvent) => {
         const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
         defaultDispatcher.dispatch({ action: "view_create_chat", initialText });
+        PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateChatItem", ev);
     };
 
     private onExplore = (ev: ButtonEvent) => {
@@ -515,6 +518,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         } else {
             const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
             defaultDispatcher.dispatch({ action: Action.ViewRoomDirectory, initialText });
+            PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuExploreRoomsItem", ev);
         }
     };
 
@@ -559,68 +563,19 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private renderCommunityInvites(): ReactComponentElement<typeof ExtraTile>[] {
-        if (SpaceStore.spacesEnabled) return [];
-        // TODO: Put community invites in a more sensible place (not in the room list)
-        // See https://github.com/vector-im/element-web/issues/14456
-        return MatrixClientPeg.get().getGroups().filter(g => {
-            return g.myMembership === 'invite';
-        }).map(g => {
-            const avatar = (
-                <GroupAvatar
-                    groupId={g.groupId}
-                    groupName={g.name}
-                    groupAvatarUrl={g.avatarUrl}
-                    width={32}
-                    height={32}
-                    resizeMethod='crop'
-                />
-            );
-            const openGroup = () => {
-                defaultDispatcher.dispatch({
-                    action: 'view_group',
-                    group_id: g.groupId,
-                });
-            };
-            return (
-                <ExtraTile
-                    isMinimized={this.props.isMinimized}
-                    isSelected={false}
-                    displayName={g.name}
-                    avatar={avatar}
-                    notificationState={StaticNotificationState.RED_EXCLAMATION}
-                    onClick={openGroup}
-                    key={`temporaryGroupTile_${g.groupId}`}
-                />
-            );
-        });
-    }
-
     private renderSublists(): React.ReactElement[] {
         // show a skeleton UI if the user is in no rooms and they are not filtering and have no suggested rooms
         const showSkeleton = !this.state.isNameFiltering && !this.state.suggestedRooms?.length &&
             Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
 
-        return TAG_ORDER.reduce((tags, tagId) => {
-            if (tagId === CUSTOM_TAGS_BEFORE_TAG) {
-                const customTags = Object.keys(this.state.sublists)
-                    .filter(tagId => isCustomTag(tagId));
-                tags.push(...customTags);
-            }
-            tags.push(tagId);
-            return tags;
-        }, [] as TagID[])
+        return TAG_ORDER
             .map(orderedTagId => {
                 let extraTiles = null;
-                if (orderedTagId === DefaultTagID.Invite) {
-                    extraTiles = this.renderCommunityInvites();
-                } else if (orderedTagId === DefaultTagID.Suggested) {
+                if (orderedTagId === DefaultTagID.Suggested) {
                     extraTiles = this.renderSuggestedRooms();
                 }
 
-                const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
-                    ? customTagAesthetics(orderedTagId)
-                    : TAG_AESTHETICS[orderedTagId];
+                const aesthetics = TAG_AESTHETICS[orderedTagId];
                 if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
                 let alwaysVisible = ALWAYS_VISIBLE_TAGS.includes(orderedTagId);
@@ -668,11 +623,8 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     public focus(): void {
         // focus the first focusable element in this aria treeview widget
         const treeItems = this.treeRef.current?.querySelectorAll<HTMLElement>('[role="treeitem"]');
-        if (treeItems) {
-            return;
-        }
-        [...treeItems]
-            .find(e => e.offsetParent !== null)?.focus();
+        if (!treeItems) return;
+        [...treeItems].find(e => e.offsetParent !== null)?.focus();
     }
 
     public render() {
diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx
index fef7c6807fa..b8ac024b918 100644
--- a/src/components/views/rooms/RoomListHeader.tsx
+++ b/src/components/views/rooms/RoomListHeader.tsx
@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ComponentProps, useContext, useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
-import { EventType } from "matrix-js-sdk/src/@types/event";
+import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
 import { ClientEvent } from "matrix-js-sdk/src/client";
 
 import { _t } from "../../../languageHandler";
 import { useEventEmitterState, useTypedEventEmitter, useTypedEventEmitterState } from "../../../hooks/useEventEmitter";
+import { useFeatureEnabled } from "../../../hooks/useSettings";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import { ChevronFace, ContextMenuTooltipButton, useContextMenu } from "../../structures/ContextMenu";
 import SpaceContextMenu from "../context_menus/SpaceContextMenu";
@@ -30,7 +31,6 @@ import IconizedContextMenu, {
     IconizedContextMenuOptionList,
 } from "../context_menus/IconizedContextMenu";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import dis from "../../../dispatcher/dispatcher";
 import {
     shouldShowSpaceInvite,
     showAddExistingRooms,
@@ -38,14 +38,7 @@ import {
     showCreateNewSubspace,
     showSpaceInvite,
 } from "../../../utils/space";
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
-import { ButtonEvent } from "../elements/AccessibleButton";
-import Modal from "../../../Modal";
-import EditCommunityPrototypeDialog from "../dialogs/EditCommunityPrototypeDialog";
 import { Action } from "../../../dispatcher/actions";
-import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
-import ErrorDialog from "../dialogs/ErrorDialog";
-import { showCommunityInviteDialog } from "../../../RoomInvite";
 import { useDispatcher } from "../../../hooks/useDispatcher";
 import InlineSpinner from "../elements/InlineSpinner";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -57,7 +50,6 @@ import {
     UPDATE_HOME_BEHAVIOUR,
     UPDATE_SELECTED_SPACE,
 } from "../../../stores/spaces";
-import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import TooltipTarget from "../elements/TooltipTarget";
 import { BetaPill } from "../beta/BetaCard";
 import PosthogTrackers from "../../../PosthogTrackers";
@@ -74,100 +66,57 @@ const contextMenuBelow = (elementRect: DOMRect) => {
     return { left, top, chevronFace };
 };
 
-const PrototypeCommunityContextMenu = (props: ComponentProps<typeof SpaceContextMenu>) => {
-    const communityId = CommunityPrototypeStore.instance.getSelectedCommunityId();
-
-    let settingsOption;
-    if (CommunityPrototypeStore.instance.isAdminOf(communityId)) {
-        const onCommunitySettingsClick = (ev: ButtonEvent) => {
-            ev.preventDefault();
-            ev.stopPropagation();
-
-            Modal.createTrackedDialog('Edit Community', '', EditCommunityPrototypeDialog, {
-                communityId: CommunityPrototypeStore.instance.getSelectedCommunityId(),
-            });
-            props.onFinished();
-        };
-
-        settingsOption = (
-            <IconizedContextMenuOption
-                iconClassName="mx_UserMenu_iconSettings"
-                label={_t("Settings")}
-                aria-label={_t("Community settings")}
-                onClick={onCommunitySettingsClick}
-            />
-        );
-    }
+// Long-running actions that should trigger a spinner
+enum PendingActionType {
+    JoinRoom,
+    BulkRedact,
+}
 
-    const onCommunityMembersClick = (ev: ButtonEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        // We'd ideally just pop open a right panel with the member list, but the current
-        // way the right panel is structured makes this exceedingly difficult. Instead, we'll
-        // switch to the general room and open the member list there as it should be in sync
-        // anyways.
-        const chat = CommunityPrototypeStore.instance.getSelectedCommunityGeneralChat();
-        if (chat) {
-            dis.dispatch<ViewRoomPayload>({
-                action: Action.ViewRoom,
-                room_id: chat.roomId,
-                metricsTrigger: undefined, // Deprecated groups
-            }, true);
-            RightPanelStore.instance.setCard({ phase: RightPanelPhases.RoomMemberList }, undefined, chat.roomId);
-        } else {
-            // "This should never happen" clauses go here for the prototype.
-            Modal.createTrackedDialog('Failed to find general chat', '', ErrorDialog, {
-                title: _t('Failed to find the general chat for this community'),
-                description: _t("Failed to find the general chat for this community"),
-            });
+const usePendingActions = (): Map<PendingActionType, Set<string>> => {
+    const cli = useContext(MatrixClientContext);
+    const [actions, setActions] = useState(new Map<PendingActionType, Set<string>>());
+
+    const addAction = (type: PendingActionType, key: string) => {
+        const keys = new Set(actions.get(type));
+        keys.add(key);
+        setActions(new Map(actions).set(type, keys));
+    };
+    const removeAction = (type: PendingActionType, key: string) => {
+        const keys = new Set(actions.get(type));
+        if (keys.delete(key)) {
+            setActions(new Map(actions).set(type, keys));
         }
-        props.onFinished();
     };
 
-    return <IconizedContextMenu {...props} compact>
-        <IconizedContextMenuOptionList first>
-            { settingsOption }
-            <IconizedContextMenuOption
-                iconClassName="mx_UserMenu_iconMembers"
-                label={_t("Members")}
-                onClick={onCommunityMembersClick}
-            />
-        </IconizedContextMenuOptionList>
-    </IconizedContextMenu>;
-};
-
-const useJoiningRooms = (): Set<string> => {
-    const cli = useContext(MatrixClientContext);
-    const [joiningRooms, setJoiningRooms] = useState(new Set<string>());
     useDispatcher(defaultDispatcher, payload => {
         switch (payload.action) {
             case Action.JoinRoom:
-                setJoiningRooms(new Set(joiningRooms.add(payload.roomId)));
+                addAction(PendingActionType.JoinRoom, payload.roomId);
                 break;
             case Action.JoinRoomReady:
             case Action.JoinRoomError:
-                if (joiningRooms.delete(payload.roomId)) {
-                    setJoiningRooms(new Set(joiningRooms));
-                }
+                removeAction(PendingActionType.JoinRoom, payload.roomId);
+                break;
+            case Action.BulkRedactStart:
+                addAction(PendingActionType.BulkRedact, payload.roomId);
+                break;
+            case Action.BulkRedactEnd:
+                removeAction(PendingActionType.BulkRedact, payload.roomId);
                 break;
         }
     });
-    useTypedEventEmitter(cli, ClientEvent.Room, (room: Room) => {
-        if (joiningRooms.delete(room.roomId)) {
-            setJoiningRooms(new Set(joiningRooms));
-        }
-    });
+    useTypedEventEmitter(cli, ClientEvent.Room, (room: Room) =>
+        removeAction(PendingActionType.JoinRoom, room.roomId),
+    );
 
-    return joiningRooms;
+    return actions;
 };
 
 interface IProps {
-    spacePanelDisabled: boolean;
     onVisibilityChange?(): void;
 }
 
-const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
+const RoomListHeader = ({ onVisibilityChange }: IProps) => {
     const cli = useContext(MatrixClientContext);
     const [mainMenuDisplayed, mainMenuHandle, openMainMenu, closeMainMenu] = useContextMenu<HTMLDivElement>();
     const [plusMenuDisplayed, plusMenuHandle, openPlusMenu, closePlusMenu] = useContextMenu<HTMLDivElement>();
@@ -179,7 +128,8 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
     const allRoomsInHome = useEventEmitterState(SpaceStore.instance, UPDATE_HOME_BEHAVIOUR, () => {
         return SpaceStore.instance.allRoomsInHome;
     });
-    const joiningRooms = useJoiningRooms();
+    const videoRoomsEnabled = useFeatureEnabled("feature_video_rooms");
+    const pendingActions = usePendingActions();
 
     const filterCondition = RoomListStore.instance.getFirstNameFilterCondition();
     const count = useEventEmitterState(RoomListStore.instance, LISTS_UPDATE_EVENT, () => {
@@ -190,6 +140,15 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
         }
     });
 
+    const canShowMainMenu = activeSpace || spaceKey === MetaSpace.Home;
+
+    useEffect(() => {
+        if (mainMenuDisplayed && !canShowMainMenu) {
+            // Space changed under us and we no longer has a main menu to draw
+            closeMainMenu();
+        }
+    }, [closeMainMenu, canShowMainMenu, mainMenuDisplayed]);
+
     // we pass null for the queryLength to inhibit the metrics hook for when there is no filterCondition
     useWebSearchMetrics(count, filterCondition ? filterCondition.search.length : null, false);
 
@@ -205,11 +164,8 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
         return <div className="mx_LeftPanel_roomListFilterCount">
             { _t("%(count)s results", { count }) }
         </div>;
-    } else if (spacePanelDisabled) {
-        return null;
     }
 
-    const communityId = CommunityPrototypeStore.instance.getSelectedCommunityId();
     const canAddRooms = activeSpace?.currentState?.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
 
     const canCreateRooms = shouldShowComponent(UIComponent.CreateRooms);
@@ -218,15 +174,13 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
     // If the user can't do anything on the plus menu, don't show it. This aims to target the
     // plus menu shown on the Home tab primarily: the user has options to use the menu for
     // communities and spaces, but is at risk of no options on the Home tab.
-    const canShowPlusMenu = canCreateRooms || canExploreRooms || activeSpace || communityId;
+    const canShowPlusMenu = canCreateRooms || canExploreRooms || activeSpace;
 
     let contextMenu: JSX.Element;
-    if (mainMenuDisplayed) {
+    if (mainMenuDisplayed && mainMenuHandle.current) {
         let ContextMenuComponent;
         if (activeSpace) {
             ContextMenuComponent = SpaceContextMenu;
-        } else if (communityId) {
-            ContextMenuComponent = PrototypeCommunityContextMenu;
         } else {
             ContextMenuComponent = HomeButtonContextMenu;
         }
@@ -250,32 +204,33 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                     closePlusMenu();
                 }}
             />;
-        } else if (CommunityPrototypeStore.instance.canInviteTo(communityId)) {
-            inviteOption = <IconizedContextMenuOption
-                iconClassName="mx_RoomListHeader_iconInvite"
-                label={_t("Invite")}
-                onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    showCommunityInviteDialog(CommunityPrototypeStore.instance.getSelectedCommunityId());
-                    closePlusMenu();
-                }}
-            />;
         }
 
-        let createNewRoomOption: JSX.Element;
+        let newRoomOptions: JSX.Element;
         if (activeSpace?.currentState.maySendStateEvent(EventType.RoomAvatar, cli.getUserId())) {
-            createNewRoomOption = <IconizedContextMenuOption
-                iconClassName="mx_RoomListHeader_iconCreateRoom"
-                label={_t("Create new room")}
-                onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    showCreateNewRoom(activeSpace);
-                    PosthogTrackers.trackInteraction("WebRoomListHeaderPlusMenuCreateRoomItem", e);
-                    closePlusMenu();
-                }}
-            />;
+            newRoomOptions = <>
+                <IconizedContextMenuOption
+                    iconClassName="mx_RoomListHeader_iconNewRoom"
+                    label={_t("New room")}
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        showCreateNewRoom(activeSpace);
+                        PosthogTrackers.trackInteraction("WebRoomListHeaderPlusMenuCreateRoomItem", e);
+                        closePlusMenu();
+                    }}
+                />
+                { videoRoomsEnabled && <IconizedContextMenuOption
+                    iconClassName="mx_RoomListHeader_iconNewVideoRoom"
+                    label={_t("New video room")}
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        showCreateNewRoom(activeSpace, RoomType.ElementVideo);
+                        closePlusMenu();
+                    }}
+                /> }
+            </>;
         }
 
         contextMenu = <IconizedContextMenu
@@ -285,7 +240,7 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
         >
             <IconizedContextMenuOptionList first>
                 { inviteOption }
-                { createNewRoomOption }
+                { newRoomOptions }
                 <IconizedContextMenuOption
                     label={_t("Explore rooms")}
                     iconClassName="mx_RoomListHeader_iconExplore"
@@ -330,12 +285,11 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
             </IconizedContextMenuOptionList>
         </IconizedContextMenu>;
     } else if (plusMenuDisplayed) {
-        let startChatOpt: JSX.Element;
-        let createRoomOpt: JSX.Element;
+        let newRoomOpts: JSX.Element;
         let joinRoomOpt: JSX.Element;
 
         if (canCreateRooms) {
-            startChatOpt = (
+            newRoomOpts = <>
                 <IconizedContextMenuOption
                     label={_t("Start new chat")}
                     iconClassName="mx_RoomListHeader_iconStartChat"
@@ -343,14 +297,13 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                         e.preventDefault();
                         e.stopPropagation();
                         defaultDispatcher.dispatch({ action: "view_create_chat" });
+                        PosthogTrackers.trackInteraction("WebRoomListHeaderPlusMenuCreateChatItem", e);
                         closePlusMenu();
                     }}
                 />
-            );
-            createRoomOpt = (
                 <IconizedContextMenuOption
-                    label={_t("Create new room")}
-                    iconClassName="mx_RoomListHeader_iconCreateRoom"
+                    label={_t("New room")}
+                    iconClassName="mx_RoomListHeader_iconNewRoom"
                     onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
@@ -359,7 +312,20 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                         closePlusMenu();
                     }}
                 />
-            );
+                { videoRoomsEnabled && <IconizedContextMenuOption
+                    label={_t("New video room")}
+                    iconClassName="mx_RoomListHeader_iconNewVideoRoom"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        defaultDispatcher.dispatch({
+                            action: "view_create_room",
+                            type: RoomType.ElementVideo,
+                        });
+                        closePlusMenu();
+                    }}
+                /> }
+            </>;
         }
         if (canExploreRooms) {
             joinRoomOpt = (
@@ -370,6 +336,7 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                         e.preventDefault();
                         e.stopPropagation();
                         defaultDispatcher.dispatch({ action: Action.ViewRoomDirectory });
+                        PosthogTrackers.trackInteraction("WebRoomListHeaderPlusMenuExploreRoomsItem", e);
                         closePlusMenu();
                     }}
                 />
@@ -382,8 +349,7 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
             compact
         >
             <IconizedContextMenuOptionList first>
-                { startChatOpt }
-                { createRoomOpt }
+                { newRoomOpts }
                 { joinRoomOpt }
             </IconizedContextMenuOptionList>
         </IconizedContextMenu>;
@@ -392,23 +358,24 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
     let title: string;
     if (activeSpace) {
         title = spaceName;
-    } else if (communityId) {
-        title = CommunityPrototypeStore.instance.getSelectedCommunityName();
     } else {
         title = getMetaSpaceName(spaceKey as MetaSpace, allRoomsInHome);
     }
 
-    let pendingRoomJoinSpinner: JSX.Element;
-    if (joiningRooms.size) {
-        pendingRoomJoinSpinner = <TooltipTarget
-            label={_t("Currently joining %(count)s rooms", { count: joiningRooms.size })}
-        >
-            <InlineSpinner />
-        </TooltipTarget>;
-    }
+    const pendingActionSummary = [...pendingActions.entries()]
+        .filter(([type, keys]) => keys.size > 0)
+        .map(([type, keys]) => {
+            switch (type) {
+                case PendingActionType.JoinRoom:
+                    return _t("Currently joining %(count)s rooms", { count: keys.size });
+                case PendingActionType.BulkRedact:
+                    return _t("Currently removing messages in %(count)s rooms", { count: keys.size });
+            }
+        })
+        .join("\n");
 
     let contextMenuButton: JSX.Element = <div className="mx_RoomListHeader_contextLessTitle">{ title }</div>;
-    if (activeSpace || spaceKey === MetaSpace.Home) {
+    if (canShowMainMenu) {
         contextMenuButton = <ContextMenuTooltipButton
             inputRef={mainMenuHandle}
             onClick={openMainMenu}
@@ -424,7 +391,9 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
 
     return <div className="mx_RoomListHeader">
         { contextMenuButton }
-        { pendingRoomJoinSpinner }
+        { pendingActionSummary ?
+            <TooltipTarget label={pendingActionSummary}><InlineSpinner /></TooltipTarget> :
+            null }
         { canShowPlusMenu && <ContextMenuTooltipButton
             inputRef={plusMenuHandle}
             onClick={openPlusMenu}
diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx
index caabe363208..e0e1f13f059 100644
--- a/src/components/views/rooms/RoomPreviewBar.tsx
+++ b/src/components/views/rooms/RoomPreviewBar.tsx
@@ -27,9 +27,6 @@ import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import SdkConfig from "../../../SdkConfig";
 import IdentityAuthClient from '../../../IdentityAuthClient';
-import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
-import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import InviteReason from "../elements/InviteReason";
 import { IOOBData } from "../../../stores/ThreepidInviteStore";
 import Spinner from "../elements/Spinner";
@@ -100,7 +97,6 @@ interface IState {
     threePidFetchError?: MatrixError;
 }
 
-@replaceableComponent("views.rooms.RoomPreviewBar")
 export default class RoomPreviewBar extends React.Component<IProps, IState> {
     static defaultProps = {
         onJoinClick() {},
@@ -116,7 +112,6 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
 
     componentDidMount() {
         this.checkInvitedEmail();
-        CommunityPrototypeStore.instance.on(UPDATE_EVENT, this.onCommunityUpdate);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -125,10 +120,6 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         }
     }
 
-    componentWillUnmount() {
-        CommunityPrototypeStore.instance.off(UPDATE_EVENT, this.onCommunityUpdate);
-    }
-
     private async checkInvitedEmail() {
         // If this is an invite and we've been told what email address was
         // invited, fetch the user's account emails and discovery bindings so we
@@ -163,13 +154,6 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         }
     }
 
-    private onCommunityUpdate = (roomId: string): void => {
-        if (this.props.room && this.props.room.roomId !== roomId) {
-            return;
-        }
-        this.forceUpdate(); // we have nothing to update
-    };
-
     private getMessageCase(): MessageCase {
         const isGuest = MatrixClientPeg.get().isGuest();
 
@@ -241,24 +225,6 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
             .getStateEvents(EventType.RoomJoinRules, "")?.getContent<IJoinRuleEventContent>().join_rule;
     }
 
-    private communityProfile(): { displayName?: string, avatarMxc?: string } {
-        if (this.props.room) return CommunityPrototypeStore.instance.getInviteProfile(this.props.room.roomId);
-        return { displayName: null, avatarMxc: null };
-    }
-
-    private roomName(atStart = false): string {
-        let name = this.props.room ? this.props.room.name : this.props.roomAlias;
-        const profile = this.communityProfile();
-        if (profile.displayName) name = profile.displayName;
-        if (name) {
-            return name;
-        } else if (atStart) {
-            return _t("This room");
-        } else {
-            return _t("this room");
-        }
-    }
-
     private getMyMember(): RoomMember {
         return this.props.room?.getMember(MatrixClientPeg.get().getUserId());
     }
@@ -310,6 +276,8 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
 
     render() {
         const brand = SdkConfig.get().brand;
+        const roomName = this.props.room?.name ?? this.props.roomAlias ?? "";
+        const isSpace = this.props.room?.isSpaceRoom() ?? this.props.oobData?.roomType === RoomType.Space;
 
         let showSpinner = false;
         let title;
@@ -325,7 +293,12 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         const messageCase = this.getMessageCase();
         switch (messageCase) {
             case MessageCase.Joining: {
-                title = this.props.oobData?.roomType === RoomType.Space ? _t("Joining space …") : _t("Joining room …");
+                if (this.props.oobData?.roomType || isSpace) {
+                    title = isSpace ? _t("Joining space …") : _t("Joining room …");
+                } else {
+                    title = _t("Joining …");
+                }
+
                 showSpinner = true;
                 break;
             }
@@ -351,7 +324,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                     footer = (
                         <div>
                             <Spinner w={20} h={20} />
-                            { _t("Loading room preview") }
+                            { _t("Loading preview") }
                         </div>
                     );
                 }
@@ -359,37 +332,56 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
             }
             case MessageCase.Kicked: {
                 const { memberName, reason } = this.getKickOrBanInfo();
-                title = _t("You were removed from %(roomName)s by %(memberName)s",
-                    { memberName, roomName: this.roomName() });
+                if (roomName) {
+                    title = _t("You were removed from %(roomName)s by %(memberName)s",
+                        { memberName, roomName });
+                } else {
+                    title = _t("You were removed by %(memberName)s", { memberName });
+                }
                 subTitle = reason ? _t("Reason: %(reason)s", { reason }) : null;
 
-                if (this.joinRule() === "invite") {
-                    primaryActionLabel = _t("Forget this room");
-                    primaryActionHandler = this.props.onForgetClick;
+                if (isSpace) {
+                    primaryActionLabel = _t("Forget this space");
                 } else {
+                    primaryActionLabel = _t("Forget this room");
+                }
+                primaryActionHandler = this.props.onForgetClick;
+
+                if (this.joinRule() !== JoinRule.Invite) {
+                    secondaryActionLabel = primaryActionLabel;
+                    secondaryActionHandler = primaryActionHandler;
+
                     primaryActionLabel = _t("Re-join");
                     primaryActionHandler = this.props.onJoinClick;
-                    secondaryActionLabel = _t("Forget this room");
-                    secondaryActionHandler = this.props.onForgetClick;
                 }
                 break;
             }
             case MessageCase.Banned: {
                 const { memberName, reason } = this.getKickOrBanInfo();
-                title = _t("You were banned from %(roomName)s by %(memberName)s",
-                    { memberName, roomName: this.roomName() });
+                if (roomName) {
+                    title = _t("You were banned from %(roomName)s by %(memberName)s", { memberName, roomName });
+                } else {
+                    title = _t("You were banned by %(memberName)s", { memberName });
+                }
                 subTitle = reason ? _t("Reason: %(reason)s", { reason }) : null;
-                primaryActionLabel = _t("Forget this room");
+                if (isSpace) {
+                    primaryActionLabel = _t("Forget this space");
+                } else {
+                    primaryActionLabel = _t("Forget this room");
+                }
                 primaryActionHandler = this.props.onForgetClick;
                 break;
             }
             case MessageCase.OtherThreePIDError: {
-                title = _t("Something went wrong with your invite to %(roomName)s",
-                    { roomName: this.roomName() });
+                if (roomName) {
+                    title = _t("Something went wrong with your invite to %(roomName)s", { roomName });
+                } else {
+                    title = _t("Something went wrong with your invite.");
+                }
                 const joinRule = this.joinRule();
                 const errCodeMessage = _t(
                     "An error (%(errcode)s) was returned while trying to validate your " +
-                    "invite. You could try to pass this information on to a room admin.",
+                    "invite. You could try to pass this information on to the person who invited you.",
                     { errcode: this.state.threePidFetchError.errcode || _t("unknown error code") },
                 );
                 switch (joinRule) {
@@ -402,7 +394,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                         primaryActionHandler = this.props.onJoinClick;
                         break;
                     case "public":
-                        subTitle = _t("You can still join it because this is a public room.");
+                        subTitle = _t("You can still join here.");
                         primaryActionLabel = _t("Join the discussion");
                         primaryActionHandler = this.props.onJoinClick;
                         break;
@@ -415,14 +407,22 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 break;
             }
             case MessageCase.InvitedEmailNotFoundInAccount: {
-                title = _t(
-                    "This invite to %(roomName)s was sent to %(email)s which is not " +
-                    "associated with your account",
-                    {
-                        roomName: this.roomName(),
-                        email: this.props.invitedEmail,
-                    },
-                );
+                if (roomName) {
+                    title = _t(
+                        "This invite to %(roomName)s was sent to %(email)s which is not " +
+                        "associated with your account",
+                        {
+                            roomName,
+                            email: this.props.invitedEmail,
+                        },
+                    );
+                } else {
+                    title = _t(
+                        "This invite was sent to %(email)s which is not associated with your account",
+                        { email: this.props.invitedEmail },
+                    );
+                }
+
                 subTitle = _t(
                     "Link this email with your account in Settings to receive invites " +
                     "directly in %(brand)s.",
@@ -433,13 +433,18 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 break;
             }
             case MessageCase.InvitedEmailNoIdentityServer: {
-                title = _t(
-                    "This invite to %(roomName)s was sent to %(email)s",
-                    {
-                        roomName: this.roomName(),
-                        email: this.props.invitedEmail,
-                    },
-                );
+                if (roomName) {
+                    title = _t(
+                        "This invite to %(roomName)s was sent to %(email)s",
+                        {
+                            roomName,
+                            email: this.props.invitedEmail,
+                        },
+                    );
+                } else {
+                    title = _t("This invite was sent to %(email)s", { email: this.props.invitedEmail });
+                }
+
                 subTitle = _t(
                     "Use an identity server in Settings to receive invites directly in %(brand)s.",
                     { brand },
@@ -449,13 +454,18 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 break;
             }
             case MessageCase.InvitedEmailMismatch: {
-                title = _t(
-                    "This invite to %(roomName)s was sent to %(email)s",
-                    {
-                        roomName: this.roomName(),
-                        email: this.props.invitedEmail,
-                    },
-                );
+                if (roomName) {
+                    title = _t(
+                        "This invite to %(roomName)s was sent to %(email)s",
+                        {
+                            roomName,
+                            email: this.props.invitedEmail,
+                        },
+                    );
+                } else {
+                    title = _t("This invite was sent to %(email)s", { email: this.props.invitedEmail });
+                }
+
                 subTitle = _t(
                     "Share this email in Settings to receive invites directly in %(brand)s.",
                     { brand },
@@ -465,10 +475,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 break;
             }
             case MessageCase.Invite: {
-                const oobData = Object.assign({}, this.props.oobData, {
-                    avatarUrl: this.communityProfile().avatarMxc,
-                });
-                const avatar = <RoomAvatar room={this.props.room} oobData={oobData} />;
+                const avatar = <RoomAvatar room={this.props.room} oobData={this.props.oobData} />;
 
                 const inviteMember = this.getInviteMember();
                 let inviterElement;
@@ -484,16 +491,14 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
 
                 const isDM = this.isDMInvite();
                 if (isDM) {
-                    title = _t("Do you want to chat with %(user)s?",
-                        { user: inviteMember.name });
+                    title = _t("Do you want to chat with %(user)s?", { user: inviteMember.name });
                     subTitle = [
                         avatar,
                         _t("<userName/> wants to chat", {}, { userName: () => inviterElement }),
                     ];
                     primaryActionLabel = _t("Start chatting");
                 } else {
-                    title = _t("Do you want to join %(roomName)s?",
-                        { roomName: this.roomName() });
+                    title = _t("Do you want to join %(roomName)s?", { roomName });
                     subTitle = [
                         avatar,
                         _t("<userName/> invited you", {}, { userName: () => inviterElement }),
@@ -526,27 +531,35 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
             }
             case MessageCase.ViewingRoom: {
                 if (this.props.canPreview) {
-                    title = _t("You're previewing %(roomName)s. Want to join it?",
-                        { roomName: this.roomName() });
+                    title = _t("You're previewing %(roomName)s. Want to join it?", { roomName });
+                } else if (roomName) {
+                    title = _t("%(roomName)s can't be previewed. Do you want to join it?", { roomName });
                 } else {
-                    title = _t("%(roomName)s can't be previewed. Do you want to join it?",
-                        { roomName: this.roomName(true) });
+                    title = _t("There's no preview, would you like to join?");
                 }
                 primaryActionLabel = _t("Join the discussion");
                 primaryActionHandler = this.props.onJoinClick;
                 break;
             }
             case MessageCase.RoomNotFound: {
-                title = _t("%(roomName)s does not exist.", { roomName: this.roomName(true) });
-                subTitle = _t("This room doesn't exist. Are you sure you're at the right place?");
+                if (roomName) {
+                    title = _t("%(roomName)s does not exist.", { roomName });
+                } else {
+                    title = _t("This room or space does not exist.");
+                }
+                subTitle = _t("Are you sure you're at the right place?");
                 break;
             }
             case MessageCase.OtherError: {
-                title = _t("%(roomName)s is not accessible at this time.", { roomName: this.roomName(true) });
+                if (roomName) {
+                    title = _t("%(roomName)s is not accessible at this time.", { roomName });
+                } else {
+                    title = _t("This room or space is not accessible at this time.");
+                }
                 subTitle = [
-                    _t("Try again later, or ask a room admin to check if you have access."),
+                    _t("Try again later, or ask a room or space admin to check if you have access."),
                     _t(
-                        "%(errcode)s was returned while trying to access the room. " +
+                        "%(errcode)s was returned while trying to access the room or space. " +
                         "If you think you're seeing this message in error, please " +
                         "<issueLink>submit a bug report</issueLink>.",
                         { errcode: this.props.error.errcode },
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index b19bed523f5..f0a66167145 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -54,7 +54,6 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects";
 import ExtraTile from "./ExtraTile";
 import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 
@@ -104,7 +103,6 @@ interface IState {
     filteredExtraTiles?: ReactComponentElement<typeof ExtraTile>[];
 }
 
-@replaceableComponent("views.rooms.RoomSublist")
 export default class RoomSublist extends React.Component<IProps, IState> {
     private headerButton = createRef<HTMLDivElement>();
     private sublistRef = createRef<HTMLDivElement>();
@@ -698,25 +696,27 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                             onFocus={onFocus}
                             aria-label={this.props.label}
                         >
-                            <div className="mx_RoomSublist_stickable">
-                                <Button
-                                    onFocus={onFocus}
-                                    inputRef={ref}
-                                    tabIndex={tabIndex}
-                                    className="mx_RoomSublist_headerText"
-                                    role="treeitem"
-                                    aria-expanded={this.state.isExpanded}
-                                    aria-level={1}
-                                    onClick={this.onHeaderClick}
-                                    onContextMenu={this.onContextMenu}
-                                    title={this.props.isMinimized ? this.props.label : undefined}
-                                >
-                                    <span className={collapseClasses} />
-                                    <span>{ this.props.label }</span>
-                                </Button>
-                                { this.renderMenu() }
-                                { this.props.isMinimized ? null : badgeContainer }
-                                { this.props.isMinimized ? null : addRoomButton }
+                            <div className="mx_RoomSublist_stickableContainer">
+                                <div className="mx_RoomSublist_stickable">
+                                    <Button
+                                        onFocus={onFocus}
+                                        inputRef={ref}
+                                        tabIndex={tabIndex}
+                                        className="mx_RoomSublist_headerText"
+                                        role="treeitem"
+                                        aria-expanded={this.state.isExpanded}
+                                        aria-level={1}
+                                        onClick={this.onHeaderClick}
+                                        onContextMenu={this.onContextMenu}
+                                        title={this.props.isMinimized ? this.props.label : undefined}
+                                    >
+                                        <span className={collapseClasses} />
+                                        <span>{ this.props.label }</span>
+                                    </Button>
+                                    { this.renderMenu() }
+                                    { this.props.isMinimized ? null : badgeContainer }
+                                    { this.props.isMinimized ? null : addRoomButton }
+                                </div>
                             </div>
                             { this.props.isMinimized ? badgeContainer : null }
                             { this.props.isMinimized ? addRoomButton : null }
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index dababf8e75b..7b0a8e95de9 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -19,13 +19,15 @@ import React, { createRef } from "react";
 import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
 import classNames from "classnames";
 import { logger } from "matrix-js-sdk/src/logger";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
 import dis from '../../../dispatcher/dispatcher';
 import defaultDispatcher from '../../../dispatcher/dispatcher';
 import { Action } from "../../../dispatcher/actions";
-import ActiveRoomObserver from "../../../ActiveRoomObserver";
+import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 import { ChevronFace, ContextMenuTooltipButton } from "../../structures/ContextMenu";
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
@@ -49,12 +51,19 @@ import IconizedContextMenu, {
     IconizedContextMenuOptionList,
     IconizedContextMenuRadio,
 } from "../context_menus/IconizedContextMenu";
-import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
+import VideoChannelStore, { VideoChannelEvent, IJitsiParticipant } from "../../../stores/VideoChannelStore";
+import { getConnectedMembers } from "../../../utils/VideoChannelUtils";
 import PosthogTrackers from "../../../PosthogTrackers";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
+
+enum VideoStatus {
+    Disconnected,
+    Connecting,
+    Connected,
+}
 
 interface IProps {
     room: Room;
@@ -70,6 +79,11 @@ interface IState {
     notificationsMenuPosition: PartialDOMRect;
     generalMenuPosition: PartialDOMRect;
     messagePreview?: string;
+    videoStatus: VideoStatus;
+    // Active video channel members, according to room state
+    videoMembers: Set<RoomMember>;
+    // Active video channel members, according to Jitsi
+    jitsiParticipants: IJitsiParticipant[];
 }
 
 const messagePreviewId = (roomId: string) => `mx_RoomTile_messagePreview_${roomId}`;
@@ -82,28 +96,42 @@ export const contextMenuBelow = (elementRect: PartialDOMRect) => {
     return { left, top, chevronFace };
 };
 
-@replaceableComponent("views.rooms.RoomTile")
 export default class RoomTile extends React.PureComponent<IProps, IState> {
     private dispatcherRef: string;
     private roomTileRef = createRef<HTMLDivElement>();
     private notificationState: NotificationState;
     private roomProps: RoomEchoChamber;
+    private isVideoRoom: boolean;
 
     constructor(props: IProps) {
         super(props);
 
+        let videoStatus;
+        if (VideoChannelStore.instance.roomId === this.props.room.roomId) {
+            if (VideoChannelStore.instance.connected) {
+                videoStatus = VideoStatus.Connected;
+            } else {
+                videoStatus = VideoStatus.Connecting;
+            }
+        } else {
+            videoStatus = VideoStatus.Disconnected;
+        }
+
         this.state = {
-            selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
+            selected: RoomViewStore.instance.getRoomId() === this.props.room.roomId,
             notificationsMenuPosition: null,
             generalMenuPosition: null,
-
             // generatePreview() will return nothing if the user has previews disabled
             messagePreview: "",
+            videoStatus,
+            videoMembers: getConnectedMembers(this.props.room, videoStatus === VideoStatus.Connected),
+            jitsiParticipants: VideoChannelStore.instance.participants,
         };
         this.generatePreview();
 
         this.notificationState = RoomNotificationStateStore.instance.getRoomState(this.props.room);
         this.roomProps = EchoChamber.forRoom(this.props.room);
+        this.isVideoRoom = SettingsStore.getValue("feature_video_rooms") && this.props.room.isElementVideoRoom();
     }
 
     private onRoomNameUpdate = (room: Room) => {
@@ -142,14 +170,9 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                 MessagePreviewStore.getPreviewChangedEventName(this.props.room),
                 this.onRoomPreviewChanged,
             );
-            CommunityPrototypeStore.instance.off(
-                CommunityPrototypeStore.getUpdateEventName(prevProps.room?.roomId),
-                this.onCommunityUpdate,
-            );
-            CommunityPrototypeStore.instance.on(
-                CommunityPrototypeStore.getUpdateEventName(this.props.room?.roomId),
-                this.onCommunityUpdate,
-            );
+            prevProps.room?.currentState?.off(RoomStateEvent.Events, this.updateVideoMembers);
+            this.props.room?.currentState?.on(RoomStateEvent.Events, this.updateVideoMembers);
+            this.updateVideoStatus();
             prevProps.room?.off(RoomEvent.Name, this.onRoomNameUpdate);
             this.props.room?.on(RoomEvent.Name, this.onRoomNameUpdate);
         }
@@ -161,7 +184,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             this.scrollIntoView();
         }
 
-        ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        RoomViewStore.instance.addRoomListener(this.props.room.roomId, this.onActiveRoomUpdate);
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
         MessagePreviewStore.instance.on(
             MessagePreviewStore.getPreviewChangedEventName(this.props.room),
@@ -169,34 +192,32 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         );
         this.notificationState.on(NotificationStateEvents.Update, this.onNotificationUpdate);
         this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
-        this.props.room?.on(RoomEvent.Name, this.onRoomNameUpdate);
-        CommunityPrototypeStore.instance.on(
-            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
-            this.onCommunityUpdate,
-        );
+        this.props.room.on(RoomEvent.Name, this.onRoomNameUpdate);
+        this.props.room.currentState.on(RoomStateEvent.Events, this.updateVideoMembers);
+
+        VideoChannelStore.instance.on(VideoChannelEvent.Connect, this.onConnectVideo);
+        VideoChannelStore.instance.on(VideoChannelEvent.StartConnect, this.onStartConnectVideo);
+        VideoChannelStore.instance.on(VideoChannelEvent.Disconnect, this.onDisconnectVideo);
+        if (VideoChannelStore.instance.roomId === this.props.room.roomId) {
+            VideoChannelStore.instance.on(VideoChannelEvent.Participants, this.updateJitsiParticipants);
+        }
     }
 
     public componentWillUnmount() {
-        if (this.props.room) {
-            ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
-            MessagePreviewStore.instance.off(
-                MessagePreviewStore.getPreviewChangedEventName(this.props.room),
-                this.onRoomPreviewChanged,
-            );
-            CommunityPrototypeStore.instance.off(
-                CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
-                this.onCommunityUpdate,
-            );
-            this.props.room.off(RoomEvent.Name, this.onRoomNameUpdate);
-        }
-        ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        RoomViewStore.instance.removeRoomListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        MessagePreviewStore.instance.off(
+            MessagePreviewStore.getPreviewChangedEventName(this.props.room),
+            this.onRoomPreviewChanged,
+        );
+        this.props.room.off(RoomEvent.Name, this.onRoomNameUpdate);
+        this.props.room.currentState.off(RoomStateEvent.Events, this.updateVideoMembers);
         defaultDispatcher.unregister(this.dispatcherRef);
         this.notificationState.off(NotificationStateEvents.Update, this.onNotificationUpdate);
         this.roomProps.off(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
-        CommunityPrototypeStore.instance.off(
-            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
-            this.onCommunityUpdate,
-        );
+
+        VideoChannelStore.instance.off(VideoChannelEvent.Connect, this.onConnectVideo);
+        VideoChannelStore.instance.off(VideoChannelEvent.StartConnect, this.onStartConnectVideo);
+        VideoChannelStore.instance.off(VideoChannelEvent.Disconnect, this.onDisconnectVideo);
     }
 
     private onAction = (payload: ActionPayload) => {
@@ -210,11 +231,6 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         }
     };
 
-    private onCommunityUpdate = (roomId: string) => {
-        if (roomId !== this.props.room.roomId) return;
-        this.forceUpdate(); // we don't have anything to actually update
-    };
-
     private onRoomPreviewChanged = (room: Room) => {
         if (this.props.room && room.roomId === this.props.room.roomId) {
             this.generatePreview();
@@ -238,7 +254,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         });
     };
 
-    private onTileClick = (ev: React.KeyboardEvent) => {
+    private onTileClick = async (ev: React.KeyboardEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
@@ -576,6 +592,54 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         );
     }
 
+    private updateVideoMembers = () => {
+        this.setState(state => ({
+            videoMembers: getConnectedMembers(this.props.room, state.videoStatus === VideoStatus.Connected),
+        }));
+    };
+
+    private updateVideoStatus = () => {
+        if (VideoChannelStore.instance.roomId === this.props.room?.roomId) {
+            if (VideoChannelStore.instance.connected) {
+                this.onConnectVideo(this.props.room?.roomId);
+            } else {
+                this.onStartConnectVideo(this.props.room?.roomId);
+            }
+        } else {
+            this.onDisconnectVideo(this.props.room?.roomId);
+        }
+    };
+
+    private onConnectVideo = (roomId: string) => {
+        if (roomId === this.props.room?.roomId) {
+            this.setState({
+                videoStatus: VideoStatus.Connected,
+                videoMembers: getConnectedMembers(this.props.room, true),
+            });
+            VideoChannelStore.instance.on(VideoChannelEvent.Participants, this.updateJitsiParticipants);
+        }
+    };
+
+    private onStartConnectVideo = (roomId: string) => {
+        if (roomId === this.props.room?.roomId) {
+            this.setState({ videoStatus: VideoStatus.Connecting });
+        }
+    };
+
+    private onDisconnectVideo = (roomId: string) => {
+        if (roomId === this.props.room?.roomId) {
+            this.setState({
+                videoStatus: VideoStatus.Disconnected,
+                videoMembers: getConnectedMembers(this.props.room, false),
+            });
+            VideoChannelStore.instance.off(VideoChannelEvent.Participants, this.updateJitsiParticipants);
+        }
+    };
+
+    private updateJitsiParticipants = (roomId: string, participants: IJitsiParticipant[]) => {
+        this.setState({ jitsiParticipants: participants });
+    };
+
     public render(): React.ReactElement {
         const classes = classNames({
             'mx_RoomTile': true,
@@ -584,12 +648,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             'mx_RoomTile_minimized': this.props.isMinimized,
         });
 
-        let roomProfile: IRoomProfile = { displayName: null, avatarMxc: null };
-        if (this.props.tag === DefaultTagID.Invite) {
-            roomProfile = CommunityPrototypeStore.instance.getInviteProfile(this.props.room.roomId);
-        }
-
-        let name = roomProfile.displayName || this.props.room.name;
+        let name = this.props.room.name;
         if (typeof name !== 'string') name = '';
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
@@ -607,11 +666,54 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             );
         }
 
-        let messagePreview = null;
-        if (this.showMessagePreview && this.state.messagePreview) {
-            messagePreview = (
+        let subtitle;
+        if (this.isVideoRoom) {
+            let videoText: string;
+            let videoActive: boolean;
+            let participantCount: number;
+
+            switch (this.state.videoStatus) {
+                case VideoStatus.Disconnected:
+                    videoText = _t("Video");
+                    videoActive = false;
+                    participantCount = this.state.videoMembers.size;
+                    break;
+                case VideoStatus.Connecting:
+                    videoText = _t("Connecting...");
+                    videoActive = true;
+                    participantCount = this.state.videoMembers.size;
+                    break;
+                case VideoStatus.Connected:
+                    videoText = _t("Connected");
+                    videoActive = true;
+                    participantCount = this.state.jitsiParticipants.length;
+            }
+
+            subtitle = (
+                <div className="mx_RoomTile_subtitle">
+                    <span
+                        className={classNames({
+                            "mx_RoomTile_videoIndicator": true,
+                            "mx_RoomTile_videoIndicator_active": videoActive,
+                        })}
+                    >
+                        { videoText }
+                    </span>
+                    { participantCount ? <>
+                        { " · " }
+                        <span
+                            className="mx_RoomTile_videoParticipants"
+                            aria-label={_t("%(count)s participants", { count: participantCount })}
+                        >
+                            { participantCount }
+                        </span>
+                    </> : null }
+                </div>
+            );
+        } else if (this.showMessagePreview && this.state.messagePreview) {
+            subtitle = (
                 <div
-                    className="mx_RoomTile_messagePreview"
+                    className="mx_RoomTile_subtitle"
                     id={messagePreviewId(this.props.room.roomId)}
                     title={this.state.messagePreview}
                 >
@@ -620,21 +722,22 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             );
         }
 
-        const nameClasses = classNames({
-            "mx_RoomTile_name": true,
-            "mx_RoomTile_nameWithPreview": !!messagePreview,
-            "mx_RoomTile_nameHasUnreadEvents": this.notificationState.isUnread,
+        const titleClasses = classNames({
+            "mx_RoomTile_title": true,
+            "mx_RoomTile_titleWithSubtitle": !!subtitle,
+            "mx_RoomTile_titleHasUnreadEvents": this.notificationState.isUnread,
         });
 
-        let nameContainer = (
-            <div className="mx_RoomTile_nameContainer">
-                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
-                    { name }
+        const titleContainer = this.props.isMinimized ? null : (
+            <div className="mx_RoomTile_titleContainer">
+                <div title={name} className={titleClasses} tabIndex={-1}>
+                    <span dir="auto">
+                        { name }
+                    </span>
                 </div>
-                { messagePreview }
+                { subtitle }
             </div>
         );
-        if (this.props.isMinimized) nameContainer = null;
 
         let ariaLabel = name;
         // The following labels are written in such a fashion to increase screen reader efficiency (speed).
@@ -687,10 +790,9 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                                 room={this.props.room}
                                 avatarSize={32}
                                 displayBadge={this.props.isMinimized}
-                                oobData={({ avatarUrl: roomProfile.avatarMxc })}
                                 tooltipProps={{ tabIndex: isActive ? 0 : -1 }}
                             />
-                            { nameContainer }
+                            { titleContainer }
                             { badge }
                             { this.renderGeneralMenu() }
                             { this.renderNotificationsMenu(isActive) }
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.tsx b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
index a9b121919b8..47d19b8b5e3 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.tsx
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
@@ -21,7 +21,6 @@ import { RoomStateEvent } from 'matrix-js-sdk/src/models/room-state';
 
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import RoomUpgradeDialog from '../dialogs/RoomUpgradeDialog';
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -34,7 +33,6 @@ interface IState {
     upgraded?: boolean;
 }
 
-@replaceableComponent("views.rooms.RoomUpgradeWarningBar")
 export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
     static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
diff --git a/src/components/views/rooms/SearchBar.tsx b/src/components/views/rooms/SearchBar.tsx
index 7331a93e057..c42131bba04 100644
--- a/src/components/views/rooms/SearchBar.tsx
+++ b/src/components/views/rooms/SearchBar.tsx
@@ -21,7 +21,6 @@ import classNames from "classnames";
 import AccessibleButton from "../elements/AccessibleButton";
 import { _t } from '../../../languageHandler';
 import DesktopBuildsNotice, { WarningKind } from "../elements/DesktopBuildsNotice";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PosthogScreenTracker } from '../../../PosthogTrackers';
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
@@ -42,7 +41,6 @@ export enum SearchScope {
     All = "All",
 }
 
-@replaceableComponent("views.rooms.SearchBar")
 export default class SearchBar extends React.Component<IProps, IState> {
     private searchTerm: RefObject<HTMLInputElement> = createRef();
 
diff --git a/src/components/views/rooms/SearchResultTile.tsx b/src/components/views/rooms/SearchResultTile.tsx
index 6664fa2f643..d4bb791aa86 100644
--- a/src/components/views/rooms/SearchResultTile.tsx
+++ b/src/components/views/rooms/SearchResultTile.tsx
@@ -21,14 +21,13 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import SettingsStore from "../../../settings/SettingsStore";
-import { UIFeature } from "../../../settings/UIFeature";
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DateSeparator from "../messages/DateSeparator";
-import EventTile, { haveTileForEvent } from "./EventTile";
+import EventTile from "./EventTile";
 import { shouldFormContinuation } from "../../structures/MessagePanel";
 import { wantsDateSeparator } from "../../../DateUtils";
 import CallEventGrouper, { buildCallEventGroupers } from "../../structures/CallEventGrouper";
+import { haveRendererForEvent } from "../../../events/EventTileFactory";
 
 interface IProps {
     // a matrix-js-sdk SearchResult containing the details of this result
@@ -41,7 +40,6 @@ interface IProps {
     permalinkCreator?: RoomPermalinkCreator;
 }
 
-@replaceableComponent("views.rooms.SearchResultTile")
 export default class SearchResultTile extends React.Component<IProps> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -69,7 +67,7 @@ export default class SearchResultTile extends React.Component<IProps> {
         const layout = SettingsStore.getValue("layout");
         const isTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
         const alwaysShowTimestamps = SettingsStore.getValue("alwaysShowTimestamps");
-        const enableFlair = SettingsStore.getValue(UIFeature.Flair);
+        const threadsEnabled = SettingsStore.getValue("feature_thread");
 
         const timeline = result.context.getTimeline();
         for (let j = 0; j < timeline.length; j++) {
@@ -80,7 +78,7 @@ export default class SearchResultTile extends React.Component<IProps> {
                 highlights = this.props.searchHighlights;
             }
 
-            if (haveTileForEvent(mxEv, this.context?.showHiddenEventsInTimeline)) {
+            if (haveRendererForEvent(mxEv, this.context?.showHiddenEvents)) {
                 // do we need a date separator since the last event?
                 const prevEv = timeline[j - 1];
                 // is this a continuation of the previous message?
@@ -89,7 +87,8 @@ export default class SearchResultTile extends React.Component<IProps> {
                     shouldFormContinuation(
                         prevEv,
                         mxEv,
-                        this.context?.showHiddenEventsInTimeline,
+                        this.context?.showHiddenEvents,
+                        threadsEnabled,
                         TimelineRenderingType.Search,
                     );
 
@@ -103,7 +102,8 @@ export default class SearchResultTile extends React.Component<IProps> {
                         !shouldFormContinuation(
                             mxEv,
                             nextEv,
-                            this.context?.showHiddenEventsInTimeline,
+                            this.context?.showHiddenEvents,
+                            threadsEnabled,
                             TimelineRenderingType.Search,
                         )
                     );
@@ -121,7 +121,6 @@ export default class SearchResultTile extends React.Component<IProps> {
                         onHeightChanged={this.props.onHeightChanged}
                         isTwelveHour={isTwelveHour}
                         alwaysShowTimestamps={alwaysShowTimestamps}
-                        enableFlair={enableFlair}
                         lastInSection={lastInSection}
                         continuation={continuation}
                         callEventGrouper={this.callEventGroupers.get(mxEv.getContent().call_id)}
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 4274db9bf5e..c309e0a16c1 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -22,6 +22,7 @@ import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Room } from 'matrix-js-sdk/src/models/room';
 import { Composer as ComposerEvent } from "matrix-analytics-events/types/typescript/Composer";
+import { THREAD_RELATION_TYPE } from 'matrix-js-sdk/src/models/thread';
 
 import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
@@ -46,7 +47,6 @@ import { containsEmoji } from "../../../effects/utils";
 import { CHAT_EFFECTS } from '../../../effects';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { getKeyBindingsManager } from '../../../KeyBindingsManager';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from '../../../settings/SettingsStore';
 import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import { ActionPayload } from "../../../dispatcher/payloads";
@@ -57,45 +57,14 @@ import { ComposerType } from "../../../dispatcher/payloads/ComposerInsertPayload
 import { getSlashCommand, isSlashCommand, runSlashCommand, shouldSendAnyway } from "../../../editor/commands";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
-import { getNestedReplyText, getRenderInMixin, makeReplyMixIn } from '../../../utils/Reply';
+import { addReplyToMessageContent } from '../../../utils/Reply';
 
-interface IAddReplyOpts {
-    permalinkCreator?: RoomPermalinkCreator;
-    includeLegacyFallback?: boolean;
-    renderIn?: string[];
-}
-
-function addReplyToMessageContent(
-    content: IContent,
-    replyToEvent: MatrixEvent,
-    opts: IAddReplyOpts = {
-        includeLegacyFallback: true,
-    },
-): void {
-    const replyContent = makeReplyMixIn(replyToEvent, opts.renderIn);
-    Object.assign(content, replyContent);
-
-    if (opts.includeLegacyFallback) {
-        // Part of Replies fallback support - prepend the text we're sending
-        // with the text we're replying to
-        const nestedReply = getNestedReplyText(replyToEvent, opts.permalinkCreator);
-        if (nestedReply) {
-            if (content.formatted_body) {
-                content.formatted_body = nestedReply.html + content.formatted_body;
-            }
-            content.body = nestedReply.body + content.body;
-        }
-    }
-}
-
-export function attachRelation(
-    content: IContent,
-    relation?: IEventRelation,
-): void {
+// Merges favouring the given relation
+export function attachRelation(content: IContent, relation?: IEventRelation): void {
     if (relation) {
         content['m.relates_to'] = {
-            ...relation, // the composer can have a default
-            ...content['m.relates_to'],
+            ...(content['m.relates_to'] || {}),
+            ...relation,
         };
     }
 }
@@ -104,7 +73,7 @@ export function attachRelation(
 export function createMessageContent(
     model: EditorModel,
     replyToEvent: MatrixEvent,
-    relation: IEventRelation,
+    relation: IEventRelation | undefined,
     permalinkCreator: RoomPermalinkCreator,
     includeReplyLegacyFallback = true,
 ): IContent {
@@ -122,27 +91,23 @@ export function createMessageContent(
         msgtype: isEmote ? "m.emote" : "m.text",
         body: body,
     };
-    const formattedBody = htmlSerializeIfNeeded(model, { forceHTML: !!replyToEvent });
+    const formattedBody = htmlSerializeIfNeeded(model, {
+        forceHTML: !!replyToEvent,
+        useMarkdown: SettingsStore.getValue("MessageComposerInput.useMarkdown"),
+    });
     if (formattedBody) {
         content.format = "org.matrix.custom.html";
         content.formatted_body = formattedBody;
     }
 
+    attachRelation(content, relation);
     if (replyToEvent) {
         addReplyToMessageContent(content, replyToEvent, {
             permalinkCreator,
-            includeLegacyFallback: true,
-            renderIn: getRenderInMixin(relation),
+            includeLegacyFallback: includeReplyLegacyFallback,
         });
     }
 
-    if (relation) {
-        content['m.relates_to'] = {
-            ...relation,
-            ...content['m.relates_to'],
-        };
-    }
-
     return content;
 }
 
@@ -173,9 +138,9 @@ interface ISendMessageComposerProps extends MatrixClientProps {
     disabled?: boolean;
     onChange?(model: EditorModel): void;
     includeReplyLegacyFallback?: boolean;
+    toggleStickerPickerOpen: () => void;
 }
 
-@replaceableComponent("views.rooms.SendMessageComposer")
 export class SendMessageComposer extends React.Component<ISendMessageComposerProps> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;
@@ -203,7 +168,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     }
 
     public componentDidUpdate(prevProps: ISendMessageComposerProps): void {
-        const replyingToThread = this.props.relation?.key === RelationType.Thread;
+        const replyingToThread = this.props.relation?.key === THREAD_RELATION_TYPE.name;
         const differentEventTarget = this.props.relation?.event_id !== prevProps.relation?.event_id;
 
         const threadChanged = replyingToThread && (differentEventTarget);
@@ -220,7 +185,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         if (this.editorRef.current?.isComposing(event)) {
             return;
         }
-        const replyingToThread = this.props.relation?.key === RelationType.Thread;
+        const replyingToThread = this.props.relation?.key === THREAD_RELATION_TYPE.name;
         const action = getKeyBindingsManager().getMessageComposerAction(event);
         switch (action) {
             case KeyBindingAction.SendMessage:
@@ -237,6 +202,14 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 }
                 break;
             }
+            case KeyBindingAction.ShowStickerPicker: {
+                if (!SettingsStore.getValue("MessageComposerInput.showStickersButton")) {
+                    return; // Do nothing if there is no Stickers button
+                }
+                this.props.toggleStickerPickerOpen();
+                event.preventDefault();
+                break;
+            }
             case KeyBindingAction.EditPrevMessage:
                 // selection must be collapsed and caret at start
                 if (this.editorRef.current?.isSelectionCollapsed() && this.editorRef.current?.isCaretAtStart()) {
@@ -349,7 +322,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
             eventName: "Composer",
             isEditing: false,
             isReply: !!this.props.replyToEvent,
-            inThread: this.props.relation?.rel_type === RelationType.Thread,
+            inThread: this.props.relation?.rel_type === THREAD_RELATION_TYPE.name,
         };
         if (posthogEvent.inThread) {
             const threadRoot = this.props.room.findEventById(this.props.relation.event_id);
@@ -374,7 +347,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         if (!containsEmote(model) && isSlashCommand(this.model)) {
             const [cmd, args, commandText] = getSlashCommand(this.model);
             if (cmd) {
-                const threadId = this.props.relation?.rel_type === RelationType.Thread
+                const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
                     ? this.props.relation?.event_id
                     : null;
 
@@ -389,7 +362,6 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                         addReplyToMessageContent(content, replyToEvent, {
                             permalinkCreator: this.props.permalinkCreator,
                             includeLegacyFallback: true,
-                            renderIn: getRenderInMixin(this.props.relation),
                         });
                     }
                 } else {
@@ -425,7 +397,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 decorateStartSendingTime(content);
             }
 
-            const threadId = this.props.relation?.rel_type === RelationType.Thread
+            const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
                 ? this.props.relation.event_id
                 : null;
 
@@ -444,7 +416,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 if (containsEmoji(content, effect.emojis)) {
                     // For initial threads launch, chat effects are disabled
                     // see #19731
-                    const isNotThread = this.props.relation?.rel_type !== RelationType.Thread;
+                    const isNotThread = this.props.relation?.rel_type !== THREAD_RELATION_TYPE.name;
                     if (!SettingsStore.getValue("feature_thread") || isNotThread) {
                         dis.dispatch({ action: `effects.${effect.command}` });
                     }
@@ -488,7 +460,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
 
     private get editorStateKey() {
         let key = `mx_cider_state_${this.props.room.roomId}`;
-        if (this.props.relation?.rel_type === RelationType.Thread) {
+        if (this.props.relation?.rel_type === THREAD_RELATION_TYPE.name) {
             key += `_${this.props.relation.event_id}`;
         }
         return key;
@@ -499,7 +471,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     }
 
     private restoreStoredEditorState(partCreator: PartCreator): Part[] {
-        const replyingToThread = this.props.relation?.key === RelationType.Thread;
+        const replyingToThread = this.props.relation?.key === THREAD_RELATION_TYPE.name;
         if (replyingToThread) {
             return null;
         }
@@ -591,7 +563,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     };
 
     render() {
-        const threadId = this.props.relation?.rel_type === RelationType.Thread
+        const threadId = this.props.relation?.rel_type === THREAD_RELATION_TYPE.name
             ? this.props.relation.event_id
             : null;
         return (
diff --git a/src/components/views/rooms/SimpleRoomHeader.tsx b/src/components/views/rooms/SimpleRoomHeader.tsx
deleted file mode 100644
index 5c83f1df14d..00000000000
--- a/src/components/views/rooms/SimpleRoomHeader.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2016-2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-interface IProps {
-    title?: string;
-    // `src` to an image. Optional.
-    icon?: string;
-}
-
-/*
- * A stripped-down room header used for things like the user settings
- * and room directory.
- */
-@replaceableComponent("views.rooms.SimpleRoomHeader")
-export default class SimpleRoomHeader extends React.PureComponent<IProps> {
-    public render(): JSX.Element {
-        let icon;
-        if (this.props.icon) {
-            icon = <img
-                className="mx_RoomHeader_icon"
-                src={this.props.icon}
-                width="25"
-                height="25"
-            />;
-        }
-
-        return (
-            <div className="mx_RoomHeader mx_RoomHeader_wrapper">
-                <div className="mx_RoomHeader_simpleHeader">
-                    { icon }
-                    { this.props.title }
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/Stickerpicker.tsx b/src/components/views/rooms/Stickerpicker.tsx
index f8d8f95f001..d6595e61fb4 100644
--- a/src/components/views/rooms/Stickerpicker.tsx
+++ b/src/components/views/rooms/Stickerpicker.tsx
@@ -30,7 +30,6 @@ import SettingsStore from "../../../settings/SettingsStore";
 import ContextMenu, { ChevronFace } from "../../structures/ContextMenu";
 import { WidgetType } from "../../../widgets/WidgetType";
 import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ActionPayload } from '../../../dispatcher/payloads';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import GenericElementContextMenu from "../context_menus/GenericElementContextMenu";
@@ -59,7 +58,6 @@ interface IState {
     widgetId: string;
 }
 
-@replaceableComponent("views.rooms.Stickerpicker")
 export default class Stickerpicker extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         threadId: null,
@@ -233,7 +231,9 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
 
     private sendVisibilityToWidget(visible: boolean): void {
         if (!this.state.stickerpickerWidget) return;
-        const messaging = WidgetMessagingStore.instance.getMessagingForId(this.state.stickerpickerWidget.id);
+        const messaging = WidgetMessagingStore.instance.getMessagingForUid(
+            WidgetUtils.calcWidgetUid(this.state.stickerpickerWidget.id, null),
+        );
         if (messaging && visible !== this.prevSentVisibility) {
             messaging.updateVisibility(visible).catch(err => {
                 logger.error("Error updating widget visibility: ", err);
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
index 0b8536afcf9..6ff87cf52a1 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
@@ -28,10 +28,8 @@ import Modal from "../../../Modal";
 import { isValid3pidInvite } from "../../../RoomInvite";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ErrorDialog from '../dialogs/ErrorDialog';
 import AccessibleButton from '../elements/AccessibleButton';
-import SpaceStore from "../../../stores/spaces/SpaceStore";
 
 interface IProps {
     event: MatrixEvent;
@@ -46,7 +44,6 @@ interface IState {
     senderName: string;
 }
 
-@replaceableComponent("views.rooms.ThirdPartyMemberInfo")
 export default class ThirdPartyMemberInfo extends React.Component<IProps, IState> {
     private room: Room;
 
@@ -138,7 +135,7 @@ export default class ThirdPartyMemberInfo extends React.Component<IProps, IState
         }
 
         let scopeHeader;
-        if (SpaceStore.spacesEnabled && this.room.isSpaceRoom()) {
+        if (this.room.isSpaceRoom()) {
             scopeHeader = <div className="mx_RightPanel_scopeHeader">
                 <RoomAvatar room={this.room} height={32} width={32} />
                 <RoomName room={this.room} />
diff --git a/src/components/views/rooms/ThreadSummary.tsx b/src/components/views/rooms/ThreadSummary.tsx
new file mode 100644
index 00000000000..3cf3b03f9ac
--- /dev/null
+++ b/src/components/views/rooms/ThreadSummary.tsx
@@ -0,0 +1,112 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useContext } from "react";
+import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
+import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
+
+import { _t } from "../../../languageHandler";
+import { CardContext } from "../right_panel/context";
+import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
+import { showThread } from "../../../dispatcher/dispatch-actions/threads";
+import PosthogTrackers from "../../../PosthogTrackers";
+import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter";
+import RoomContext from "../../../contexts/RoomContext";
+import { MessagePreviewStore } from "../../../stores/room-list/MessagePreviewStore";
+import MemberAvatar from "../avatars/MemberAvatar";
+import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+    thread: Thread;
+}
+
+const ThreadSummary = ({ mxEvent, thread }: IProps) => {
+    const roomContext = useContext(RoomContext);
+    const cardContext = useContext(CardContext);
+    const count = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.length);
+    if (!count) return null; // We don't want to show a thread summary if the thread doesn't have replies yet
+
+    let countSection: string | number = count;
+    if (!roomContext.narrow) {
+        countSection = _t("%(count)s reply", { count });
+    }
+
+    return (
+        <AccessibleButton
+            className="mx_ThreadSummary"
+            onClick={(ev: ButtonEvent) => {
+                showThread({
+                    rootEvent: mxEvent,
+                    push: cardContext.isCard,
+                });
+                PosthogTrackers.trackInteraction("WebRoomTimelineThreadSummaryButton", ev);
+            }}
+            aria-label={_t("Open thread")}
+        >
+            <span className="mx_ThreadSummary_ThreadsAmount">
+                { countSection }
+            </span>
+            <ThreadMessagePreview thread={thread} showDisplayname={!roomContext.narrow} />
+            <div className="mx_ThreadSummary_chevron" />
+        </AccessibleButton>
+    );
+};
+
+interface IPreviewProps {
+    thread: Thread;
+    showDisplayname?: boolean;
+}
+
+export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPreviewProps) => {
+    const cli = useContext(MatrixClientContext);
+
+    const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.replyToEvent);
+    // track the replacing event id as a means to regenerate the thread message preview
+    const replacingEventId = useTypedEventEmitterState(
+        lastReply,
+        MatrixEventEvent.Replaced,
+        () => lastReply?.replacingEventId(),
+    );
+
+    const preview = useAsyncMemo(async () => {
+        if (!lastReply) return;
+        await cli.decryptEventIfNeeded(lastReply);
+        return MessagePreviewStore.instance.generatePreviewForEvent(lastReply);
+    }, [lastReply, replacingEventId]);
+    if (!preview) return null;
+
+    return <>
+        <MemberAvatar
+            member={lastReply.sender}
+            fallbackUserId={lastReply.getSender()}
+            width={24}
+            height={24}
+            className="mx_ThreadSummary_avatar"
+        />
+        { showDisplayname && <div className="mx_ThreadSummary_sender">
+            { lastReply.sender?.name ?? lastReply.getSender() }
+        </div> }
+        <div className="mx_ThreadSummary_content">
+            <span className="mx_ThreadSummary_message-preview">
+                { preview }
+            </span>
+        </div>
+    </>;
+};
+
+export default ThreadSummary;
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.tsx b/src/components/views/rooms/TopUnreadMessagesBar.tsx
index a9cb4517835..f39b5ed58c2 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.tsx
+++ b/src/components/views/rooms/TopUnreadMessagesBar.tsx
@@ -18,14 +18,12 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     onScrollUpClick?: (e: React.MouseEvent) => void;
     onCloseClick?: (e: React.MouseEvent) => void;
 }
 
-@replaceableComponent("views.rooms.TopUnreadMessagesBar")
 export default class TopUnreadMessagesBar extends React.PureComponent<IProps> {
     public render(): JSX.Element {
         return (
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 448883645e2..84898c8d086 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -25,7 +25,6 @@ import { _t } from "../../../languageHandler";
 import { IUpload, RecordingState, VoiceRecording } from "../../../audio/VoiceRecording";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import LiveRecordingWaveform from "../audio_messages/LiveRecordingWaveform";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import LiveRecordingClock from "../audio_messages/LiveRecordingClock";
 import { VoiceRecordingStore } from "../../../stores/VoiceRecordingStore";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
@@ -52,7 +51,6 @@ interface IState {
 /**
  * Container tile for rendering the voice message recorder in the composer.
  */
-@replaceableComponent("views.rooms.VoiceRecordComposerTile")
 export default class VoiceRecordComposerTile extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);
@@ -233,7 +231,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         if (!this.state.recorder) return null; // no recorder means we're not recording: no waveform
 
         if (this.state.recordingPhase !== RecordingState.Started) {
-            return <RecordingPlayback playback={this.state.recorder.getPlayback()} />;
+            return <RecordingPlayback playback={this.state.recorder.getPlayback()} withWaveform={true} />;
         }
 
         // only other UI is the recording-in-progress UI
diff --git a/src/components/views/rooms/WhoIsTypingTile.tsx b/src/components/views/rooms/WhoIsTypingTile.tsx
index f0df814c87b..e736a670122 100644
--- a/src/components/views/rooms/WhoIsTypingTile.tsx
+++ b/src/components/views/rooms/WhoIsTypingTile.tsx
@@ -24,7 +24,6 @@ import * as WhoIsTyping from '../../../WhoIsTyping';
 import Timer from '../../../utils/Timer';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { compare } from "../../../utils/strings";
 
 interface IProps {
@@ -47,7 +46,6 @@ interface IState {
     delayedStopTypingTimers: Record<string, Timer>;
 }
 
-@replaceableComponent("views.rooms.WhoIsTypingTile")
 export default class WhoIsTypingTile extends React.Component<IProps, IState> {
     static defaultProps = {
         whoIsTypingLimit: 3,
diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx
index 5fa06e3ff39..860022c978a 100644
--- a/src/components/views/settings/BridgeTile.tsx
+++ b/src/components/views/settings/BridgeTile.tsx
@@ -26,7 +26,6 @@ import { makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import SettingsStore from "../../../settings/SettingsStore";
 import { isUrlPermitted } from '../../../HtmlUtils';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 
 interface IProps {
@@ -66,7 +65,6 @@ interface IBridgeStateEvent {
     };
 }
 
-@replaceableComponent("views.settings.BridgeTile")
 export default class BridgeTile extends React.PureComponent<IProps> {
     static propTypes = {
         ev: PropTypes.object.isRequired,
@@ -117,7 +115,7 @@ export default class BridgeTile extends React.PureComponent<IProps> {
         if (protocol.avatar_url) {
             const avatarUrl = mediaFromMxc(protocol.avatar_url).getSquareThumbnailHttp(64);
 
-            networkIcon = <BaseAvatar className="protocol-icon"
+            networkIcon = <BaseAvatar className="mx_RoomSettingsDialog_protocolIcon"
                 width={48}
                 height={48}
                 resizeMethod='crop'
@@ -126,7 +124,7 @@ export default class BridgeTile extends React.PureComponent<IProps> {
                 url={avatarUrl}
             />;
         } else {
-            networkIcon = <div className="noProtocolIcon" />;
+            networkIcon = <div className="mx_RoomSettingsDialog_noProtocolIcon" />;
         }
         let networkItem = null;
         if (network) {
@@ -148,19 +146,19 @@ export default class BridgeTile extends React.PureComponent<IProps> {
         }
 
         const id = this.props.ev.getId();
-        return (<li key={id}>
-            <div className="column-icon">
+        return (<li key={id} className="mx_RoomSettingsDialog_BridgeList_listItem">
+            <div className="mx_RoomSettingsDialog_column_icon">
                 { networkIcon }
             </div>
-            <div className="column-data">
-                <h3>{ protocolName }</h3>
-                <p className="workspace-channel-details">
+            <div className="mx_RoomSettingsDialog_column_data">
+                <h3 className="mx_RoomSettingsDialog_column_data_protocolName">{ protocolName }</h3>
+                <p className="mx_RoomSettingsDialog_column_data_details mx_RoomSettingsDialog_workspace_channel_details">
                     { networkItem }
-                    <span className="channel">{ _t("Channel: <channelLink/>", {}, {
+                    <span className="mx_RoomSettingsDialog_channel">{ _t("Channel: <channelLink/>", {}, {
                         channelLink: () => channelLink,
                     }) }</span>
                 </p>
-                <ul className="metadata">
+                <ul className="mx_RoomSettingsDialog_column_data_metadata mx_RoomSettingsDialog_metadata">
                     { creator } { bot }
                 </ul>
             </div>
diff --git a/src/components/views/settings/ChangeAvatar.tsx b/src/components/views/settings/ChangeAvatar.tsx
index 98cc17f75dc..b0645ac51b4 100644
--- a/src/components/views/settings/ChangeAvatar.tsx
+++ b/src/components/views/settings/ChangeAvatar.tsx
@@ -23,10 +23,10 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import Spinner from '../elements/Spinner';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import RoomAvatar from '../avatars/RoomAvatar';
 import BaseAvatar from '../avatars/BaseAvatar';
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 interface IProps {
     initialAvatarUrl?: string;
@@ -50,7 +50,6 @@ enum Phases {
     Error = "error",
 }
 
-@replaceableComponent("views.settings.ChangeAvatar")
 export default class ChangeAvatar extends React.Component<IProps, IState> {
     public static defaultProps = {
         showUploadSection: true,
@@ -184,7 +183,7 @@ export default class ChangeAvatar extends React.Component<IProps, IState> {
             uploadSection = (
                 <div className={this.props.className}>
                     { _t("Upload new:") }
-                    <input type="file" accept="image/*" onChange={this.onFileSelected} />
+                    <input type="file" accept="image/*" onClick={chromeFileInputFix} onChange={this.onFileSelected} />
                     { this.state.errorText }
                 </div>
             );
diff --git a/src/components/views/settings/ChangeDisplayName.tsx b/src/components/views/settings/ChangeDisplayName.tsx
index 3e1ff0cb7db..e3af9f51dde 100644
--- a/src/components/views/settings/ChangeDisplayName.tsx
+++ b/src/components/views/settings/ChangeDisplayName.tsx
@@ -18,10 +18,8 @@ import React from 'react';
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EditableTextContainer from "../elements/EditableTextContainer";
 
-@replaceableComponent("views.settings.ChangeDisplayName")
 export default class ChangeDisplayName extends React.Component {
     private getDisplayName = async (): Promise<string> => {
         const cli = MatrixClientPeg.get();
diff --git a/src/components/views/settings/ChangePassword.tsx b/src/components/views/settings/ChangePassword.tsx
index 0c5520f3a31..39e7ff8d1d0 100644
--- a/src/components/views/settings/ChangePassword.tsx
+++ b/src/components/views/settings/ChangePassword.tsx
@@ -26,7 +26,6 @@ import withValidation, { IFieldState, IValidationResult } from '../elements/Vali
 import { _t, _td } from '../../../languageHandler';
 import Modal from "../../../Modal";
 import PassphraseField from "../auth/PassphraseField";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../auth/RegistrationForm';
 import SetEmailDialog from "../dialogs/SetEmailDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
@@ -42,7 +41,11 @@ enum Phase {
 }
 
 interface IProps {
-    onFinished?: ({ didSetEmail: boolean }?) => void;
+    onFinished?: (outcome: {
+        didSetEmail?: boolean;
+        /** Was one or more other devices logged out whilst changing the password */
+        didLogoutOutOtherDevices: boolean;
+    }) => void;
     onError?: (error: {error: string}) => void;
     rowClassName?: string;
     buttonClassName?: string;
@@ -63,7 +66,6 @@ interface IState {
     newPasswordConfirm: string;
 }
 
-@replaceableComponent("views.settings.ChangePassword")
 export default class ChangePassword extends React.Component<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         onFinished() {},
@@ -84,48 +86,58 @@ export default class ChangePassword extends React.Component<IProps, IState> {
         };
     }
 
-    private onChangePassword(oldPassword: string, newPassword: string): void {
+    private async onChangePassword(oldPassword: string, newPassword: string): Promise<void> {
         const cli = MatrixClientPeg.get();
 
-        if (!this.props.confirm) {
-            this.changePassword(cli, oldPassword, newPassword);
-            return;
+        // if the server supports it then don't sign user out of all devices
+        const serverSupportsControlOfDevicesLogout = await cli.doesServerSupportLogoutDevices();
+        const userHasOtherDevices = (await cli.getDevices()).devices.length > 1;
+
+        if (userHasOtherDevices && !serverSupportsControlOfDevicesLogout && this.props.confirm) {
+            // warn about logging out all devices
+            const { finished } = Modal.createTrackedDialog<[boolean]>('Change Password', '', QuestionDialog, {
+                title: _t("Warning!"),
+                description:
+                    <div>
+                        <p>{ _t(
+                            'Changing your password on this homeserver will cause all of your other devices to be ' +
+                            'signed out. This will delete the message encryption keys stored on them, and may make ' +
+                            'encrypted chat history unreadable.',
+                        ) }</p>
+                        <p>{ _t(
+                            'If you want to retain access to your chat history in encrypted rooms you should first ' +
+                            'export your room keys and re-import them afterwards.',
+                        ) }</p>
+                        <p>{ _t(
+                            'You can also ask your homeserver admin to upgrade the server to change this behaviour.',
+                        ) }</p>
+                    </div>,
+                button: _t("Continue"),
+                extraButtons: [
+                    <button
+                        key="exportRoomKeys"
+                        className="mx_Dialog_primary"
+                        onClick={this.onExportE2eKeysClicked}
+                    >
+                        { _t('Export E2E room keys') }
+                    </button>,
+                ],
+            });
+
+            const [confirmed] = await finished;
+            if (!confirmed) return;
         }
 
-        Modal.createTrackedDialog('Change Password', '', QuestionDialog, {
-            title: _t("Warning!"),
-            description:
-                <div>
-                    { _t(
-                        'Changing password will currently reset any end-to-end encryption keys on all sessions, ' +
-                        'making encrypted chat history unreadable, unless you first export your room keys ' +
-                        'and re-import them afterwards. ' +
-                        'In future this will be improved.',
-                    ) }
-                    { ' ' }
-                    <a href="https://github.com/vector-im/element-web/issues/2671" target="_blank" rel="noreferrer noopener">
-                        https://github.com/vector-im/element-web/issues/2671
-                    </a>
-                </div>,
-            button: _t("Continue"),
-            extraButtons: [
-                <button
-                    key="exportRoomKeys"
-                    className="mx_Dialog_primary"
-                    onClick={this.onExportE2eKeysClicked}
-                >
-                    { _t('Export E2E room keys') }
-                </button>,
-            ],
-            onFinished: (confirmed) => {
-                if (confirmed) {
-                    this.changePassword(cli, oldPassword, newPassword);
-                }
-            },
-        });
+        this.changePassword(cli, oldPassword, newPassword, serverSupportsControlOfDevicesLogout, userHasOtherDevices);
     }
 
-    private changePassword(cli: MatrixClient, oldPassword: string, newPassword: string): void {
+    private changePassword(
+        cli: MatrixClient,
+        oldPassword: string,
+        newPassword: string,
+        serverSupportsControlOfDevicesLogout: boolean,
+        userHasOtherDevices: boolean,
+    ): void {
         const authDict = {
             type: 'm.login.password',
             identifier: {
@@ -142,15 +154,21 @@ export default class ChangePassword extends React.Component<IProps, IState> {
             phase: Phase.Uploading,
         });
 
-        cli.setPassword(authDict, newPassword).then(() => {
+        const logoutDevices = serverSupportsControlOfDevicesLogout ? false : undefined;
+
+        // undefined or true mean all devices signed out
+        const didLogoutOutOtherDevices = !serverSupportsControlOfDevicesLogout && userHasOtherDevices;
+
+        cli.setPassword(authDict, newPassword, logoutDevices).then(() => {
             if (this.props.shouldAskForEmail) {
                 return this.optionallySetEmail().then((confirmed) => {
                     this.props.onFinished({
                         didSetEmail: confirmed,
+                        didLogoutOutOtherDevices,
                     });
                 });
             } else {
-                this.props.onFinished();
+                this.props.onFinished({ didLogoutOutOtherDevices });
             }
         }, (err) => {
             this.props.onError(err);
@@ -281,7 +299,7 @@ export default class ChangePassword extends React.Component<IProps, IState> {
         if (err) {
             this.props.onError(err);
         } else {
-            this.onChangePassword(oldPassword, newPassword);
+            return this.onChangePassword(oldPassword, newPassword);
         }
     };
 
diff --git a/src/components/views/settings/CrossSigningPanel.tsx b/src/components/views/settings/CrossSigningPanel.tsx
index e5e018be6a0..5c6e650c9fb 100644
--- a/src/components/views/settings/CrossSigningPanel.tsx
+++ b/src/components/views/settings/CrossSigningPanel.tsx
@@ -25,7 +25,6 @@ import Modal from '../../../Modal';
 import Spinner from '../elements/Spinner';
 import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog';
 import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
 import { accessSecretStorage } from '../../../SecurityManager';
 import AccessibleButton from "../elements/AccessibleButton";
@@ -41,7 +40,6 @@ interface IState {
     crossSigningReady?: boolean;
 }
 
-@replaceableComponent("views.settings.CrossSigningPanel")
 export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
     private unmounted = false;
 
diff --git a/src/components/views/settings/CryptographyPanel.tsx b/src/components/views/settings/CryptographyPanel.tsx
index 365c24ab40b..dd580058afb 100644
--- a/src/components/views/settings/CryptographyPanel.tsx
+++ b/src/components/views/settings/CryptographyPanel.tsx
@@ -19,7 +19,6 @@ import React, { ComponentType } from 'react';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "../elements/AccessibleButton";
 import * as FormattingUtils from "../../../utils/FormattingUtils";
 import SettingsStore from "../../../settings/SettingsStore";
@@ -32,7 +31,6 @@ interface IProps {
 interface IState {
 }
 
-@replaceableComponent("views.settings.CryptographyPanel")
 export default class CryptographyPanel extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/settings/DevicesPanel.tsx b/src/components/views/settings/DevicesPanel.tsx
index 0b19d5605e5..71f9b07e99b 100644
--- a/src/components/views/settings/DevicesPanel.tsx
+++ b/src/components/views/settings/DevicesPanel.tsx
@@ -24,7 +24,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog";
 import DevicesPanelEntry from "./DevicesPanelEntry";
 import Spinner from "../elements/Spinner";
@@ -42,7 +41,6 @@ interface IState {
     deleting?: boolean;
 }
 
-@replaceableComponent("views.settings.DevicesPanel")
 export default class DevicesPanel extends React.Component<IProps, IState> {
     private unmounted = false;
 
@@ -207,7 +205,9 @@ export default class DevicesPanel extends React.Component<IProps, IState> {
                     continueKind: "primary",
                 },
                 [SSOAuthEntry.PHASE_POSTAUTH]: {
-                    title: _t("Confirm signing out these devices"),
+                    title: _t("Confirm signing out these devices", {
+                        count: numDevices,
+                    }),
                     body: _t("Click the button below to confirm signing out these devices.", {
                         count: numDevices,
                     }),
diff --git a/src/components/views/settings/DevicesPanelEntry.tsx b/src/components/views/settings/DevicesPanelEntry.tsx
index dccfc705980..33a5939aa20 100644
--- a/src/components/views/settings/DevicesPanelEntry.tsx
+++ b/src/components/views/settings/DevicesPanelEntry.tsx
@@ -23,7 +23,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { formatDate } from '../../../DateUtils';
 import StyledCheckbox from '../elements/StyledCheckbox';
 import { CheckboxStyle } from '../elements/StyledCheckbox';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 import TextWithTooltip from "../elements/TextWithTooltip";
@@ -47,7 +46,6 @@ interface IState {
     displayName: string;
 }
 
-@replaceableComponent("views.settings.DevicesPanelEntry")
 export default class DevicesPanelEntry extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/settings/EventIndexPanel.tsx b/src/components/views/settings/EventIndexPanel.tsx
index 9966e38de86..03ae821d5c7 100644
--- a/src/components/views/settings/EventIndexPanel.tsx
+++ b/src/components/views/settings/EventIndexPanel.tsx
@@ -24,7 +24,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { formatBytes, formatCountLong } from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SeshatResetDialog from '../dialogs/SeshatResetDialog';
 import InlineSpinner from '../elements/InlineSpinner';
 
@@ -35,7 +34,6 @@ interface IState {
     eventIndexingEnabled: boolean;
 }
 
-@replaceableComponent("views.settings.EventIndexPanel")
 export default class EventIndexPanel extends React.Component<{}, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/FontScalingPanel.tsx b/src/components/views/settings/FontScalingPanel.tsx
index a9950dfcd92..55a36d256d4 100644
--- a/src/components/views/settings/FontScalingPanel.tsx
+++ b/src/components/views/settings/FontScalingPanel.tsx
@@ -27,7 +27,6 @@ import { Layout } from "../../../settings/enums/Layout";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { SettingLevel } from "../../../settings/SettingLevel";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -45,7 +44,6 @@ interface IState {
     avatarUrl: string;
 }
 
-@replaceableComponent("views.settings.tabs.user.FontScalingPanel")
 export default class FontScalingPanel extends React.Component<IProps, IState> {
     private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
 
diff --git a/src/components/views/settings/IntegrationManager.tsx b/src/components/views/settings/IntegrationManager.tsx
index c2faa126d27..d9a45860dca 100644
--- a/src/components/views/settings/IntegrationManager.tsx
+++ b/src/components/views/settings/IntegrationManager.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ActionPayload } from '../../../dispatcher/payloads';
 import Spinner from "../elements/Spinner";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
@@ -42,7 +41,6 @@ interface IState {
     errored: boolean;
 }
 
-@replaceableComponent("views.settings.IntegrationManager")
 export default class IntegrationManager extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
diff --git a/src/components/views/settings/KeyboardShortcut.tsx b/src/components/views/settings/KeyboardShortcut.tsx
new file mode 100644
index 00000000000..14dcf77d241
--- /dev/null
+++ b/src/components/views/settings/KeyboardShortcut.tsx
@@ -0,0 +1,67 @@
+/*
+Copyright 2022 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+
+import { ALTERNATE_KEY_NAME, KEY_ICON } from "../../../accessibility/KeyboardShortcuts";
+import { KeyCombo } from "../../../KeyBindingsManager";
+import { isMac, Key } from "../../../Keyboard";
+import { _t } from "../../../languageHandler";
+
+interface IKeyboardKeyProps {
+    name: string;
+    last?: boolean;
+}
+
+export const KeyboardKey: React.FC<IKeyboardKeyProps> = ({ name, last }) => {
+    const icon = KEY_ICON[name];
+    const alternateName = ALTERNATE_KEY_NAME[name];
+
+    return <React.Fragment>
+        <kbd> { icon || (alternateName && _t(alternateName)) || name } </kbd>
+        { !last && "+" }
+    </React.Fragment>;
+};
+
+interface IKeyboardShortcutProps {
+    value: KeyCombo;
+}
+
+export const KeyboardShortcut: React.FC<IKeyboardShortcutProps> = ({ value }) => {
+    if (!value) return null;
+
+    const modifiersElement = [];
+    if (value.ctrlOrCmdKey) {
+        modifiersElement.push(<KeyboardKey key="ctrlOrCmdKey" name={isMac ? Key.META : Key.CONTROL} />);
+    } else if (value.ctrlKey) {
+        modifiersElement.push(<KeyboardKey key="ctrlKey" name={Key.CONTROL} />);
+    } else if (value.metaKey) {
+        modifiersElement.push(<KeyboardKey key="metaKey" name={Key.META} />);
+    }
+    if (value.altKey) {
+        modifiersElement.push(<KeyboardKey key="altKey" name={Key.ALT} />);
+    }
+    if (value.shiftKey) {
+        modifiersElement.push(<KeyboardKey key="shiftKey" name={Key.SHIFT} />);
+    }
+
+    return <div className="mx_KeyboardShortcut">
+        { modifiersElement }
+        <KeyboardKey name={value.key} last />
+    </div>;
+};
+
+export default KeyboardShortcut;
diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx
index d86d6e7c7bf..2f05b5e4dc5 100644
--- a/src/components/views/settings/Notifications.tsx
+++ b/src/components/views/settings/Notifications.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2016 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import {
     VectorPushRulesDefinitions,
     VectorState,
 } from "../../../notifications";
+import type { VectorPushRuleDefinition } from "../../../notifications";
 import { _t, TranslatedString } from "../../../languageHandler";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../settings/SettingsStore";
@@ -209,7 +210,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
         for (const category of vectorCategories) {
             preparedNewState.vectorPushRules[category] = [];
             for (const rule of defaultRules[category]) {
-                const definition = VectorPushRulesDefinitions[rule.rule_id];
+                const definition: VectorPushRuleDefinition = VectorPushRulesDefinitions[rule.rule_id];
                 const vectorState = definition.ruleToVectorState(rule);
                 preparedNewState.vectorPushRules[category].push({
                     ruleId: rule.rule_id,
@@ -356,7 +357,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
                     }
                 }
             } else {
-                const definition = VectorPushRulesDefinitions[rule.ruleId];
+                const definition: VectorPushRuleDefinition = VectorPushRulesDefinitions[rule.ruleId];
                 const actions = definition.vectorStateToActions[checkedState];
                 if (!actions) {
                     await cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, false);
diff --git a/src/components/views/settings/ProfileSettings.tsx b/src/components/views/settings/ProfileSettings.tsx
index 2088ec3abeb..94d83439995 100644
--- a/src/components/views/settings/ProfileSettings.tsx
+++ b/src/components/views/settings/ProfileSettings.tsx
@@ -24,12 +24,12 @@ import { getHostingLink } from '../../../utils/HostingLink';
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import AccessibleButton from '../elements/AccessibleButton';
 import AvatarSetting from './AvatarSetting';
 import ExternalLink from '../elements/ExternalLink';
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 interface IState {
     userId?: string;
@@ -41,7 +41,6 @@ interface IState {
     enableProfileSave?: boolean;
 }
 
-@replaceableComponent("views.settings.ProfileSettings")
 export default class ProfileSettings extends React.Component<{}, IState> {
     private avatarUpload: React.RefObject<HTMLInputElement> = createRef();
 
@@ -190,6 +189,7 @@ export default class ProfileSettings extends React.Component<{}, IState> {
                     type="file"
                     ref={this.avatarUpload}
                     className="mx_ProfileSettings_avatarUpload"
+                    onClick={chromeFileInputFix}
                     onChange={this.onAvatarChanged}
                     accept="image/*"
                 />
diff --git a/src/components/views/settings/SecureBackupPanel.tsx b/src/components/views/settings/SecureBackupPanel.tsx
index ab489ad0efb..da5df6c7a71 100644
--- a/src/components/views/settings/SecureBackupPanel.tsx
+++ b/src/components/views/settings/SecureBackupPanel.tsx
@@ -30,7 +30,6 @@ import AccessibleButton from '../elements/AccessibleButton';
 import QuestionDialog from '../dialogs/QuestionDialog';
 import RestoreKeyBackupDialog from '../dialogs/security/RestoreKeyBackupDialog';
 import { accessSecretStorage } from '../../../SecurityManager';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IState {
     loading: boolean;
@@ -45,7 +44,6 @@ interface IState {
     sessionsRemaining: number;
 }
 
-@replaceableComponent("views.settings.SecureBackupPanel")
 export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
     private unmounted = false;
 
diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx
index d38e9083328..d50ae3d3615 100644
--- a/src/components/views/settings/SetIdServer.tsx
+++ b/src/components/views/settings/SetIdServer.tsx
@@ -27,7 +27,6 @@ import IdentityAuthClient from "../../../IdentityAuthClient";
 import { abbreviateUrl, unabbreviateUrl } from "../../../utils/UrlUtils";
 import { getDefaultIdentityServerUrl, doesIdentityServerHaveTerms } from '../../../utils/IdentityServerUtils';
 import { timeout } from "../../../utils/promise";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ActionPayload } from '../../../dispatcher/payloads';
 import InlineSpinner from '../elements/InlineSpinner';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -80,7 +79,6 @@ interface IState {
     checking: boolean;
 }
 
-@replaceableComponent("views.settings.SetIdServer")
 export default class SetIdServer extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx
index 100afea9a63..557cbaea612 100644
--- a/src/components/views/settings/SetIntegrationManager.tsx
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -22,7 +22,6 @@ import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ToggleSwitch from "../elements/ToggleSwitch";
 
 interface IProps {
@@ -34,7 +33,6 @@ interface IState {
     provisioningEnabled: boolean;
 }
 
-@replaceableComponent("views.settings.SetIntegrationManager")
 export default class SetIntegrationManager extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index 2864be34fc9..83c3492a874 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -19,7 +19,6 @@ import React from 'react';
 import SpellCheckLanguagesDropdown from "../../../components/views/elements/SpellCheckLanguagesDropdown";
 import AccessibleButton from "../../../components/views/elements/AccessibleButton";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface ExistingSpellCheckLanguageIProps {
     language: string;
@@ -55,7 +54,6 @@ export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellChe
     }
 }
 
-@replaceableComponent("views.settings.SpellCheckLanguages")
 export default class SpellCheckLanguages extends React.Component<SpellCheckLanguagesIProps, SpellCheckLanguagesIState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/ThemeChoicePanel.tsx b/src/components/views/settings/ThemeChoicePanel.tsx
index 3296acff7ec..cc4545e9ea9 100644
--- a/src/components/views/settings/ThemeChoicePanel.tsx
+++ b/src/components/views/settings/ThemeChoicePanel.tsx
@@ -29,7 +29,6 @@ import StyledCheckbox from '../elements/StyledCheckbox';
 import Field from '../elements/Field';
 import StyledRadioGroup from "../elements/StyledRadioGroup";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import PosthogTrackers from "../../../PosthogTrackers";
 
 interface IProps {
@@ -50,7 +49,6 @@ interface IState extends IThemeState {
     customThemeMessage: CustomThemeMessage;
 }
 
-@replaceableComponent("views.settings.tabs.user.ThemeChoicePanel")
 export default class ThemeChoicePanel extends React.Component<IProps, IState> {
     private themeTimer: number;
 
diff --git a/src/components/views/settings/account/EmailAddresses.tsx b/src/components/views/settings/account/EmailAddresses.tsx
index 75a72f192c1..9ee1ae742b4 100644
--- a/src/components/views/settings/account/EmailAddresses.tsx
+++ b/src/components/views/settings/account/EmailAddresses.tsx
@@ -26,7 +26,6 @@ import AccessibleButton from "../../elements/AccessibleButton";
 import * as Email from "../../../../email";
 import AddThreepid from "../../../../AddThreepid";
 import Modal from '../../../../Modal';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 
 /*
@@ -136,7 +135,6 @@ interface IState {
     newEmailAddress: string;
 }
 
-@replaceableComponent("views.settings.account.EmailAddresses")
 export default class EmailAddresses extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/settings/account/PhoneNumbers.tsx b/src/components/views/settings/account/PhoneNumbers.tsx
index 770bdb889d0..d2751fddbbd 100644
--- a/src/components/views/settings/account/PhoneNumbers.tsx
+++ b/src/components/views/settings/account/PhoneNumbers.tsx
@@ -26,7 +26,6 @@ import AccessibleButton from "../../elements/AccessibleButton";
 import AddThreepid from "../../../../AddThreepid";
 import CountryDropdown from "../../auth/CountryDropdown";
 import Modal from '../../../../Modal';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import { PhoneNumberCountryDefinition } from "../../../../phonenumber";
 
@@ -136,7 +135,6 @@ interface IState {
     newPhoneNumberCode: string;
 }
 
-@replaceableComponent("views.settings.account.PhoneNumbers")
 export default class PhoneNumbers extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/settings/discovery/EmailAddresses.tsx b/src/components/views/settings/discovery/EmailAddresses.tsx
index 316e20202e9..8d94797ef00 100644
--- a/src/components/views/settings/discovery/EmailAddresses.tsx
+++ b/src/components/views/settings/discovery/EmailAddresses.tsx
@@ -23,7 +23,6 @@ import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import AccessibleButton from "../../elements/AccessibleButton";
 
@@ -244,7 +243,6 @@ interface IProps {
     emails: IThreepid[];
 }
 
-@replaceableComponent("views.settings.discovery.EmailAddresses")
 export default class EmailAddresses extends React.Component<IProps> {
     public render(): JSX.Element {
         let content;
diff --git a/src/components/views/settings/discovery/PhoneNumbers.tsx b/src/components/views/settings/discovery/PhoneNumbers.tsx
index 13bef06e4b9..add8759a85e 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.tsx
+++ b/src/components/views/settings/discovery/PhoneNumbers.tsx
@@ -23,7 +23,6 @@ import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
@@ -260,7 +259,6 @@ interface IProps {
     msisdns: IThreepid[];
 }
 
-@replaceableComponent("views.settings.discovery.PhoneNumbers")
 export default class PhoneNumbers extends React.Component<IProps> {
     public render(): JSX.Element {
         let content;
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
index fd5aadc90f1..408e92e3a86 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
@@ -21,11 +21,9 @@ import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import RoomUpgradeDialog from "../../../dialogs/RoomUpgradeDialog";
-import DevtoolsDialog from "../../../dialogs/DevtoolsDialog";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
 import { Action } from '../../../../../dispatcher/actions';
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import CopyableText from "../../../elements/CopyableText";
 import { ViewRoomPayload } from "../../../../../dispatcher/payloads/ViewRoomPayload";
 
@@ -47,7 +45,6 @@ interface IState {
     upgraded?: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.room.AdvancedRoomSettingsTab")
 export default class AdvancedRoomSettingsTab extends React.Component<IProps, IState> {
     constructor(props, context) {
         super(props, context);
@@ -83,10 +80,6 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
         Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, { room });
     };
 
-    private openDevtools = (e) => {
-        Modal.createDialog(DevtoolsDialog, { roomId: this.props.roomId });
-    };
-
     private onOldRoomClicked = (e) => {
         e.preventDefault();
         e.stopPropagation();
@@ -104,6 +97,7 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
     render() {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
+        const isSpace = room.isSpaceRoom();
 
         let unfederatableSection;
         const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, '');
@@ -127,7 +121,9 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
                         ) }
                     </p>
                     <AccessibleButton onClick={this.upgradeRoom} kind='primary'>
-                        { _t("Upgrade this room to the recommended room version") }
+                        { isSpace
+                            ? _t("Upgrade this space to the recommended room version")
+                            : _t("Upgrade this room to the recommended room version") }
                     </AccessibleButton>
                 </div>
             );
@@ -135,12 +131,16 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
 
         let oldRoomLink;
         if (this.state.oldRoomId) {
-            let name = _t("this room");
-            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-            if (room && room.name) name = room.name;
+            let copy: string;
+            if (isSpace) {
+                copy = _t("View older version of %(spaceName)s.", { spaceName: room.name });
+            } else {
+                copy = _t("View older messages in %(roomName)s.", { roomName: room.name });
+            }
+
             oldRoomLink = (
                 <AccessibleButton element='a' onClick={this.onOldRoomClicked}>
-                    { _t("View older messages in %(roomName)s.", { roomName: name }) }
+                    { copy }
                 </AccessibleButton>
             );
         }
@@ -169,12 +169,6 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
                     { oldRoomLink }
                     { roomUpgradeButton }
                 </div>
-                <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <span className='mx_SettingsTab_subheading'>{ _t("Developer options") }</span>
-                    <AccessibleButton onClick={this.openDevtools} kind='primary'>
-                        { _t("Open Devtools") }
-                    </AccessibleButton>
-                </div>
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
index 58cb7447f9f..1e1b54dc930 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
@@ -21,7 +21,6 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import BridgeTile from "../../BridgeTile";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -34,7 +33,6 @@ interface IProps {
     roomId: string;
 }
 
-@replaceableComponent("views.settings.tabs.room.BridgeSettingsTab")
 export default class BridgeSettingsTab extends React.Component<IProps> {
     private renderBridgeCard(event: MatrixEvent, room: Room) {
         const content = event.getContent();
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
index 203ad321c97..e531f0c2a6e 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
@@ -23,9 +23,7 @@ import dis from "../../../../../dispatcher/dispatcher";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import UrlPreviewSettings from "../../../room_settings/UrlPreviewSettings";
-import RelatedGroupSettings from "../../../room_settings/RelatedGroupSettings";
 import AliasSettings from "../../../room_settings/AliasSettings";
 import PosthogTrackers from "../../../../../PosthogTrackers";
 
@@ -37,7 +35,6 @@ interface IState {
     isRoomPublished: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.room.GeneralRoomSettingsTab")
 export default class GeneralRoomSettingsTab extends React.Component<IProps, IState> {
     public static contextType = MatrixClientContext;
     context: ContextType<typeof MatrixClientContext>;
@@ -67,27 +64,10 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
 
-        const canChangeGroups = room.currentState.mayClientSendStateEvent("m.room.related_groups", client);
-        const groupsEvent = room.currentState.getStateEvents("m.room.related_groups", "");
-
         const urlPreviewSettings = SettingsStore.getValue(UIFeature.URLPreviews) ?
             <UrlPreviewSettings room={room} /> :
             null;
 
-        let flairSection;
-        if (SettingsStore.getValue(UIFeature.Flair)) {
-            flairSection = <>
-                <span className='mx_SettingsTab_subheading'>{ _t("Flair") }</span>
-                <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <RelatedGroupSettings
-                        roomId={room.roomId}
-                        canSetRelatedGroups={canChangeGroups}
-                        relatedGroupsEvent={groupsEvent}
-                    />
-                </div>
-            </>;
-        }
-
         let leaveSection;
         if (room.getMyMembership() === "join") {
             leaveSection = <>
@@ -115,7 +95,6 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
                     canonicalAliasEvent={canonicalAliasEv}
                 />
                 <div className="mx_SettingsTab_heading">{ _t("Other") }</div>
-                { flairSection }
                 { urlPreviewSettings }
                 { leaveSection }
             </div>
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
index cf732bc0520..3467660ff78 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
@@ -23,7 +23,6 @@ import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
 import { SettingLevel } from "../../../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { RoomEchoChamber } from "../../../../../stores/local-echo/RoomEchoChamber";
 import { EchoChamber } from '../../../../../stores/local-echo/EchoChamber';
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
@@ -31,7 +30,8 @@ import StyledRadioGroup from "../../../elements/StyledRadioGroup";
 import { RoomNotifState } from '../../../../../RoomNotifs';
 import defaultDispatcher from "../../../../../dispatcher/dispatcher";
 import { Action } from "../../../../../dispatcher/actions";
-import { UserTab } from "../../../dialogs/UserSettingsDialog";
+import { UserTab } from "../../../dialogs/UserTab";
+import { chromeFileInputFix } from "../../../../../utils/BrowserWorkarounds";
 
 interface IProps {
     roomId: string;
@@ -43,7 +43,6 @@ interface IState {
     uploadedFile: File;
 }
 
-@replaceableComponent("views.settings.tabs.room.NotificationsSettingsTab")
 export default class NotificationsSettingsTab extends React.Component<IProps, IState> {
     private readonly roomProps: RoomEchoChamber;
     private soundUpload = createRef<HTMLInputElement>();
@@ -79,7 +78,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
         this.soundUpload.current.click();
     };
 
-    private onSoundUploadChanged = (e: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
+    private onSoundUploadChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
         if (!e.target.files || !e.target.files.length) {
             this.setState({
                 uploadedFile: null,
@@ -256,7 +255,14 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
                         <h3>{ _t("Set a new custom sound") }</h3>
                         <div className="mx_SettingsFlag">
                             <form autoComplete="off" noValidate={true}>
-                                <input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" />
+                                <input
+                                    ref={this.soundUpload}
+                                    className="mx_NotificationSound_soundUpload"
+                                    type="file"
+                                    onClick={chromeFileInputFix}
+                                    onChange={this.onSoundUploadChanged}
+                                    accept="audio/*"
+                                />
                             </form>
 
                             { currentUploadedFile }
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index 27d72a46f03..85cafc37b8f 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -25,7 +25,6 @@ import { _t, _td } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { compare } from "../../../../../utils/strings";
 import ErrorDialog from '../../../dialogs/ErrorDialog';
 import PowerSelector from "../../../elements/PowerSelector";
@@ -120,7 +119,6 @@ interface IProps {
     roomId: string;
 }
 
-@replaceableComponent("views.settings.tabs.room.RolesRoomSettingsTab")
 export default class RolesRoomSettingsTab extends React.Component<IProps> {
     componentDidMount() {
         MatrixClientPeg.get().on(RoomStateEvent.Update, this.onRoomStateUpdate);
@@ -264,7 +262,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
             },
             "invite": {
                 desc: _t('Invite users'),
-                defaultValue: 50,
+                defaultValue: 0,
             },
             "state_default": {
                 desc: _t('Change settings'),
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index eed93c31f23..ba79cbd8759 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 The Matrix.org Foundation C.I.C.
+Copyright 2019-2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,14 +15,13 @@ limitations under the License.
 */
 
 import React from 'react';
-import { GuestAccess, HistoryVisibility, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
+import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 import { EventType } from 'matrix-js-sdk/src/@types/event';
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../../languageHandler";
-import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import Modal from "../../../../../Modal";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
@@ -30,7 +29,6 @@ import StyledRadioGroup from '../../../elements/StyledRadioGroup';
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import SettingsFlag from '../../../elements/SettingsFlag';
 import createRoom, { IOpts } from '../../../../../createRoom';
@@ -40,6 +38,7 @@ import ErrorDialog from "../../../dialogs/ErrorDialog";
 import SettingsFieldset from '../../SettingsFieldset';
 import ExternalLink from '../../../elements/ExternalLink';
 import PosthogTrackers from "../../../../../PosthogTrackers";
+import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 interface IProps {
     roomId: string;
@@ -47,7 +46,6 @@ interface IProps {
 }
 
 interface IState {
-    restrictedAllowRoomIds?: string[];
     guestAccess: GuestAccess;
     history: HistoryVisibility;
     hasAliases: boolean;
@@ -55,54 +53,34 @@ interface IState {
     showAdvancedSection: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.room.SecurityRoomSettingsTab")
 export default class SecurityRoomSettingsTab extends React.Component<IProps, IState> {
-    constructor(props) {
-        super(props);
+    static contextType = MatrixClientContext;
+    public context!: React.ContextType<typeof MatrixClientContext>;
+
+    constructor(props, context) {
+        super(props, context);
+
+        const state = context.getRoom(this.props.roomId).currentState;
 
         this.state = {
-            guestAccess: GuestAccess.Forbidden,
-            history: HistoryVisibility.Shared,
-            hasAliases: false,
-            encrypted: false,
+            guestAccess: this.pullContentPropertyFromEvent<GuestAccess>(
+                state.getStateEvents(EventType.RoomGuestAccess, ""),
+                'guest_access',
+                GuestAccess.Forbidden,
+            ),
+            history: this.pullContentPropertyFromEvent<HistoryVisibility>(
+                state.getStateEvents(EventType.RoomHistoryVisibility, ""),
+                'history_visibility',
+                HistoryVisibility.Shared,
+            ),
+            hasAliases: false, // async loaded in componentDidMount
+            encrypted: context.isRoomEncrypted(this.props.roomId),
             showAdvancedSection: false,
         };
     }
 
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() { // eslint-disable-line
-        const cli = MatrixClientPeg.get();
-        cli.on(RoomStateEvent.Events, this.onStateEvent);
-
-        const room = cli.getRoom(this.props.roomId);
-        const state = room.currentState;
-
-        const joinRuleEvent = state.getStateEvents(EventType.RoomJoinRules, "");
-        const joinRule: JoinRule = this.pullContentPropertyFromEvent<JoinRule>(
-            joinRuleEvent,
-            'join_rule',
-            JoinRule.Invite,
-        );
-        const restrictedAllowRoomIds = joinRule === JoinRule.Restricted
-            ? joinRuleEvent?.getContent().allow
-                ?.filter(a => a.type === RestrictedAllowType.RoomMembership)
-                ?.map(a => a.room_id)
-            : undefined;
-
-        const guestAccess: GuestAccess = this.pullContentPropertyFromEvent<GuestAccess>(
-            state.getStateEvents(EventType.RoomGuestAccess, ""),
-            'guest_access',
-            GuestAccess.Forbidden,
-        );
-        const history: HistoryVisibility = this.pullContentPropertyFromEvent<HistoryVisibility>(
-            state.getStateEvents(EventType.RoomHistoryVisibility, ""),
-            'history_visibility',
-            HistoryVisibility.Shared,
-        );
-
-        const encrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
-        this.setState({ restrictedAllowRoomIds, guestAccess, history, encrypted });
-
+    componentDidMount() {
+        this.context.on(RoomStateEvent.Events, this.onStateEvent);
         this.hasAliases().then(hasAliases => this.setState({ hasAliases }));
     }
 
@@ -111,7 +89,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     componentWillUnmount() {
-        MatrixClientPeg.get().removeListener(RoomStateEvent.Events, this.onStateEvent);
+        this.context.removeListener(RoomStateEvent.Events, this.onStateEvent);
     }
 
     private onStateEvent = (e: MatrixEvent) => {
@@ -125,7 +103,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     };
 
     private onEncryptionChange = async () => {
-        if (MatrixClientPeg.get().getRoom(this.props.roomId)?.getJoinRule() === JoinRule.Public) {
+        if (this.context.getRoom(this.props.roomId)?.getJoinRule() === JoinRule.Public) {
             const dialog = Modal.createTrackedDialog('Confirm Public Encrypted Room', '', QuestionDialog, {
                 title: _t('Are you sure you want to add encryption to this public room?'),
                 description: <div>
@@ -180,7 +158,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
                 const beforeEncrypted = this.state.encrypted;
                 this.setState({ encrypted: true });
-                MatrixClientPeg.get().sendStateEvent(
+                this.context.sendStateEvent(
                     this.props.roomId, EventType.RoomEncryption,
                     { algorithm: "m.megolm.v1.aes-sha2" },
                 ).catch((e) => {
@@ -198,8 +176,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         this.setState({ guestAccess });
 
-        const client = MatrixClientPeg.get();
-        client.sendStateEvent(this.props.roomId, EventType.RoomGuestAccess, {
+        this.context.sendStateEvent(this.props.roomId, EventType.RoomGuestAccess, {
             guest_access: guestAccess,
         }, "").catch((e) => {
             logger.error(e);
@@ -229,7 +206,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         if (beforeHistory === history) return;
 
         this.setState({ history: history });
-        MatrixClientPeg.get().sendStateEvent(this.props.roomId, EventType.RoomHistoryVisibility, {
+        this.context.sendStateEvent(this.props.roomId, EventType.RoomHistoryVisibility, {
             history_visibility: history,
         }, "").catch((e) => {
             logger.error(e);
@@ -238,11 +215,11 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     };
 
     private updateBlacklistDevicesFlag = (checked: boolean) => {
-        MatrixClientPeg.get().getRoom(this.props.roomId).setBlacklistUnverifiedDevices(checked);
+        this.context.getRoom(this.props.roomId).setBlacklistUnverifiedDevices(checked);
     };
 
     private async hasAliases(): Promise<boolean> {
-        const cli = MatrixClientPeg.get();
+        const cli = this.context;
         if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
             const response = await cli.unstableGetLocalAliases(this.props.roomId);
             const localAliases = response.aliases;
@@ -256,7 +233,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     private renderJoinRule() {
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         const room = client.getRoom(this.props.roomId);
 
         let aliasWarning = null;
@@ -335,7 +312,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             return null;
         }
 
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         const history = this.state.history;
         const state = client.getRoom(this.props.roomId).currentState;
         const canChangeHistory = state.mayClientSendStateEvent(EventType.RoomHistoryVisibility, client);
@@ -382,7 +359,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     };
 
     private renderAdvanced() {
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         const guestAccess = this.state.guestAccess;
         const state = client.getRoom(this.props.roomId).currentState;
         const canSetGuestAccess = state.mayClientSendStateEvent(EventType.RoomGuestAccess, client);
@@ -402,7 +379,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     render() {
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         const room = client.getRoom(this.props.roomId);
         const isEncrypted = this.state.encrypted;
         const hasEncryptionPermission = room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, client);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 5561df050d2..30e7882f105 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -26,7 +26,6 @@ import Field from '../../../elements/Field';
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import { Layout } from "../../../../../settings/enums/Layout";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import LayoutSwitcher from "../../LayoutSwitcher";
 import FontScalingPanel from '../../FontScalingPanel';
 import ThemeChoicePanel from '../../ThemeChoicePanel';
@@ -46,7 +45,6 @@ interface IState {
     avatarUrl: string;
 }
 
-@replaceableComponent("views.settings.tabs.user.AppearanceUserSettingsTab")
 export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
     private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
 
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
deleted file mode 100644
index 919851e9fbf..00000000000
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-
-import { _t } from "../../../../../languageHandler";
-import GroupUserSettings from "../../../groups/GroupUserSettings";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
-
-@replaceableComponent("views.settings.tabs.user.FlairUserSettingsTab")
-export default class FlairUserSettingsTab extends React.Component {
-    render() {
-        return (
-            <div className="mx_SettingsTab">
-                <span className="mx_SettingsTab_heading">{ _t("Flair") }</span>
-                <div className="mx_SettingsTab_section">
-                    <GroupUserSettings />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
index 14851b5becb..36d3e55d852 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
@@ -40,7 +40,6 @@ import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
 import Spinner from "../../../elements/Spinner";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { UIFeature } from "../../../../../settings/UIFeature";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { ActionPayload } from "../../../../../dispatcher/payloads";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import AccountPhoneNumbers from "../../account/PhoneNumbers";
@@ -78,7 +77,6 @@ interface IState {
     idServerName: string;
 }
 
-@replaceableComponent("views.settings.tabs.user.GeneralUserSettingsTab")
 export default class GeneralUserSettingsTab extends React.Component<IProps, IState> {
     private readonly dispatcherRef: string;
 
@@ -262,14 +260,17 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
         });
     };
 
-    private onPasswordChanged = (): void => {
+    private onPasswordChanged = ({ didLogoutOutOtherDevices }: { didLogoutOutOtherDevices: boolean }): void => {
+        let description = _t("Your password was successfully changed.");
+        if (didLogoutOutOtherDevices) {
+            description += " " + _t(
+                "You will not receive push notifications on other devices until you sign back in to them.",
+            );
+        }
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         Modal.createTrackedDialog('Password changed', '', ErrorDialog, {
             title: _t("Success"),
-            description: _t(
-                "Your password was successfully changed. You will not receive " +
-                "push notifications on other sessions until you log back in to them",
-            ) + ".",
+            description,
         });
     };
 
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 5b744fc0f6f..346c0c5bb1a 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2022 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,11 +25,10 @@ import createRoom from "../../../../../createRoom";
 import Modal from "../../../../../Modal";
 import PlatformPeg from "../../../../../PlatformPeg";
 import UpdateCheckButton from "../../UpdateCheckButton";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import BugReportDialog from '../../../dialogs/BugReportDialog';
 import { OpenToTabPayload } from "../../../../../dispatcher/payloads/OpenToTabPayload";
 import { Action } from "../../../../../dispatcher/actions";
-import { UserTab } from "../../../dialogs/UserSettingsDialog";
+import { UserTab } from "../../../dialogs/UserTab";
 import dis from "../../../../../dispatcher/dispatcher";
 import CopyableText from "../../../elements/CopyableText";
 
@@ -42,7 +41,6 @@ interface IState {
     canUpdate: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.user.HelpUserSettingsTab")
 export default class HelpUserSettingsTab extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
@@ -95,29 +93,17 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
     private onStartBotChat = (e) => {
         this.props.closeSettingsFn();
         createRoom({
-            dmUserId: SdkConfig.get().welcomeUserId,
+            dmUserId: SdkConfig.get("welcome_user_id"),
             andView: true,
         });
     };
 
-    private showSpoiler = (event) => {
-        const target = event.target;
-        target.innerHTML = target.getAttribute('data-spoiler');
-
-        const range = document.createRange();
-        range.selectNodeContents(target);
-
-        const selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(range);
-    };
-
     private renderLegal() {
         const tocLinks = SdkConfig.get().terms_and_conditions_links;
         if (!tocLinks) return null;
 
         const legalLinks = [];
-        for (const tocEntry of SdkConfig.get().terms_and_conditions_links) {
+        for (const tocEntry of tocLinks) {
             legalLinks.push(<div key={tocEntry.url}>
                 <a href={tocEntry.url} rel="noreferrer noopener" target="_blank">{ tocEntry.text }</a>
             </div>);
@@ -210,7 +196,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                 </a>,
             },
         );
-        if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
+        if (SdkConfig.get("welcome_user_id") && getCurrentLanguage().startsWith('en')) {
             faqText = (
                 <div>
                     { _t(
@@ -251,11 +237,13 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                     <div className='mx_SettingsTab_subsectionText'>
                         { _t(
                             "If you've submitted a bug via GitHub, debug logs can help " +
-                            "us track down the problem. Debug logs contain application " +
+                            "us track down the problem. ",
+                        ) }
+                        { _t("Debug logs contain application " +
                             "usage data including your username, the IDs or aliases of " +
-                            "the rooms or groups you have visited, which UI elements you " +
-                            "last interacted with, and the usernames of " +
-                            "other users. They do not contain messages.",
+                            "the rooms you have visited, which UI elements you " +
+                            "last interacted with, and the usernames of other users. " +
+                            "They do not contain messages.",
                         ) }
                         <div className='mx_HelpUserSettingsTab_debugButton'>
                             <AccessibleButton onClick={this.onBugReport} kind='primary'>
diff --git a/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx b/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx
index 95495118f81..ef38c16078b 100644
--- a/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx
@@ -18,71 +18,16 @@ limitations under the License.
 import React from "react";
 
 import {
-    getKeyboardShortcutsForUI,
-    ALTERNATE_KEY_NAME,
-    KEY_ICON,
     ICategory,
     CATEGORIES,
     CategoryName,
-    KeyBindingConfig,
 } from "../../../../../accessibility/KeyboardShortcuts";
 import SdkConfig from "../../../../../SdkConfig";
-import { isMac, Key } from "../../../../../Keyboard";
 import { _t } from "../../../../../languageHandler";
-
-// TODO: This should return KeyCombo but it has ctrlOrCmd instead of ctrlOrCmdKey
-const getKeyboardShortcutValue = (name: string): KeyBindingConfig => {
-    return getKeyboardShortcutsForUI()[name]?.default;
-};
-
-const getKeyboardShortcutDisplayName = (name: string): string | null => {
-    const keyboardShortcutDisplayName = getKeyboardShortcutsForUI()[name]?.displayName;
-    return keyboardShortcutDisplayName && _t(keyboardShortcutDisplayName);
-};
-
-interface IKeyboardKeyProps {
-    name: string;
-    last?: boolean;
-}
-
-export const KeyboardKey: React.FC<IKeyboardKeyProps> = ({ name, last }) => {
-    const icon = KEY_ICON[name];
-    const alternateName = ALTERNATE_KEY_NAME[name];
-
-    return <React.Fragment>
-        <kbd> { icon || (alternateName && _t(alternateName)) || name } </kbd>
-        { !last && "+" }
-    </React.Fragment>;
-};
-
-interface IKeyboardShortcutProps {
-    name: string;
-}
-
-export const KeyboardShortcut: React.FC<IKeyboardShortcutProps> = ({ name }) => {
-    const value = getKeyboardShortcutValue(name);
-    if (!value) return null;
-
-    const modifiersElement = [];
-    if (value.ctrlOrCmdKey) {
-        modifiersElement.push(<KeyboardKey key="ctrlOrCmdKey" name={isMac ? Key.META : Key.CONTROL} />);
-    } else if (value.ctrlKey) {
-        modifiersElement.push(<KeyboardKey key="ctrlKey" name={Key.CONTROL} />);
-    } else if (value.metaKey) {
-        modifiersElement.push(<KeyboardKey key="metaKey" name={Key.META} />);
-    }
-    if (value.altKey) {
-        modifiersElement.push(<KeyboardKey key="altKey" name={Key.ALT} />);
-    }
-    if (value.shiftKey) {
-        modifiersElement.push(<KeyboardKey key="shiftKey" name={Key.SHIFT} />);
-    }
-
-    return <div>
-        { modifiersElement }
-        <KeyboardKey name={value.key} last />
-    </div>;
-};
+import {
+    getKeyboardShortcutDisplayName, getKeyboardShortcutValue,
+} from "../../../../../accessibility/KeyboardShortcutUtils";
+import { KeyboardShortcut } from "../../KeyboardShortcut";
 
 interface IKeyboardShortcutRowProps {
     name: string;
@@ -90,15 +35,16 @@ interface IKeyboardShortcutRowProps {
 
 // Filter out the labs section if labs aren't enabled.
 const visibleCategories = Object.entries(CATEGORIES).filter(([categoryName]) =>
-    categoryName !== CategoryName.LABS || SdkConfig.get()['showLabsSettings']);
+    categoryName !== CategoryName.LABS || SdkConfig.get("show_labs_settings"));
 
 const KeyboardShortcutRow: React.FC<IKeyboardShortcutRowProps> = ({ name }) => {
     const displayName = getKeyboardShortcutDisplayName(name);
-    if (!displayName) return null;
+    const value = getKeyboardShortcutValue(name);
+    if (!displayName || !value) return null;
 
     return <div className="mx_KeyboardShortcut_shortcutRow">
         { displayName }
-        <KeyboardShortcut name={name} />
+        <KeyboardShortcut value={value} />
     </div>;
 };
 
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
index a7c7f4df497..9e0b31b2ad5 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
@@ -21,7 +21,6 @@ import { _t } from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import SdkConfig from "../../../../../SdkConfig";
 import BetaCard from "../../../beta/BetaCard";
 import SettingsFlag from '../../../elements/SettingsFlag';
@@ -52,7 +51,6 @@ interface IState {
     showJumpToDate: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.user.LabsUserSettingsTab")
 export default class LabsUserSettingsTab extends React.Component<{}, IState> {
     constructor(props: {}) {
         super(props);
@@ -85,8 +83,8 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
             </div>;
         }
 
-        let labsSection;
-        if (SdkConfig.get()['showLabsSettings']) {
+        let labsSections;
+        if (SdkConfig.get("show_labs_settings")) {
             const groups = new EnhancedMap<LabGroup, JSX.Element[]>();
             labs.forEach(f => {
                 groups.getOrCreate(SettingsStore.getLabGroup(f), []).push(
@@ -110,19 +108,6 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
                 />,
             );
 
-            groups.getOrCreate(LabGroup.Developer, []).push(
-                <SettingsFlag
-                    key="developerMode"
-                    name="developerMode"
-                    level={SettingLevel.ACCOUNT}
-                />,
-                <SettingsFlag
-                    key="showHiddenEventsInTimeline"
-                    name="showHiddenEventsInTimeline"
-                    level={SettingLevel.DEVICE}
-                />,
-            );
-
             groups.getOrCreate(LabGroup.Analytics, []).push(
                 <SettingsFlag
                     key="automaticErrorReporting"
@@ -156,14 +141,14 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
                 );
             }
 
-            labsSection = <div className="mx_SettingsTab_section">
+            labsSections = <>
                 { sortBy(Array.from(groups.entries()), "0").map(([group, flags]) => (
-                    <div key={group}>
+                    <div className="mx_SettingsTab_section" key={group}>
                         <span className="mx_SettingsTab_subheading">{ _t(labGroupNames[group]) }</span>
                         { flags }
                     </div>
                 )) }
-            </div>;
+            </>;
         }
 
         return (
@@ -185,7 +170,7 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
                     }
                 </div>
                 { betaSection }
-                { labsSection }
+                { labsSections }
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
index 88000892e4e..709b3e8c56c 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
@@ -24,7 +24,6 @@ import { ListRule } from "../../../../../mjolnir/ListRule";
 import { BanList, RULE_SERVER, RULE_USER } from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -36,7 +35,6 @@ interface IState {
     newList: string;
 }
 
-@replaceableComponent("views.settings.tabs.user.MjolnirUserSettingsTab")
 export default class MjolnirUserSettingsTab extends React.Component<{}, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
index 429472c7f52..b49cf3920e6 100644
--- a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx
@@ -17,10 +17,8 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../../../languageHandler";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import Notifications from "../../Notifications";
 
-@replaceableComponent("views.settings.tabs.user.NotificationUserSettingsTab")
 export default class NotificationUserSettingsTab extends React.Component {
     render() {
         return (
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 74a9ecaf773..8b3bdeb7fcf 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useContext, useEffect, useState } from 'react';
-import { EventType } from 'matrix-js-sdk/src/@types/event';
+import React from 'react';
 
 import { _t } from "../../../../../languageHandler";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
@@ -24,21 +23,12 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import PlatformPeg from "../../../../../PlatformPeg";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import SettingsFlag from '../../../elements/SettingsFlag';
 import AccessibleButton from "../../../elements/AccessibleButton";
-import GroupAvatar from "../../../avatars/GroupAvatar";
 import dis from "../../../../../dispatcher/dispatcher";
-import GroupActions from "../../../../../actions/GroupActions";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
-import { useDispatcher } from "../../../../../hooks/useDispatcher";
-import { createSpaceFromCommunity } from "../../../../../utils/space";
-import Spinner from "../../../elements/Spinner";
-import { UserTab } from "../../../dialogs/UserSettingsDialog";
+import { UserTab } from "../../../dialogs/UserTab";
 import { OpenToTabPayload } from "../../../../../dispatcher/payloads/OpenToTabPayload";
 import { Action } from "../../../../../dispatcher/actions";
-import { ViewRoomPayload } from "../../../../../dispatcher/payloads/ViewRoomPayload";
-import { CreateEventField, IGroupSummary } from '../../../../../@types/groups';
 
 interface IProps {
     closeSettingsFn(success: boolean): void;
@@ -58,86 +48,6 @@ interface IState {
     readMarkerOutOfViewThresholdMs: string;
 }
 
-type Community = IGroupSummary & {
-    groupId: string;
-    spaceId?: string;
-};
-
-const CommunityMigrator = ({ onFinished }) => {
-    const cli = useContext(MatrixClientContext);
-    const [communities, setCommunities] = useState<Community[]>(null);
-    useEffect(() => {
-        dis.dispatch(GroupActions.fetchJoinedGroups(cli));
-    }, [cli]);
-    useDispatcher(dis, async payload => {
-        if (payload.action === "GroupActions.fetchJoinedGroups.success") {
-            const communities: Community[] = [];
-
-            const migratedSpaceMap = new Map(cli.getRooms().map(room => {
-                const createContent = room.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent();
-                if (createContent?.[CreateEventField]) {
-                    return [createContent[CreateEventField], room.roomId] as [string, string];
-                }
-            }).filter(Boolean));
-
-            for (const groupId of payload.result.groups) {
-                const summary = await cli.getGroupSummary(groupId) as IGroupSummary;
-                if (summary.user.is_privileged) {
-                    communities.push({
-                        ...summary,
-                        groupId,
-                        spaceId: migratedSpaceMap.get(groupId),
-                    });
-                }
-            }
-
-            setCommunities(communities);
-        }
-    });
-
-    if (!communities) {
-        return <Spinner />;
-    }
-
-    return <div className="mx_PreferencesUserSettingsTab_CommunityMigrator">
-        { communities.map(community => (
-            <div key={community.groupId}>
-                <GroupAvatar
-                    groupId={community.groupId}
-                    groupAvatarUrl={community.profile.avatar_url}
-                    groupName={community.profile.name}
-                    width={32}
-                    height={32}
-                />
-                { community.profile.name }
-                <AccessibleButton
-                    kind="primary_outline"
-                    onClick={() => {
-                        if (community.spaceId) {
-                            dis.dispatch<ViewRoomPayload>({
-                                action: Action.ViewRoom,
-                                room_id: community.spaceId,
-                                metricsTrigger: undefined, // other
-                            });
-                            onFinished();
-                        } else {
-                            createSpaceFromCommunity(cli, community.groupId).then(([spaceId]) => {
-                                if (spaceId) {
-                                    community.spaceId = spaceId;
-                                    setCommunities([...communities]); // force component re-render
-                                }
-                            });
-                        }
-                    }}
-                >
-                    { community.spaceId ? _t("Open Space") : _t("Create Space") }
-                </AccessibleButton>
-            </div>
-        )) }
-    </div>;
-};
-
-@replaceableComponent("views.settings.tabs.user.PreferencesUserSettingsTab")
 export default class PreferencesUserSettingsTab extends React.Component<IProps, IState> {
     static ROOM_LIST_SETTINGS = [
         'breadcrumbs',
@@ -147,16 +57,13 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         "Spaces.allRoomsInHome",
     ];
 
-    static COMMUNITIES_SETTINGS = [
-        "showCommunitiesInsteadOfSpaces",
-    ];
-
     static KEYBINDINGS_SETTINGS = [
         'ctrlFForSearch',
     ];
 
     static COMPOSER_SETTINGS = [
         'MessageComposerInput.autoReplaceEmoji',
+        'MessageComposerInput.useMarkdown',
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
         'MessageComposerInput.ctrlEnterToSend',
@@ -193,7 +100,6 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         'scrollToBottomOnMessageSent',
     ];
     static GENERAL_SETTINGS = [
-        'TagPanel.enableTagPanel',
         'promptBeforeInviteUnknownUsers',
         // Start automatically after startup (electron-only)
         // Autocomplete delay (niche text box)
@@ -356,19 +262,6 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                     { this.renderGroup(PreferencesUserSettingsTab.SPACES_SETTINGS, SettingLevel.ACCOUNT) }
                 </div>
 
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{ _t("Communities") }</span>
-                    <p>{ _t("Communities have been archived to make way for Spaces but you can convert your " +
-                        "communities into Spaces below. Converting will ensure your conversations get the latest " +
-                        "features.") }</p>
-                    <details>
-                        <summary>{ _t("Show my Communities") }</summary>
-                        <p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p>
-                        <CommunityMigrator onFinished={this.props.closeSettingsFn} />
-                    </details>
-                    { this.renderGroup(PreferencesUserSettingsTab.COMMUNITIES_SETTINGS, SettingLevel.DEVICE) }
-                </div>
-
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{ _t("Keyboard shortcuts") }</span>
                     <div className="mx_SettingsFlag">
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
index 288c14ea7d2..e577cd873fc 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,13 +24,11 @@ import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Analytics from "../../../../../Analytics";
 import dis from "../../../../../dispatcher/dispatcher";
-import { privateShouldBeEncrypted } from "../../../../../createRoom";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import SecureBackupPanel from "../../SecureBackupPanel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import E2eAdvancedPanel, { isE2eAdvancedPanelPossible } from "../../E2eAdvancedPanel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { ActionPayload } from "../../../../../dispatcher/payloads";
 import CryptographyPanel from "../../CryptographyPanel";
 import DevicesPanel from "../../DevicesPanel";
@@ -41,6 +38,7 @@ import EventIndexPanel from "../../EventIndexPanel";
 import InlineSpinner from "../../../elements/InlineSpinner";
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
 import { showDialog as showAnalyticsLearnMoreDialog } from "../../../dialogs/AnalyticsLearnMoreDialog";
+import { privateShouldBeEncrypted } from "../../../../../utils/rooms";
 
 interface IIgnoredUserProps {
     userId: string;
@@ -77,7 +75,6 @@ interface IState {
     invitedRoomIds: Set<string>;
 }
 
-@replaceableComponent("views.settings.tabs.user.SecurityUserSettingsTab")
 export default class SecurityUserSettingsTab extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
@@ -147,14 +144,6 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
         });
     };
 
-    private onGoToUserProfileClick = (): void => {
-        dis.dispatch({
-            action: 'view_user_info',
-            userId: MatrixClientPeg.get().getUserId(),
-        });
-        this.props.closeSettingsFn();
-    };
-
     private onUserUnignored = async (userId: string): Promise<void> => {
         const { ignoredUserIds, waitingUnignored } = this.state;
         const currentlyIgnoredUserIds = ignoredUserIds.filter(e => !waitingUnignored.includes(e));
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
index b187e300a25..18a0b0b288c 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
@@ -26,7 +26,6 @@ import AccessibleButton from "../../../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import Modal from "../../../../../Modal";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import SettingsFlag from '../../../elements/SettingsFlag';
 import ErrorDialog from '../../../dialogs/ErrorDialog';
 
@@ -46,7 +45,6 @@ interface IState extends Record<MediaDeviceKindEnum, string> {
     mediaDevices: IMediaDevices;
 }
 
-@replaceableComponent("views.settings.tabs.user.VoiceUserSettingsTab")
 export default class VoiceUserSettingsTab extends React.Component<{}, IState> {
     constructor(props: {}) {
         super(props);
diff --git a/src/components/views/spaces/QuickSettingsButton.tsx b/src/components/views/spaces/QuickSettingsButton.tsx
index c131bfb47a9..2f4ee9315f3 100644
--- a/src/components/views/spaces/QuickSettingsButton.tsx
+++ b/src/components/views/spaces/QuickSettingsButton.tsx
@@ -27,12 +27,16 @@ import { useSettingValue } from "../../../hooks/useSettings";
 import { onMetaSpaceChangeFactory } from "../settings/tabs/user/SidebarUserSettingsTab";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "../dialogs/UserSettingsDialog";
+import { UserTab } from "../dialogs/UserTab";
 import QuickThemeSwitcher from "./QuickThemeSwitcher";
 import { Icon as PinUprightIcon } from '../../../../res/img/element-icons/room/pin-upright.svg';
 import { Icon as EllipsisIcon } from '../../../../res/img/element-icons/room/ellipsis.svg';
 import { Icon as MembersIcon } from '../../../../res/img/element-icons/room/members.svg';
 import { Icon as FavoriteIcon } from '../../../../res/img/element-icons/roomlist/favorite.svg';
+import SettingsStore from "../../../settings/SettingsStore";
+import Modal from "../../../Modal";
+import DevtoolsDialog from "../dialogs/DevtoolsDialog";
+import { RoomViewStore } from "../../../stores/RoomViewStore";
 
 const QuickSettingsButton = ({ isPanelCollapsed = false }) => {
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<HTMLDivElement>();
@@ -63,6 +67,20 @@ const QuickSettingsButton = ({ isPanelCollapsed = false }) => {
                 { _t("All settings") }
             </AccessibleButton>
 
+            { SettingsStore.getValue("developerMode") && (
+                <AccessibleButton
+                    onClick={() => {
+                        closeMenu();
+                        Modal.createDialog(DevtoolsDialog, {
+                            roomId: RoomViewStore.instance.getRoomId(),
+                        }, "mx_DevtoolsDialog_wrapper");
+                    }}
+                    kind="danger_outline"
+                >
+                    { _t("Developer tools") }
+                </AccessibleButton>
+            ) }
+
             <h4 className="mx_QuickSettingsButton_pinToSidebarHeading">
                 <PinUprightIcon className="mx_QuickSettingsButton_icon" />
                 { _t("Pin to sidebar") }
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
index 4f305edd8ba..14e4d5d5632 100644
--- a/src/components/views/spaces/SpaceBasicSettings.tsx
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -19,6 +19,7 @@ import React, { useRef, useState } from "react";
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import Field from "../elements/Field";
+import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
 
 interface IProps {
     avatarUrl?: string;
@@ -89,6 +90,7 @@ export const SpaceAvatar = ({
         <input
             type="file"
             ref={avatarUploadRef}
+            onClick={chromeFileInputFix}
             onChange={(e) => {
                 if (!e.target.files?.length) return;
                 const file = e.target.files[0];
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 32de3144830..745fdc433bc 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -35,9 +35,6 @@ import SdkConfig from "../../../SdkConfig";
 import Modal from "../../../Modal";
 import GenericFeatureFeedbackDialog from "../dialogs/GenericFeatureFeedbackDialog";
 import SettingsStore from "../../../settings/SettingsStore";
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import { Action } from "../../../dispatcher/actions";
-import { UserTab } from "../dialogs/UserSettingsDialog";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
@@ -59,7 +56,7 @@ export const createSpace = async (
                 events_default: 100,
                 invite: isPublic ? 0 : 50,
             },
-            room_alias_name: isPublic && alias ? alias.substr(1, alias.indexOf(":") - 1) : undefined,
+            room_alias_name: isPublic && alias ? alias.substring(1, alias.indexOf(":")) : undefined,
             topic,
             ...createOpts,
         },
@@ -267,22 +264,11 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
     let body;
     if (visibility === null) {
-        const onCreateSpaceFromCommunityClick = () => {
-            defaultDispatcher.dispatch({
-                action: Action.ViewUserSettings,
-                initialTabId: UserTab.Preferences,
-            });
-            onFinished();
-        };
-
         body = <React.Fragment>
             <h2>{ _t("Create a space") }</h2>
             <p>
-                { _t("Spaces are a new way to group rooms and people.") }
-                &nbsp;
-                { _t("What kind of Space do you want to create?") }
-                &nbsp;
-                { _t("You can change this later.") }
+                { _t("Spaces are a new way to group rooms and people. What kind of Space do you want to create? " +
+                  "You can change this later.") }
             </p>
 
             <SpaceCreateMenuType
@@ -299,12 +285,6 @@ const SpaceCreateMenu = ({ onFinished }) => {
             />
 
             <p>
-                { _t("You can also make Spaces from <a>communities</a>.", {}, {
-                    a: sub => <AccessibleButton kind="link" onClick={onCreateSpaceFromCommunityClick}>
-                        { sub }
-                    </AccessibleButton>,
-                }) }
-                <br />
                 { _t("To join a space you'll need an invite.") }
             </p>
 
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index a1dd62e735a..70e1de55cb3 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -205,7 +205,7 @@ const CreateSpaceButton = ({
 }: Pick<IInnerSpacePanelProps, "isPanelCollapsed" | "setPanelCollapsed">) => {
     // We don't need the handle as we position the menu in a constant location
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<void>();
+    const [menuDisplayed, _handle, openMenu, closeMenu] = useContextMenu<void>();
 
     useEffect(() => {
         if (!isPanelCollapsed && menuDisplayed) {
diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
index 4752c0f6db8..b572122da1b 100644
--- a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
+++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
@@ -26,7 +26,7 @@ import SpaceBasicSettings from "./SpaceBasicSettings";
 import { avatarUrlForRoom } from "../../../Avatar";
 import { IDialogProps } from "../dialogs/IDialogProps";
 import { getTopic } from "../elements/RoomTopic";
-import { leaveSpace } from "../../../utils/space";
+import { leaveSpace } from "../../../utils/leave-behaviour";
 
 interface IProps extends IDialogProps {
     matrixClient: MatrixClient;
diff --git a/src/components/views/terms/InlineTermsAgreement.tsx b/src/components/views/terms/InlineTermsAgreement.tsx
index a7ba47aa7c9..2cca51e670a 100644
--- a/src/components/views/terms/InlineTermsAgreement.tsx
+++ b/src/components/views/terms/InlineTermsAgreement.tsx
@@ -19,7 +19,6 @@ import React from "react";
 import { _t, pickBestLanguage } from "../../../languageHandler";
 import { objectClone } from "../../../utils/objects";
 import StyledCheckbox from "../elements/StyledCheckbox";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "../elements/AccessibleButton";
 
 interface IProps {
@@ -40,7 +39,6 @@ interface Policy {
     name: string;
 }
 
-@replaceableComponent("views.terms.InlineTermsAgreement")
 export default class InlineTermsAgreement extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
index 91407a4fa5f..931cb3b3f1e 100644
--- a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
+++ b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
@@ -20,9 +20,7 @@ import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import ServerOfflineDialog from "../dialogs/ServerOfflineDialog";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-@replaceableComponent("views.toasts.NonUrgentEchoFailureToast")
 export default class NonUrgentEchoFailureToast extends React.PureComponent {
     private openDialog = () => {
         Modal.createTrackedDialog('Local Echo Server Error', '', ServerOfflineDialog, {});
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 341be988c4a..b424f439006 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -31,7 +31,6 @@ import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
 import GenericToast from "./GenericToast";
 import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import VerificationRequestDialog from "../dialogs/VerificationRequestDialog";
 import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -47,7 +46,6 @@ interface IState {
     ip?: string;
 }
 
-@replaceableComponent("views.toasts.VerificationRequestToast")
 export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
     private intervalHandle: number;
 
diff --git a/src/components/views/typography/Heading.tsx b/src/components/views/typography/Heading.tsx
index 069ecb54df2..afc6c916c65 100644
--- a/src/components/views/typography/Heading.tsx
+++ b/src/components/views/typography/Heading.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 import React, { HTMLAttributes } from 'react';
 import classNames from 'classnames';
 
-type Size = 'h1' | 'h2' | 'h3';
+type Size = 'h1' | 'h2' | 'h3' | 'h4';
 interface HeadingProps extends HTMLAttributes<HTMLHeadingElement> {
     size: Size;
 }
diff --git a/src/components/views/verification/VerificationCancelled.tsx b/src/components/views/verification/VerificationCancelled.tsx
index 2a08dfaa687..3cc7b9b6202 100644
--- a/src/components/views/verification/VerificationCancelled.tsx
+++ b/src/components/views/verification/VerificationCancelled.tsx
@@ -17,14 +17,12 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialogButtons from "../elements/DialogButtons";
 
 interface IProps {
     onDone: () => void;
 }
 
-@replaceableComponent("views.verification.VerificationCancelled")
 export default class VerificationCancelled extends React.Component<IProps> {
     public render(): React.ReactNode {
         return <div>
diff --git a/src/components/views/verification/VerificationComplete.tsx b/src/components/views/verification/VerificationComplete.tsx
index 88bdd70d226..48419d5ea0a 100644
--- a/src/components/views/verification/VerificationComplete.tsx
+++ b/src/components/views/verification/VerificationComplete.tsx
@@ -17,14 +17,12 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialogButtons from "../elements/DialogButtons";
 
 interface IProps {
     onDone: () => void;
 }
 
-@replaceableComponent("views.verification.VerificationComplete")
 export default class VerificationComplete extends React.Component<IProps> {
     public render(): React.ReactNode {
         return <div>
diff --git a/src/components/views/verification/VerificationShowSas.tsx b/src/components/views/verification/VerificationShowSas.tsx
index 2615a57b4ba..e9c5fcf441e 100644
--- a/src/components/views/verification/VerificationShowSas.tsx
+++ b/src/components/views/verification/VerificationShowSas.tsx
@@ -22,7 +22,6 @@ import { _t, _td } from '../../../languageHandler';
 import { PendingActionSpinner } from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
 import { fixupColorFonts } from '../../../utils/FontManager';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     pending?: boolean;
@@ -44,7 +43,6 @@ function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
 }
 
-@replaceableComponent("views.verification.VerificationShowSas")
 export default class VerificationShowSas extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/voip/AudioFeed.tsx b/src/components/views/voip/AudioFeed.tsx
index 944ea3ad000..64a33a69268 100644
--- a/src/components/views/voip/AudioFeed.tsx
+++ b/src/components/views/voip/AudioFeed.tsx
@@ -93,7 +93,10 @@ export default class AudioFeed extends React.Component<IProps, IState> {
             // load() explicitly, it shouldn't be a problem. - Dave
             await element.load();
         } catch (e) {
-            logger.info("Failed to play media element with feed", this.props.feed, e);
+            logger.info(
+                `Failed to play media element with feed for userId ` +
+                `${this.props.feed.userId} with purpose ${this.props.feed.purpose}`, e,
+            );
         }
     }
 
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 120fed1243d..bdcf7b38ad8 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -30,7 +30,6 @@ import VideoFeed from './VideoFeed';
 import RoomAvatar from "../avatars/RoomAvatar";
 import AccessibleButton from '../elements/AccessibleButton';
 import { avatarUrlForMember } from '../../../Avatar';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DesktopCapturerSourcePicker from "../elements/DesktopCapturerSourcePicker";
 import Modal from '../../../Modal';
 import CallViewSidebar from './CallViewSidebar';
@@ -105,7 +104,6 @@ function exitFullscreen() {
     if (exitMethod) exitMethod.call(document);
 }
 
-@replaceableComponent("views.voip.CallView")
 export default class CallView extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private contentWrapperRef = createRef<HTMLDivElement>();
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
index e02a85a9fb6..1a443876549 100644
--- a/src/components/views/voip/CallViewForRoom.tsx
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import { Resizable } from "re-resizable";
 import CallHandler, { CallHandlerEvent } from '../../../CallHandler';
 import CallView from './CallView';
 import ResizeNotifier from "../../../utils/ResizeNotifier";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // What room we should display the call for
@@ -40,10 +39,7 @@ interface IState {
  * Wrapper for CallView that always display the call in a given room,
  * or nothing if there is no call in that room.
  */
-@replaceableComponent("views.voip.CallViewForRoom")
 export default class CallViewForRoom extends React.Component<IProps, IState> {
-    private dispatcherRef: string;
-
     constructor(props: IProps) {
         super(props);
         this.state = {
diff --git a/src/components/views/voip/DialPad.tsx b/src/components/views/voip/DialPad.tsx
index 4af98a4a35c..5e584f6b70e 100644
--- a/src/components/views/voip/DialPad.tsx
+++ b/src/components/views/voip/DialPad.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import * as React from "react";
 
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { _t } from "../../../languageHandler";
 
 const BUTTONS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'];
@@ -66,7 +65,6 @@ interface IProps {
     onDialPress?: () => void;
 }
 
-@replaceableComponent("views.voip.DialPad")
 export default class Dialpad extends React.PureComponent<IProps> {
     render() {
         const buttonNodes = [];
diff --git a/src/components/views/voip/DialPadModal.tsx b/src/components/views/voip/DialPadModal.tsx
index 6432ccf5e13..321cd4b070c 100644
--- a/src/components/views/voip/DialPadModal.tsx
+++ b/src/components/views/voip/DialPadModal.tsx
@@ -20,7 +20,6 @@ import { createRef } from "react";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 import DialPad from './DialPad';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
 import CallHandler from "../../../CallHandler";
 
@@ -32,7 +31,6 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.voip.DialPadModal")
 export default class DialpadModal extends React.PureComponent<IProps, IState> {
     private numberEntryFieldRef: React.RefObject<Field> = createRef();
 
diff --git a/src/components/views/voip/PictureInPictureDragger.tsx b/src/components/views/voip/PictureInPictureDragger.tsx
index 126f60fdc0f..be32ab2cd9a 100644
--- a/src/components/views/voip/PictureInPictureDragger.tsx
+++ b/src/components/views/voip/PictureInPictureDragger.tsx
@@ -19,7 +19,6 @@ import React, { createRef } from 'react';
 import UIStore from '../../../stores/UIStore';
 import { lerp } from '../../../utils/AnimationUtils';
 import { MarkedExecution } from '../../../utils/MarkedExecution';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
 
 const PIP_VIEW_WIDTH = 336;
 const PIP_VIEW_HEIGHT = 232;
@@ -56,7 +55,6 @@ interface IState {
  * PictureInPictureDragger shows a small version of CallView hovering over the UI in 'picture-in-picture'
  * (PiP mode). It displays the call(s) which is *not* in the room the user is currently viewing.
  */
-@replaceableComponent("views.voip.PictureInPictureDragger")
 export default class PictureInPictureDragger extends React.Component<IProps, IState> {
     private callViewWrapper = createRef<HTMLDivElement>();
     private initX = 0;
diff --git a/src/components/views/voip/PipContainer.tsx b/src/components/views/voip/PipContainer.tsx
index 1d3438aec62..2d74b5d1313 100644
--- a/src/components/views/voip/PipContainer.tsx
+++ b/src/components/views/voip/PipContainer.tsx
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 
 import PipView from './PipView';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
 
@@ -28,7 +27,6 @@ interface IState {
 
 }
 
-@replaceableComponent("views.voip.PiPContainer")
 export default class PiPContainer extends React.PureComponent<IProps, IState> {
     public render() {
         return <div className="mx_PiPContainer">
diff --git a/src/components/views/voip/PipView.tsx b/src/components/views/voip/PipView.tsx
index 1c3c9edc685..db3ef0187dc 100644
--- a/src/components/views/voip/PipView.tsx
+++ b/src/components/views/voip/PipView.tsx
@@ -21,12 +21,11 @@ import { logger } from "matrix-js-sdk/src/logger";
 import classNames from 'classnames';
 
 import CallView from "./CallView";
-import RoomViewStore from '../../../stores/RoomViewStore';
+import { RoomViewStore } from '../../../stores/RoomViewStore';
 import CallHandler, { CallHandlerEvent } from '../../../CallHandler';
 import PersistentApp from "../elements/PersistentApp";
 import SettingsStore from "../../../settings/SettingsStore";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import PictureInPictureDragger from './PictureInPictureDragger';
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from "../../../dispatcher/actions";
@@ -34,7 +33,6 @@ import { WidgetLayoutStore } from '../../../stores/widgets/WidgetLayoutStore';
 import CallViewHeader from './CallView/CallViewHeader';
 import ActiveWidgetStore, { ActiveWidgetStoreEvent } from '../../../stores/ActiveWidgetStore';
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import AppTile from '../elements/AppTile';
 
 const SHOW_CALL_IN_STATES = [
     CallState.Connected,
@@ -60,6 +58,7 @@ interface IState {
 
     // widget candidate to be displayed in the pip view.
     persistentWidgetId: string;
+    persistentRoomId: string;
     showWidgetInPip: boolean;
 
     moving: boolean;
@@ -104,7 +103,6 @@ function getPrimarySecondaryCallsForPip(roomId: string): [MatrixCall, MatrixCall
  * and all widgets that are active but not shown in any other possible container.
  */
 
-@replaceableComponent("views.voip.PipView")
 export default class PipView extends React.Component<IProps, IState> {
     private roomStoreToken: EventSubscription;
     private settingsWatcherRef: string;
@@ -112,7 +110,7 @@ export default class PipView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
-        const roomId = RoomViewStore.getRoomId();
+        const roomId = RoomViewStore.instance.getRoomId();
 
         const [primaryCall, secondaryCalls] = getPrimarySecondaryCallsForPip(roomId);
 
@@ -122,6 +120,7 @@ export default class PipView extends React.Component<IProps, IState> {
             primaryCall: primaryCall,
             secondaryCall: secondaryCalls[0],
             persistentWidgetId: ActiveWidgetStore.instance.getPersistentWidgetId(),
+            persistentRoomId: ActiveWidgetStore.instance.getPersistentRoomId(),
             showWidgetInPip: false,
         };
     }
@@ -129,13 +128,15 @@ export default class PipView extends React.Component<IProps, IState> {
     public componentDidMount() {
         CallHandler.instance.addListener(CallHandlerEvent.CallChangeRoom, this.updateCalls);
         CallHandler.instance.addListener(CallHandlerEvent.CallState, this.updateCalls);
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.roomStoreToken = RoomViewStore.instance.addListener(this.onRoomViewStoreUpdate);
         MatrixClientPeg.get().on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
         const room = MatrixClientPeg.get()?.getRoom(this.state.viewedRoomId);
         if (room) {
             WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(room), this.updateCalls);
         }
-        ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Update, this.onActiveWidgetStoreUpdate);
+        ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Persistence, this.onWidgetPersistence);
+        ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Dock, this.onWidgetDockChanges);
+        ActiveWidgetStore.instance.on(ActiveWidgetStoreEvent.Undock, this.onWidgetDockChanges);
         document.addEventListener("mouseup", this.onEndMoving.bind(this));
     }
 
@@ -149,7 +150,9 @@ export default class PipView extends React.Component<IProps, IState> {
         if (room) {
             WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(room), this.updateCalls);
         }
-        ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Update, this.onActiveWidgetStoreUpdate);
+        ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Persistence, this.onWidgetPersistence);
+        ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Dock, this.onWidgetDockChanges);
+        ActiveWidgetStore.instance.off(ActiveWidgetStoreEvent.Undock, this.onWidgetDockChanges);
         document.removeEventListener("mouseup", this.onEndMoving.bind(this));
     }
 
@@ -162,7 +165,7 @@ export default class PipView extends React.Component<IProps, IState> {
     }
 
     private onRoomViewStoreUpdate = () => {
-        const newRoomId = RoomViewStore.getRoomId();
+        const newRoomId = RoomViewStore.instance.getRoomId();
         const oldRoomId = this.state.viewedRoomId;
         if (newRoomId === oldRoomId) return;
         // The WidgetLayoutStore observer always tracks the currently viewed Room,
@@ -186,8 +189,15 @@ export default class PipView extends React.Component<IProps, IState> {
         this.updateShowWidgetInPip();
     };
 
-    private onActiveWidgetStoreUpdate = (): void => {
-        this.updateShowWidgetInPip(ActiveWidgetStore.instance.getPersistentWidgetId());
+    private onWidgetPersistence = (): void => {
+        this.updateShowWidgetInPip(
+            ActiveWidgetStore.instance.getPersistentWidgetId(),
+            ActiveWidgetStore.instance.getPersistentRoomId(),
+        );
+    };
+
+    private onWidgetDockChanges = (): void => {
+        this.updateShowWidgetInPip();
     };
 
     private updateCalls = (): void => {
@@ -213,39 +223,36 @@ export default class PipView extends React.Component<IProps, IState> {
 
     private onDoubleClick = (): void => {
         const callRoomId = this.state.primaryCall?.roomId;
-        const widgetRoomId = ActiveWidgetStore.instance.getRoomId(this.state.persistentWidgetId);
-        if (!!(callRoomId ?? widgetRoomId)) {
+        if (callRoomId ?? this.state.persistentRoomId) {
             dis.dispatch<ViewRoomPayload>({
                 action: Action.ViewRoom,
-                room_id: callRoomId ?? widgetRoomId,
+                room_id: callRoomId ?? this.state.persistentRoomId,
                 metricsTrigger: "WebFloatingCallWindow",
             });
         }
     };
 
     // Accepts a persistentWidgetId to be able to skip awaiting the setState for persistentWidgetId
-    public updateShowWidgetInPip(persistentWidgetId = this.state.persistentWidgetId) {
+    public updateShowWidgetInPip(
+        persistentWidgetId = this.state.persistentWidgetId,
+        persistentRoomId = this.state.persistentRoomId,
+    ) {
         let fromAnotherRoom = false;
-        let notVisible = false;
-        if (persistentWidgetId) {
-            const persistentWidgetInRoomId = ActiveWidgetStore.instance.getRoomId(persistentWidgetId);
-            const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
-
-            // Sanity check the room - the widget may have been destroyed between render cycles, and
-            // thus no room is associated anymore.
-            if (persistentWidgetInRoom) {
-                notVisible = !AppTile.isLive(persistentWidgetId);
-                fromAnotherRoom = this.state.viewedRoomId !== persistentWidgetInRoomId;
-            }
+        let notDocked = false;
+        // Sanity check the room - the widget may have been destroyed between render cycles, and
+        // thus no room is associated anymore.
+        if (persistentWidgetId && MatrixClientPeg.get().getRoom(persistentRoomId)) {
+            notDocked = !ActiveWidgetStore.instance.isDocked(persistentWidgetId, persistentRoomId);
+            fromAnotherRoom = this.state.viewedRoomId !== persistentRoomId;
         }
 
         // The widget should only be shown as a persistent app (in a floating
         // pip container) if it is not visible on screen: either because we are
         // viewing a different room OR because it is in none of the possible
         // containers of the room view.
-        const showWidgetInPip = fromAnotherRoom || notVisible;
+        const showWidgetInPip = fromAnotherRoom || notDocked;
 
-        this.setState({ showWidgetInPip, persistentWidgetId });
+        this.setState({ showWidgetInPip, persistentWidgetId, persistentRoomId });
     }
 
     public render() {
@@ -269,8 +276,7 @@ export default class PipView extends React.Component<IProps, IState> {
                 mx_CallView_pip: pipMode,
                 mx_CallView_large: !pipMode,
             });
-            const roomId = ActiveWidgetStore.instance.getRoomId(this.state.persistentWidgetId);
-            const roomForWidget = MatrixClientPeg.get().getRoom(roomId);
+            const roomForWidget = MatrixClientPeg.get().getRoom(this.state.persistentRoomId);
 
             pipContent = ({ onStartMoving, _onResize }) =>
                 <div className={pipViewClasses}>
@@ -281,6 +287,7 @@ export default class PipView extends React.Component<IProps, IState> {
                     />
                     <PersistentApp
                         persistentWidgetId={this.state.persistentWidgetId}
+                        persistentRoomId={this.state.persistentRoomId}
                         pointerEvents={this.state.moving ? 'none' : undefined}
                     />
                 </div>;
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index 0c56a2f9c50..ad9874ba202 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -24,7 +24,6 @@ import { SDPStreamMetadataPurpose } from 'matrix-js-sdk/src/webrtc/callEventType
 
 import SettingsStore from "../../../settings/SettingsStore";
 import MemberAvatar from "../avatars/MemberAvatar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     call: MatrixCall;
@@ -50,7 +49,6 @@ interface IState {
     videoMuted: boolean;
 }
 
-@replaceableComponent("views.voip.VideoFeed")
 export default class VideoFeed extends React.PureComponent<IProps, IState> {
     private element: HTMLVideoElement;
 
@@ -140,7 +138,10 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
             // load() explicitly, it shouldn't be a problem. - Dave
             await element.play();
         } catch (e) {
-            logger.info("Failed to play media element with feed", this.props.feed, e);
+            logger.info(
+                `Failed to play media element with feed for userId ` +
+                `${this.props.feed.userId} with purpose ${this.props.feed.purpose}`, e,
+            );
         }
     }
 
@@ -227,7 +228,7 @@ export default class VideoFeed extends React.PureComponent<IProps, IState> {
                 ),
             });
 
-            content= (
+            content = (
                 <video className={videoClasses} ref={this.setElementRef} />
             );
         }
diff --git a/src/components/views/voip/VideoLobby.tsx b/src/components/views/voip/VideoLobby.tsx
new file mode 100644
index 00000000000..862e58fe630
--- /dev/null
+++ b/src/components/views/voip/VideoLobby.tsx
@@ -0,0 +1,240 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { FC, useState, useMemo, useRef, useEffect } from "react";
+import classNames from "classnames";
+import { logger } from "matrix-js-sdk/src/logger";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { _t } from "../../../languageHandler";
+import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
+import { useConnectedMembers } from "../../../utils/VideoChannelUtils";
+import VideoChannelStore from "../../../stores/VideoChannelStore";
+import IconizedContextMenu, {
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList,
+} from "../context_menus/IconizedContextMenu";
+import { aboveLeftOf, ContextMenuButton, useContextMenu } from "../../structures/ContextMenu";
+import { Alignment } from "../elements/Tooltip";
+import AccessibleButton from "../elements/AccessibleButton";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import FacePile from "../elements/FacePile";
+import MemberAvatar from "../avatars/MemberAvatar";
+
+interface IDeviceButtonProps {
+    kind: string;
+    devices: MediaDeviceInfo[];
+    setDevice: (device: MediaDeviceInfo) => void;
+    deviceListLabel: string;
+    active: boolean;
+    disabled: boolean;
+    toggle: () => void;
+    activeTitle: string;
+    inactiveTitle: string;
+}
+
+const DeviceButton: FC<IDeviceButtonProps> = ({
+    kind, devices, setDevice, deviceListLabel, active, disabled, toggle, activeTitle, inactiveTitle,
+}) => {
+    // Depending on permissions, the browser might not let us know device labels,
+    // in which case there's nothing helpful we can display
+    const labelledDevices = useMemo(() => devices.filter(d => d.label.length), [devices]);
+
+    const [menuDisplayed, buttonRef, openMenu, closeMenu] = useContextMenu();
+    let contextMenu;
+    if (menuDisplayed) {
+        const selectDevice = (device: MediaDeviceInfo) => {
+            setDevice(device);
+            closeMenu();
+        };
+
+        const buttonRect = buttonRef.current.getBoundingClientRect();
+        contextMenu = <IconizedContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu}>
+            <IconizedContextMenuOptionList>
+                { labelledDevices.map(d =>
+                    <IconizedContextMenuOption
+                        key={d.deviceId}
+                        label={d.label}
+                        onClick={() => selectDevice(d)}
+                    />,
+                ) }
+            </IconizedContextMenuOptionList>
+        </IconizedContextMenu>;
+    }
+
+    if (!devices.length) return null;
+
+    return <div
+        className={classNames({
+            "mx_VideoLobby_deviceButtonWrapper": true,
+            "mx_VideoLobby_deviceButtonWrapper_active": active,
+        })}
+    >
+        <AccessibleTooltipButton
+            className={`mx_VideoLobby_deviceButton mx_VideoLobby_deviceButton_${kind}`}
+            title={active ? activeTitle : inactiveTitle}
+            alignment={Alignment.Top}
+            onClick={toggle}
+            disabled={disabled}
+        />
+        { labelledDevices.length > 1 ? (
+            <ContextMenuButton
+                className="mx_VideoLobby_deviceListButton"
+                inputRef={buttonRef}
+                onClick={openMenu}
+                isExpanded={menuDisplayed}
+                label={deviceListLabel}
+                disabled={disabled}
+            />
+        ) : null }
+        { contextMenu }
+    </div>;
+};
+
+const MAX_FACES = 8;
+
+const VideoLobby: FC<{ room: Room }> = ({ room }) => {
+    const store = VideoChannelStore.instance;
+    const [connecting, setConnecting] = useState(false);
+    const me = useMemo(() => room.getMember(room.myUserId), [room]);
+    const connectedMembers = useConnectedMembers(room, false);
+    const videoRef = useRef<HTMLVideoElement>();
+
+    const devices = useAsyncMemo(async () => {
+        try {
+            return await navigator.mediaDevices.enumerateDevices();
+        } catch (e) {
+            logger.warn(`Failed to get media device list: ${e}`);
+            return [];
+        }
+    }, [], []);
+    const audioDevices = useMemo(() => devices.filter(d => d.kind === "audioinput"), [devices]);
+    const videoDevices = useMemo(() => devices.filter(d => d.kind === "videoinput"), [devices]);
+
+    const [selectedAudioDevice, selectAudioDevice] = useState<MediaDeviceInfo>(null);
+    const [selectedVideoDevice, selectVideoDevice] = useState<MediaDeviceInfo>(null);
+
+    const audioDevice = selectedAudioDevice ?? audioDevices[0];
+    const videoDevice = selectedVideoDevice ?? videoDevices[0];
+
+    const [audioActive, setAudioActive] = useState(!store.audioMuted);
+    const [videoActive, setVideoActive] = useState(!store.videoMuted);
+    const toggleAudio = () => {
+        store.audioMuted = audioActive;
+        setAudioActive(!audioActive);
+    };
+    const toggleVideo = () => {
+        store.videoMuted = videoActive;
+        setVideoActive(!videoActive);
+    };
+
+    const videoStream = useAsyncMemo(async () => {
+        if (videoDevice && videoActive) {
+            try {
+                return await navigator.mediaDevices.getUserMedia({
+                    video: { deviceId: videoDevice.deviceId },
+                });
+            } catch (e) {
+                logger.error(`Failed to get stream for device ${videoDevice.deviceId}: ${e}`);
+            }
+        }
+        return null;
+    }, [videoDevice, videoActive]);
+
+    useEffect(() => {
+        if (videoStream) {
+            const videoElement = videoRef.current;
+            videoElement.srcObject = videoStream;
+            videoElement.play();
+
+            return () => {
+                videoStream?.getTracks().forEach(track => track.stop());
+                videoElement.srcObject = null;
+            };
+        }
+    }, [videoStream]);
+
+    const connect = async () => {
+        setConnecting(true);
+        try {
+            await store.connect(
+                room.roomId, audioActive ? audioDevice : null, videoActive ? videoDevice : null,
+            );
+        } catch (e) {
+            logger.error(e);
+            setConnecting(false);
+        }
+    };
+
+    let facePile;
+    if (connectedMembers.size) {
+        const shownMembers = [...connectedMembers].slice(0, MAX_FACES);
+        const overflow = connectedMembers.size > shownMembers.length;
+
+        facePile = <div className="mx_VideoLobby_connectedMembers">
+            { _t("%(count)s people connected", { count: connectedMembers.size }) }
+            <FacePile members={shownMembers} faceSize={24} overflow={overflow} />
+        </div>;
+    }
+
+    return <div className="mx_VideoLobby">
+        { facePile }
+        <div className="mx_VideoLobby_preview">
+            <MemberAvatar key={me.userId} member={me} width={200} height={200} resizeMethod="scale" />
+            <video
+                ref={videoRef}
+                style={{ visibility: videoActive ? null : "hidden" }}
+                muted
+                playsInline
+                disablePictureInPicture
+            />
+            <div className="mx_VideoLobby_controls">
+                <DeviceButton
+                    kind="audio"
+                    devices={audioDevices}
+                    setDevice={selectAudioDevice}
+                    deviceListLabel={_t("Audio devices")}
+                    active={audioActive}
+                    disabled={connecting}
+                    toggle={toggleAudio}
+                    activeTitle={_t("Mute microphone")}
+                    inactiveTitle={_t("Unmute microphone")}
+                />
+                <DeviceButton
+                    kind="video"
+                    devices={videoDevices}
+                    setDevice={selectVideoDevice}
+                    deviceListLabel={_t("Video devices")}
+                    active={videoActive}
+                    disabled={connecting}
+                    toggle={toggleVideo}
+                    activeTitle={_t("Turn off camera")}
+                    inactiveTitle={_t("Turn on camera")}
+                />
+            </div>
+        </div>
+        <AccessibleButton
+            className="mx_VideoLobby_joinButton"
+            kind="primary"
+            disabled={connecting}
+            onClick={connect}
+        >
+            { _t("Connect now") }
+        </AccessibleButton>
+    </div>;
+};
+
+export default VideoLobby;
diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index 0c8f20686c7..9c44553a983 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -47,19 +47,21 @@ const RoomContext = createContext<IRoomState>({
     statusBarVisible: false,
     canReact: false,
     canSendMessages: false,
+    resizing: false,
     layout: Layout.Group,
     lowBandwidth: false,
     alwaysShowTimestamps: false,
     showTwelveHourTimestamps: false,
     readMarkerInViewThresholdMs: 3000,
     readMarkerOutOfViewThresholdMs: 30000,
-    showHiddenEventsInTimeline: false,
+    showHiddenEvents: false,
     showReadReceipts: true,
     showRedactions: true,
     showJoinLeaves: true,
     showAvatarChanges: true,
     showDisplaynameChanges: true,
     matrixClientIsReady: false,
+    showUrlPreview: false,
     timelineRenderingType: TimelineRenderingType.Room,
     threadId: undefined,
     liveTimeline: undefined,
diff --git a/src/createRoom.ts b/src/createRoom.ts
index 2677075652d..66177d812b1 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -17,7 +17,6 @@ limitations under the License.
 
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { EventType, RoomCreateTypeField, RoomType } from "matrix-js-sdk/src/@types/event";
 import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests";
 import {
@@ -28,25 +27,24 @@ import {
     Visibility,
 } from "matrix-js-sdk/src/@types/partials";
 import { logger } from "matrix-js-sdk/src/logger";
-import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
-import DMRoomMap from "./utils/DMRoomMap";
 import { getAddressType } from "./UserAddress";
-import { getE2EEWellKnown } from "./utils/WellKnownUtils";
-import GroupStore from "./stores/GroupStore";
-import { isJoinedOrNearlyJoined } from "./utils/membership";
-import { VIRTUAL_ROOM_EVENT_TYPE } from "./CallHandler";
+import { VIRTUAL_ROOM_EVENT_TYPE } from "./call-types";
 import SpaceStore from "./stores/spaces/SpaceStore";
 import { makeSpaceParentEvent } from "./utils/space";
+import { VIDEO_CHANNEL_MEMBER, addVideoChannel } from "./utils/VideoChannelUtils";
 import { Action } from "./dispatcher/actions";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
 import Spinner from "./components/views/elements/Spinner";
 import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
+import { findDMForUser } from "./utils/direct-messages";
+import { privateShouldBeEncrypted } from "./utils/rooms";
+import { waitForMember } from "./utils/membership";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
@@ -59,7 +57,6 @@ export interface IOpts {
     encryption?: boolean;
     inlineErrors?: boolean;
     andView?: boolean;
-    associatedWithCommunity?: string;
     avatar?: File | string; // will upload if given file, else mxcUrl is needed
     roomType?: RoomType | string;
     historyVisibility?: HistoryVisibility;
@@ -128,6 +125,31 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
             ...createOpts.creation_content,
             [RoomCreateTypeField]: opts.roomType,
         };
+
+        // Video rooms require custom power levels
+        if (opts.roomType === RoomType.ElementVideo) {
+            createOpts.power_level_content_override = {
+                events: {
+                    // Allow all users to send video member updates
+                    [VIDEO_CHANNEL_MEMBER]: 0,
+                    // Make widgets immutable, even to admins
+                    "im.vector.modular.widgets": 200,
+                    // Annoyingly, we have to reiterate all the defaults here
+                    [EventType.RoomName]: 50,
+                    [EventType.RoomAvatar]: 50,
+                    [EventType.RoomPowerLevels]: 100,
+                    [EventType.RoomHistoryVisibility]: 100,
+                    [EventType.RoomCanonicalAlias]: 50,
+                    [EventType.RoomTombstone]: 100,
+                    [EventType.RoomServerAcl]: 100,
+                    [EventType.RoomEncryption]: 100,
+                },
+                users: {
+                    // Temporarily give ourselves the power to set up a widget
+                    [client.getUserId()]: 200,
+                },
+            };
+        }
     }
 
     // By default, view the room after creating it
@@ -244,8 +266,15 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
         if (opts.parentSpace) {
             return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], opts.suggested);
         }
-        if (opts.associatedWithCommunity) {
-            return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);
+    }).then(async () => {
+        if (opts.roomType === RoomType.ElementVideo) {
+            // Set up video rooms with a Jitsi widget
+            await addVideoChannel(roomId, createOpts.name);
+
+            // Reset our power level back to admin so that the widget becomes immutable
+            const room = client.getRoom(roomId);
+            const plEvent = room?.currentState.getStateEvents(EventType.RoomPowerLevels, "");
+            await client.setPowerLevel(roomId, client.getUserId(), 100, plEvent);
         }
     }).then(function() {
         // NB createRoom doesn't block on the client seeing the echo that the
@@ -294,55 +323,6 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
     });
 }
 
-export function findDMForUser(client: MatrixClient, userId: string): Room {
-    const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
-    const rooms = roomIds.map(id => client.getRoom(id));
-    const suitableDMRooms = rooms.filter(r => {
-        // Validate that we are joined and the other person is also joined. We'll also make sure
-        // that the room also looks like a DM (until we have canonical DMs to tell us). For now,
-        // a DM is a room of two people that contains those two people exactly. This does mean
-        // that bots, assistants, etc will ruin a room's DM-ness, though this is a problem for
-        // canonical DMs to solve.
-        if (r && r.getMyMembership() === "join") {
-            const members = r.currentState.getMembers();
-            const joinedMembers = members.filter(m => isJoinedOrNearlyJoined(m.membership));
-            const otherMember = joinedMembers.find(m => m.userId === userId);
-            return otherMember && joinedMembers.length === 2;
-        }
-        return false;
-    }).sort((r1, r2) => {
-        return r2.getLastActiveTimestamp() -
-            r1.getLastActiveTimestamp();
-    });
-    if (suitableDMRooms.length) {
-        return suitableDMRooms[0];
-    }
-}
-
-/*
- * Try to ensure the user is already in the megolm session before continuing
- * NOTE: this assumes you've just created the room and there's not been an opportunity
- * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
- */
-export async function waitForMember(client: MatrixClient, roomId: string, userId: string, opts = { timeout: 1500 }) {
-    const { timeout } = opts;
-    let handler;
-    return new Promise((resolve) => {
-        handler = function(_, __, member: RoomMember) { // eslint-disable-line @typescript-eslint/naming-convention
-            if (member.userId !== userId) return;
-            if (member.roomId !== roomId) return;
-            resolve(true);
-        };
-        client.on(RoomStateEvent.NewMember, handler);
-
-        /* We don't want to hang if this goes wrong, so we proceed and hope the other
-           user is already in the megolm session */
-        setTimeout(resolve, timeout, false);
-    }).finally(() => {
-        client.removeListener(RoomStateEvent.NewMember, handler);
-    });
-}
-
 /*
  * Ensure that for every user in a room, there is at least one device that we
  * can encrypt to.
@@ -405,12 +385,3 @@ export async function ensureDMExists(client: MatrixClient, userId: string): Prom
     }
     return roomId;
 }
-
-export function privateShouldBeEncrypted(): boolean {
-    const e2eeWellKnown = getE2EEWellKnown();
-    if (e2eeWellKnown) {
-        const defaultDisabled = e2eeWellKnown["default"] === false;
-        return !defaultDisabled;
-    }
-    return true;
-}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 80e01bfaaf8..3fdbccb71b9 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -176,6 +176,16 @@ export enum Action {
      */
     JoinRoomError = "join_room_error",
 
+    /**
+     * Fired when starting to bulk redact messages from a user in a room.
+     */
+    BulkRedactStart = "bulk_redact_start",
+
+    /**
+     * Fired when done bulk redacting messages from a user in a room.
+     */
+    BulkRedactEnd = "bulk_redact_end",
+
     /**
      * Inserts content into the active composer. Should be used with ComposerInsertPayload.
      */
@@ -249,4 +259,57 @@ export enum Action {
      * Fired when clicking user name from group view
      */
     ViewStartChatOrReuse = "view_start_chat_or_reuse",
+
+    /**
+     * Fired when the user's active room changed, possibly from/to a non-room view.
+     * Payload: ActiveRoomChangedPayload
+     */
+    ActiveRoomChanged = "active_room_changed",
+
+    /**
+     * Fired when the forward dialog needs to be opened.
+     * Payload: OpenForwardDialogPayload
+     */
+    OpenForwardDialog = "open_forward_dialog",
+
+    /**
+     * Fired when the "report event" dialog needs to be opened.
+     * Payload: OpenReportEventDialogPayload.
+     */
+    OpenReportEventDialog = "open_report_event_dialog",
+
+    /**
+     * Fired when the tabbed integration manager dialog needs to be opened.
+     * Payload: OpenTabbedIntegrationManagerDialogPayload
+     */
+    OpenTabbedIntegrationManagerDialog = "open_tabbed_imanager_dialog",
+
+    /**
+     * Fired when something within the application has determined that a logout,
+     * or logout-like behaviour, needs to happen. Specifically meant to target
+     * storage deletion rather than calling the logout API.
+     *
+     * No payload.
+     */
+    TriggerLogout = "trigger_logout",
+
+    /**
+     * Opens the user's preferences for the given space. Used with a OpenSpacePreferencesPayload.
+     */
+    OpenSpacePreferences = "open_space_preferences",
+
+    /**
+     * Opens the settings for the given space. Used with a OpenSpaceSettingsPayload.
+     */
+    OpenSpaceSettings = "open_space_settings",
+
+    /**
+     * Opens the invite dialog. Used with a OpenInviteDialogPayload.
+     */
+    OpenInviteDialog = "open_invite_dialog",
+
+    /**
+     * Opens a dialog to add an existing object to a space. Used with a OpenAddExistingToSpaceDialogPayload.
+     */
+    OpenAddToExistingSpaceDialog = "open_add_to_existing_space_dialog",
 }
diff --git a/src/dispatcher/dispatch-actions/threads.ts b/src/dispatcher/dispatch-actions/threads.ts
index 0b2c202848c..db01d0b5af2 100644
--- a/src/dispatcher/dispatch-actions/threads.ts
+++ b/src/dispatcher/dispatch-actions/threads.ts
@@ -13,15 +13,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 import RightPanelStore from "../../stores/right-panel/RightPanelStore";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
+import dis from "../dispatcher";
+import { Action } from "../actions";
+import { TimelineRenderingType } from "../../contexts/RoomContext";
 
 export const showThread = (props: {
     rootEvent: MatrixEvent;
     initialEvent?: MatrixEvent;
     highlighted?: boolean;
+    scroll_into_view?: boolean;
     push?: boolean;
 }) => {
     const push = props.push ?? false;
@@ -31,6 +36,7 @@ export const showThread = (props: {
             threadHeadEvent: props.rootEvent,
             initialEvent: props.initialEvent,
             isInitialEventHighlighted: props.highlighted,
+            initialEventScrollIntoView: props.scroll_into_view,
         },
     };
     if (push) {
@@ -41,6 +47,12 @@ export const showThread = (props: {
             threadViewCard,
         ]);
     }
+
+    // Focus the composer
+    dis.dispatch({
+        action: Action.FocusSendMessageComposer,
+        context: TimelineRenderingType.Thread,
+    });
 };
 
 export const showThreadPanel = () => {
diff --git a/res/css/views/groups/_GroupPublicityToggle.scss b/src/dispatcher/payloads/ActiveRoomChangedPayload.ts
similarity index 60%
rename from res/css/views/groups/_GroupPublicityToggle.scss
rename to src/dispatcher/payloads/ActiveRoomChangedPayload.ts
index b8be2711ca2..3768cca5e4f 100644
--- a/res/css/views/groups/_GroupPublicityToggle.scss
+++ b/src/dispatcher/payloads/ActiveRoomChangedPayload.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,20 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GroupPublicity_toggle {
-    display: flex;
-    align-items: center;
-    margin: 8px;
-}
+import { Optional } from "matrix-events-sdk";
 
-.mx_GroupPublicity_toggle .mx_GroupTile {
-    display: flex;
-    align-items: flex-start;
-    cursor: pointer;
-    box-sizing: border-box;
-    width: 100%;
-}
+import { Action } from "../actions";
+import { ActionPayload } from "../payloads";
+
+export interface ActiveRoomChangedPayload extends ActionPayload {
+    action: Action.ActiveRoomChanged;
 
-.mx_GroupPublicity_toggle .mx_ToggleSwitch {
-    float: right;
+    oldRoomId: Optional<string>;
+    newRoomId: Optional<string>;
 }
diff --git a/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts b/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts
new file mode 100644
index 00000000000..383677e147d
--- /dev/null
+++ b/src/dispatcher/payloads/OpenAddExistingToSpaceDialogPayload.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenAddExistingToSpaceDialogPayload extends ActionPayload {
+    action: Action.OpenAddToExistingSpaceDialog;
+
+    space: Room;
+}
diff --git a/src/dispatcher/payloads/OpenForwardDialogPayload.ts b/src/dispatcher/payloads/OpenForwardDialogPayload.ts
new file mode 100644
index 00000000000..4a5a9b1c849
--- /dev/null
+++ b/src/dispatcher/payloads/OpenForwardDialogPayload.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Optional } from "matrix-events-sdk";
+
+import { Action } from "../actions";
+import { ActionPayload } from "../payloads";
+import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
+
+export interface OpenForwardDialogPayload extends ActionPayload {
+    action: Action.OpenForwardDialog;
+
+    event: MatrixEvent;
+    permalinkCreator: Optional<RoomPermalinkCreator>;
+}
diff --git a/src/dispatcher/payloads/OpenInviteDialogPayload.ts b/src/dispatcher/payloads/OpenInviteDialogPayload.ts
new file mode 100644
index 00000000000..286781a45a3
--- /dev/null
+++ b/src/dispatcher/payloads/OpenInviteDialogPayload.ts
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Optional } from "matrix-events-sdk";
+import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import {
+    AnyInviteKind,
+} from "../../components/views/dialogs/InviteDialogTypes";
+
+export interface OpenInviteDialogPayload extends ActionPayload {
+    action: Action.OpenInviteDialog;
+
+    kind: AnyInviteKind;
+    onFinishedCallback: Optional<(results: boolean[]) => void>;
+
+    call?: MatrixCall;
+    roomId?: string;
+
+    analyticsName: string;
+    className: string;
+}
diff --git a/src/dispatcher/payloads/OpenReportEventDialogPayload.ts b/src/dispatcher/payloads/OpenReportEventDialogPayload.ts
new file mode 100644
index 00000000000..1af103871d1
--- /dev/null
+++ b/src/dispatcher/payloads/OpenReportEventDialogPayload.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { Action } from "../actions";
+import { ActionPayload } from "../payloads";
+
+export interface OpenReportEventDialogPayload extends ActionPayload {
+    action: Action.OpenReportEventDialog;
+
+    event: MatrixEvent;
+}
diff --git a/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts b/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts
new file mode 100644
index 00000000000..36b340441bc
--- /dev/null
+++ b/src/dispatcher/payloads/OpenSpacePreferencesPayload.ts
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export enum SpacePreferenceTab {
+    Appearance = "SPACE_PREFERENCE_APPEARANCE_TAB",
+}
+
+export interface OpenSpacePreferencesPayload extends ActionPayload {
+    action: Action.OpenSpacePreferences;
+
+    /**
+     * The space to open preferences for.
+     */
+    space: Room;
+
+    /**
+     * Optional tab to open specifically, otherwise the dialog's internal default.
+     */
+    initialTabId?: SpacePreferenceTab;
+}
diff --git a/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts b/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts
new file mode 100644
index 00000000000..e366b6a08e1
--- /dev/null
+++ b/src/dispatcher/payloads/OpenSpaceSettingsPayload.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenSpaceSettingsPayload extends ActionPayload {
+    action: Action.OpenSpaceSettings;
+
+    /**
+     * The space to open settings for.
+     */
+    space: Room;
+}
diff --git a/src/dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload.ts b/src/dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload.ts
new file mode 100644
index 00000000000..891d1261694
--- /dev/null
+++ b/src/dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+import { Optional } from "matrix-events-sdk";
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenTabbedIntegrationManagerDialogPayload extends ActionPayload {
+    action: Action.OpenTabbedIntegrationManagerDialog;
+
+    room: Optional<Room>;
+    screen: Optional<string>;
+    integrationId: Optional<string>;
+}
diff --git a/src/dispatcher/payloads/ViewRoomPayload.ts b/src/dispatcher/payloads/ViewRoomPayload.ts
index d85c07e6667..376fce2d58d 100644
--- a/src/dispatcher/payloads/ViewRoomPayload.ts
+++ b/src/dispatcher/payloads/ViewRoomPayload.ts
@@ -32,6 +32,7 @@ export interface ViewRoomPayload extends Pick<ActionPayload, "action"> {
 
     event_id?: string; // the event to ensure is in view if any
     highlighted?: boolean; // whether to highlight `event_id`
+    scroll_into_view?: boolean; // whether to scroll `event_id` into view
     should_peek?: boolean; // whether we should peek the room if we are not yet joined
     joining?: boolean; // whether we have already sent a join request for this room
     via_servers?: string[]; // the list of servers to join via if no room_alias is provided
diff --git a/src/editor/caret.ts b/src/editor/caret.ts
index b2b7846880f..a4e4258ad6f 100644
--- a/src/editor/caret.ts
+++ b/src/editor/caret.ts
@@ -43,6 +43,8 @@ function setDocumentRangeSelection(editor: HTMLDivElement, model: EditorModel, r
 }
 
 export function setCaretPosition(editor: HTMLDivElement, model: EditorModel, caretPosition: IPosition) {
+    if (model.isEmpty) return; // selection can't possibly be wrong, so avoid a reflow
+
     const range = document.createRange();
     const { node, offset } = getNodeAndOffsetForPosition(editor, model, caretPosition);
     range.setStart(node, offset);
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index f016a1f61c5..c6c9fc35200 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -16,191 +16,113 @@ limitations under the License.
 */
 
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MsgType } from "matrix-js-sdk/src/@types/event";
 
-import { walkDOMDepthFirst } from "./dom";
 import { checkBlockNode } from "../HtmlUtils";
 import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks";
 import { Part, PartCreator, Type } from "./parts";
 import SdkConfig from "../SdkConfig";
 import { textToHtmlRainbow } from "../utils/colour";
+import { stripPlainReply } from "../utils/Reply";
 
-function parseAtRoomMentions(text: string, partCreator: PartCreator): Part[] {
+const LIST_TYPES = ["UL", "OL", "LI"];
+
+// Escapes all markup in the given text
+function escape(text: string): string {
+    return text.replace(/[\\*_[\]`<]|^>/g, match => `\\${match}`);
+}
+
+// Finds the length of the longest backtick sequence in the given text, used for
+// escaping backticks in code blocks
+export function longestBacktickSequence(text: string): number {
+    let length = 0;
+    let currentLength = 0;
+
+    for (const c of text) {
+        if (c === "`") {
+            currentLength++;
+        } else {
+            length = Math.max(length, currentLength);
+            currentLength = 0;
+        }
+    }
+
+    return Math.max(length, currentLength);
+}
+
+function isListChild(n: Node): boolean {
+    return LIST_TYPES.includes(n.parentNode?.nodeName);
+}
+
+function parseAtRoomMentions(text: string, pc: PartCreator, opts: IParseOptions): Part[] {
     const ATROOM = "@room";
     const parts: Part[] = [];
     text.split(ATROOM).forEach((textPart, i, arr) => {
         if (textPart.length) {
-            parts.push(...partCreator.plainWithEmoji(textPart));
+            parts.push(...pc.plainWithEmoji(opts.shouldEscape ? escape(textPart) : textPart));
         }
         // it's safe to never append @room after the last textPart
         // as split will report an empty string at the end if
         // `text` ended in @room.
         const isLast = i === arr.length - 1;
         if (!isLast) {
-            parts.push(partCreator.atRoomPill(ATROOM));
+            parts.push(pc.atRoomPill(ATROOM));
         }
     });
     return parts;
 }
 
-function parseLink(a: HTMLAnchorElement, partCreator: PartCreator): Part[] {
-    const { href } = a;
+function parseLink(n: Node, pc: PartCreator, opts: IParseOptions): Part[] {
+    const { href } = n as HTMLAnchorElement;
     const resourceId = getPrimaryPermalinkEntity(href); // The room/user ID
-    const prefix = resourceId ? resourceId[0] : undefined; // First character of ID
-    switch (prefix) {
-        case "@":
-            return [partCreator.userPill(a.textContent, resourceId)];
-        case "#":
-            return [partCreator.roomPill(resourceId)];
-        default: {
-            if (href === a.textContent) {
-                return partCreator.plainWithEmoji(a.textContent);
-            } else {
-                return partCreator.plainWithEmoji(`[${a.textContent.replace(/[[\\\]]/g, c => "\\" + c)}](${href})`);
-            }
-        }
+
+    switch (resourceId?.[0]) {
+        case "@": return [pc.userPill(n.textContent, resourceId)];
+        case "#": return [pc.roomPill(resourceId)];
+    }
+
+    const children = Array.from(n.childNodes);
+    if (href === n.textContent && children.every(c => c.nodeType === Node.TEXT_NODE)) {
+        return parseAtRoomMentions(n.textContent, pc, opts);
+    } else {
+        return [pc.plain("["), ...parseChildren(n, pc, opts), pc.plain(`](${href})`)];
     }
 }
 
-function parseImage(img: HTMLImageElement, partCreator: PartCreator): Part[] {
-    const { src } = img;
-    return partCreator.plainWithEmoji(`![${img.alt.replace(/[[\\\]]/g, c => "\\" + c)}](${src})`);
+function parseImage(n: Node, pc: PartCreator, opts: IParseOptions): Part[] {
+    const { alt, src } = n as HTMLImageElement;
+    return pc.plainWithEmoji(`![${escape(alt)}](${src})`);
 }
 
-function parseCodeBlock(n: HTMLElement, partCreator: PartCreator): Part[] {
-    const parts: Part[] = [];
+function parseCodeBlock(n: Node, pc: PartCreator, opts: IParseOptions): Part[] {
     let language = "";
-    if (n.firstChild && n.firstChild.nodeName === "CODE") {
-        for (const className of (<HTMLElement>n.firstChild).classList) {
+    if (n.firstChild?.nodeName === "CODE") {
+        for (const className of (n.firstChild as HTMLElement).classList) {
             if (className.startsWith("language-") && !className.startsWith("language-_")) {
-                language = className.substr("language-".length);
+                language = className.slice("language-".length);
                 break;
             }
         }
     }
-    const preLines = ("```" + language + "\n" + n.textContent + "```").split("\n");
-    preLines.forEach((l, i) => {
-        parts.push(...partCreator.plainWithEmoji(l));
-        if (i < preLines.length - 1) {
-            parts.push(partCreator.newline());
-        }
-    });
-    return parts;
-}
 
-function parseHeader(el: HTMLElement, partCreator: PartCreator): Part {
-    const depth = parseInt(el.nodeName.substr(1), 10);
-    return partCreator.plain("#".repeat(depth) + " ");
-}
+    const text = n.textContent.replace(/\n$/, "");
+    // Escape backticks by using even more backticks for the fence if necessary
+    const fence = "`".repeat(Math.max(3, longestBacktickSequence(text) + 1));
+    const parts: Part[] = [...pc.plainWithEmoji(fence + language), pc.newline()];
 
-interface IState {
-    listIndex: number[];
-    listDepth?: number;
-}
+    text.split("\n").forEach(line => {
+        parts.push(...pc.plainWithEmoji(line));
+        parts.push(pc.newline());
+    });
 
-function parseElement(
-    n: HTMLElement,
-    partCreator: PartCreator,
-    lastNode: Node | undefined,
-    state: IState,
-): Part | Part[] {
-    switch (n.nodeName) {
-        case "H1":
-        case "H2":
-        case "H3":
-        case "H4":
-        case "H5":
-        case "H6":
-            return parseHeader(n, partCreator);
-        case "A":
-            return parseLink(<HTMLAnchorElement>n, partCreator);
-        case "IMG":
-            return parseImage(<HTMLImageElement>n, partCreator);
-        case "BR":
-            return partCreator.newline();
-        case "HR":
-            // the newline arrangement here is quite specific otherwise it may be misconstrued as marking the previous
-            // text line as a header instead of acting as a horizontal rule.
-            return [
-                partCreator.newline(),
-                partCreator.plain("---"),
-                partCreator.newline(),
-            ];
-        case "EM":
-            return partCreator.plainWithEmoji(`_${n.textContent}_`);
-        case "STRONG":
-            return partCreator.plainWithEmoji(`**${n.textContent}**`);
-        case "PRE":
-            return parseCodeBlock(n, partCreator);
-        case "CODE":
-            return partCreator.plainWithEmoji(`\`${n.textContent}\``);
-        case "DEL":
-            return partCreator.plainWithEmoji(`<del>${n.textContent}</del>`);
-        case "SUB":
-            return partCreator.plainWithEmoji(`<sub>${n.textContent}</sub>`);
-        case "SUP":
-            return partCreator.plainWithEmoji(`<sup>${n.textContent}</sup>`);
-        case "U":
-            return partCreator.plainWithEmoji(`<u>${n.textContent}</u>`);
-        case "LI": {
-            const BASE_INDENT = 4;
-            const depth = state.listDepth - 1;
-            const indent = " ".repeat(BASE_INDENT * depth);
-            if (n.parentElement.nodeName === "OL") {
-                // The markdown parser doesn't do nested indexed lists at all, but this supports it anyway.
-                const index = state.listIndex[state.listIndex.length - 1];
-                state.listIndex[state.listIndex.length - 1] += 1;
-                return partCreator.plain(`${indent}${index}. `);
-            } else {
-                return partCreator.plain(`${indent}- `);
-            }
-        }
-        case "P": {
-            if (lastNode) {
-                return partCreator.newline();
-            }
-            break;
-        }
-        case "DIV":
-        case "SPAN": {
-            // math nodes are translated back into delimited latex strings
-            if (n.hasAttribute("data-mx-maths")) {
-                const delimLeft = (n.nodeName == "SPAN") ?
-                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['left'] || "\\(" :
-                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['left'] || "\\[";
-                const delimRight = (n.nodeName == "SPAN") ?
-                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['right'] || "\\)" :
-                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['right'] || "\\]";
-                const tex = n.getAttribute("data-mx-maths");
-                return partCreator.plainWithEmoji(delimLeft + tex + delimRight);
-            } else if (!checkDescendInto(n)) {
-                return partCreator.plainWithEmoji(n.textContent);
-            }
-            break;
-        }
-        case "OL":
-            state.listIndex.push((<HTMLOListElement>n).start || 1);
-            /* falls through */
-        case "UL":
-            state.listDepth = (state.listDepth || 0) + 1;
-            /* falls through */
-        default:
-            // don't textify block nodes we'll descend into
-            if (!checkDescendInto(n)) {
-                return partCreator.plainWithEmoji(n.textContent);
-            }
-    }
+    parts.push(pc.plain(fence));
+    return parts;
 }
 
-function checkDescendInto(node) {
-    switch (node.nodeName) {
-        case "PRE":
-            // a code block is textified in parseCodeBlock
-            // as we don't want to preserve markup in it,
-            // so no need to descend into it
-            return false;
-        default:
-            return checkBlockNode(node);
-    }
+function parseHeader(n: Node, pc: PartCreator, opts: IParseOptions): Part[] {
+    const depth = parseInt(n.nodeName.slice(1), 10);
+    const prefix = pc.plain("#".repeat(depth) + " ");
+    return [prefix, ...parseChildren(n, pc, opts)];
 }
 
 function checkIgnored(n) {
@@ -214,144 +136,182 @@ function checkIgnored(n) {
     return true;
 }
 
-const QUOTE_LINE_PREFIX = "> ";
-function prefixQuoteLines(isFirstNode, parts, partCreator) {
-    // a newline (to append a > to) wouldn't be added to parts for the first line
-    // if there was no content before the BLOCKQUOTE, so handle that
-    if (isFirstNode) {
-        parts.splice(0, 0, partCreator.plain(QUOTE_LINE_PREFIX));
-    }
-    for (let i = 0; i < parts.length; i += 1) {
+function prefixLines(parts: Part[], prefix: string, pc: PartCreator) {
+    parts.unshift(pc.plain(prefix));
+    for (let i = 0; i < parts.length; i++) {
         if (parts[i].type === Type.Newline) {
-            parts.splice(i + 1, 0, partCreator.plain(QUOTE_LINE_PREFIX));
+            parts.splice(i + 1, 0, pc.plain(prefix));
             i += 1;
         }
     }
 }
 
-function parseHtmlMessage(html: string, partCreator: PartCreator, isQuotedMessage: boolean): Part[] {
-    // no nodes from parsing here should be inserted in the document,
-    // as scripts in event handlers, etc would be executed then.
-    // we're only taking text, so that is fine
-    const rootNode = new DOMParser().parseFromString(html, "text/html").body;
-    const parts: Part[] = [];
-    let lastNode: Node;
-    let inQuote = isQuotedMessage;
-    const state: IState = {
-        listIndex: [],
-    };
-
-    function onNodeEnter(n: Node) {
-        if (checkIgnored(n)) {
-            return false;
-        }
-        if (n.nodeName === "BLOCKQUOTE") {
-            inQuote = true;
-        }
-
-        const newParts: Part[] = [];
-        if (lastNode && (checkBlockNode(lastNode) || checkBlockNode(n))) {
-            newParts.push(partCreator.newline());
-        }
-
-        if (n.nodeType === Node.TEXT_NODE) {
-            let { nodeValue } = n;
-
-            // Sometimes commonmark adds a newline at the end of the list item text
-            if (n.parentNode.nodeName === "LI") {
-                nodeValue = nodeValue.trimEnd();
+function parseChildren(n: Node, pc: PartCreator, opts: IParseOptions, mkListItem?: (li: Node) => Part[]): Part[] {
+    let prev;
+    return Array.from(n.childNodes).flatMap(c => {
+        const parsed = parseNode(c, pc, opts, mkListItem);
+        if (parsed.length && prev && (checkBlockNode(prev) || checkBlockNode(c))) {
+            if (isListChild(c)) {
+                // Use tighter spacing within lists
+                parsed.unshift(pc.newline());
+            } else {
+                parsed.unshift(pc.newline(), pc.newline());
             }
-            newParts.push(...parseAtRoomMentions(nodeValue, partCreator));
+        }
+        if (parsed.length) prev = c;
+        return parsed;
+    });
+}
 
-            const grandParent = n.parentNode.parentNode;
-            const isTight = n.parentNode.nodeName !== "P" || grandParent?.nodeName !== "LI";
-            if (!isTight) {
-                newParts.push(partCreator.newline());
-            }
-        } else if (n.nodeType === Node.ELEMENT_NODE) {
-            const parseResult = parseElement(n as HTMLElement, partCreator, lastNode, state);
-            if (parseResult) {
-                if (Array.isArray(parseResult)) {
-                    newParts.push(...parseResult);
-                } else {
-                    newParts.push(parseResult);
+function parseNode(n: Node, pc: PartCreator, opts: IParseOptions, mkListItem?: (li: Node) => Part[]): Part[] {
+    if (checkIgnored(n)) return [];
+
+    switch (n.nodeType) {
+        case Node.TEXT_NODE:
+            return parseAtRoomMentions(n.nodeValue, pc, opts);
+        case Node.ELEMENT_NODE:
+            switch (n.nodeName) {
+                case "H1":
+                case "H2":
+                case "H3":
+                case "H4":
+                case "H5":
+                case "H6":
+                    return parseHeader(n, pc, opts);
+                case "A":
+                    return parseLink(n, pc, opts);
+                case "IMG":
+                    return parseImage(n, pc, opts);
+                case "BR":
+                    return [pc.newline()];
+                case "HR":
+                    return [pc.plain("---")];
+                case "EM":
+                    return [pc.plain("_"), ...parseChildren(n, pc, opts), pc.plain("_")];
+                case "STRONG":
+                    return [pc.plain("**"), ...parseChildren(n, pc, opts), pc.plain("**")];
+                case "DEL":
+                    return [pc.plain("<del>"), ...parseChildren(n, pc, opts), pc.plain("</del>")];
+                case "SUB":
+                    return [pc.plain("<sub>"), ...parseChildren(n, pc, opts), pc.plain("</sub>")];
+                case "SUP":
+                    return [pc.plain("<sup>"), ...parseChildren(n, pc, opts), pc.plain("</sup>")];
+                case "U":
+                    return [pc.plain("<u>"), ...parseChildren(n, pc, opts), pc.plain("</u>")];
+                case "PRE":
+                    return parseCodeBlock(n, pc, opts);
+                case "CODE": {
+                    // Escape backticks by using multiple backticks for the fence if necessary
+                    const fence = "`".repeat(longestBacktickSequence(n.textContent) + 1);
+                    return pc.plainWithEmoji(`${fence}${n.textContent}${fence}`);
+                }
+                case "BLOCKQUOTE": {
+                    const parts = parseChildren(n, pc, opts);
+                    prefixLines(parts, "> ", pc);
+                    return parts;
+                }
+                case "LI":
+                    return mkListItem?.(n) ?? parseChildren(n, pc, opts);
+                case "UL": {
+                    const parts = parseChildren(n, pc, opts, li => [pc.plain("- "), ...parseChildren(li, pc, opts)]);
+                    if (isListChild(n)) {
+                        prefixLines(parts, "    ", pc);
+                    }
+                    return parts;
                 }
+                case "OL": {
+                    let counter = (n as HTMLOListElement).start ?? 1;
+                    const parts = parseChildren(n, pc, opts, li => {
+                        const parts = [pc.plain(`${counter}. `), ...parseChildren(li, pc, opts)];
+                        counter++;
+                        return parts;
+                    });
+                    if (isListChild(n)) {
+                        prefixLines(parts, "    ", pc);
+                    }
+                    return parts;
+                }
+                case "DIV":
+                case "SPAN":
+                    // Math nodes are translated back into delimited latex strings
+                    if ((n as Element).hasAttribute("data-mx-maths")) {
+                        const delims = SdkConfig.get().latex_maths_delims;
+                        const delimLeft = (n.nodeName === "SPAN") ?
+                            delims?.inline?.left ?? "\\(" :
+                            delims?.display?.left ?? "\\[";
+                        const delimRight = (n.nodeName === "SPAN") ?
+                            delims?.inline?.right ?? "\\)" :
+                            delims?.display?.right ?? "\\]";
+                        const tex = (n as Element).getAttribute("data-mx-maths");
+
+                        return pc.plainWithEmoji(`${delimLeft}${tex}${delimRight}`);
+                    }
             }
-        }
-
-        if (newParts.length && inQuote) {
-            const isFirstPart = parts.length === 0;
-            prefixQuoteLines(isFirstPart, newParts, partCreator);
-        }
-
-        parts.push(...newParts);
-
-        const descend = checkDescendInto(n);
-        // when not descending (like for PRE), onNodeLeave won't be called to set lastNode
-        // so do that here.
-        lastNode = descend ? null : n;
-        return descend;
     }
 
-    function onNodeLeave(n: Node) {
-        if (checkIgnored(n)) {
-            return;
-        }
-        switch (n.nodeName) {
-            case "BLOCKQUOTE":
-                inQuote = false;
-                break;
-            case "OL":
-                state.listIndex.pop();
-                /* falls through */
-            case "UL":
-                state.listDepth -= 1;
-                break;
-        }
-        lastNode = n;
-    }
+    return parseChildren(n, pc, opts);
+}
 
-    walkDOMDepthFirst(rootNode, onNodeEnter, onNodeLeave);
+interface IParseOptions {
+    isQuotedMessage?: boolean;
+    shouldEscape?: boolean;
+}
 
+function parseHtmlMessage(html: string, pc: PartCreator, opts: IParseOptions): Part[] {
+    // no nodes from parsing here should be inserted in the document,
+    // as scripts in event handlers, etc would be executed then.
+    // we're only taking text, so that is fine
+    const parts = parseNode(new DOMParser().parseFromString(html, "text/html").body, pc, opts);
+    if (opts.isQuotedMessage) {
+        prefixLines(parts, "> ", pc);
+    }
     return parts;
 }
 
-export function parsePlainTextMessage(body: string, partCreator: PartCreator, isQuotedMessage?: boolean): Part[] {
+export function parsePlainTextMessage(
+    body: string,
+    pc: PartCreator,
+    opts: IParseOptions,
+): Part[] {
     const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
     return lines.reduce((parts, line, i) => {
-        if (isQuotedMessage) {
-            parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
+        if (opts.isQuotedMessage) {
+            parts.push(pc.plain("> "));
         }
-        parts.push(...parseAtRoomMentions(line, partCreator));
+        parts.push(...parseAtRoomMentions(line, pc, opts));
         const isLast = i === lines.length - 1;
         if (!isLast) {
-            parts.push(partCreator.newline());
+            parts.push(pc.newline());
         }
         return parts;
     }, [] as Part[]);
 }
 
-export function parseEvent(event: MatrixEvent, partCreator: PartCreator, { isQuotedMessage = false } = {}) {
+export function parseEvent(event: MatrixEvent, pc: PartCreator, opts: IParseOptions = { shouldEscape: true }) {
     const content = event.getContent();
     let parts: Part[];
-    const isEmote = content.msgtype === "m.emote";
+    const isEmote = content.msgtype === MsgType.Emote;
     let isRainbow = false;
 
     if (content.format === "org.matrix.custom.html") {
-        parts = parseHtmlMessage(content.formatted_body || "", partCreator, isQuotedMessage);
+        parts = parseHtmlMessage(content.formatted_body || "", pc, opts);
         if (content.body && content.formatted_body && textToHtmlRainbow(content.body) === content.formatted_body) {
             isRainbow = true;
         }
     } else {
-        parts = parsePlainTextMessage(content.body || "", partCreator, isQuotedMessage);
+        let body = content.body || "";
+        if (event.replyEventId) {
+            body = stripPlainReply(body);
+        }
+        parts = parsePlainTextMessage(body, pc, opts);
     }
 
     if (isEmote && isRainbow) {
-        parts.unshift(partCreator.plain("/rainbowme "));
+        parts.unshift(pc.plain("/rainbowme "));
     } else if (isRainbow) {
-        parts.unshift(partCreator.plain("/rainbow "));
+        parts.unshift(pc.plain("/rainbow "));
     } else if (isEmote) {
-        parts.unshift(partCreator.plain("/me "));
+        parts.unshift(pc.plain("/me "));
     }
 
     return parts;
diff --git a/src/editor/diff.ts b/src/editor/diff.ts
index 5cf94560cea..c28cd3350d6 100644
--- a/src/editor/diff.ts
+++ b/src/editor/diff.ts
@@ -33,16 +33,16 @@ function firstDiff(a: string, b: string): number {
 
 function diffStringsAtEnd(oldStr: string, newStr: string): IDiff {
     const len = Math.min(oldStr.length, newStr.length);
-    const startInCommon = oldStr.substr(0, len) === newStr.substr(0, len);
+    const startInCommon = oldStr.slice(0, len) === newStr.slice(0, len);
     if (startInCommon && oldStr.length > newStr.length) {
-        return { removed: oldStr.substr(len), at: len };
+        return { removed: oldStr.slice(len), at: len };
     } else if (startInCommon && oldStr.length < newStr.length) {
-        return { added: newStr.substr(len), at: len };
+        return { added: newStr.slice(len), at: len };
     } else {
         const commonStartLen = firstDiff(oldStr, newStr);
         return {
-            removed: oldStr.substr(commonStartLen),
-            added: newStr.substr(commonStartLen),
+            removed: oldStr.slice(commonStartLen),
+            added: newStr.slice(commonStartLen),
             at: commonStartLen,
         };
     }
@@ -55,7 +55,7 @@ export function diffDeletion(oldStr: string, newStr: string): IDiff {
     }
     const firstDiffIdx = firstDiff(oldStr, newStr);
     const amount = oldStr.length - newStr.length;
-    return { at: firstDiffIdx, removed: oldStr.substr(firstDiffIdx, amount) };
+    return { at: firstDiffIdx, removed: oldStr.slice(firstDiffIdx, firstDiffIdx + amount) };
 }
 
 /**
@@ -70,7 +70,7 @@ export function diffDeletion(oldStr: string, newStr: string): IDiff {
 export function diffAtCaret(oldValue: string, newValue: string, caretPosition: number): IDiff {
     const diffLen = newValue.length - oldValue.length;
     const caretPositionBeforeInput = caretPosition - diffLen;
-    const oldValueBeforeCaret = oldValue.substr(0, caretPositionBeforeInput);
-    const newValueBeforeCaret = newValue.substr(0, caretPosition);
+    const oldValueBeforeCaret = oldValue.substring(0, caretPositionBeforeInput);
+    const newValueBeforeCaret = newValue.substring(0, caretPosition);
     return diffStringsAtEnd(oldValueBeforeCaret, newValueBeforeCaret);
 }
diff --git a/src/editor/operations.ts b/src/editor/operations.ts
index 85c0b783aa1..40a438cc562 100644
--- a/src/editor/operations.ts
+++ b/src/editor/operations.ts
@@ -16,11 +16,55 @@ limitations under the License.
 
 import Range from "./range";
 import { Part, Type } from "./parts";
+import { Formatting } from "../components/views/rooms/MessageComposerFormatBar";
+import { longestBacktickSequence } from './deserialize';
 
 /**
  * Some common queries and transformations on the editor model
  */
 
+/**
+ * Formats a given range with a given action
+ * @param {Range} range the range that should be formatted
+ * @param {Formatting} action the action that should be performed on the range
+ */
+export function formatRange(range: Range, action: Formatting): void {
+    // If the selection was empty we select the current word instead
+    if (range.wasInitializedEmpty()) {
+        selectRangeOfWordAtCaret(range);
+    } else {
+        // Remove whitespace or new lines in our selection
+        range.trim();
+    }
+
+    // Edgecase when just selecting whitespace or new line.
+    // There should be no reason to format whitespace, so we can just return.
+    if (range.length === 0) {
+        return;
+    }
+
+    switch (action) {
+        case Formatting.Bold:
+            toggleInlineFormat(range, "**");
+            break;
+        case Formatting.Italics:
+            toggleInlineFormat(range, "_");
+            break;
+        case Formatting.Strikethrough:
+            toggleInlineFormat(range, "<del>", "</del>");
+            break;
+        case Formatting.Code:
+            formatRangeAsCode(range);
+            break;
+        case Formatting.Quote:
+            formatRangeAsQuote(range);
+            break;
+        case Formatting.InsertLink:
+            formatRangeAsLink(range);
+            break;
+    }
+}
+
 export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]): void {
     const { model } = range;
     model.transform(() => {
@@ -32,17 +76,69 @@ export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]):
     });
 }
 
-export function replaceRangeAndMoveCaret(range: Range, newParts: Part[], offset = 0): void {
+export function replaceRangeAndMoveCaret(range: Range, newParts: Part[], offset = 0, atNodeEnd = false): void {
     const { model } = range;
     model.transform(() => {
         const oldLen = range.length;
         const addedLen = range.replace(newParts);
         const firstOffset = range.start.asOffset(model);
-        const lastOffset = firstOffset.add(oldLen + addedLen + offset);
+        const lastOffset = firstOffset.add(oldLen + addedLen + offset, atNodeEnd);
         return lastOffset.asPosition(model);
     });
 }
 
+/**
+ * Replaces a range with formatting or removes existing formatting and
+ * positions the cursor with respect to the prefix and suffix length.
+ * @param {Range} range the previous value
+ * @param {Part[]} newParts the new value
+ * @param {boolean} rangeHasFormatting the new value
+ * @param {number} prefixLength the length of the formatting prefix
+ * @param {number} suffixLength the length of the formatting suffix, defaults to prefix length
+ */
+export function replaceRangeAndAutoAdjustCaret(
+    range: Range,
+    newParts: Part[],
+    rangeHasFormatting = false,
+    prefixLength: number,
+    suffixLength = prefixLength,
+): void {
+    const { model } = range;
+    const lastStartingPosition = range.getLastStartingPosition();
+    const relativeOffset = lastStartingPosition.offset - range.start.offset;
+    const distanceFromEnd = range.length - relativeOffset;
+    // Handle edge case where the caret is located within the suffix or prefix
+    if (rangeHasFormatting) {
+        if (relativeOffset < prefixLength) { // Was the caret at the left format string?
+            replaceRangeAndMoveCaret(range, newParts, -(range.length - 2 * suffixLength));
+            return;
+        }
+        if (distanceFromEnd < suffixLength) { // Was the caret at the right format string?
+            replaceRangeAndMoveCaret(range, newParts, 0, true);
+            return;
+        }
+    }
+    // Calculate new position with respect to the previous position
+    model.transform(() => {
+        const offsetDirection = Math.sign(range.replace(newParts)); // Compensates for shrinkage or expansion
+        const atEnd = distanceFromEnd === suffixLength;
+        return lastStartingPosition.asOffset(model).add(offsetDirection * prefixLength, atEnd).asPosition(model);
+    });
+}
+
+const isFormattable = (_index: number, offset: number, part: Part) => {
+    return part.text[offset] !== " " && part.type === Type.Plain;
+};
+
+export function selectRangeOfWordAtCaret(range: Range): void {
+    // Select right side of word
+    range.expandForwardsWhile(isFormattable);
+    // Select left side of word
+    range.expandBackwardsWhile(isFormattable);
+    // Trim possibly selected new lines
+    range.trim();
+}
+
 export function rangeStartsAtBeginningOfLine(range: Range): boolean {
     const { model } = range;
     const startsWithPartial = range.start.offset !== 0;
@@ -76,7 +172,6 @@ export function formatRangeAsQuote(range: Range): void {
     if (!rangeEndsAtEndOfLine(range)) {
         parts.push(partCreator.newline());
     }
-
     parts.push(partCreator.newline());
     replaceRangeAndExpandSelection(range, parts);
 }
@@ -84,8 +179,22 @@ export function formatRangeAsQuote(range: Range): void {
 export function formatRangeAsCode(range: Range): void {
     const { model, parts } = range;
     const { partCreator } = model;
-    const needsBlock = parts.some(p => p.type === Type.Newline);
-    if (needsBlock) {
+
+    const hasBlockFormatting = (range.length > 0)
+        && range.text.startsWith("```")
+        && range.text.endsWith("```")
+        && range.text.includes('\n');
+
+    const needsBlockFormatting = parts.some(p => p.type === Type.Newline);
+
+    if (hasBlockFormatting) {
+        parts.shift();
+        parts.pop();
+        if (parts[0]?.text === "\n" && parts[parts.length - 1]?.text === "\n") {
+            parts.shift();
+            parts.pop();
+        }
+    } else if (needsBlockFormatting) {
         parts.unshift(partCreator.plain("```"), partCreator.newline());
         if (!rangeStartsAtBeginningOfLine(range)) {
             parts.unshift(partCreator.newline());
@@ -97,19 +206,31 @@ export function formatRangeAsCode(range: Range): void {
             parts.push(partCreator.newline());
         }
     } else {
-        parts.unshift(partCreator.plain("`"));
-        parts.push(partCreator.plain("`"));
+        const fenceLen = longestBacktickSequence(range.text);
+        const hasInlineFormatting = range.text.startsWith("`") && range.text.endsWith("`");
+        //if it's already formatted untoggle based on fenceLen which returns the max. num of backtick within a text else increase the fence backticks with a factor of 1.
+        toggleInlineFormat(range, "`".repeat(hasInlineFormatting ? fenceLen : fenceLen + 1));
+        return;
     }
+
     replaceRangeAndExpandSelection(range, parts);
 }
 
 export function formatRangeAsLink(range: Range) {
-    const { model, parts } = range;
+    const { model } = range;
     const { partCreator } = model;
-    parts.unshift(partCreator.plain("["));
-    parts.push(partCreator.plain("]()"));
-    // We set offset to -1 here so that the caret lands between the brackets
-    replaceRangeAndMoveCaret(range, parts, -1);
+    const linkRegex = /\[(.*?)\]\(.*?\)/g;
+    const isFormattedAsLink = linkRegex.test(range.text);
+    if (isFormattedAsLink) {
+        const linkDescription = range.text.replace(linkRegex, "$1");
+        const newParts = [partCreator.plain(linkDescription)];
+        const prefixLength = 1;
+        const suffixLength = range.length - (linkDescription.length + 2);
+        replaceRangeAndAutoAdjustCaret(range, newParts, true, prefixLength, suffixLength);
+    } else {
+        // We set offset to -1 here so that the caret lands between the brackets
+        replaceRangeAndMoveCaret(range, [partCreator.plain("[" + range.text + "]" + "()")], -1);
+    }
 }
 
 // parts helper methods
@@ -123,6 +244,7 @@ export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix
     // compute paragraph [start, end] indexes
     const paragraphIndexes = [];
     let startIndex = 0;
+
     // start at i=2 because we look at i and up to two parts behind to detect paragraph breaks at their end
     for (let i = 2; i < parts.length; i++) {
         // paragraph breaks can be denoted in a multitude of ways,
@@ -162,9 +284,9 @@ export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix
             parts[index - 1].text.endsWith(suffix);
 
         if (isFormatted) {
-            // remove prefix and suffix
+            // remove prefix and suffix formatting string
             const partWithoutPrefix = parts[base].serialize();
-            partWithoutPrefix.text = partWithoutPrefix.text.substr(prefix.length);
+            partWithoutPrefix.text = partWithoutPrefix.text.slice(prefix.length);
             parts[base] = partCreator.deserializePart(partWithoutPrefix);
 
             const partWithoutSuffix = parts[index - 1].serialize();
@@ -178,5 +300,13 @@ export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix
         }
     });
 
-    replaceRangeAndExpandSelection(range, parts);
+    // If the user didn't select something initially, we want to just restore
+    // the caret position instead of making a new selection.
+    if (range.wasInitializedEmpty() && prefix === suffix) {
+        // Check if we need to add a offset for a toggle or untoggle
+        const hasFormatting = range.text.startsWith(prefix) && range.text.endsWith(suffix);
+        replaceRangeAndAutoAdjustCaret(range, parts, hasFormatting, prefix.length);
+    } else {
+        replaceRangeAndExpandSelection(range, parts);
+    }
 }
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index b8cf61a1e2e..7d74c53c0c4 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -106,8 +106,8 @@ abstract class BasePart {
     }
 
     public split(offset: number): IBasePart {
-        const splitText = this.text.substr(offset);
-        this._text = this.text.substr(0, offset);
+        const splitText = this.text.slice(offset);
+        this._text = this.text.slice(0, offset);
         return new PlainPart(splitText);
     }
 
@@ -115,7 +115,7 @@ abstract class BasePart {
     // if the part would become invalid if it removed everything.
     public remove(offset: number, len: number): string | undefined {
         // validate
-        const strWithRemoval = this.text.substr(0, offset) + this.text.substr(offset + len);
+        const strWithRemoval = this.text.slice(0, offset) + this.text.slice(offset + len);
         for (let i = offset; i < (len + offset); ++i) {
             const chr = this.text.charAt(i);
             if (!this.acceptsRemoval(i, chr)) {
@@ -131,8 +131,8 @@ abstract class BasePart {
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
             if (!this.acceptsInsertion(chr, offset + i, inputType)) {
-                this._text = this._text + str.substr(0, i);
-                return str.substr(i);
+                this._text = this._text + str.slice(0, i);
+                return str.slice(i);
             }
         }
         this._text = this._text + str;
@@ -147,8 +147,8 @@ abstract class BasePart {
                 return false;
             }
         }
-        const beforeInsert = this._text.substr(0, offset);
-        const afterInsert = this._text.substr(offset);
+        const beforeInsert = this._text.slice(0, offset);
+        const afterInsert = this._text.slice(offset);
         this._text = beforeInsert + str + afterInsert;
         return true;
     }
@@ -156,8 +156,8 @@ abstract class BasePart {
     public createAutoComplete(updateCallback: UpdateCallback): void {}
 
     protected trim(len: number): string {
-        const remaining = this._text.substr(len);
-        this._text = this._text.substr(0, len);
+        const remaining = this._text.slice(len);
+        this._text = this._text.slice(0, len);
         return remaining;
     }
 
diff --git a/src/editor/range.ts b/src/editor/range.ts
index 4336a151306..fc42fd186ed 100644
--- a/src/editor/range.ts
+++ b/src/editor/range.ts
@@ -25,11 +25,15 @@ const whitespacePredicate: Predicate = (index, offset, part) => {
 export default class Range {
     private _start: DocumentPosition;
     private _end: DocumentPosition;
+    private _lastStart: DocumentPosition;
+    private _initializedEmpty: boolean;
 
     constructor(public readonly model: EditorModel, positionA: DocumentPosition, positionB = positionA) {
         const bIsLarger = positionA.compare(positionB) < 0;
         this._start = bIsLarger ? positionA : positionB;
         this._end = bIsLarger ? positionB : positionA;
+        this._lastStart = this._start;
+        this._initializedEmpty = this._start.index === this._end.index && this._start.offset == this._end.offset;
     }
 
     public moveStartForwards(delta: number): void {
@@ -39,6 +43,22 @@ export default class Range {
         });
     }
 
+    public wasInitializedEmpty(): boolean {
+        return this._initializedEmpty;
+    }
+
+    public setWasEmpty(value: boolean) {
+        this._initializedEmpty = value;
+    }
+
+    public getLastStartingPosition(): DocumentPosition {
+        return this._lastStart;
+    }
+
+    public setLastStartingPosition(position: DocumentPosition): void {
+        this._lastStart = position;
+    }
+
     public moveEndBackwards(delta: number): void {
         this._end = this._end.backwardsWhile(this.model, () => {
             delta -= 1;
@@ -47,6 +67,10 @@ export default class Range {
     }
 
     public trim(): void {
+        if (this.text.trim() === "") {
+            this._start = this._end;
+            return;
+        }
         this._start = this._start.forwardsWhile(this.model, whitespacePredicate);
         this._end = this._end.backwardsWhile(this.model, whitespacePredicate);
     }
@@ -55,6 +79,10 @@ export default class Range {
         this._start = this._start.backwardsWhile(this.model, predicate);
     }
 
+    public expandForwardsWhile(predicate: Predicate): void {
+        this._end = this._end.forwardsWhile(this.model, predicate);
+    }
+
     public get text(): string {
         let text = "";
         this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 4618cf79c1d..7c4d62e9ab5 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -17,6 +17,7 @@ limitations under the License.
 
 import { AllHtmlEntities } from 'html-entities';
 import cheerio from 'cheerio';
+import escapeHtml from "escape-html";
 
 import Markdown from '../Markdown';
 import { makeGenericPermalink } from "../utils/permalinks/Permalinks";
@@ -48,7 +49,19 @@ export function mdSerialize(model: EditorModel): string {
     }, "");
 }
 
-export function htmlSerializeIfNeeded(model: EditorModel, { forceHTML = false } = {}): string {
+interface ISerializeOpts {
+    forceHTML?: boolean;
+    useMarkdown?: boolean;
+}
+
+export function htmlSerializeIfNeeded(
+    model: EditorModel,
+    { forceHTML = false, useMarkdown = true }: ISerializeOpts = {},
+): string {
+    if (!useMarkdown) {
+        return escapeHtml(textSerialize(model)).replace(/\n/g, '<br/>');
+    }
+
     let md = mdSerialize(model);
     // copy of raw input to remove unwanted math later
     const orig = md;
@@ -95,7 +108,7 @@ export function htmlSerializeIfNeeded(model: EditorModel, { forceHTML = false }
         patternNames.forEach(function(patternName) {
             patternTypes.forEach(function(patternType) {
                 // get the regex replace pattern from config or use the default
-                const pattern = (((SdkConfig.get()["latex_maths_delims"] ||
+                const pattern = (((SdkConfig.get("latex_maths_delims") ||
                     {})[patternType] || {})["pattern"] || {})[patternName] ||
                     patternDefaults[patternName][patternType];
 
@@ -181,7 +194,9 @@ export function textSerialize(model: EditorModel): string {
 }
 
 export function containsEmote(model: EditorModel): boolean {
-    return startsWith(model, "/me ", false) && model.parts[0]?.text?.length > 4;
+    const hasCommand = startsWith(model, "/me ", false);
+    const hasArgument = model.parts[0]?.text?.length > 4 || model.parts.length > 1;
+    return hasCommand && hasArgument;
 }
 
 export function startsWith(model: EditorModel, prefix: string, caseSensitive = true): boolean {
diff --git a/src/effects/hearts/index.ts b/src/effects/hearts/index.ts
new file mode 100644
index 00000000000..1fb743f99c6
--- /dev/null
+++ b/src/effects/hearts/index.ts
@@ -0,0 +1,191 @@
+/*
+ Copyright 2021 The Matrix.org Foundation C.I.C.
+ Copyright 2022 Arseny Uskov
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+import ICanvasEffect from '../ICanvasEffect';
+import { arrayFastClone } from "../../utils/arrays";
+
+export type HeartOptions = {
+    /**
+     * The maximum number of hearts to render at a given time
+     */
+    maxCount: number;
+    /**
+     * The amount of gravity to apply to the hearts
+     */
+    gravity: number;
+    /**
+     * The maximum amount of drift (horizontal sway) to apply to the hearts. Each heart varies.
+     */
+    maxDrift: number;
+    /**
+     * The maximum amount of tilt to apply to the heart. Each heart varies.
+     */
+    maxRot: number;
+};
+
+type Heart = {
+    x: number;
+    y: number;
+    xCol: number;
+    scale: number;
+    maximumDrift: number;
+    maximumRot: number;
+    gravity: number;
+    color: string;
+};
+
+export const DefaultOptions: HeartOptions = {
+    maxCount: 120,
+    gravity: 3.2,
+    maxDrift: 5,
+    maxRot: 5,
+};
+
+const KEY_FRAME_INTERVAL = 15; // 15ms, roughly
+
+export default class Hearts implements ICanvasEffect {
+    private readonly options: HeartOptions;
+
+    constructor(options: { [key: string]: any }) {
+        this.options = { ...DefaultOptions, ...options };
+    }
+
+    private context: CanvasRenderingContext2D | null = null;
+    private particles: Array<Heart> = [];
+    private lastAnimationTime: number;
+
+    private colours = [
+        'rgba(194,210,224,1)',
+        'rgba(235,214,219,1)',
+        'rgba(255,211,45,1)',
+        'rgba(255,190,174,1)',
+        'rgba(255,173,226,1)',
+        'rgba(242,114,171,1)',
+        'rgba(228,55,116,1)',
+        'rgba(255,86,130,1)',
+        'rgba(244,36,57,1)',
+        'rgba(247,126,157,1)',
+        'rgba(243,142,140,1)',
+        'rgba(252,116,183,1)'];
+
+    public isRunning: boolean;
+
+    public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+        if (!canvas) {
+            return;
+        }
+        this.context = canvas.getContext('2d');
+        this.particles = [];
+        const count = this.options.maxCount;
+        while (this.particles.length < count) {
+            this.particles.push(this.resetParticle({} as Heart, canvas.width, canvas.height));
+        }
+        this.isRunning = true;
+        requestAnimationFrame(this.renderLoop);
+        if (timeout) {
+            window.setTimeout(this.stop, timeout);
+        }
+    };
+
+    public stop = async () => {
+        this.isRunning = false;
+    };
+
+    private resetParticle = (particle: Heart, width: number, height: number): Heart => {
+        particle.color = this.colours[(Math.random() * this.colours.length) | 0];
+        particle.x = Math.random() * width;
+        particle.y = Math.random() * height + height;
+        particle.xCol = particle.x;
+        particle.scale = (Math.random() * 0.07) + 0.04;
+        particle.maximumDrift = (Math.random() * this.options.maxDrift) + 3.5;
+        particle.maximumRot = (Math.random() * this.options.maxRot) + 3.5;
+        particle.gravity = this.options.gravity + (Math.random() * 4.8);
+        return particle;
+    };
+
+    private renderLoop = (): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        if (this.particles.length === 0) {
+            this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+        } else {
+            const timeDelta = Date.now() - this.lastAnimationTime;
+            if (timeDelta >= KEY_FRAME_INTERVAL || !this.lastAnimationTime) {
+                // Clear the screen first
+                this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+
+                this.lastAnimationTime = Date.now();
+                this.animateAndRenderHearts();
+            }
+            requestAnimationFrame(this.renderLoop);
+        }
+    };
+
+    private animateAndRenderHearts() {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        for (const particle of arrayFastClone(this.particles)) {
+            particle.y -= particle.gravity;
+
+            // We treat the drift as a sine function to have a more fluid-like movement instead
+            // of a pong-like movement off walls of the X column. This means that for
+            // $x=A\sin(\frac{2\pi}{P}y)$ we use the `maximumDrift` as the amplitude (A) and a
+            // large multiplier to create a very long waveform through P.
+            const peakDistance = 75 * particle.maximumDrift;
+            const PI2 = Math.PI * 2;
+            particle.x = 6 * particle.maximumDrift * Math.sin(0.7 * (PI2 / peakDistance) * particle.y);
+            particle.x += particle.xCol; // bring the particle to the right place
+
+            const posScale = 1 / particle.scale;
+            const x = particle.x * posScale;
+            const y = particle.y * posScale;
+
+            this.context.save();
+            this.context.scale(particle.scale, particle.scale);
+            this.context.beginPath();
+
+            // Rotate the heart about its centre.
+            // The tilt of the heart is modelled similarly to its horizontal drift,
+            // using a sine function.
+            this.context.translate(248 + x, 215 + y);
+            this.context.rotate((1 / 10) * particle.maximumRot * Math.sin((PI2 / peakDistance) * particle.y * 0.8));
+            this.context.translate(-248 - x, -215 - y);
+
+            // Use bezier curves to draw a heart using pre-calculated coordinates.
+            this.context.moveTo(140 + x, 20 + y);
+            this.context.bezierCurveTo(73 + x, 20 + y, 20 + x, 74 + y, 20 + x, 140 + y);
+            this.context.bezierCurveTo(20 + x, 275 + y, 156 + x, 310 + y, 248 + x, 443 + y);
+            this.context.bezierCurveTo(336 + x, 311 + y, 477 + x, 270 + y, 477 + x, 140 + y);
+            this.context.bezierCurveTo(477 + x, 74 + y, 423 + x, 20 + y, 357 + x, 20 + y);
+            this.context.bezierCurveTo(309 + x, 20 + y, 267 + x, 48 + y, 248 + x, 89 + y);
+            this.context.bezierCurveTo(229 + x, 48 + y, 188 + x, 20 + y, 140 + x, 20 + y);
+            this.context.closePath();
+
+            this.context.fillStyle = particle.color;
+            this.context.fill();
+
+            this.context.restore();
+
+            // Remove any dead hearts after a 100px wide margin.
+            if (particle.y < -100) {
+                const idx = this.particles.indexOf(particle);
+                this.particles.splice(idx, 1);
+            }
+        }
+    }
+}
diff --git a/src/effects/index.ts b/src/effects/index.ts
index fe14fe28f8f..3468d4c5b6a 100644
--- a/src/effects/index.ts
+++ b/src/effects/index.ts
@@ -21,6 +21,7 @@ import { FireworksOptions } from "./fireworks";
 import { RainfallOptions } from "./rainfall";
 import { SnowfallOptions } from "./snowfall";
 import { SpaceInvadersOptions } from "./spaceinvaders";
+import { HeartOptions } from "./hearts";
 
 /**
  * This configuration defines room effects that can be triggered by custom message types and emojis
@@ -85,5 +86,15 @@ export const CHAT_EFFECTS: Array<Effect<{ [key: string]: any }>> = [
             gravity: 0.01,
         },
     } as Effect<SpaceInvadersOptions>,
+    {
+        emojis: ["💝"],
+        msgType: "io.element.effect.hearts",
+        command: "hearts",
+        description: () => _td("Sends the given message with hearts"),
+        fallbackMessage: () => _t("sends hearts") + " 💝",
+        options: {
+            maxCount: 120,
+            gravity: 3.2,
+        },
+    } as Effect<HeartOptions>,
 ];
-
diff --git a/src/emoji.ts b/src/emoji.ts
index 73898c12eb6..a8b5a228be9 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -18,7 +18,7 @@ import EMOJIBASE from 'emojibase-data/en/compact.json';
 import SHORTCODES from 'emojibase-data/en/shortcodes/iamcal.json';
 
 export interface IEmoji {
-    annotation: string;
+    label: string;
     group?: number;
     hexcode: string;
     order?: number;
@@ -26,7 +26,7 @@ export interface IEmoji {
     tags?: string[];
     unicode: string;
     skins?: Omit<IEmoji, "shortcodes" | "tags">[]; // Currently unused
-    emoticon?: string;
+    emoticon?: string | string[];
 }
 
 // The unicode is stored without the variant selector
@@ -74,7 +74,7 @@ export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcode
     // If there's ever a gap in shortcode coverage, we fudge it by
     // filling it in with the emoji's CLDR annotation
     const shortcodeData = SHORTCODES[emojiData.hexcode] ??
-        [emojiData.annotation.toLowerCase().replace(/\W+/g, "_")];
+        [emojiData.label.toLowerCase().replace(/\W+/g, "_")];
 
     const emoji: IEmoji = {
         ...emojiData,
@@ -102,7 +102,9 @@ export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcode
 
     if (emoji.emoticon) {
         // Add mapping from emoticon to Emoji object
-        EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
+        Array.isArray(emoji.emoticon)
+            ? emoji.emoticon.forEach((x) => EMOTICON_TO_EMOJI.set(x, emoji))
+            : EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
     }
 
     return emoji;
diff --git a/src/events/EventTileFactory.tsx b/src/events/EventTileFactory.tsx
new file mode 100644
index 00000000000..17713108233
--- /dev/null
+++ b/src/events/EventTileFactory.tsx
@@ -0,0 +1,397 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { M_POLL_START, Optional } from "matrix-events-sdk";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+import EditorStateTransfer from "../utils/EditorStateTransfer";
+import { RoomPermalinkCreator } from "../utils/permalinks/Permalinks";
+import CallEventGrouper from "../components/structures/CallEventGrouper";
+import { GetRelationsForEvent } from "../components/views/rooms/EventTile";
+import { TimelineRenderingType } from "../contexts/RoomContext";
+import MessageEvent from "../components/views/messages/MessageEvent";
+import MKeyVerificationConclusion from "../components/views/messages/MKeyVerificationConclusion";
+import CallEvent from "../components/views/messages/CallEvent";
+import TextualEvent from "../components/views/messages/TextualEvent";
+import EncryptionEvent from "../components/views/messages/EncryptionEvent";
+import RoomCreate from "../components/views/messages/RoomCreate";
+import RoomAvatarEvent from "../components/views/messages/RoomAvatarEvent";
+import { WIDGET_LAYOUT_EVENT_TYPE } from "../stores/widgets/WidgetLayoutStore";
+import { ALL_RULE_TYPES } from "../mjolnir/BanList";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import MKeyVerificationRequest from "../components/views/messages/MKeyVerificationRequest";
+import { WidgetType } from "../widgets/WidgetType";
+import MJitsiWidgetEvent from "../components/views/messages/MJitsiWidgetEvent";
+import { hasText } from "../TextForEvent";
+import { getMessageModerationState, MessageModerationState } from "../utils/EventUtils";
+import HiddenBody from "../components/views/messages/HiddenBody";
+import ViewSourceEvent from "../components/views/messages/ViewSourceEvent";
+import { shouldDisplayAsBeaconTile } from "../utils/beacon/timeline";
+
+// Subset of EventTile's IProps plus some mixins
+export interface EventTileTypeProps {
+    ref?: React.RefObject<any>; // `any` because it's effectively impossible to convince TS of a reasonable type
+    mxEvent: MatrixEvent;
+    highlights: string[];
+    highlightLink: string;
+    showUrlPreview?: boolean;
+    onHeightChanged: () => void;
+    forExport?: boolean;
+    getRelationsForEvent?: GetRelationsForEvent;
+    editState?: EditorStateTransfer;
+    replacingEventId?: string;
+    permalinkCreator: RoomPermalinkCreator;
+    callEventGrouper?: CallEventGrouper;
+    isSeeingThroughMessageHiddenForModeration?: boolean;
+    timestamp?: JSX.Element;
+    maxImageHeight?: number; // pixels
+    overrideBodyTypes?: Record<string, typeof React.Component>;
+    overrideEventTypes?: Record<string, typeof React.Component>;
+}
+
+type FactoryProps = Omit<EventTileTypeProps, "ref">;
+type Factory<X = FactoryProps> = (ref: Optional<React.RefObject<any>>, props: X) => JSX.Element;
+type FactoryMap = Record<string, Factory>;
+
+const MessageEventFactory: Factory = (ref, props) => <MessageEvent ref={ref} {...props} />;
+const KeyVerificationConclFactory: Factory = (ref, props) => <MKeyVerificationConclusion ref={ref} {...props} />;
+const CallEventFactory: Factory<FactoryProps & { callEventGrouper: CallEventGrouper }> = (ref, props) => (
+    <CallEvent ref={ref} {...props} />
+);
+const TextualEventFactory: Factory = (ref, props) => <TextualEvent ref={ref} {...props} />;
+const VerificationReqFactory: Factory = (ref, props) => <MKeyVerificationRequest ref={ref} {...props} />;
+const HiddenEventFactory: Factory = (ref, props) => <HiddenBody ref={ref} {...props} />;
+
+// These factories are exported for reference comparison against pickFactory()
+export const JitsiEventFactory: Factory = (ref, props) => <MJitsiWidgetEvent ref={ref} {...props} />;
+export const JSONEventFactory: Factory = (ref, props) => <ViewSourceEvent ref={ref} {...props} />;
+
+const EVENT_TILE_TYPES: FactoryMap = {
+    [EventType.RoomMessage]: MessageEventFactory, // note that verification requests are handled in pickFactory()
+    [EventType.Sticker]: MessageEventFactory,
+    [M_POLL_START.name]: MessageEventFactory,
+    [M_POLL_START.altName]: MessageEventFactory,
+    [EventType.KeyVerificationCancel]: KeyVerificationConclFactory,
+    [EventType.KeyVerificationDone]: KeyVerificationConclFactory,
+    [EventType.CallInvite]: CallEventFactory, // note that this requires a special factory type
+};
+
+const STATE_EVENT_TILE_TYPES: FactoryMap = {
+    [EventType.RoomEncryption]: (ref, props) => <EncryptionEvent ref={ref} {...props} />,
+    [EventType.RoomCanonicalAlias]: TextualEventFactory,
+    [EventType.RoomCreate]: (ref, props) => <RoomCreate ref={ref} {...props} />,
+    [EventType.RoomMember]: TextualEventFactory,
+    [EventType.RoomName]: TextualEventFactory,
+    [EventType.RoomAvatar]: (ref, props) => <RoomAvatarEvent ref={ref} {...props} />,
+    [EventType.RoomThirdPartyInvite]: TextualEventFactory,
+    [EventType.RoomHistoryVisibility]: TextualEventFactory,
+    [EventType.RoomTopic]: TextualEventFactory,
+    [EventType.RoomPowerLevels]: TextualEventFactory,
+    [EventType.RoomPinnedEvents]: TextualEventFactory,
+    [EventType.RoomServerAcl]: TextualEventFactory,
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+    'im.vector.modular.widgets': TextualEventFactory, // note that Jitsi widgets are special in pickFactory()
+    [WIDGET_LAYOUT_EVENT_TYPE]: TextualEventFactory,
+    [EventType.RoomTombstone]: TextualEventFactory,
+    [EventType.RoomJoinRules]: TextualEventFactory,
+    [EventType.RoomGuestAccess]: TextualEventFactory,
+};
+
+// Add all the Mjolnir stuff to the renderer too
+for (const evType of ALL_RULE_TYPES) {
+    STATE_EVENT_TILE_TYPES[evType] = TextualEventFactory;
+}
+
+// These events should be recorded in the STATE_EVENT_TILE_TYPES
+const SINGULAR_STATE_EVENTS = new Set([
+    EventType.RoomEncryption,
+    EventType.RoomCanonicalAlias,
+    EventType.RoomCreate,
+    EventType.RoomName,
+    EventType.RoomAvatar,
+    EventType.RoomHistoryVisibility,
+    EventType.RoomTopic,
+    EventType.RoomPowerLevels,
+    EventType.RoomPinnedEvents,
+    EventType.RoomServerAcl,
+    WIDGET_LAYOUT_EVENT_TYPE,
+    EventType.RoomTombstone,
+    EventType.RoomJoinRules,
+    EventType.RoomGuestAccess,
+]);
+
+/**
+ * Find an event tile factory for the given conditions.
+ * @param mxEvent The event.
+ * @param cli The matrix client to reference when needed.
+ * @param showHiddenEvents Whether hidden events should be shown.
+ * @param asHiddenEv When true, treat the event as always hidden.
+ * @returns The factory, or falsy if not possible.
+ */
+export function pickFactory(
+    mxEvent: MatrixEvent,
+    cli: MatrixClient,
+    showHiddenEvents: boolean,
+    asHiddenEv?: boolean,
+): Optional<Factory> {
+    const evType = mxEvent.getType(); // cache this to reduce call stack execution hits
+
+    // Note: we avoid calling SettingsStore unless absolutely necessary - this code is on the critical path.
+
+    if (asHiddenEv && showHiddenEvents) {
+        return JSONEventFactory;
+    }
+
+    const noEventFactoryFactory: (() => Optional<Factory>) = () => showHiddenEvents
+        ? JSONEventFactory
+        : undefined; // just don't render things that we shouldn't render
+
+    // We run all the event type checks first as they might override the factory entirely.
+
+    const moderationState = getMessageModerationState(mxEvent, cli);
+    if (moderationState === MessageModerationState.HIDDEN_TO_CURRENT_USER) {
+        return HiddenEventFactory;
+    }
+
+    if (evType === EventType.RoomMessage) {
+        // don't show verification requests we're not involved in,
+        // not even when showing hidden events
+        const content = mxEvent.getContent();
+        if (content?.msgtype === MsgType.KeyVerificationRequest) {
+            const me = cli.getUserId();
+            if (mxEvent.getSender() !== me && content['to'] !== me) {
+                return noEventFactoryFactory(); // not for/from us
+            } else {
+                // override the factory
+                return VerificationReqFactory;
+            }
+        }
+    } else if (evType === EventType.KeyVerificationDone) {
+        // these events are sent by both parties during verification, but we only want to render one
+        // tile once the verification concludes, so filter out the one from the other party.
+        const me = cli.getUserId();
+        if (mxEvent.getSender() !== me) {
+            return noEventFactoryFactory();
+        }
+    }
+
+    if (evType === EventType.KeyVerificationCancel || evType === EventType.KeyVerificationDone) {
+        // sometimes MKeyVerificationConclusion declines to render. Jankily decline to render and
+        // fall back to showing hidden events, if we're viewing hidden events
+        // XXX: This is extremely a hack. Possibly these components should have an interface for
+        // declining to render?
+        if (!MKeyVerificationConclusion.shouldRender(mxEvent, mxEvent.verificationRequest)) {
+            return noEventFactoryFactory();
+        }
+    }
+
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+    if (evType === "im.vector.modular.widgets") {
+        let type = mxEvent.getContent()['type'];
+        if (!type) {
+            // deleted/invalid widget - try the past widget type
+            type = mxEvent.getPrevContent()['type'];
+        }
+
+        if (WidgetType.JITSI.matches(type)) {
+            // override the factory
+            return JitsiEventFactory;
+        }
+    }
+
+    // Try and pick a state event factory, if we can.
+    if (mxEvent.isState()) {
+        if (shouldDisplayAsBeaconTile(mxEvent)) {
+            return MessageEventFactory;
+        }
+
+        if (SINGULAR_STATE_EVENTS.has(evType) && mxEvent.getStateKey() !== '') {
+            return noEventFactoryFactory(); // improper event type to render
+        }
+
+        return STATE_EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
+    }
+
+    // Blanket override for all events. The MessageEvent component handles redacted states for us.
+    if (mxEvent.isRedacted()) {
+        return MessageEventFactory;
+    }
+
+    if (mxEvent.isRelation(RelationType.Replace)) {
+        return noEventFactoryFactory();
+    }
+
+    return EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
+}
+
+/**
+ * Render an event as a tile
+ * @param renderType The render type. Used to inform properties given to the eventual component.
+ * @param props The properties to provide to the eventual component.
+ * @param showHiddenEvents Whether hidden events should be shown.
+ * @param cli Optional client instance to use, otherwise the default MatrixClientPeg will be used.
+ * @returns The tile as JSX, or falsy if unable to render.
+ */
+export function renderTile(
+    renderType: TimelineRenderingType,
+    props: EventTileTypeProps,
+    showHiddenEvents: boolean,
+    cli?: MatrixClient,
+): Optional<JSX.Element> {
+    cli = cli ?? MatrixClientPeg.get(); // because param defaults don't do the correct thing
+
+    const factory = pickFactory(props.mxEvent, cli, showHiddenEvents);
+    if (!factory) return undefined;
+
+    // Note that we split off the ones we actually care about here just to be sure that we're
+    // not going to accidentally send things we shouldn't from lazy callers. Eg: EventTile's
+    // lazy calls of `renderTile(..., this.props)` will have a lot more than we actually care
+    // about.
+    const {
+        ref,
+        mxEvent,
+        forExport,
+        replacingEventId,
+        editState,
+        highlights,
+        highlightLink,
+        showUrlPreview,
+        permalinkCreator,
+        onHeightChanged,
+        callEventGrouper,
+        getRelationsForEvent,
+        isSeeingThroughMessageHiddenForModeration,
+        timestamp,
+    } = props;
+
+    switch (renderType) {
+        case TimelineRenderingType.File:
+        case TimelineRenderingType.Notification:
+        case TimelineRenderingType.Thread:
+            // We only want a subset of props, so we don't end up causing issues for downstream components.
+            return factory(props.ref, {
+                mxEvent,
+                highlights,
+                highlightLink,
+                showUrlPreview,
+                onHeightChanged,
+                editState,
+                replacingEventId,
+                getRelationsForEvent,
+                isSeeingThroughMessageHiddenForModeration,
+                permalinkCreator,
+            });
+        default:
+            // NEARLY ALL THE OPTIONS!
+            return factory(ref, {
+                mxEvent,
+                forExport,
+                replacingEventId,
+                editState,
+                highlights,
+                highlightLink,
+                showUrlPreview,
+                permalinkCreator,
+                onHeightChanged,
+                callEventGrouper,
+                getRelationsForEvent,
+                isSeeingThroughMessageHiddenForModeration,
+                timestamp,
+            });
+    }
+}
+
+/**
+ * A version of renderTile() specifically for replies.
+ * @param props The properties to specify on the eventual object.
+ * @param showHiddenEvents Whether hidden events should be shown.
+ * @param cli Optional client instance to use, otherwise the default MatrixClientPeg will be used.
+ * @returns The tile as JSX, or falsy if unable to render.
+ */
+export function renderReplyTile(
+    props: EventTileTypeProps,
+    showHiddenEvents: boolean,
+    cli?: MatrixClient,
+): Optional<JSX.Element> {
+    cli = cli ?? MatrixClientPeg.get(); // because param defaults don't do the correct thing
+
+    const factory = pickFactory(props.mxEvent, cli, showHiddenEvents);
+    if (!factory) return undefined;
+
+    // See renderTile() for why we split off so much
+    const {
+        ref,
+        mxEvent,
+        highlights,
+        highlightLink,
+        onHeightChanged,
+        showUrlPreview,
+        overrideBodyTypes,
+        overrideEventTypes,
+        replacingEventId,
+        maxImageHeight,
+        getRelationsForEvent,
+        isSeeingThroughMessageHiddenForModeration,
+        permalinkCreator,
+    } = props;
+
+    return factory(ref, {
+        mxEvent,
+        highlights,
+        highlightLink,
+        onHeightChanged,
+        showUrlPreview,
+        overrideBodyTypes,
+        overrideEventTypes,
+        replacingEventId,
+        maxImageHeight,
+        getRelationsForEvent,
+        isSeeingThroughMessageHiddenForModeration,
+        permalinkCreator,
+    });
+}
+
+// XXX: this'll eventually be dynamic based on the fields once we have extensible event types
+const messageTypes = [EventType.RoomMessage, EventType.Sticker];
+export function isMessageEvent(ev: MatrixEvent): boolean {
+    return (messageTypes.includes(ev.getType() as EventType)) || M_POLL_START.matches(ev.getType());
+}
+
+export function haveRendererForEvent(mxEvent: MatrixEvent, showHiddenEvents: boolean): boolean {
+    // Only show "Message deleted" tile for plain message events, encrypted events,
+    // and state events as they'll likely still contain enough keys to be relevant.
+    if (mxEvent.isRedacted() && !mxEvent.isEncrypted() && !isMessageEvent(mxEvent) && !mxEvent.isState()) {
+        return false;
+    }
+
+    // No tile for replacement events since they update the original tile
+    if (mxEvent.isRelation(RelationType.Replace)) return false;
+
+    const handler = pickFactory(mxEvent, MatrixClientPeg.get(), showHiddenEvents);
+    if (!handler) return false;
+    if (handler === TextualEventFactory) {
+        return hasText(mxEvent, showHiddenEvents);
+    } else if (handler === STATE_EVENT_TILE_TYPES[EventType.RoomCreate]) {
+        return Boolean(mxEvent.getContent()['predecessor']);
+    } else if (handler === JSONEventFactory) {
+        return false;
+    } else {
+        return true;
+    }
+}
diff --git a/src/group_helpers.tsx b/src/group_helpers.tsx
new file mode 100644
index 00000000000..0c0fe1077f6
--- /dev/null
+++ b/src/group_helpers.tsx
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+
+import Modal from "./Modal";
+import QuestionDialog from "./components/views/dialogs/QuestionDialog";
+import { _t } from "./languageHandler";
+import SdkConfig, { DEFAULTS } from "./SdkConfig";
+
+export function showGroupReplacedWithSpacesDialog(groupId: string) {
+    const learnMoreUrl = SdkConfig.get().spaces_learn_more_url ?? DEFAULTS.spaces_learn_more_url;
+    Modal.createTrackedDialog("Groups are now Spaces", '', QuestionDialog, {
+        title: _t("That link is no longer supported"),
+        description: <>
+            <p>
+                { _t(
+                    "You're trying to access a community link (%(groupId)s).<br/>" +
+                        "Communities are no longer supported and have been replaced by spaces.<br2/>" +
+                        "<a>Learn more about spaces here.</a>",
+                    { groupId },
+                    {
+                        br: () => <br />,
+                        br2: () => <br />,
+                        a: (sub) => <a href={learnMoreUrl} rel="noreferrer noopener" target="_blank">{ sub }</a>,
+                    },
+                ) }
+            </p>
+        </>,
+        hasCancelButton: false,
+    });
+}
diff --git a/src/groups.js b/src/groups.js
deleted file mode 100644
index e73af15c79a..00000000000
--- a/src/groups.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import PropTypes from 'prop-types';
-
-import { _t } from './languageHandler';
-
-export const GroupMemberType = PropTypes.shape({
-    userId: PropTypes.string.isRequired,
-    displayname: PropTypes.string,
-    avatarUrl: PropTypes.string,
-});
-
-export const GroupRoomType = PropTypes.shape({
-    displayname: PropTypes.string,
-    name: PropTypes.string,
-    roomId: PropTypes.string.isRequired,
-    canonicalAlias: PropTypes.string,
-    avatarUrl: PropTypes.string,
-});
-
-export function groupMemberFromApiObject(apiObject) {
-    return {
-        userId: apiObject.user_id,
-        displayname: apiObject.displayname,
-        avatarUrl: apiObject.avatar_url,
-        isPrivileged: apiObject.is_privileged,
-    };
-}
-
-export function groupRoomFromApiObject(apiObject) {
-    return {
-        displayname: apiObject.name || apiObject.canonical_alias || _t("Unnamed Room"),
-        name: apiObject.name,
-        roomId: apiObject.room_id,
-        canonicalAlias: apiObject.canonical_alias,
-        avatarUrl: apiObject.avatar_url,
-        topic: apiObject.topic,
-        numJoinedMembers: apiObject.num_joined_members,
-        worldReadable: apiObject.world_readable,
-        guestCanJoin: apiObject.guest_can_join,
-        isPublic: apiObject.is_public !== false,
-    };
-}
diff --git a/src/i18n/strings/am.json b/src/i18n/strings/am.json
index 0967ef424bc..84635752b7f 100644
--- a/src/i18n/strings/am.json
+++ b/src/i18n/strings/am.json
@@ -1 +1,5 @@
-{}
+{
+    "Use Single Sign On to continue": "ለመቀጠል ነጠላ ምዝገባ ይጠቀሙ",
+    "This phone number is already in use": "ይህ ስልክ ቁጥር ከዚህ በፊት ጥቅም ላይ የዋለ ነው።",
+    "This email address is already in use": "ይህ የኢሜል አድራሻ ከዚህ በፊት ጥቅም ላይ የዋለ ነው።"
+}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index ad1a4ef658f..d9246337e8b 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -110,7 +110,7 @@
     "Failed to reject invite": "Nepodařilo se odmítnout pozvánku",
     "Failed to send request.": "Odeslání žádosti se nezdařilo.",
     "Failed to set display name": "Nepodařilo se nastavit zobrazované jméno",
-    "Failed to unban": "Přijetí zpět se nezdařilo",
+    "Failed to unban": "Zrušení vykázání se nezdařilo",
     "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo!",
     "Failure to create room": "Vytvoření místnosti se nezdařilo",
     "Forget room": "Zapomenout místnost",
@@ -208,7 +208,7 @@
     "Unable to create widget.": "Nepodařilo se vytvořit widget.",
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
-    "Unban": "Přijmout zpět",
+    "Unban": "Zrušit vykázání",
     "Unable to enable Notifications": "Nepodařilo se povolit oznámení",
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
@@ -408,10 +408,10 @@
     "were banned %(count)s times|one": "byl(a) vykázán(a)",
     "was banned %(count)s times|other": "byli %(count)s krát vykázáni",
     "was banned %(count)s times|one": "byl(a) vykázán(a)",
-    "were unbanned %(count)s times|other": "byli %(count)s přijati zpět",
-    "were unbanned %(count)s times|one": "byl(a) přijat(a) zpět",
-    "was unbanned %(count)s times|other": "byli %(count)s krát přijati zpět",
-    "was unbanned %(count)s times|one": "byl(a) přijat(a) zpět",
+    "were unbanned %(count)s times|other": "měli %(count)s krát zrušeno vykázání",
+    "were unbanned %(count)s times|one": "měli zrušeno vykázání",
+    "was unbanned %(count)s times|other": "měl(a) %(count)s krát zrušeno vykázání",
+    "was unbanned %(count)s times|one": "má zrušeno vykázání",
     "were kicked %(count)s times|other": "byli %(count)s krát vyhozeni",
     "were kicked %(count)s times|one": "byli vyhozeni",
     "was kicked %(count)s times|other": "byl %(count)s krát vyhozen",
@@ -641,7 +641,7 @@
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Viditelnost zpráv v Matrixu je podobná e-mailu. Smazání vašich zpráv znamená, že už nebudou sdíleny s žádným novým nebo neregistrovaným uživatelem, ale registrovaní uživatelé, kteří už přístup ke zprávám mají, budou stále mít přístup k jejich kopii.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "S deaktivací účtu si přeji smazat všechny mnou odeslané zprávy (<b>Pozor:</b> způsobí, že noví uživatelé uvidí nekompletní konverzace)",
     "To continue, please enter your password:": "Pro pokračování, zadejte své heslo:",
-    "Upgrade Room Version": "Upgradeovat verzi místnosti",
+    "Upgrade Room Version": "Aktualizovat verzi místnosti",
     "Create a new room with the same name, description and avatar": "Vznikne místnost se stejným názvem, popisem a avatarem",
     "Update any local room aliases to point to the new room": "Aktualizujeme všechny lokální aliasy místnosti tak, aby ukazovaly na novou místnost",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Přerušíme konverzace ve staré verzi místnosti a pošleme uživatelům zprávu o přechodu do nové mistnosti",
@@ -685,9 +685,9 @@
     "Are you sure you want to sign out?": "Opravdu se chcete odhlásit?",
     "Updating %(brand)s": "Aktualizujeme %(brand)s",
     "Go back": "Zpět",
-    "Failed to upgrade room": "Nepovedlo se upgradeovat místnost",
-    "The room upgrade could not be completed": "Upgrade místnosti se nepovedlo dokončit",
-    "Upgrade this room to version %(version)s": "Upgradování místnosti na verzi %(version)s",
+    "Failed to upgrade room": "Nezdařilo se aktualizovat místnost",
+    "The room upgrade could not be completed": "Nepodařilo se dokončit aktualizaci místnosti",
+    "Upgrade this room to version %(version)s": "Aktualizace místnosti na verzi %(version)s",
     "Security & Privacy": "Zabezpečení a soukromí",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Jakmile je šifrování povoleno, nelze jej zakázat.",
@@ -766,10 +766,10 @@
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Soubor '%(fileName)s' je větší než povoluje limit domovského serveru",
     "Unable to load! Check your network connectivity and try again.": "Stránku se nepovedlo načíst! Zkontrolujte prosím své připojení k internetu a zkuste to znovu.",
     "Failed to invite users to the room:": "Nepovedlo se pozvat uživatele do místnosti:",
-    "Upgrades a room to a new version": "Upgraduje místnost na novou verzi",
+    "Upgrades a room to a new version": "Aktualizuje na novou verzi",
     "This room has no topic.": "Tato místnost nemá žádné specifické téma.",
     "Sets the room name": "Nastaví název místnosti",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgradoval(a) místnost.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s aktualizoval(a) místnost.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s zveřejnil(a) místnost pro všechny s odkazem.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s zpřístupnil(a) místnost pouze na pozvání.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s změnil(a) pravidlo k připojení na %(rule)s",
@@ -1016,7 +1016,7 @@
     "Name or Matrix ID": "Jméno nebo Matrix ID",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varování</b>: Upgrade místnosti <i>automaticky převede všechny členy na novou verzi místnosti.</i> Do staré místnosti pošleme odkaz na novou místnost - všichni členové na něj budou muset klepnout, aby se přidali do nové místnosti.",
     "Changes your avatar in this current room only": "Změní váš avatar jen v této místnosti",
-    "Unbans user with given ID": "Přijmout zpět uživatele s daným identifikátorem",
+    "Unbans user with given ID": "Zruší vykázání uživatele s daným identifikátorem",
     "Adds a custom widget by URL to the room": "Přidá do místnosti vlastní widget podle adresy URL",
     "Please supply a https:// or http:// widget URL": "Zadejte webovou adresu widgetu (začínající na https:// nebo http://)",
     "You cannot modify widgets in this room.": "V této místnosti nemůžete manipulovat s widgety.",
@@ -1030,9 +1030,9 @@
     "Unexpected error resolving homeserver configuration": "Chyba při zjišťování konfigurace domovského serveru",
     "The user's homeserver does not support the version of the room.": "Uživatelův domovský server nepodporuje verzi této místnosti.",
     "Show hidden events in timeline": "Zobrazovat v časové ose skryté události",
-    "When rooms are upgraded": "Upgrade místnosti",
+    "When rooms are upgraded": "Při aktualizaci místnosti",
     "<a>Upgrade</a> to your own domain": "<a>Přejít</a> na vlastní doménu",
-    "Upgrade this room to the recommended room version": "Provést upgrade místnosti na doporučenou verzi",
+    "Upgrade this room to the recommended room version": "Aktualizovat místnost na doporučenou verzi",
     "this room": "tato místnost",
     "View older messages in %(roomName)s.": "Zobrazit starší zprávy v %(roomName)s.",
     "Default role": "Výchozí role",
@@ -1062,8 +1062,8 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Tato místnost neexistuje. Jste si jistí, že jste na správném místě?",
     "Try again later, or ask a room admin to check if you have access.": "Zkuste to znovu nebo se zeptejte správce, zda může zkontrolovat váš přístup.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Při pokusu o vstup do místnosti došlo k chybě: %(errcode)s. Pokud si myslíte, že je to chyba, <issueLink>nahlaste ji</issueLink>.",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrade místnosti vypne její aktuální verzi a vyrobí novou místnost se stejným názvem a novou verzí.",
-    "This room has already been upgraded.": "V této místnostu už byl proveden upgrade.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Aktualizace místnosti uzavře její aktuální verzi a vyrobí novou místnost se stejným názvem a novou verzí.",
+    "This room has already been upgraded.": "Tato místnost byla již aktualizována.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Tato místnost běží na verzi <roomVersion />, což domovský server označuje za <i>nestabilní</i>.",
     "Failed to revoke invite": "Pozvání se nepovedlo zrušit",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Pozvání se nepovedlo zrušit. Mohlo dojít k dočasnému problému nebo na to nemáte dostatečná práva.",
@@ -1194,7 +1194,7 @@
     "Report Content to Your Homeserver Administrator": "Nahlásit obsah správci vašeho domovského serveru",
     "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.": "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.",
     "Send report": "Nahlásit",
-    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Upgrade vyžaduje zrušení této místnosti a vyrobení nové, která jí nahradí. Pro usnadnění procesu pro členy místnosti, provedeme:",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Aktualizace této místnosti vyžaduje uzavření stávající místnosti a vytvoření nové místnosti, která ji nahradí. Pro usnadnění procesu pro členy místnosti, provedeme:",
     "Command Help": "Nápověda příkazu",
     "Find others by phone or email": "Najít ostatní pomocí e-mailu nebo telefonu",
     "Be found by phone or email": "Umožnit ostatním mě nalézt pomocí e-mailu nebo telefonu",
@@ -1214,7 +1214,7 @@
     "Show tray icon and minimize window to it on close": "Zobrazovat systémovou ikonu a minimalizovat při zavření",
     "Read Marker lifetime (ms)": "Platnost značky přečteno (ms)",
     "Read Marker off-screen lifetime (ms)": "Platnost značky přečteno mimo obrazovku (ms)",
-    "Upgrade the room": "Upgradovat místnost",
+    "Upgrade the room": "Aktualizovat místnost",
     "Enable room encryption": "Povolit v místnosti šifrování",
     "Error changing power level requirement": "Chyba změny požadavku na úroveň oprávnění",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Došlo k chybě při změně požadované úrovně oprávnění v místnosti. Ubezpečte se, že na to máte dostatečná práva, a zkuste to znovu.",
@@ -1340,7 +1340,7 @@
     "Room Autocomplete": "Automatické doplňování místností",
     "User Autocomplete": "Automatické doplňování uživatelů",
     "Custom (%(level)s)": "Vlastní (%(level)s)",
-    "Error upgrading room": "Chyba při upgrade místnosti",
+    "Error upgrading room": "Chyba při aktualizaci místnosti",
     "Double check that your server supports the room version chosen and try again.": "Zkontrolujte, že váš server opravdu podporuje zvolenou verzi místnosti.",
     "%(senderName)s placed a voice call.": "%(senderName)s zahájil(a) hovor.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s zahájil(a) hovor. (není podporováno tímto prohlížečem)",
@@ -1426,11 +1426,11 @@
     "Integrations are disabled": "Integrace jsou zakázané",
     "Enable 'Manage Integrations' in Settings to do this.": "Pro provedení této akce povolte v nastavení správu integrací.",
     "Integrations not allowed": "Integrace nejsou povolené",
-    "Upgrade private room": "Upgradovat soukromou místnost",
-    "Upgrade public room": "Upgradovat veřejnou místnost",
+    "Upgrade private room": "Aktualizovat soukromou místnost",
+    "Upgrade public room": "Aktualizovat veřejnou místnost",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgradování místnosti je pokročilá operace a je doporučeno jí provést pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo zranitelnostem.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Toto obvykle ovlivňuje pouze zpracovávání místnosti na serveru. Pokud máte problém s %(brand)sem, <a>nahlaste nám ho prosím</a>.",
-    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Místnost bude upgradována z verze <oldVersion /> na verzi <newVersion />.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Místnost bude povýšena z verze <oldVersion /> na verzi <newVersion />.",
     "Upgrade": "Aktualizovat",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varování</b>: Nastavujte zálohu jen z důvěryhodných počítačů.",
     "Notification settings": "Nastavení oznámení",
@@ -2598,7 +2598,7 @@
     "Abort": "Přerušit",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.",
     "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele",
-    "Upgrade to %(hostSignupBrand)s": "Povýšit na %(hostSignupBrand)s",
+    "Upgrade to %(hostSignupBrand)s": "Aktualizovat na %(hostSignupBrand)s",
     "Edit Values": "Upravit hodnoty",
     "Values at explicit levels in this room:": "Hodnoty na explicitních úrovních v této místnosti:",
     "Values at explicit levels:": "Hodnoty na explicitních úrovních:",
@@ -2908,7 +2908,7 @@
     "%(senderName)s kicked %(targetName)s: %(reason)s": "%(senderName)s vykopl(a) uživatele %(targetName)s: %(reason)s",
     "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s",
     "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s: %(reason)s",
-    "%(senderName)s unbanned %(targetName)s": "%(senderName)s přijal(a) zpět uživatele %(targetName)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s zrušil(a) vykázání uživatele %(targetName)s",
     "%(targetName)s left the room": "%(targetName)s opustil(a) místnost",
     "%(targetName)s left the room: %(reason)s": "%(targetName)s opustil(a) místnost: %(reason)s",
     "%(targetName)s rejected the invitation": "%(targetName)s odmítl(a) pozvání",
@@ -3070,7 +3070,7 @@
     "Show sidebar": "Zobrazit postranní panel",
     "Hide sidebar": "Skrýt postranní panel",
     "Start sharing your screen": "Začít sdílet obrazovku",
-    "Stop sharing your screen": "Přestat sdílet obrazovku",
+    "Stop sharing your screen": "Ukončit sdílení obrazovky",
     "Stop the camera": "Vypnout kameru",
     "Start the camera": "Zapnout kameru",
     "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti.",
@@ -3227,13 +3227,13 @@
     "Shows all threads you’ve participated in": "Zobrazí všechna vlákna, kterých jste se zúčastnili",
     "My threads": "Moje vlákna",
     "They won't be able to access whatever you're not an admin of.": "Nebudou mít přístup ke všemu, čeho nejste správcem.",
-    "Unban them from specific things I'm able to": "Přijmout je zpět do konkrétních míst, do kterých jsem schopen",
-    "Unban them from everything I'm able to": "Přijmout je zpět všude, kam mohu",
+    "Unban them from specific things I'm able to": "Zrušit jejich vykázání z konkrétních míst, kde mám oprávnění",
+    "Unban them from everything I'm able to": "Zrušit jejich vykázání všude, kde mám oprávnění",
     "Ban them from specific things I'm able to": "Vykázat je z konkrétních míst, ze kterých jsem schopen",
     "Kick them from specific things I'm able to": "Vykopnout je z konkrétních míst, ze kterých jsem schopen",
     "Ban them from everything I'm able to": "Vykázat je všude, kde mohu",
     "Ban from %(roomName)s": "Vykázat z %(roomName)s",
-    "Unban from %(roomName)s": "Přijmout zpět do %(roomName)s",
+    "Unban from %(roomName)s": "Zrušit vykázání z %(roomName)s",
     "They'll still be able to access whatever you're not an admin of.": "Stále budou mít přístup ke všemu, čeho nejste správcem.",
     "Kick them from everything I'm able to": "Vykopnout je ze všeho, co to jde",
     "Kick from %(roomName)s": "Vykopnout z %(roomName)s",
@@ -3245,7 +3245,7 @@
     "Sending invites... (%(progress)s out of %(count)s)|one": "Odeslání pozvánky...",
     "Sending invites... (%(progress)s out of %(count)s)|other": "Odesílání pozvánek... (%(progress)s z %(count)s)",
     "Loading new room": "Načítání nové místnosti",
-    "Upgrading room": "Upgrade místnosti",
+    "Upgrading room": "Aktualizace místnosti",
     "Polls (under active development)": "Hlasování (v aktivním vývoji)",
     "Downloading": "Stahování",
     "%(count)s reply|one": "%(count)s odpověď",
@@ -3432,7 +3432,7 @@
     "Share location": "Sdílet polohu",
     "Manage pinned events": "Správa připnutých událostí",
     "Location sharing (under active development)": "Sdílení polohy (v aktivním vývoji)",
-    "Toggle space panel": "Přepnout panel prostoru",
+    "Toggle space panel": "Zobrazit/skrýt panel prostoru",
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Chcete ukončit toto hlasování? Zobrazí se konečné výsledky hlasování a lidé nebudou moci dále hlasovat.",
     "End Poll": "Ukončit hlasování",
     "Sorry, the poll did not end. Please try again.": "Omlouváme se, ale hlasování neskončilo. Zkuste to prosím znovu.",
@@ -3633,7 +3633,7 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s a %(space2Name)s",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sodeslal(a) skrytou zprávu",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s odeslal(a) %(count)s skrytých zpráv",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sodeslali %(count)s skrytou zprávu",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sodeslali skrytou zprávu",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sodeslali %(count)s skrytých zpráv",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)ssmazal(a) %(count)s zpráv",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)ssmazal(a) zprávu",
@@ -3656,5 +3656,217 @@
     "Open poll": "Otevřené hlasování",
     "Poll type": "Typ hlasování",
     "Results will be visible when the poll is ended": "Výsledky se zobrazí po ukončení hlasování",
-    "Search Dialog": "Dialogové okno hledání"
+    "Search Dialog": "Dialogové okno hledání",
+    "Next recently visited room or community": "Další nedávno navštívená místnost nebo skupina",
+    "Previous recently visited room or community": "Předchozí nedávno navštívená místnost nebo skupina",
+    "No virtual room for this room": "Žádná virtuální místnost pro tuto místnost",
+    "Switches to this room's virtual room, if it has one": "Přepne do virtuální místnosti této místnosti, pokud ji má",
+    "Accessibility": "Přístupnost",
+    "Open user settings": "Otevřít nastavení uživatele",
+    "Switch to space by number": "Přepnout do prostoru podle čísla",
+    "Pinned": "Připnuto",
+    "Open thread": "Otevřít vlákno",
+    "Remove messages sent by me": "Odstranit mnou odeslané zprávy",
+    "Location sharing - pin drop (under active development)": "Sdílení polohy - zvolená poloha (v aktivním vývoji)",
+    "Export Cancelled": "Export zrušen",
+    "What location type do you want to share?": "Jaký typ polohy chcete sdílet?",
+    "Drop a Pin": "Zvolená poloha",
+    "My live location": "Moje poloha živě",
+    "My current location": "Moje současná poloha",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s nemohl odeslat vaši polohu. Zkuste to prosím později.",
+    "We couldn't send your location": "Vaši polohu se nepodařilo odeslat",
+    "Match system": "Podle systému",
+    "This is a beta feature. Click for more info": "Jedná se o beta funkci. Klikněte pro více informací",
+    "Insert a trailing colon after user mentions at the start of a message": "Vložit dvojtečku za zmínku o uživateli na začátku zprávy",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Odpovědět na probíhající vlákno nebo použít \"%(replyInThread)s\", když najedete na zprávu a začnete novou.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)szměnil(a) <a>připnuté zprávy</a> místnosti",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s%(count)s krát změnil(a) <a>připnuté zprávy</a> místnosti",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)szměnili <a>připnuté zprávy</a> místnosti",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s%(count)s krát změnili <a>připnuté zprávy</a> v místnosti",
+    "Show polls button": "Zobrazit tlačítko hlasování",
+    "Location sharing - share your current location with live updates (under active development)": "Sdílení polohy - sdílení průběžně aktualizované polohy (v aktivním vývoji)",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Prostory představují nový způsob seskupování místností a osob. Jaký prostor chcete vytvořit? To můžete později změnit.",
+    "Click": "Kliknutí",
+    "Expand quotes": "Rozbalit citace",
+    "Collapse quotes": "Sbalit citace",
+    "We'll create rooms for each of them.": "Pro každého z nich vytvoříme místnost.",
+    "Click to drop a pin": "Kliknutím umístíte špendlík",
+    "Click to move the pin": "Kliknutím přesunete špendlík",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Tento domovský server není správně nakonfigurován pro zobrazování map nebo je mapový server nedostupný.",
+    "This homeserver is not configured to display maps.": "Tento domovský server není nakonfigurován pro zobrazování map.",
+    "Shared a location: ": "Sdílel(a) polohu: ",
+    "Shared their location: ": "Sdíleli svou polohu: ",
+    "Unable to load map": "Nelze načíst mapu",
+    "Can't create a thread from an event with an existing relation": "Nelze založit vlákno ve vlákně",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Pokud jste odeslali chybu prostřednictvím GitHubu, ladící protokoly nám mohou pomoci problém vysledovat. ",
+    "Busy": "Zaneprázdněný",
+    "Toggle Link": "Odkaz",
+    "Toggle Code Block": "Blok kódu",
+    "Thank you for helping us testing Threads!": "Děkujeme, že nám pomáháte s testováním vláken!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Všechny události vlákna vytvořené během experimentálního období se nyní zobrazí na časové ose místnosti a zobrazí se jako odpovědi. Jedná se o jednorázový přechod. Vlákna jsou nyní součástí specifikace Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Nedávno jsme zavedli důležitá vylepšení stability pro vlákna, což také znamená postupné ukončení podpory experimentálních vláken.",
+    "Threads are no longer experimental! 🎉": "Vlákna již nejsou experimentální funkcí! 🎉",
+    "You are sharing your live location": "Sdílíte svoji polohu živě",
+    "%(displayName)s's live location": "Poloha %(displayName)s živě",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Zrušte zaškrtnutí, pokud chcete odstranit i systémové zprávy tohoto uživatele (např. změna členství, změna profilu...)",
+    "Preserve system messages": "Zachovat systémové zprávy",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Chystáte se odstranit %(count)s zprávu od %(user)s. Tím ji trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Chystáte se odstranit %(count)s zpráv od %(user)s. Tím je trvale odstraníte pro všechny účastníky konverzace. Přejete si pokračovat?",
+    "Currently removing messages in %(count)s rooms|one": "Momentálně se odstraňují zprávy v %(count)s místnosti",
+    "Currently removing messages in %(count)s rooms|other": "Momentálně se odstraňují zprávy v %(count)s místnostech",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "Share for %(duration)s": "Sdílet na %(duration)s",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Jedná se o jednorázový přechod, protože vlákna jsou nyní součástí Matrix specifikace.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "V rámci příprav musíme provést některé změny: vlákna vytvořená před tímto bodem budou <strong>zobrazena jako běžné odpovědi</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Blížíme se k vydání veřejné betaverze vláken.",
+    "Threads Approaching Beta 🎉": "Vlákna se blíží k betaverzi 🎉",
+    "Stop sharing": "Ukončit sdílení",
+    "You are sharing %(count)s live locations|one": "Sdílíte svoji polohu živě",
+    "You are sharing %(count)s live locations|other": "Sdílíte %(count)s poloh živě",
+    "%(timeRemaining)s left": "%(timeRemaining)s zbývá",
+    "Room details": "Podrobnosti o místnosti",
+    "Voice & video room": "Hlasová a video místnost",
+    "Text room": "Textová místnost",
+    "Room type": "Typ místnosti",
+    "Connecting...": "Připojování...",
+    "Voice room": "Video místnost",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ladící protokoly obsahují údaje o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasů místností, které jste navštívili, s kterými prvky uživatelského rozhraní jste naposledy interagovali a uživatelských jmen ostatních uživatelů. Neobsahují zprávy.",
+    "Mic": "Mikrofon",
+    "Mic off": "Mikrofon vypnutý",
+    "Video": "Video",
+    "Video off": "Video vypnuto",
+    "Connected": "Připojeno",
+    "Voice & video rooms (under active development)": "Hlasové a video místnosti (v aktivním vývoji)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Snažíte se použít odkazu na skupinu (%(groupId)s).<br/>Skupiny již nejsou podporovány a byly nahrazeny prostory.<br2/><a>Další informace o prostorech najdete zde.</a>",
+    "That link is no longer supported": "Tento odkaz již není podporován",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Pokud tato stránka obsahuje identifikovatelné údaje, jako je místnost nebo ID uživatele, jsou tyto údaje před odesláním na server odstraněny.",
+    "Next recently visited room or space": "Další nedávno navštívená místnost nebo prostor",
+    "Previous recently visited room or space": "Předchozí nedávno navštívená místnost nebo prostor",
+    "Event ID: %(eventId)s": "ID události: %(eventId)s",
+    "No verification requests found": "Nebyly nalezeny žádné požadavky na ověření",
+    "Observe only": "Pouze sledovat",
+    "Requester": "Žadatel",
+    "Methods": "Metody",
+    "Timeout": "Časový limit",
+    "Phase": "Fáze",
+    "Client Versions": "Verze klienta",
+    "Server Versions": "Verze serveru",
+    "Transaction": "Transakce",
+    "Cancelled": "Zrušeno",
+    "Started": "Zahájeno",
+    "Ready": "Připraveno",
+    "Requested": "Požadované",
+    "Unsent": "Neodeslané",
+    "Edit values": "Upravit hodnoty",
+    "Failed to save settings.": "Nepodařilo se uložit nastavení.",
+    "Number of users": "Počet uživatelů",
+    "Server": "Server",
+    "Failed to load.": "Nepodařilo se načíst.",
+    "Capabilities": "Schopnosti",
+    "Send custom state event": "Odeslat vlastní stavovou událost",
+    "Failed to send event!": "Nepodařilo se odeslat událost!",
+    "Doesn't look like valid JSON.": "Nevypadá to jako platný JSON.",
+    "Send custom room account data event": "Odeslat vlastní událost s údaji o účtu místnosti",
+    "Send custom account data event": "Odeslat vlastní událost s údaji o účtu",
+    "Room ID: %(roomId)s": "ID místnosti: %(roomId)s",
+    "Server info": "Informace o serveru",
+    "Settings explorer": "Průzkumník nastavení",
+    "Explore account data": "Prozkoumat údaje o účtu",
+    "Verification explorer": "Průzkumník ověřování",
+    "View servers in room": "Zobrazit servery v místnosti",
+    "Explore room account data": "Prozkoumat údaje o účtu místnosti",
+    "Explore room state": "Prozkoumat stav místnosti",
+    "Send custom timeline event": "Odeslat vlastní událost na časové ose",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Pomozte nám identifikovat problémy a zlepšit %(analyticsOwner)s sdílením anonymních údajů o používání. Abychom pochopili, jak lidé používají více zařízení, vygenerujeme náhodný identifikátor sdílený vašimi zařízeními.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Můžete použít vlastní volbu serveru a přihlásit se k jiným Matrix serverům zadáním adresy URL domovského serveru. To vám umožní používat %(brand)s s existujícím Matrix účtem na jiném domovském serveru.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "Aplikaci %(brand)s bylo odepřeno oprávnění ke zjištění vaší polohy. Povolte prosím přístup k poloze v nastavení prohlížeče.",
+    "Developer tools": "Nástroje pro vývojáře",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s je experimentální v mobilním webovém prohlížeči. Chcete-li získat lepší zážitek a nejnovější funkce, použijte naši bezplatnou nativní aplikaci.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Pokud nemůžete najít místnost, kterou hledáte, požádejte o pozvání nebo <a>vytvořte novou místnost</a>.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Sdílení polohy živě - sdílení aktuální polohy (aktivní vývoj, polohy přetrvávají dočasně v historii místnosti)",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Při pokusu o přístup do místnosti nebo prostoru bylo vráceno %(errcode)s. Pokud si myslíte, že se vám tato zpráva zobrazuje chybně, pošlete prosím <issueLink>hlášení o chybě</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Zkuste to později nebo požádejte správce místnosti či prostoru, aby zkontroloval, zda máte přístup.",
+    "This room or space is not accessible at this time.": "Tato místnost nebo prostor není v tuto chvíli přístupná.",
+    "Are you sure you're at the right place?": "Jste si jisti, že jste na správném místě?",
+    "This room or space does not exist.": "Tato místnost nebo prostor neexistuje.",
+    "There's no preview, would you like to join?": "Není k dispozici žádný náhled, chcete se připojit?",
+    "This invite was sent to %(email)s": "Tato pozvánka byla odeslána na adresu %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Tato pozvánka byla odeslána na adresu %(email)s, která není spojena s vaším účtem",
+    "You can still join here.": "Zde se můžete stále připojit.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Při pokusu o ověření vaší pozvánky byla vrácena chyba (%(errcode)s). Tuto informaci můžete zkusit předat osobě, která vás pozvala.",
+    "Something went wrong with your invite.": "Něco se pokazilo s vaší pozvánkou.",
+    "You were banned by %(memberName)s": "Byl(a) jsi vykázán(a) uživatelem %(memberName)s",
+    "Forget this space": "Zapomenout tento prostor",
+    "You were removed by %(memberName)s": "%(memberName)s vás odebral(a)",
+    "Loading preview": "Načítání náhledu",
+    "Joining …": "Připojování …",
+    "View older version of %(spaceName)s.": "Zobrazit starší verzi %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Aktualizovat tento prostor na doporučenou verzi místnosti",
+    "Failed to join": "Nepodařilo se připojit",
+    "The person who invited you has already left, or their server is offline.": "Osoba, která vás pozvala, již odešla nebo je její server offline.",
+    "The person who invited you has already left.": "Osoba, která vás pozvala, již odešla.",
+    "Sorry, your homeserver is too old to participate here.": "Omlouváme se, ale váš domovský server je příliš zastaralý na to, aby se zde mohl účastnit.",
+    "There was an error joining.": "Došlo k chybě při připojování.",
+    "The user's homeserver does not support the version of the space.": "Domovský server uživatele nepodporuje danou verzi prostoru.",
+    "User may or may not exist": "Uživatel může, ale nemusí existovat",
+    "User does not exist": "Uživatel neexistuje",
+    "User is already in the room": "Uživatel je již v místnosti",
+    "User is already in the space": "Uživatel je již v prostoru",
+    "User is already invited to the room": "Uživatel je již pozván do místnosti",
+    "User is already invited to the space": "Uživatel je již pozván do prostoru",
+    "You do not have permission to invite people to this space.": "Nemáte oprávnění zvát lidi do tohoto prostoru.",
+    "Failed to invite users to %(roomName)s": "Nepodařilo se pozvat uživatele do %(roomName)s",
+    "An error occurred while stopping your live location, please try again": "Při ukončování vaší polohy živě došlo k chybě, zkuste to prosím znovu",
+    "Stop sharing and close": "Ukončit sdílení a zavřít",
+    "An error occured whilst sharing your live location, please try again": "Při sdílení vaší polohy živě došlo k chybě, zkuste to prosím znovu",
+    "An error occured whilst sharing your live location": "Při sdílení vaší polohy živě došlo k chybě",
+    "Create room": "Vytvořit místnost",
+    "Create video room": "Vytvořit video místnost",
+    "Create a video room": "Vytvořit video místnost",
+    "%(count)s participants|one": "1 účastník",
+    "%(count)s participants|other": "%(count)s účastníků",
+    "New video room": "Nová video místnost",
+    "New room": "Nová místnost",
+    "Video rooms (under active development)": "Video místnosti (v aktivním vývoji)",
+    "<a>Give feedback</a>": "<a>Poskytnout zpětnou vazbu</a>",
+    "%(featureName)s Beta feedback": "Zpětná vazba beta funkce %(featureName)s",
+    "Beta feature. Click to learn more.": "Beta funkce. Kliknutím získáte další informace.",
+    "Beta feature": "Beta funkce",
+    "Threads are a beta feature": "Vlákna jsou beta funkcí",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Tip:</b> Při najetí na zprávu použijte možnost \"Odpovědět ve vlákně\".",
+    "Threads help keep your conversations on-topic and easy to track.": "Vlákna pomáhají udržovat konverzace k tématu a snadno je sledovat.",
+    "To leave, return to this page and use the “Leave the beta” button.": "Chcete-li odejít, vraťte se na tuto stránku a použijte tlačítko \"Opustit beta verzi\".",
+    "Use \"Reply in thread\" when hovering over a message.": "Po najetí na zprávu použijte možnost \"Odpovědět ve vlákně\".",
+    "How can I start a thread?": "Jak mohu založit vlákno?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Vlákna pomáhají udržovat konverzace k tématu a snadno je sledovat. <a>Další informace</a>.",
+    "Keep discussions organised with threads.": "Diskuse udržovat organizované pomocí vláken.",
+    "sends hearts": "posílá srdíčka",
+    "Sends the given message with hearts": "Odešle danou zprávu se srdíčky",
+    "Confirm signing out these devices|one": "Potvrďte odhlášení z tohoto zařízení",
+    "Confirm signing out these devices|other": "Potvrďte odhlášení z těchto zařízení",
+    "Live location ended": "Sdílení polohy živě skončilo",
+    "Loading live location...": "Načítání polohy živě...",
+    "View live location": "Zobrazit polohu živě",
+    "Live location enabled": "Poloha živě povolena",
+    "Live location error": "Chyba polohy živě",
+    "Live until %(expiryTime)s": "Živě do %(expiryTime)s",
+    "Yes, enable": "Ano, povolit",
+    "Do you want to enable threads anyway?": "Chcete i přesto vlákna povolit?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Váš domovský server v současné době nepodporuje vlákna, takže tato funkce může být nespolehlivá. Některé zprávy ve vláknech nemusí být spolehlivě dostupné. <a>Dozvědět se více</a>.",
+    "Partial Support for Threads": "Částečná podpora vláken",
+    "Ban from room": "Vykázat z místnosti",
+    "Unban from room": "Zrušit vykázání z místnosti",
+    "Ban from space": "Vykázat z prostoru",
+    "Unban from space": "Zrušit vykázání z prostoru",
+    "Jump to the given date in the timeline": "Přejít na zadané datum na časové ose",
+    "Right-click message context menu": "Klikněte pravým tlačítkem pro zobrazení kontextové nabídky",
+    "Remove from space": "Odebrat z prostoru",
+    "Disinvite from room": "Zrušit pozvánku do místnosti",
+    "Disinvite from space": "Zrušit pozvánku do prostoru",
+    "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.": "<b>Tip:</b> Použijte \"%(replyInThread)s\" při najetí na zprávu.",
+    "To leave, return to this page and use the “%(leaveTheBeta)s” button.": "Chcete-li odejít, vraťte se na tuto stránku a použijte tlačítko \"%(leaveTheBeta)s\".",
+    "Use “%(replyInThread)s” when hovering over a message.": "Použijte \"%(replyInThread)s\" při najetí na zprávu."
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 62e664576b7..4ca4a853a1a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -69,7 +69,7 @@
     "Success": "Erfolg",
     "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
     "This room is not accessible by remote Matrix servers": "Dieser Raum ist von Personen auf anderen Matrix-Servern nicht betretbar",
-    "Admin": "Administration",
+    "Admin": "Admin",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Softwarefehler gestoßen.",
     "Labs": "Labor",
     "Unable to add email address": "E-Mail-Adresse konnte nicht hinzugefügt werden",
@@ -1202,7 +1202,7 @@
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Durch die Änderung des Passworts werden derzeit alle Ende-zu-Ende-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chatverlauf nicht mehr lesbar ist, es sei denn, du exportierst zuerst deine Raumschlüssel und importierst sie anschließend wieder. In Zukunft wird dies verbessert werden.",
     "Delete %(count)s sessions|other": "%(count)s Sitzungen löschen",
     "Backup is not signed by any of your sessions": "Die Sicherung wurde von keiner deiner Sitzungen bestätigt",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhältst keine Puschbenachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldest",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. In anderen Sitzungen musst du dich erneut Anmelden, damit du weiterhin Benachrichtigungen erhältst",
     "Notification sound": "Benachrichtigungston",
     "Set a new custom sound": "Neuen individuellen Ton festlegen",
     "Browse": "Durchsuchen",
@@ -3119,7 +3119,7 @@
     "Change main address for the space": "Hauptadresse des Space ändern",
     "Change space name": "Name des Space ändern",
     "Change space avatar": "Space-Icon ändern",
-    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Alle in <spaceName/> können finden und beitreten. Du kannst auch weitere Spaces auswählen.",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Alle können <spaceName/> finden und beitreten. Du kannst auch weitere Spaces auswählen.",
     "Currently, %(count)s spaces have access|one": "Derzeit hat ein Space Zugriff",
     "& %(count)s more|one": "und %(count)s weitere",
     "Low bandwidth mode (requires compatible homeserver)": "Modus für niedrige Bandweite (kompatibler Heimserver benötigt)",
@@ -3397,7 +3397,7 @@
     "Testing small changes": "Kleine Änderungen testen",
     "Open in OpenStreetMap": "In OpenStreetMap öffnen",
     "Use <arrows/> to scroll results": "Scolle mit <arrows/> durch die Ergebnisse",
-    "Recent searches": "Kürzliche Suchen",
+    "Recent searches": "Kürzliche Gesucht",
     "To search messages, look for this icon at the top of a room <icon/>": "Wenn du Nachrichten durchsuchen willst, klicke auf das <icon/> Icon oberhalb des Raumes",
     "Other searches": "Andere Suchen",
     "Public rooms": "Öffentliche Räume",
@@ -3607,9 +3607,9 @@
     "Voice Message": "Sprachnachricht",
     "Hide stickers": "Sticker ausblenden",
     "You do not have permissions to add spaces to this space": "Du hast keine Berechtigung, um Spaces zu diesem Space hinzuzufügen",
-    "Reply to an ongoing thread or use “Reply in thread”when hovering over a message to start a new one.": "Antworte auf einen laufenden Thread oder bewege deinen Mauszeiger über einer Nachricht und benutze „In Thread antworten“, um einen neuen zu starten.",
+    "Reply to an ongoing thread or use “Reply in thread”when hovering over a message to start a new one.": "Antworte auf einen laufenden Thread oder klicke bei einer Nachricht auf „In Thread antworten“, um einen neuen zu starten.",
     "How can I give feedback?": "Wie kann ich Feedback geben?",
-    "Results not as expected? Please <a>give feedback</a>.": "Ergebnisse nicht wie erwartet? Bitte <a>gib Feedback</a>.",
+    "Results not as expected? Please <a>give feedback</a>.": "Sind die Ergebnisse nicht wie erwartet? Bitte <a>gib Feedback</a>.",
     "Feedback sent! Thanks, we appreciate it!": "Feedback gesendet! Danke, wir wissen es zu schätzen!",
     "A new, quick way to search spaces and rooms you're in.": "Eine neue, schnelle Art der Suche nach Spaces und Räumen in denen du bist.",
     "New search experience": "Neue Sucherfahrung",
@@ -3626,5 +3626,100 @@
     "Maximise": "Maximieren",
     "To leave, just return to this page or click on the beta badge when you search.": "Zum Verlassen komme einfach auf diese Seite zurück oder klicke auf Beta, wenn du suchst.",
     "We're testing a new search to make finding what you want quicker.\n": "Wir testen eine neue Suche, damit du schneller findest, was du möchtest.\n",
-    "Automatically send debug logs when key backup is not functioning": "Sende automatisch Protokolle zur Fehlerkorrektur, wenn die Schlüsselsicherung nicht funktioniert"
+    "Automatically send debug logs when key backup is not functioning": "Sende automatisch Protokolle zur Fehlerkorrektur, wenn die Schlüsselsicherung nicht funktioniert",
+    "Open user settings": "Benutzereinstellungen öffnen",
+    "Switch to space by number": "Mit Nummer zu Space springen",
+    "Next recently visited room or community": "Nächster kürzlich besuchter Raum/Space",
+    "Previous recently visited room or community": "Vorheriger kürzlich besuchter Raum/Space",
+    "Accessibility": "Barrierefreiheit",
+    "Pinned": "Angeheftet",
+    "Open thread": "Thread anzeigen",
+    "Show current avatar and name for users in message history": "Aktuelle Profilbilder und Nicknamen im Chatverlauf anzeigen",
+    "Search Dialog": "Suchdialog",
+    "Join %(roomAddress)s": "%(roomAddress)s beitreten",
+    "<%(count)s spaces>|zero": "<Leere Zeichenkette>",
+    "<%(count)s spaces>|one": "<Leerzeichen>",
+    "<%(count)s spaces>|other": "<%(count)s Leerzeichen>",
+    "Results are only revealed when you end the poll": "Die Ergebnisse sind sichtbar, sobald die Abstimmung beendet wird",
+    "Voters see results as soon as they have voted": "Alle die ihre Stimme abgegeben haben, sehen die Ergebnisse",
+    "Open poll": "Laufende Abstimmung",
+    "Closed poll": "Abgeschlossene Abstimmung",
+    "Poll type": "Art der Abstimmung",
+    "Edit poll": "Abstimmung bearbeiten",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s hat eine versteckte Nachricht gesendet",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s hat %(count)s versteckte Nachrichten gesendet",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s hat eine versteckte Nachricht gesendet",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s haben %(count)s versteckte Nachrichten gesendet",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s hat eine Nachricht gelöscht",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s hat %(count)s Nachrichten gelöscht",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s hat eine Nachricht gelöscht",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s haben %(count)s Nachrichten gelöscht",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> bearbeitet.",
+    "Results will be visible when the poll is ended": "Ergebnisse sind erst nach Beenden der Abstimmung sichtbar",
+    "Sorry, you can't edit a poll after votes have been cast.": "Du kannst die Abstimmung nicht bearbeiten, wenn schon Stimmen abgegeben wurden.",
+    "Can't edit poll": "Die Abstimmung kann nicht bearbeitet werden",
+    "No virtual room for this room": "Kein virtueller Raum für diesen Raum",
+    "Switches to this room's virtual room, if it has one": "Zum virtuellen Raum dieses Raums wechseln, sofern vorhanden",
+    "They won't be able to access whatever you're not an admin of.": "Sie werden keinen Zugriff auf das haben, wo du kein Admin bist.",
+    "Location sharing - pin drop (under active development)": "Standort teilen - auf Karte auswählen (in Entwicklung)",
+    "Remove messages sent by me": "Vom mir gesendete Nachrichten löschen",
+    "Show polls button": "Abstimmungsknopf anzeigen",
+    "Location sharing - share your current location with live updates (under active development)": "Standort teilen - teile deinen Standort live (in Entwicklung)",
+    "This homeserver is not configured to display maps.": "Dein Homeserver unterstützt das Anzeigen von Karten nicht.",
+    "Click to drop a pin": "Klicke, um den Standort zu setzen",
+    "Click to move the pin": "Klicke, um den Standort zu bewegen",
+    "Shared a location: ": "Hat einen Standort geteilt: ",
+    "Shared their location: ": "Hat den Standort geteilt: ",
+    "Unable to load map": "Karte kann nicht geladen werden",
+    "Click": "Klick",
+    "Expand quotes": "Zitate ausklappen",
+    "Collapse quotes": "Zitate einklappen",
+    "Can't create a thread from an event with an existing relation": "Du kannst keinen Thread in einem Thread starten",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Gruppiere deine Chats mit Spaces. Welche Art von Space willst du erstellen? Du kannst dies später ändern.",
+    "Match system": "An System anpassen",
+    "Insert a trailing colon after user mentions at the start of a message": "Doppelpunkt nach Erwähnungen einfügen",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Antworte auf einen Thread oder klicke bei einer Nachricht auf „%(replyInThread)s“, um einen Thread zu starten.",
+    "We'll create rooms for each of them.": "Wir werden dir dafür entsprechende Räume erstellen.",
+    "This is a beta feature. Click for more info": "Dies ist ein Beta-Feature. Klicke für weitere Infos",
+    "Export Cancelled": "Exportieren abgebrochen",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s hat die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s hat die <a>angehefteten Nachrichten</a> des Raumes bearbeitet",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s haben die <a>angehefteten Nachrichten</a> des Raumes %(count)s-Mal bearbeitet",
+    "What location type do you want to share?": "Wie willst du deinen Standort teilen?",
+    "Drop a Pin": "Standort setzen",
+    "My live location": "Mein Live-Standort",
+    "My current location": "Mein Standort",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s konnte deinen Standort nicht senden. Versuche es später bitte erneut.",
+    "We couldn't send your location": "Wir können deinen Standort nicht senden",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Dein Homeserver unterstützt das Anzeigen von Karten nicht oder der Kartenanbieter ist nicht erreichbar.",
+    "Busy": "Beschäftigt",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Wenn du uns einen Bug auf GitHub gemeldet hast, können uns Debug-Logs helfen, das Problem zu finden. ",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Wir haben die Stabilität von Threads deutlich verbessern können. Ab sofort sind Threads ein offizielles Feature und nicht mehr experimentell.",
+    "Toggle Link": "Link umschalten",
+    "Toggle Code Block": "Code-Block umschalten",
+    "Thank you for helping us testing Threads!": "Danke, dass du mit uns Threads getestet hast!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Alle Threads, die du früher erstellt hast, werden ab sofort als normale Antworten im Chatverlauf angezeigt werden. Dies muss geschehen, da deinen neuen Threads nun offizieller Teil von Matrix sein werden.",
+    "Threads are no longer experimental! 🎉": "Threads sind ab sofort nicht mehr experimentell! 🎉",
+    "You are sharing your live location": "Du teilst deinen Live-Standort",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Entferne das Häkchen, wenn du auch Systemnachrichten des Nutzers löschen willst (z.B. Mitglieds- und Profiländerungen)",
+    "Preserve system messages": "Systemnachrichten behalten",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Du bist gerade dabei, %(count)s Nachricht von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Du bist gerade dabei, %(count)s Nachrichten von %(user)s Benutzern zu löschen. Die Nachrichten werden für niemanden mehr sichtbar sein. Willst du fortfahren?",
+    "%(displayName)s's live location": "Aktueller Standort von %(displayName)s",
+    "Currently removing messages in %(count)s rooms|one": "Entferne Nachrichten in %(count)s Raum",
+    "Currently removing messages in %(count)s rooms|other": "Entferne Nachrichten in %(count)s Räumen",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Dies ist einmalig notwendig, da wir auf die offiziellen Threads der Matrix-Spezifikation umsteigen.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Als Vorbereitung dazu, müssen wir ein paar Änderungen machen: Alle Threads, die du bis jetzt erstellt hast, werden als <strong>normale Antworten auf die Nachricht</strong> angezeigt werden.",
+    "We're getting closer to releasing a public Beta for Threads.": "Bald werden wir Threads als Beta-Version veröffentlichen.",
+    "Threads Approaching Beta 🎉": "Threads sind bald in der Beta 🎉",
+    "Stop sharing": "Nicht mehr teilen",
+    "You are sharing %(count)s live locations|one": "Du teilst deinen Live-Standort",
+    "You are sharing %(count)s live locations|other": "Du teilst %(count)s Live-Standort",
+    "%(timeRemaining)s left": "%(timeRemaining)s übrig",
+    "Share for %(duration)s": "Geteilt für %(duration)s",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)smin",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index acad8aff77c..ee84cf5f12d 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -66,7 +66,7 @@
     "For security, this session has been signed out. Please sign in again.": "Για λόγους ασφαλείας, αυτή η συνεδρία έχει τερματιστεί. Παρακαλούμε συνδεθείτε ξανά.",
     "Hangup": "Κλείσιμο",
     "Historical": "Ιστορικό",
-    "Homeserver is": "Ο διακομιστής είναι",
+    "Homeserver is": "Ο κεντρικός διακομιστής είναι",
     "I have verified my email address": "Έχω επαληθεύσει την διεύθυνση ηλ. αλληλογραφίας",
     "Import": "Εισαγωγή",
     "Import E2E room keys": "Εισαγωγή κλειδιών E2E",
@@ -261,8 +261,8 @@
     "Failed to invite": "Δεν ήταν δυνατή η πρόσκληση",
     "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του %(brand)s στο μικρόφωνο/κάμερα",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή - παρακαλούμε ελέγξτε την συνδεσιμότητα, βεβαιωθείτε ότι το <a>πιστοποιητικό SSL</a> του διακομιστή είναι έμπιστο και ότι κάποιο πρόσθετο περιηγητή δεν αποτρέπει τα αιτήματα.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή μέσω HTTP όταν μια διεύθυνση HTTPS βρίσκεται στην μπάρα του περιηγητή. Είτε χρησιμοποιήστε HTTPS ή <a>ενεργοποιήστε τα μη ασφαλή σενάρια εντολών</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Δεν είναι δυνατή η σύνδεση στον κεντρικό διακομιστή - παρακαλούμε ελέγξτε τη συνδεσιμότητα, βεβαιωθείτε ότι το <a>πιστοποιητικό SSL</a> του διακομιστή είναι έμπιστο και ότι κάποιο πρόσθετο περιηγητή δεν αποτρέπει τα αιτήματα.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Δεν είναι δυνατή η σύνδεση στον κεντρικό διακομιστή μέσω HTTP όταν μια διεύθυνση HTTPS βρίσκεται στην μπάρα του περιηγητή. Είτε χρησιμοποιήστε HTTPS ή <a>ενεργοποιήστε τα μη ασφαλή σενάρια εντολών</a>.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Ο %(senderName)s άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
@@ -366,7 +366,7 @@
     "The platform you're on": "Η πλατφόρμα στην οποία βρίσκεστε",
     "The version of %(brand)s": "Η έκδοση του %(brand)s",
     "Your language of choice": "Η γλώσσα επιλογής σας",
-    "Your homeserver's URL": "Το URL του διακομιστή φιλοξενίας σας",
+    "Your homeserver's URL": "Το URL του κεντρικού διακομιστή σας",
     "Every page you use in the app": "Κάθε σελίδα που χρησιμοποιείτε στην εφαρμογή",
     "e.g. <CurrentPageURL>": "π.χ. <CurrentPageURL>",
     "Your device resolution": "Η ανάλυση της συσκευής σας",
@@ -389,15 +389,15 @@
     "Failed to add the following rooms to %(groupId)s:": "Αποτυχία προσθήκης στο %(groupId)s των δωματίων:",
     "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;",
     "Restricted": "Περιορισμένο/η",
-    "Unable to create widget.": "Αδυναμία δημιουργίας γραφικού στοιχείου.",
+    "Unable to create widget.": "Αδυναμία δημιουργίας μικροεφαρμογής.",
     "You are not in this room.": "Δεν είστε μέλος αυτού του δωματίου.",
     "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
     "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s",
     "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s",
     "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.",
-    "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στη μικροεφαρμογή %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε η μικροεφαρμογή %(widgetName)s από τον/την %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Η μικροεφαρμογή %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
     "Disinvite this user?": "Απόσυρση της πρόσκλησης αυτού του χρήστη;",
@@ -420,11 +420,11 @@
     "Add Phone Number": "Προσθήκη Τηλεφωνικού Αριθμού",
     "Whether or not you're logged in (we don't record your username)": "Χωρίς να έχει σημασία εάν είστε συνδεδεμένοι (δεν καταγράφουμε το όνομα χρήστη σας)",
     "Which officially provided instance you are using, if any": "Ποιά επίσημα παρεχόμενη έκδοση χρησιμοποιείτε, εάν χρησιμοποιείτε κάποια",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Χωρίς να έχει σημασία εάν χρησιμοποιείτε την λειτουργία \"Πλούσιο Κείμενο\" του Επεξεργαστή Πλουσίου Κειμένου",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Χωρίς να έχει σημασία εάν χρησιμοποιείτε την λειτουργία \"Richtext \" του Επεξεργαστή Εμπλουτισμένου Κειμένου",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Χωρίς να έχει σημασία εάν χρησιμοποιείτε το χαρακτηριστικό 'breadcrumbs' (τα άβαταρ πάνω από την λίστα δωματίων)",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Όπου αυτή η σελίδα περιέχει αναγνωρίσιμες πληροφορίες, όπως ταυτότητα δωματίου, χρήστη ή ομάδας, αυτά τα δεδομένα αφαιρούνται πριν πραγματοποιηθεί αποστολή στον διακομιστή.",
     "Call failed due to misconfigured server": "Η κλήση απέτυχε λόγω της λανθασμένης διάρθρωσης του διακομιστή",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Παρακαλείστε να ρωτήσετε τον διαχειριστή του διακομιστή φιλοξενίας σας (<code>%(homeserverDomain)s</code>) να ρυθμίσουν έναν διακομιστή πρωτοκόλλου TURN ώστε οι κλήσεις να λειτουργούν απρόσκοπτα.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Παρακαλείστε να ρωτήσετε τον διαχειριστή του κεντρικού διακομιστή σας (<code>%(homeserverDomain)s</code>) να ρυθμίσουν έναν διακομιστή πρωτοκόλλου TURN ώστε οι κλήσεις να λειτουργούν απρόσκοπτα.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Εναλλακτικά, δοκιμάστε να χρησιμοποιήσετε τον δημόσιο διακομιστή στο <code>turn.matrix.org</code>, αλλά δεν θα είναι το ίδιο απρόσκοπτο, και θα κοινοποιεί την διεύθυνση IP σας με τον διακομιστή. Μπορείτε επίσης να το διαχειριστείτε στις Ρυθμίσεις.",
     "Try using turn.matrix.org": "Δοκιμάστε το turn.matrix.org",
     "Permission Required": "Απαιτείται Άδεια",
@@ -432,7 +432,7 @@
     "Replying With Files": "Απαντώντας Με Αρχεία",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Αυτήν την στιγμή δεν είναι δυνατό να απαντήσετε με αρχείο. Θα θέλατε να ανεβάσετε το αρχείο χωρίς να απαντήσετε;",
     "The file '%(fileName)s' failed to upload.": "Απέτυχε το ανέβασμα του αρχείου '%(fileName)s'.",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Το αρχείο '%(fileName)s' ξεπερνάει το όριο μεγέθους ανεβάσματος αυτού του διακομιστή φιλοξενίας",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Το αρχείο '%(fileName)s' ξεπερνάει το όριο μεγέθους ανεβάσματος αυτού του κεντρικού διακομιστή",
     "The server does not support the room version specified.": "Ο διακομιστής δεν υποστηρίζει την έκδοση του δωματίου που ορίστηκε.",
     "Name or Matrix ID": "Όνομα ή ταυτότητα Matrix",
     "Identity server has no terms of service": "Ο διακομιστής ταυτοποίησης δεν έχει όρους χρήσης",
@@ -544,7 +544,7 @@
     "Sends the given message coloured as a rainbow": "Στέλνει το δοσμένο μήνυμα χρωματισμένο σαν ουράνιο τόξο",
     "Session already verified!": "Η συνεδρία έχει ήδη επιβεβαιωθεί!",
     "Unknown (user, session) pair:": "Άγνωστο ζευγάρι (χρήστης, συνεδρία):",
-    "You cannot modify widgets in this room.": "Δεν μπορείτε να τροποποιήσετε τα widget σε αυτό το δωμάτιο.",
+    "You cannot modify widgets in this room.": "Δεν μπορείτε να τροποποιήσετε μικροεφαρμογές σε αυτό το δωμάτιο.",
     "Please supply a https:// or http:// widget URL": "Παρακαλώ εισάγετε ένα widget URL με https:// ή http://",
     "Please supply a widget URL or embed code": "Παρακαλώ εισάγετε ένα widget URL ή ενσωματώστε κώδικα",
     "Adds a custom widget by URL to the room": "Προσθέτει ένα προσαρμοσμένο widget μέσω URL στο δωμάτιο",
@@ -865,7 +865,7 @@
     "Aruba": "Αρούμπα",
     "Antigua & Barbuda": "Αντίγκουα και Μπαρμπούντα",
     "Anguilla": "Ανγκουίλα",
-    "%(name)s is requesting verification": "Ο/η %(name)s ζητάει επιβεβαίωση",
+    "%(name)s is requesting verification": "%(name)s ζητάει επιβεβαίωση",
     "%(date)s at %(time)s": "%(date)s στις %(time)s",
     "Failed to transfer call": "Αποτυχία μεταφοράς κλήσης",
     "Transfer Failed": "Αποτυχία μεταφοράς",
@@ -925,5 +925,2529 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s": "Ο/η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομα σε %(displayName)s",
     "%(senderName)s banned %(targetName)s": "Ο %(senderName)s απέκλεισε τον/την %(targetName)s",
     "%(senderName)s banned %(targetName)s: %(reason)s": "Ο %(senderName)s απέκλεισε τον/την %(targetName)s: %(reason)s",
-    "%(senderName)s changed the <a>pinned messages</a> for the room.": "Ο/Η %(senderName)s άλλαξε τα  <a>καρφιτσωμένα μηνύματα </a> του δωματίου."
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "Ο/Η %(senderName)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> του δωματίου.",
+    "Failed to get room topic: Unable to find room (%(roomId)s": "Αποτυχία λήψης θέματος δωματίου: Αδυναμία εύρεσης δωματίου (%(roomId)s",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s kai %(space2Name)s",
+    "Unrecognised room address: %(roomAlias)s": "Μη αναγνωρισμένη διεύθυνση δωματίου: %(roomAlias)s",
+    "%(spaceName)s and %(count)s others|other": "%(spaceName)s και άλλα %(count)s",
+    "Message didn't send. Click for info.": "Το μήνυμα δεν στάλθηκε. Κάντε κλικ για πληροφορίες.",
+    "End-to-end encryption isn't enabled": "Η κρυπτογράφηση από άκρο σε άκρο δεν είναι ενεργοποιημένη",
+    "Enable encryption in settings.": "Ενεργοποιήστε την κρυπτογράφηση στις ρυθμίσεις.",
+    "Add a photo, so people can easily spot your room.": "Προσθέστε μια φωτογραφία, ώστε οι χρήστες να μπορούν εύκολα να εντοπίσουν το δωμάτιό σας.",
+    "Invite to just this room": "Προσκαλέστε μόνο σε αυτό το δωμάτιο",
+    "You created this room.": "Δημιουργήσατε αυτό το δωμάτιο.",
+    "Insert link": "Εισαγωγή συνδέσμου",
+    "Code block": "Μπλοκ κώδικα",
+    "Strikethrough": "Διαγράμμιση",
+    "Italics": "Πλάγια",
+    "Bold": "Έντονα",
+    "Poll": "Ψηφοφορία",
+    "You do not have permission to start polls in this room.": "Δεν έχετε άδεια να ξεκινήσετε ψηφοφορίες σε αυτήν την αίθουσα.",
+    "Voice Message": "Φωνητικό μήνυμα",
+    "Sticker": "Αυτοκόλλητο",
+    "Hide stickers": "Απόκρυψη αυτοκόλλητων",
+    "Send voice message": "Στείλτε φωνητικό μήνυμα",
+    "This room has been replaced and is no longer active.": "Αυτό το δωμάτιο έχει αντικατασταθεί και δεν είναι πλέον ενεργό.",
+    "The conversation continues here.": "Η συζήτηση συνεχίζεται εδώ.",
+    "Send a reply…": "Στείλτε μια απάντηση…",
+    "Send a message…": "Στείλτε ένα μήνυμα…",
+    "Reply to thread…": "Απάντηση στο νήμα…",
+    "Reply to encrypted thread…": "Απάντηση στο κρυπτογραφημένο νήμα…",
+    "Send message": "Αποστολή μηνύματος",
+    "Invite to this space": "Πρόσκληση σε αυτό το χώρο",
+    "Invite to this community": "Πρόσκληση σε αυτήν την κοινότητα",
+    "Close preview": "Κλείσιμο προεπισκόπησης",
+    "Scroll to most recent messages": "Κύλιση στα πιο πρόσφατα μηνύματα",
+    "You can't see earlier messages": "Δεν μπορείτε να δείτε προηγούμενα μηνύματα",
+    "Encrypted messages before this point are unavailable.": "Κρυπτογραφημένα μηνύματα πριν από αυτό το σημείο δεν είναι διαθέσιμα.",
+    "You don't have permission to view messages from before you joined.": "Δεν έχετε άδεια προβολής των μηνυμάτων που δημιουργήθηκαν πριν από την εγγραφή σας.",
+    "You don't have permission to view messages from before you were invited.": "Δεν έχετε άδεια προβολής των μηνυμάτων που δημιουργήθηκαν πριν από την πρόσκληση σας.",
+    "Failed to send": "Αποτυχία αποστολής",
+    "Your message was sent": "Το μήνυμά σας στάλθηκε",
+    "Encrypting your message...": "Κρυπτογράφηση του μηνύματός σας...",
+    "Sending your message...": "Αποστολή του μηνύματός σας...",
+    "This message cannot be decrypted": "Αυτό το μήνυμα δεν μπορεί να αποκρυπτογραφηθεί",
+    "Edit message": "Επεξεργασία μηνύματος",
+    "Everyone in this room is verified": "Όλοι σε αυτό το δωμάτιο έχουν επαληθευτεί",
+    "This room is end-to-end encrypted": "Αυτό το δωμάτιο έχει κρυπτογράφηση από άκρο σε άκρο",
+    "Someone is using an unknown session": "Κάποιος χρησιμοποιεί μια άγνωστη συνεδρία",
+    "You have verified this user. This user has verified all of their sessions.": "Έχετε επαληθεύσει αυτόν τον χρήστη. Αυτός ο χρήστης έχει επαληθεύσει όλες τις συνεδρίες του.",
+    "You have not verified this user.": "Δεν έχετε επαληθεύσει αυτόν τον χρήστη.",
+    "This user has not verified all of their sessions.": "Αυτός ο χρήστης δεν έχει επαληθεύσει όλες τις συνεδρίες του.",
+    "Phone Number": "Αριθμός Τηλεφώνου",
+    "Share": "Διαμοιρασμός",
+    "Revoke": "Ανάκληση",
+    "Complete": "Ολοκληρώθηκε",
+    "Verify the link in your inbox": "Επαληθεύστε τον σύνδεσμο στα εισερχόμενα σας",
+    "Your email address hasn't been verified yet": "Η διεύθυνση email σας δεν έχει επαληθευτεί ακόμα",
+    "Unable to share email address": "Δεν είναι δυνατή η κοινή χρήση της διεύθυνσης email",
+    "Encrypted": "Κρυπτογραφημένο",
+    "Once enabled, encryption cannot be disabled.": "Αφού ενεργοποιηθεί, η κρυπτογράφηση δεν μπορεί να απενεργοποιηθεί.",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "Για να αποφύγετε αυτά τα ζητήματα, δημιουργήστε ένα <a>νέο δημόσιο δωμάτιο</a> για τη συνομιλία που σκοπεύετε να έχετε.",
+    "Are you sure you want to make this encrypted room public?": "Είστε βέβαιοι ότι θέλετε να κάνετε δημόσιο αυτό το κρυπτογραφημένο δωμάτιο;",
+    "Images, GIFs and videos": "Εικόνες, GIF και βίντεο",
+    "Backup version:": "Έκδοση αντιγράφου ασφαλείας:",
+    "Algorithm:": "Αλγόριθμος:",
+    "Restore from Backup": "Επαναφορά από Αντίγραφο ασφαλείας",
+    "Unable to load key backup status": "Δεν είναι δυνατή η φόρτωση της κατάστασης του αντιγράφου ασφαλείας κλειδιού",
+    "Delete Backup": "Διαγραφή Αντιγράφου ασφαλείας",
+    "Profile picture": "Εικόνα προφίλ",
+    "The operation could not be completed": "Η λειτουργία δεν μπόρεσε να ολοκληρωθεί",
+    "Failed to save your profile": "Αποτυχία αποθήκευσης του προφίλ σας",
+    "There was an error loading your notification settings.": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των ρυθμίσεων ειδοποιήσεων σας.",
+    "Mentions & keywords": "Αναφορές & λέξεις-κλειδιά",
+    "New keyword": "Νέα λέξη-κλειδί",
+    "Clear notifications": "Εκκαθάριση ειδοποιήσεων",
+    "Enable audible notifications for this session": "Ενεργοποιήστε τις ηχητικές ειδοποιήσεις για αυτήν τη συνεδρία",
+    "Show message in desktop notification": "Εμφάνιση του μηνύματος στην ειδοποίηση στον υπολογιστή",
+    "Enable desktop notifications for this session": "Ενεργοποιήστε τις ειδοποιήσεις στον υπολογιστή για αυτήν τη συνεδρία",
+    "Enable email notifications for %(email)s": "Ενεργοποίηση ειδοποιήσεων email για %(email)s",
+    "Enable for this account": "Ενεργοποίηση για αυτόν τον λογαριασμό",
+    "An error occurred whilst saving your notification preferences.": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση των προτιμήσεων ειδοποίησης.",
+    "Error saving notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων ειδοποιήσεων",
+    "Messages containing keywords": "Μηνύματα που περιέχουν λέξεις-κλειδιά",
+    "Message bubbles": "Συννεφάκια μηνυμάτων",
+    "Modern": "Μοντέρνο",
+    "Message layout": "Διάταξη μηνύματος",
+    "Updating spaces... (%(progress)s out of %(count)s)|one": "Ενημέρωση χώρου...",
+    "Updating spaces... (%(progress)s out of %(count)s)|other": "Ενημέρωση χώρων... (%(progress)s out of %(count)s)",
+    "Sending invites... (%(progress)s out of %(count)s)|one": "Αποστολή πρόσκλησης...",
+    "Sending invites... (%(progress)s out of %(count)s)|other": "Αποστολή προσκλήσεων... (%(progress)s από %(count)s)",
+    "Loading new room": "Φόρτωση νέου δωματίου",
+    "Upgrading room": "Αναβάθμιση δωματίου",
+    "Space members": "Μέλη χώρου",
+    "not found": "δε βρέθηκε",
+    "Reset": "Επαναφορά",
+    "Passwords don't match": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+    "Space options": "Επιλογές χώρου",
+    "Recommended for public spaces.": "Προτείνεται για δημόσιους χώρους.",
+    "Preview Space": "Προεπισκόπηση Χώρου",
+    "Failed to update the visibility of this space": "Αποτυχία ενημέρωσης της ορατότητας αυτού του χώρου",
+    "Decide who can view and join %(spaceName)s.": "Αποφασίστε ποιος μπορεί να δει και να συμμετάσχει %(spaceName)s.",
+    "Access": "Πρόσβαση",
+    "Visibility": "Ορατότητα",
+    "This may be useful for public spaces.": "Αυτό μπορεί να είναι χρήσιμο για δημόσιους χώρους.",
+    "Guests can join a space without having an account.": "Οι επισκέπτες μπορούν να εγγραφούν σε ένα χώρο χωρίς να έχουν λογαριασμό.",
+    "Enable guest access": "Ενεργοποίηση πρόσβασης επισκέπτη",
+    "Hide advanced": "Απόκρυψη προχωρημένων",
+    "Show advanced": "Εμφάνιση προχωρημένων",
+    "Failed to update the guest access of this space": "Αποτυχία ενημέρωσης της πρόσβασης επισκέπτη σε αυτόν τον χώρο",
+    "Failed to update the history visibility of this space": "Αποτυχία ενημέρωσης της ορατότητας του ιστορικού αυτού του χώρου",
+    "Leave Space": "Αποχώρηση από τον Χώρο",
+    "Save Changes": "Αποθήκευση Αλλαγών",
+    "Saving...": "Αποθήκευση...",
+    "Edit settings relating to your space.": "Επεξεργαστείτε τις ρυθμίσεις που σχετίζονται με τον χώρο σας.",
+    "General": "Γενικά",
+    "Failed to save space settings.": "Αποτυχία αποθήκευσης ρυθμίσεων χώρου.",
+    "Invite with email or username": "Πρόσκληση με email ή όνομα χρήστη",
+    "Share invite link": "Κοινή χρήση συνδέσμου πρόσκλησης",
+    "Failed to copy": "Αποτυχία αντιγραφής",
+    "Copied!": "Αντιγράφηκε!",
+    "Click to copy": "Κλικ για αντιγραφή",
+    "Collapse": "Σύμπτυξη",
+    "Expand": "Επέκταση",
+    "Show all rooms": "Εμφάνιση όλων των δωματίων",
+    "Developer mode": "Λειτουργία για προγραμματιστές",
+    "Display Communities instead of Spaces": "Εμφάνιση Κοινοτήτων αντί για Χώρους",
+    "Show all rooms in Home": "Εμφάνιση όλων των δωματίων στην Αρχική",
+    "Enable message search in encrypted rooms": "Ενεργοποίηση αναζήτησης μηνυμάτων σε κρυπτογραφημένα δωμάτια",
+    "Show hidden events in timeline": "Εμφάνιση κρυφών συμβάντων στη γραμμή χρόνου",
+    "Show shortcuts to recently viewed rooms above the room list": "Εμφάνιση συντομεύσεων σε δωμάτια που προβλήθηκαν πρόσφατα πάνω από τη λίστα δωματίων",
+    "Show rooms with unread notifications first": "Εμφάνιση δωματίων με μη αναγνωσμένες ειδοποιήσεις πρώτα",
+    "Show developer tools": "Εμφάνιση εργαλείων προγραμματιστή",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Μη στέλνετε ποτέ κρυπτογραφημένα μηνύματα σε μη επαληθευμένες συνεδρίες σε αυτό το δωμάτιο από αυτή τη συνεδρία",
+    "Never send encrypted messages to unverified sessions from this session": "Μη στέλνετε ποτέ κρυπτογραφημένα μηνύματα σε μη επαληθευμένες συνεδρίες από αυτήν τη συνεδρία",
+    "Send analytics data": "Αποστολή δεδομένων αναλυτικών στοιχείων",
+    "System font name": "Όνομα γραμματοσειράς συστήματος",
+    "Use a system font": "Χρήση μιας γραμματοσειρά συστήματος",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Μπορείτε να συνδεθείτε, αλλά ορισμένες λειτουργίες δε θα είναι διαθέσιμες μέχρι να συνδεθεί ξανά ο διακομιστής ταυτότητας. Εάν εξακολουθείτε να βλέπετε αυτήν την προειδοποίηση, ελέγξτε τις ρυθμίσεις σας ή επικοινωνήστε με έναν διαχειριστή του διακομιστή σας.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σας, αλλά ορισμένες λειτουργίες δε θα είναι διαθέσιμες μέχρι να συνδεθεί ξανά ο διακομιστής ταυτότητας. Εάν εξακολουθείτε να βλέπετε αυτήν την προειδοποίηση, ελέγξτε τις ρυθμίσεις σας ή επικοινωνήστε με έναν διαχειριστή του διακομιστή σας.",
+    "Group all your people in one place.": "Ομαδοποιήστε όλα τα άτομα σας σε ένα μέρος.",
+    "Group all your favourite rooms and people in one place.": "Ομαδοποιήστε όλα τα αγαπημένα σας δωμάτια και άτομα σε ένα μέρος.",
+    "Manage your signed-in devices below. A device's name is visible to people you communicate with.": "Διαχειριστείτε τις συνδεδεμένες συσκευές σας παρακάτω. Το όνομα μιας συσκευής είναι ορατό στα άτομα με τα οποία επικοινωνείτε.",
+    "Where you're signed in": "Που έχετε συνδεθεί",
+    "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Μοιραστείτε ανώνυμα δεδομένα για να μας βοηθήσετε να εντοπίσουμε προβλήματα. Δε συλλέγουμε προσωπικά δεδομένα. Δεν τα παρέχουμε σε τρίτους.",
+    "Okay": "Εντάξει",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Ο διαχειριστής του διακομιστή σας έχει απενεργοποιήσει την κρυπτογράφηση από άκρο σε άκρο από προεπιλογή σε ιδιωτικά δωμάτια & άμεσα μηνύματα.",
+    "Message search": "Αναζήτηση μηνυμάτων",
+    "Security & Privacy": "Ασφάλεια & Απόρρητο",
+    "Change the topic of this room": "Αλλάξτε το θέμα αυτού του δωματίου",
+    "Send stickers into your active room": "Στείλτε αυτοκόλλητα στο ενεργό δωμάτιο",
+    "Send stickers into this room": "Στείλτε αυτοκόλλητα σε αυτό το δωμάτιο",
+    "Remain on your screen while running": "Παραμονή στην οθόνη σας ενώ τρέχετε",
+    "Remain on your screen when viewing another room, when running": "Παραμονή στην οθόνη σας όταν βλέπετε άλλο δωμάτιο, όταν τρέχετε",
+    "No active call in this room": "Δεν υπάρχει ενεργή κλήση σε αυτό το δωμάτιο",
+    "Unable to find Matrix ID for phone number": "Δεν είναι δυνατή η εύρεση του αναγνωριστικού Matrix για τον αριθμό τηλεφώνου",
+    "No virtual room for this room": "Δεν υπάρχει εικονικό δωμάτιο για αυτό το δωμάτιο",
+    "Removes user with given id from this room": "Αφαιρεί τον χρήστη με το συγκεκριμένο αναγνωριστικό από αυτό το δωμάτιο",
+    "Only invited people can join.": "Μόνο προσκεκλημένοι μπορούν να συμμετάσχουν.",
+    "Allow people to preview your space before they join.": "Επιτρέψτε στους χρήστες να κάνουν προεπισκόπηση του χώρου σας προτού να εγγραφούν.",
+    "Invite people": "Προσκαλέστε άτομα",
+    "Add some details to help people recognise it.": "Προσθέστε ορισμένες λεπτομέρειες για να βοηθήσετε τους άλλους να το αναγνωρίσουν.",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Οι Χώροι είναι ένας νέος τρόπος ομαδοποίησης δωματίων και ατόμων. Τι είδους Χώρο θέλετε να δημιουργήσετε; Μπορείτε αυτό να το αλλάξετε αργότερα.",
+    "People": "Άτομα",
+    "Generating a ZIP": "Δημιουργία ZIP",
+    "Are you sure you want to exit during this export?": "Είστε βέβαιοι ότι θέλετε να αποχωρήσετε κατά τη διάρκεια αυτής της εξαγωγής;",
+    "Unknown App": "Άγνωστη εφαρμογή",
+    "Share your public space": "Μοιραστείτε τον δημόσιο χώρο σας",
+    "Invite to %(spaceName)s": "Πρόσκληση σε %(spaceName)s",
+    "Short keyboard patterns are easy to guess": "Τα σύντομα μοτίβα πληκτρολογίου είναι εύκολο να μαντευτούν",
+    "Straight rows of keys are easy to guess": "Οι ευθείες σειρές πλήκτρων είναι εύκολο να μαντευτούν",
+    "Common names and surnames are easy to guess": "Τα κοινά ονόματα και επώνυμα είναι εύκολο να τα μαντέψει κανείς",
+    "Names and surnames by themselves are easy to guess": "Τα ονόματα και τα επώνυμα από μόνα τους είναι εύκολο να τα μαντέψει κανείς",
+    "A word by itself is easy to guess": "Μια λέξη από μόνη της είναι εύκολο να τη μαντέψει κανείς",
+    "This is similar to a commonly used password": "Αυτό είναι παρόμοιο με έναν κοινό κωδικό πρόσβασης",
+    "This is a very common password": "Αυτός είναι ένας πολύ συνηθισμένος κωδικός πρόσβασης",
+    "This is a top-100 common password": "Αυτός είναι ένας από τους 100 πιο συνηθισμένους κωδικούς πρόσβασης",
+    "This is a top-10 common password": "Αυτός είναι ένας απο τους 10 πιο συνηθισμένους κωδικούς πρόσβασης",
+    "Dates are often easy to guess": "Οι ημερομηνίες είναι συχνά εύκολο να τις μαντέψει κανείς",
+    "Recent years are easy to guess": "Τα τελευταία χρόνια είναι εύκολο να τα μαντέψει κανείς",
+    "Sequences like abc or 6543 are easy to guess": "Διαδιχικές σειρές όπως το αβγ ή το 6543 είναι εύκολο να τις μαντέψει κανείς",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Επαναλήψεις όπως \"αβγαβγαβγ\" είναι λίγο πιο δύσκολο να τις μαντέψει κανείς από το \"αβγ\"",
+    "Repeats like \"aaa\" are easy to guess": "Επαναλήψεις όπως \"ααα\" είναι εύκολο να τις μαντέψει κανείς",
+    "Add another word or two. Uncommon words are better.": "Προσθέστε άλλη μια ή δύο λέξεις. Οι ασυνήθιστες λέξεις είναι καλύτερες.",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Οι προβλέψιμες αντικαταστάσεις όπως το '@' αντί για το 'α' δεν βοηθούν πολύ",
+    "Reversed words aren't much harder to guess": "Οι αντίστροφες λέξεις δεν είναι πολύ πιο δύσκολο να τις μαντέψει κανείς",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Τα κεφαλαία είναι σχεδόν τόσο εύκολο να μαντευτούν όσο και τα πεζά",
+    "Capitalization doesn't help very much": "Η χρήση κεφαλαίων δεν βοηθάει πολύ",
+    "Avoid dates and years that are associated with you": "Αποφύγετε ημερομηνίες και χρόνια που σχετίζονται με εσάς",
+    "Avoid years that are associated with you": "Αποφύγετε χρόνια που σχετίζονται με εσάς",
+    "Avoid recent years": "Αποφύγετε τα τελευταία χρόνια",
+    "Avoid sequences": "Αποφύγετε τις διαδοχικές σειρές",
+    "Avoid repeated words and characters": "Αποφύγετε επαναλαμβανόμενες λέξεις και χαρακτήρες",
+    "Use a longer keyboard pattern with more turns": "Χρησιμοποιήστε ένα μεγαλύτερο μοτίβο πληκτρολογίου με περισσότερες στροφές",
+    "The user's homeserver does not support the version of the room.": "Ο κεντρικός διακομιστής του χρήστη δεν υποστηρίζει την έκδοση του δωματίου.",
+    "The user must be unbanned before they can be invited.": "Πρέπει να καταργηθεί η απαγόρευση του χρήστη για να προσκληθεί.",
+    "User %(userId)s is already invited to the room": "Ο χρήστης %(userId)s έχει ήδη προσκληθεί στην αίθουσα",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Αυτό το δωμάτιο χρησιμοποιείται για σημαντικά μηνύματα από τον κεντρικό διακομιστή, επομένως δεν μπορείτε να το αφήσετε.",
+    "Can't leave Server Notices room": "Δεν είναι δυνατή η έξοδος από την αίθουσα ειδοποιήσεων διακομιστή",
+    "Unexpected server error trying to leave the room": "Μη αναμενόμενο σφάλμα διακομιστή κατά την προσπάθεια εξόδου από το δωμάτιο",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "%(num)s days from now": "%(num)s μέρες από τώρα",
+    "about a day from now": "περίπου μια μέρα από τώρα",
+    "%(num)s hours from now": "%(num)s ώρες από τώρα",
+    "about an hour from now": "περίπου μία ώρα από τώρα",
+    "%(num)s minutes from now": "%(num)s λεπτά από τώρα",
+    "about a minute from now": "περίπου ένα λεπτό από τώρα",
+    "a few seconds from now": "λίγα δευτερόλεπτα από τώρα",
+    "Unable to connect to Homeserver. Retrying...": "Δεν είναι δυνατή η σύνδεση στον κεντρικό διακομιστή. Επανάληψη προσπάθειας...",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Παρακαλούμε να <a>επικοινωνήσετε με τον διαχειριστή της υπηρεσίας σας</a> για να συνεχίσετε να χρησιμοποιείτε την υπηρεσία.",
+    "This homeserver has exceeded one of its resource limits.": "Αυτός ο κεντρικός διακομιστής έχει υπερβεί ένα από τα όρια πόρων του.",
+    "Unexpected error resolving identity server configuration": "Μη αναμενόμενο σφάλμα κατά την επίλυση της διαμόρφωσης διακομιστή ταυτότητας",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Μπορείτε να εγγραφείτε, αλλά ορισμένες λειτουργίες δεν θα είναι διαθέσιμες μέχρι να συνδεθεί ξανά ο διακομιστής ταυτότητας. Εάν εξακολουθείτε να βλέπετε αυτήν την ειδοποίηση, ελέγξτε τις ρυθμίσεις σας ή επικοινωνήστε με έναν διαχειριστή διακομιστή.",
+    "Cannot reach identity server": "Δεν είναι δυνατή η πρόσβαση στον διακομιστή ταυτότητας",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Ζητήστε από τον %(brand)s διαχειριστή σας να ελέγξει <a>τις ρυθμίσεις σας</a> για λανθασμένες ή διπλότυπες καταχωρίσεις.",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Βεβαιωθείτε ότι έχετε σταθερή σύνδεση στο διαδίκτυο ή επικοινωνήστε με τον διαχειριστή του διακομιστή",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Δείτε <b>%(msgtype)s</b> μηνύματα που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Δείτε <b>%(msgtype)s</b> μηνύματα που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "See general files posted to your active room": "Δείτε τα γενικά αρχεία που δημοσιεύονται στο ενεργό δωμάτιό σας",
+    "See general files posted to this room": "Δείτε τα γενικά αρχεία που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "Send general files as you in this room": "Στείλτε γενικά αρχεία, ως εσείς, σε αυτό το δωμάτιο",
+    "See videos posted to your active room": "Δείτε βίντεο που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See videos posted to this room": "Δείτε βίντεο που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "Send videos as you in your active room": "Στείλτε βίντεο, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send videos as you in this room": "Στείλτε βίντεο, ως εσείς, σε αυτό το δωμάτιο",
+    "See images posted to your active room": "Δείτε εικόνες που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See images posted to this room": "Δείτε εικόνες που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "Send images as you in your active room": "Στείλτε εικόνες, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send images as you in this room": "Στείλτε εικόνες, ως εσείς, σε αυτό το δωμάτιο",
+    "See emotes posted to your active room": "Δείτε τα emotes που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See emotes posted to this room": "Δείτε τα emotes που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "See text messages posted to your active room": "Δείτε τα μηνύματα κειμένου που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See text messages posted to this room": "Δείτε τα μηνύματα κειμένου που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "See messages posted to your active room": "Δείτε τα μηνύματα που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See messages posted to this room": "Δείτε τα μηνύματα που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "Send messages as you in your active room": "Στείλτε μηνύματα, ως εσείς, στο ενεργό δωμάτιό σας",
+    "The <b>%(capability)s</b> capability": "Η <b>%(capability)s</b> ικανότητα",
+    "See <b>%(eventType)s</b> events posted to your active room": "Δείτε <b>%(eventType)s</b> γεγονότα που δημοσιεύτηκαν στο ενεργό δωμάτιό σας",
+    "See <b>%(eventType)s</b> events posted to this room": "Δείτε <b>%(eventType)s</b> γεγονότα που δημοσιεύτηκαν σε αυτό το δωμάτιο",
+    "The above, but in any room you are joined or invited to as well": "Τα παραπάνω, αλλά και σε οποιοδήποτε δωμάτιο είστε μέλος ή προσκεκλημένοι",
+    "See when anyone posts a sticker to your active room": "Δείτε πότε κάποιος δημοσιεύει ένα αυτοκόλλητο στο ενεργό δωμάτιό σας",
+    "See when a sticker is posted in this room": "Δείτε πότε αναρτάται ένα αυτοκόλλητο σε αυτό το δωμάτιο",
+    "See when people join, leave, or are invited to your active room": "Δείτε πότε τα άτομα εγγράφονται, φεύγουν ή προσκαλούνται στο ενεργό δωμάτιό σας",
+    "Remove, ban, or invite people to your active room, and make you leave": "Αφαιρέστε, απαγορεύστε ή προσκαλέστε άτομα στο ενεργό δωμάτιό σας και σας αποχωρήστε",
+    "See when people join, leave, or are invited to this room": "Δείτε πότε τα άτομα εγγράφονται, αποχωρούν ή προσκαλούνται σε αυτό το δωμάτιο",
+    "Remove, ban, or invite people to this room, and make you leave": "Αφαιρέστε, αποκλείστε ή προσκαλέστε άτομα σε αυτό το δωμάτιο και αποχωρήστε",
+    "See when the avatar changes in your active room": "Δείτε πότε αλλάζει το avatar στο ενεργό δωμάτιό σας",
+    "Change the avatar of your active room": "Αλλάξτε το avatar του ενεργού δωματίου σας",
+    "See when the avatar changes in this room": "Δείτε πότε αλλάζει το avatar σε αυτό το δωμάτιο",
+    "Change the avatar of this room": "Αλλάξτε το avatar αυτού του δωματίου",
+    "See when the name changes in your active room": "Δείτε πότε αλλάζει το όνομα στο ενεργό δωμάτιό σας",
+    "Change the name of your active room": "Αλλάξτε το όνομα του ενεργού δωματίου σας",
+    "See when the name changes in this room": "Δείτε πότε αλλάζει το όνομα σε αυτό το δωμάτιο",
+    "Change the name of this room": "Αλλάξτε το όνομα αυτού του δωματίου",
+    "See when the topic changes in your active room": "Δείτε πότε αλλάζει το θέμα στο ενεργό δωμάτιό σας",
+    "Change the topic of your active room": "Αλλάξτε το θέμα του ενεργού δωματίου σας",
+    "See when the topic changes in this room": "Δείτε πότε αλλάζει το θέμα σε αυτό το δωμάτιο",
+    "Change which room, message, or user you're viewing": "Αλλάξτε το δωμάτιο, το μήνυμα ή τον χρήστη που βλέπετε",
+    "Change which room you're viewing": "Αλλάξτε το δωμάτιο που βλέπετε",
+    "%(senderName)s has ended a poll": "%(senderName)s τερμάτισε μία δημοσκόπηση",
+    "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s ξεκίνησε μια δημοσκόπηση - %(pollQuestion)s",
+    "%(senderName)s has shared their location": "%(senderName)s μοιράστηκαν την τοποθεσία τους",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ενημέρωσε έναν κανόνα απαγόρευσης που αντιστοιχούσε %(oldGlob)s σε αντιστοίχιση %(newGlob)s για %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s άλλαξε έναν κανόνα που απαγόρευε την αντιστοίχιση διακομιστών %(oldGlob)s σε αντιστοίχιση %(newGlob)s για %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s άλλαξε έναν κανόνα που απαγόρευε την αντιστοίχιση δωματίων %(oldGlob)s σε αντιστοίχιση %(newGlob)s για %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s άλλαξε έναν κανόνα που απαγόρευε την αντιστοίχιση χρηστών %(oldGlob)s σε αντιστοίχιση %(newGlob)s για %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s δημιούργησε μια απαγόρευση αντιστοίχισης κανόνων %(glob)s για %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s δημιούργησε έναν κανόνα που απαγορεύει την αντιστοίχιση διακομιστών %(glob)s για %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s δημιούργησε έναν κανόνα που απαγορεύει την αντιστοίχιση δωματίων %(glob)s για %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s δημιούργησε έναν κανόνα που απαγορεύει την αντιστοίχιση χρηστών %(glob)s για %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s ενημέρωσε μια απαγόρευση αντιστοίχισης κανόνα%(glob)s για %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s ενημέρωσε τον κανόνα που απαγορεύει την αντιστοίχιση διακομιστών %(glob)s για %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s ενημέρωσε τον κανόνα που απαγορεύει την αντιστοίχιση δωματίων %(glob)s για %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s ενημέρωσε τον κανόνα που απαγορεύει την αντιστοίχιση χρηστών %(glob)s για %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s ενημέρωσε έναν μη έγκυρο κανόνα απαγόρευσης",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s αφαίρεσε μια απαγόρευση αντιστοίχισης κανόνων %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s αφαίρεσε τον κανόνα που απαγορεύει την αντιστοίχιση διακομιστών %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s αφαίρεσε τον κανόνα που απαγορεύει την αντιστοίχιση δωματίων %(glob)s",
+    "%(senderName)s has updated the room layout": "%(senderName)s έχει ενημερώσει τη διάταξη του δωματίου",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s ξεκαρφίτσωσε ένα μήνυμα από αυτό το δωμάτιο. Δείτε όλα τα καρφιτσωμένα μηνύματα.",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s ξεκαρφίτσωσε <a>ένα μήνυμα</a> από αυτό το δωμάτιο. Δείτε όλα τα <b>καρφιτσωμένα μηνύματα</b>.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s καρφίτσωσε ένα μήνυμα σε αυτό το δωμάτιο. Δείτε όλα τα καρφιτσωμένα μηνύματα.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s καρφίτσωσε <a>ένα μήνυμα</a> σε αυτό το δωμάτιο. Δείτε όλα τα <b>καρφιτσωμένα μηνύματα</b>.",
+    "%(senderName)s removed %(targetName)s": "%(senderName)s αφαιρέθηκε %(targetName)s",
+    "%(senderName)s removed %(targetName)s: %(reason)s": "%(senderName)s αφαιρέθηκε %(targetName)s: %(reason)s",
+    "Switches to this room's virtual room, if it has one": "Μεταβαίνει στο εικονικό δωμάτιο αυτού του δωματίου, εάν υπάρχει",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Επιβάλλει την τρέχουσα εξερχόμενη ομαδική συνεδρία σε κρυπτογραφημένο δωμάτιο για απόρριψη",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η ΕΠΑΛΗΘΕΥΣΗ ΚΛΕΙΔΙΟΥ ΑΠΕΤΥΧΕ! Το κλειδί σύνδεσης για %(userId)s και συνεδρίας %(deviceId)s είναι \"%(fprint)s\" που δεν ταιριάζει με το παρεχόμενο κλειδί\"%(fingerprint)s\". Αυτό μπορεί να σημαίνει ότι υπάρχει υποκλοπή στις επικοινωνίες σας!",
+    "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "Άγνωστο ζευγάρι (χρήστης, συνεδρία): (%(userId)s, %(deviceId)s)",
+    "Command failed: Unable to find room (%(roomId)s": "Η εντολή απέτυχε: Δεν είναι δυνατή η εύρεση δωματίου (%(roomId)s",
+    "Command error: Unable to find rendering type (%(renderingType)s)": "Σφάλμα εντολής: Δεν είναι δυνατή η εύρεση του τύπου απόδοσης (%(renderingType)s)",
+    "Current Timeline": "Τρέχον χρονοδιάγραμμα",
+    "Specify a number of messages": "Καθορίστε έναν αριθμό μηνυμάτων",
+    "From the beginning": "Από την αρχή",
+    "Plain Text": "Απλό κείμενο",
+    "JSON": "JSON",
+    "HTML": "HTML",
+    "Fetched %(count)s events so far|one": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα",
+    "Fetched %(count)s events so far|other": "Ανακτήθηκαν %(count)s συμβάντα μέχρι τώρα",
+    "Fetched %(count)s events out of %(total)s|one": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s",
+    "Fetched %(count)s events out of %(total)s|other": "Ανακτήθηκαν %(count)s συμβάντα από %(total)s",
+    "This homeserver has been blocked by its administrator.": "Αυτός ο κεντρικός διακομιστής έχει αποκλειστεί από τον διαχειριστή του.",
+    "This homeserver has hit its Monthly Active User limit.": "Αυτός ο κεντρικός διακομιστής έχει φτάσει το μηνιαίο όριο ενεργού χρήστη.",
+    "Unexpected error resolving homeserver configuration": "Μη αναμενόμενο σφάλμα κατά την επίλυση της διαμόρφωσης του κεντρικού διακομιστή",
+    "No homeserver URL provided": "Δεν παρέχεται URL του κεντρικού διακομιστή",
+    "Cannot reach homeserver": "Δεν είναι δυνατή η πρόσβαση στον κεντρικό διακομιστή",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Στείλτε <b>%(msgtype)s</b> μηνύματα, ώς εσείς, στο ενεργό δωμάτιό σας",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Στείλτε <b>%(msgtype)s</b> μηνύματα, ως εσείς, σε αυτό το δωμάτιο",
+    "Send general files as you in your active room": "Στείλτε γενικά αρχεία, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send emotes as you in your active room": "Στείλτε emotes, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send emotes as you in this room": "Στείλτε emotes, ως εσείς, σε αυτό το δωμάτιο",
+    "Send text messages as you in your active room": "Στείλτε μηνύματα κειμένου, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send text messages as you in this room": "Στείλτε μηνύματα κειμένου, ως εσείς, σε αυτό το δωμάτιο",
+    "Send messages as you in this room": "Στείλτε μηνύματα, ως εσείς, σε αυτό το δωμάτιο",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Στείλετε <b>%(eventType)s</b> γεγονότα, ως εσείς, στο ενεργό δωμάτιό σας",
+    "Send <b>%(eventType)s</b> events as you in this room": "Στείλτε <b>%(eventType)s</b> γεγονότα σε αυτό το δωμάτιο",
+    "The above, but in <Room /> as well": "Τα παραπάνω, αλλά και μέσα <Room />",
+    "Send stickers to your active room as you": "Στείλτε αυτοκόλλητα στο ενεργό δωμάτιό σας",
+    "Send stickers to this room as you": "Στείλτε αυτοκόλλητα σε αυτό το δωμάτιο",
+    "Command error: Unable to handle slash command.": "Σφάλμα εντολής: Δεν είναι δυνατή η χρήση της εντολής slash.",
+    "%(spaceName)s and %(count)s others|one": "%(spaceName)s και %(count)s άλλο",
+    "Exported %(count)s events in %(seconds)s seconds|one": "Έγινε εξαγωγή %(count)s συμβάντος σε %(seconds)s δευτερόλεπτα",
+    "Exported %(count)s events in %(seconds)s seconds|other": "Έγινε εξαγωγή %(count)s συμβάντων σε %(seconds)s δευτερόλεπτα",
+    "Export successful!": "Επιτυχής εξαγωγή!",
+    "Creating HTML...": "Δημιουργία HTML...",
+    "Fetched %(count)s events in %(seconds)ss|one": "Λήφθηκε %(count)s συμβάν σε %(seconds)s''",
+    "Fetched %(count)s events in %(seconds)ss|other": "Λήφθηκαν %(count)s συμβάντα σε %(seconds)s''",
+    "Starting export...": "Έναρξη εξαγωγής...",
+    "Processing event %(number)s out of %(total)s": "Επεξεργασία συμβάντος %(number)s από %(total)s",
+    "Error fetching file": "Σφάλμα κατά την ανάκτηση του αρχείου",
+    "Topic: %(topic)s": "Θέμα: %(topic)s",
+    "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Αυτή είναι η αρχή της εξαγωγής του <roomName/>. Εξήχθησαν από <exporterDetails/> στις %(exportDate)s.",
+    "%(creatorName)s created this room.": "Ο %(creatorName)s δημιούργησε αυτό το δωμάτιο.",
+    "Media omitted - file size limit exceeded": "Τα μέσα παραλείφθηκαν - υπέρβαση του ορίου μεγέθους αρχείου",
+    "Show info about bridges in room settings": "Εμφάνιση πληροφοριών σχετικά με τις γέφυρες στις ρυθμίσεις δωματίου",
+    "Show current avatar and name for users in message history": "Εμφάνιση τρέχοντος avatar και ονόματος για τους χρήστες στο ιστορικό μηνυμάτων",
+    "Show extensible event representation of events": "Εμφάνιση επεκτάσιμης αναπαράστασης συμβάντων",
+    "Show message previews for reactions in all rooms": "Εμφάνιση προεπισκοπήσεων μηνυμάτων για αντιδράσεις σε όλα τα δωμάτια",
+    "Show message previews for reactions in DMs": "Εμφάνιση προεπισκοπήσεων μηνυμάτων για αντιδράσεις σε DM",
+    "Support adding custom themes": "Υποστήριξη προσθήκης προσαρμοσμένων θεμάτων",
+    "Try out new ways to ignore people (experimental)": "Δοκιμάστε νέους τρόπους για να αγνοήσετε ανθρώπους (πειραματικό)",
+    "Multiple integration managers (requires manual setup)": "Πολλαπλοί διαχειριστές ενσωμάτωσης(απαιτεί χειροκίνητη ρύθμιση)",
+    "Render simple counters in room header": "Απόδοση απλών μετρητών στην κεφαλίδα δωματίου",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Ομαδοποίηση και φιλτράρισμα δωματίων κατά τις προσαρμοσμένες ετικέτες (ανανεώστε για να εφαρμόσετε αλλαγές)",
+    "Custom user status messages": "Προσαρμοσμένα μηνύματα κατάστασης χρήστη",
+    "Threaded messaging": "Μηνύματα με νήματα εκτέλεσης",
+    "Show options to enable 'Do not disturb' mode": "Εμφάνιση επιλογών για ενεργοποίηση της λειτουργίας «Μην ενοχλείτε»",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Αναφορά στο πρωτότυπο συντονιστών. Σε δωμάτια που υποστηρίζουν εποπτεία, το κουμπί «αναφορά» θα σας επιτρέψει να αναφέρετε κατάχρηση στους επόπτες των δωματίων",
+    "Let moderators hide messages pending moderation.": "Επιτρέψτε στους επόπτες να αποκρύψουν μηνύματα που βρίσκονται σε εκκρεμότητα.",
+    "Developer": "Προγραμματιστής",
+    "Experimental": "Πειραματικό",
+    "Encryption": "Κρυπτογράφηση",
+    "Themes": "Θέματα",
+    "Message Previews": "Προεπισκοπήσεις μηνυμάτων",
+    "Widgets": "Μικροεφαρμογές",
+    "Spaces": "Χώροι",
+    "Messaging": "Μηνύματα",
+    "Change notification settings": "Αλλάξτε τις ρυθμίσεις ειδοποιήσεων",
+    "Back to thread": "Επιστροφή στο νήμα εκτέλεσης",
+    "Room members": "Μέλη δωματίου",
+    "Room information": "Πληροφορίες δωματίου",
+    "Back to chat": "Επιστροφή στη συνομιλία",
+    "Threads": "Νήμα εκτέλεσης",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "Ο %(senderName)s καλεί",
+    "Waiting for answer": "Αναμονή απάντησης",
+    "%(senderName)s started a call": "Ο %(senderName)s ξεκίνησε μια κλήση",
+    "Other rooms": "Άλλα δωμάτια",
+    "All rooms": "Όλα τα δωμάτια",
+    "The person who invited you already left the room, or their server is offline.": "Το άτομο που σας προσκάλεσε έχει φύγει από το δωμάτιο ή ο διακομιστής του είναι εκτός σύνδεσης.",
+    "The person who invited you already left the room.": "Το άτομο που σας προσκάλεσε έχει φύγει από το δωμάτιο.",
+    "Please contact your homeserver administrator.": "Επικοινωνήστε με τον διαχειριστή του κεντρικού σας διακομιστή.",
+    "Sorry, your homeserver is too old to participate in this room.": "Λυπούμαστε, ο κεντρικός σας διακομιστής είναι πολύ παλιός για να συμμετέχει σε αυτό το δωμάτιο.",
+    "There was an error joining the room": "Παρουσιάστηκε σφάλμα κατά την ένταξη στο δωμάτιο",
+    "New version of %(brand)s is available": "Διατίθεται νέα έκδοση του %(brand)s",
+    "Update %(brand)s": "Ενημέρωση %(brand)s",
+    "Check your devices": "Ελέγξτε τις συσκευές σας",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s από %(ip)s",
+    "New login. Was this you?": "Νέα σύνδεση. Ήσουν εσύ;",
+    "Other users may not trust it": "Άλλοι χρήστες μπορεί να μην το εμπιστεύονται",
+    "Safeguard against losing access to encrypted messages & data": "Προστατευτείτε από την απώλεια πρόσβασης σε κρυπτογραφημένα μηνύματα και δεδομένα",
+    "Verify": "Επαλήθευση",
+    "Upgrade": "Αναβάθμιση",
+    "Verify this session": "Επαληθεύστε αυτήν τη συνεδρία",
+    "Encryption upgrade available": "Διατίθεται αναβάθμιση κρυπτογράφησης",
+    "Set up Secure Backup": "Ρυθμίστε το αντίγραφο ασφαλείας",
+    "Contact your <a>server admin</a>.": "Επικοινωνήστε με τον <a>διαχειριστή του διακομιστή σας</a>.",
+    "Your homeserver has exceeded one of its resource limits.": "Ο κεντρικός σας διακομιστής έχει υπερβεί ένα από τα όρια πόρων του.",
+    "This homeserver has been blocked by it's administrator.": "Αυτός ο κεντρικός διακομιστής έχει αποκλειστεί από τον διαχειριστή του.",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Το Element Web είναι πειραματικό στα κινητά. Για καλύτερη εμπειρία και τα πιο πρόσφατα χαρακτηριστικά, χρησιμοποιήστε τη δωρεάν τοπική εφαρμογή μας.",
+    "Silence call": "Σίγαση",
+    "Sound on": "Ήχος ενεργοποιημένος",
+    "Unknown caller": "Άγνωστος",
+    "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
+    "Don't miss a reply": "Μην χάσετε καμία απάντηση",
+    "Later": "Αργότερα",
+    "Review": "Ανασκόπηση",
+    "Review to ensure your account is safe": "Ελέγξτε για να βεβαιωθείτε ότι ο λογαριασμός σας είναι ασφαλής",
+    "You have unverified logins": "Έχετε μη επαληθευμένες συνδέσεις",
+    "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Μοιραστείτε ανώνυμα δεδομένα για να μας βοηθήσετε να εντοπίσουμε προβλήματα. Τίποτα προσωπικό. Χωρίς τρίτους. <LearnMoreLink>Μάθετε περισσότερα</LearnMoreLink>",
+    "Learn more": "Μάθετε περισσότερα",
+    "You previously consented to share anonymous usage data with us. We're updating how that works.": "Έχετε συμφωνήσει να μοιραστείτε ανώνυμα δεδομένα χρήσης μαζί μας. Ενημερώνουμε τον τρόπο που λειτουργεί.",
+    "Help improve %(analyticsOwner)s": "Βοηθήστε στη βελτίωση του %(analyticsOwner)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Στείλτε <UsageDataLink>ανώνυμα δεδομένα χρήσης</UsageDataLink> που μας βοηθούν να βελτιώσουμε τα %(brand)s. Θα χρησιμοποιηθεί ένα <PolicyLink>cookie</PolicyLink>.",
+    "Stop": "Παύση",
+    "That's fine": "Είναι εντάξει",
+    "Creating output...": "Δημιουργία παραγωγής...",
+    "Fetching events...": "Λήψη συμβάντων...",
+    "Starting export process...": "Έναρξη διαδικασίας εξαγωγής...",
+    "File Attached": "Tο αρχείο επισυνάφθηκε",
+    "Surround selected text when typing special characters": "Περιτριγυριστείτε το επιλεγμένο κείμενο κατά την πληκτρολόγηση ειδικών χαρακτήρων",
+    "Use Ctrl + Enter to send a message": "Χρησιμοποιήστε Ctrl + Enter για να στείλετε ένα μήνυμα",
+    "Use Command + Enter to send a message": "Χρησιμοποιήστε Command + Enter για να στείλετε ένα μήνυμα",
+    "Use Ctrl + F to search timeline": "Χρησιμοποιήστε τα πλήκτρα Ctrl + F για αναζήτηση στο χρονοδιάγραμμα",
+    "Use Command + F to search timeline": "Χρησιμοποιήστε το Command + F για αναζήτηση στο χρονοδιάγραμμα",
+    "Show typing notifications": "Εμφάνιση ειδοποιήσεων πληκτρολόγησης",
+    "Send typing notifications": "Αποστολή ειδοποιήσεων πληκτρολόγησης",
+    "Enable big emoji in chat": "Ενεργοποίηση μεγάλων emoji στη συνομιλία",
+    "Show avatars in user and room mentions": "Εμφάνιση των avatar σε αναφορές χρηστών και δωματίων",
+    "Jump to the bottom of the timeline when you send a message": "Μεταβείτε στο τέλος του χρονοδιαγράμματος όταν στέλνετε ένα μήνυμα",
+    "Show line numbers in code blocks": "Εμφάνιση αριθμών γραμμής σε μπλοκ κώδικα",
+    "Expand code blocks by default": "Αναπτύξτε τα μπλοκ κώδικα από προεπιλογή",
+    "Enable automatic language detection for syntax highlighting": "Ενεργοποίηση αυτόματης ανίχνευσης γλώσσας για επισήμανση σύνταξης",
+    "Autoplay videos": "Αυτόματη αναπαραγωγή videos",
+    "Autoplay GIFs": "Αυτόματη αναπαραγωγή GIFs",
+    "Show read receipts sent by other users": "Εμφάνιση αποδείξεων ανάγνωσης που έχουν αποσταλεί από άλλους χρήστες",
+    "Show display name changes": "Εμφάνιση αλλαγών εμφανιζόμενου ονόματος",
+    "Show avatar changes": "Εμφάνιση αλλαγών avatar",
+    "Show join/leave messages (invites/removes/bans unaffected)": "Εμφάνιση μηνυμάτων συμμετοχής/αποχώρησης (προσκλήσεις/αφαιρέσεις/απαγορεύσεις δεν επηρεάζονται)",
+    "Show a placeholder for removed messages": "Εμφάνιση πλαισίου θέσης για μηνύματα που έχουν αφαιρεθεί",
+    "Use a more compact 'Modern' layout": "Χρησιμοποιήστε μια πιο συμπαγή \"Μοντέρνα\" διάταξη",
+    "Insert a trailing colon after user mentions at the start of a message": "Εισαγάγετε άνω και κάτω τελεία μετά την αναφορά του χρήστη στην αρχή ενός μηνύματος",
+    "Show polls button": "Εμφάνιση κουμπιού δημοσκοπήσεων",
+    "Show stickers button": "Εμφάνιση κουμπιού αυτοκόλλητων",
+    "Enable Emoji suggestions while typing": "Ενεργοποιήστε τις προτάσεις Emoji κατά την πληκτρολόγηση",
+    "Location sharing - share your current location with live updates (under active development)": "Κοινή χρήση τοποθεσίας - μοιραστείτε την τρέχουσα τοποθεσία σας με ζωντανές ενημερώσεις (υπό ανάπτυξη)",
+    "Location sharing - pin drop (under active development)": "Κοινή χρήση τοποθεσίας - τοποθέτηση καρφίτσας (υπό ανάπτυξη)",
+    "Don't send read receipts": "Μην στέλνετε αποδείξεις ανάγνωσης",
+    "Jump to date (adds /jumptodate and jump to date headers)": "Μετάβαση στην ημερομηνία (προσθέτει /μετάβαση στην ημερομηνία και μετάβαση στις κεφαλίδες ημερομηνίας)",
+    "Right panel stays open (defaults to room member list)": "Το δεξί πλαίσιο παραμένει ανοιχτό (προεπιλογή στη λίστα μελών του δωματίου)",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Σας ευχαριστούμε που δοκιμάσατε την έκδοση beta, παρακαλούμε να αναφέρετε όσο περισσότερες λεπτομέρειες μπορείτε για να τη βελτιώσουμε.",
+    "To leave, just return to this page or click on the beta badge when you search.": "Για να αποχωρήσετε, απλώς επιστρέψτε σε αυτήν τη σελίδα ή κάντε κλικ στο σήμα beta όταν κάνετε αναζήτηση.",
+    "How can I leave the beta?": "Πώς μπορώ να φύγω από την beta έκδοση;",
+    "To feedback, join the beta, start a search and click on feedback.": "Για σχόλια, εγγραφείτε στην έκδοση beta, ξεκινήστε μια αναζήτηση και κάντε κλικ στα σχόλια.",
+    "How can I give feedback?": "Πώς μπορώ να σχολιάσω;",
+    "This feature is a work in progress, we'd love to hear your feedback.": "Αυτή η λειτουργία βρίσκεται σε εξέλιξη, θα θέλαμε να ακούσουμε τα σχόλιά σας.",
+    "A new, quick way to search spaces and rooms you're in.": "Ένας νέος, γρήγορος τρόπος για να αναζητήσετε χώρους και δωμάτια στα οποία συμμετέχετε.",
+    "The new search": "Η νέα αναζήτηση",
+    "New search experience": "Εμπειρία νέας αναζήτησης",
+    "Low bandwidth mode (requires compatible homeserver)": "Λειτουργία χαμηλού bandwidth (απαιτεί συμβατό κεντρικό διακομιστή)",
+    "Order rooms by name": "Ορίστε τη σειρά των δωματίων κατά το όνομά τους",
+    "Media omitted": "Τα μέσα παραλείφθηκαν",
+    "Enable widget screenshots on supported widgets": "Ενεργοποίηση στιγμιότυπων οθόνης μικροεφαρμογών σε υποστηριζόμενες μικροεφαρμογές",
+    "Enable URL previews by default for participants in this room": "Ενεργοποιήστε τις προεπισκοπήσεις URL από προεπιλογή για τους συμμετέχοντες σε αυτό το δωμάτιο",
+    "Enable inline URL previews by default": "Ενεργοποιήστε τις ενσωματωμένες προεπισκοπήσεις URL από προεπιλογή",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Να επιτρέπεται το Peer-to-Peer για κλήσεις 1:1 (εάν το ενεργοποιήσετε, το άλλο μέρος ενδέχεται να μπορεί να δει τη διεύθυνση IP σας)",
+    "Match system theme": "Αντιστοίχιση θέματος συστήματος",
+    "Enable Community Filter Panel": "Ενεργοποίηση του πίνακα φίλτρου κοινότητας",
+    "Mirror local video feed": "Αντικατοπτρίστε την τοπική ροή βίντεο",
+    "Automatically replace plain text Emoji": "Αυτόματη αντικατάσταση απλού κειμένου Emoji",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Προσωρινή εμφάνιση κοινοτήτων αντί για Χώρων για αυτήν την συνεδρία. Η υποστήριξη για αυτό θα καταργηθεί στο εγγύς μέλλον. Αυτό θα επαναφορτώσει το Element.",
+    "All rooms you're in will appear in Home.": "Όλα τα δωμάτια στα οποία συμμετέχετε θα εμφανίζονται στην Αρχική σελίδα.",
+    "Show chat effects (animations when receiving e.g. confetti)": "Εμφάνιση εφέ συνομιλίας (κινούμενα σχέδια κατά τη λήψη π.χ. κομφετί)",
+    "IRC display name width": "Πλάτος εμφανιζόμενου ονόματος IRC",
+    "Manually verify all remote sessions": "Επαληθεύστε χειροκίνητα όλες τις απομακρυσμένες συνεδρίες",
+    "How fast should messages be downloaded.": "Πόσο γρήγορα πρέπει να γίνεται λήψη των μηνυμάτων.",
+    "Show previews/thumbnails for images": "Εμφάνιση προεπισκοπήσεων/μικρογραφιών για εικόνες",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Να επιτρέπεται ο διακομιστής υποβοήθησης εναλλακτικής κλήσης turn.matrix.org όταν ο κεντρικός σας διακομιστής δεν την προσφέρει (η διεύθυνση IP σας θα κοινοποιηθεί κατά τη διάρκεια μιας κλήσης)",
+    "Pizza": "Πίτσα",
+    "Corn": "Καλαμπόκι",
+    "Strawberry": "Φράουλα",
+    "Apple": "Μήλο",
+    "Banana": "Μπανάνα",
+    "Fire": "Φωτιά",
+    "Cloud": "Σύννεφο",
+    "Moon": "Φεγγάρι",
+    "Globe": "Υδρόγειος",
+    "Mushroom": "Μανιτάρι",
+    "Cactus": "Κάκτος",
+    "Tree": "Δέντρο",
+    "Flower": "Λουλούδι",
+    "Butterfly": "Πεταλούδα",
+    "Octopus": "Χταπόδι",
+    "Fish": "Ψάρι",
+    "Turtle": "Χελώνα",
+    "Penguin": "Πιγκουίνος",
+    "Rooster": "Κόκκορας",
+    "Panda": "Πάντα",
+    "Rabbit": "Κουνέλι",
+    "Elephant": "Ελέφαντας",
+    "Pig": "Γουρούνι",
+    "Unicorn": "Μονόκερος",
+    "Horse": "Άλογο",
+    "Lion": "Λιοντάρι",
+    "Cat": "Γάτα",
+    "Dog": "Σκύλος",
+    "To be secure, do this in person or use a trusted way to communicate.": "Για να είστε ασφαλείς, κάντε το αυτοπροσώπως ή χρησιμοποιήστε έναν αξιόπιστο τρόπο επικοινωνίας.",
+    "They match": "Ταιριάζουν",
+    "They don't match": "Δεν ταιριάζουν",
+    "Cancelling…": "Ακύρωση…",
+    "Waiting for %(displayName)s to verify…": "Αναμονή για επαλήθευση του %(displayName)s…",
+    "Waiting for you to verify on your other device…": "Αναμονή για επαλήθευση στην άλλη συσκευή σας…",
+    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "Αναμονή για επαλήθευση στην άλλη συσκευή σας, %(deviceName)s (%(deviceId)s)…",
+    "Unable to find a supported verification method.": "Δεν είναι δυνατή η εύρεση μιας υποστηριζόμενης μεθόδου επαλήθευσης.",
+    "Verify this user by confirming the following number appears on their screen.": "Επαληθεύστε αυτόν τον χρήστη επιβεβαιώνοντας ότι ο ακόλουθος αριθμός εμφανίζεται στην οθόνη του.",
+    "Verify this device by confirming the following number appears on its screen.": "Επαληθεύστε αυτήν τη συσκευή επιβεβαιώνοντας ότι ο ακόλουθος αριθμός εμφανίζεται στην οθόνη της.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Επαληθεύστε αυτόν τον χρήστη επιβεβαιώνοντας ότι τα ακόλουθα emoji εμφανίζονται στην οθόνη του.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Επιβεβαιώστε ότι τα παρακάτω emoji εμφανίζονται και στις δύο συσκευές, με την ίδια σειρά:",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Τα ασφαλή μηνύματα με αυτόν τον χρήστη είναι κρυπτογραφημένα από άκρο σε άκρο και δεν μπορούν να διαβαστούν από τρίτους.",
+    "You've successfully verified this user.": "Επαληθεύσατε με επιτυχία αυτόν τον χρήστη.",
+    "Verified!": "Επαληθεύτηκε!",
+    "The other party cancelled the verification.": "Το άλλο μέρος ακύρωσε την επαλήθευση.",
+    "Call": "Κλήση",
+    "%(name)s on hold": "%(name)s σε αναμονή",
+    "Return to call": "Επιστροφή στην κλήση",
+    "Fill Screen": "Πλήρωση οθόνης",
+    "More": "Περισσότερα",
+    "Hide sidebar": "Απόκρυψη πλαϊνής μπάρας",
+    "Show sidebar": "Εμφάνιση πλαϊνής μπάρας",
+    "Start sharing your screen": "Ξεκινήστε να μοιράζεστε την οθόνη σας",
+    "Stop sharing your screen": "Σταματήστε να μοιράζεστε την οθόνη σας",
+    "Start the camera": "Ξεκινήστε την κάμερα",
+    "Stop the camera": "Σταματήστε την κάμερα",
+    "Unmute the microphone": "Καταργήστε τη σίγαση του μικροφώνου",
+    "Mute the microphone": "Σίγαση του μικροφώνου",
+    "Dialpad": "Πληκτρολόγιο κλήσης",
+    "Your camera is still enabled": "Η κάμερά σας είναι ακόμα ενεργοποιημένη",
+    "Your camera is turned off": "Η κάμερά σας είναι απενεργοποιημένη",
+    "%(sharerName)s is presenting": "%(sharerName)s παρουσιάζει",
+    "You are presenting": "Παρουσιάζετε",
+    "Connecting": "Συνδέεται",
+    "You held the call <a>Resume</a>": "Έχετε βάλει την κλήση σε αναμονή <a>Επαναφορά</a>",
+    "You held the call <a>Switch</a>": "Έχετε βάλει την κλήση σε αναμονή <a>Switch</a>",
+    "unknown person": "άγνωστο άτομο",
+    "Send as message": "Αποστολή ως μήνυμα",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Συμβουλή: Ξεκινήστε το μήνυμά σας με <code>//</code> για να το ξεκινήσετε με κάθετο.",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Μπορείτε να χρησιμοποιήσετε το <code>/help</code> για να παραθέσετε τις διαθέσιμες εντολές. Μήπως θέλατε να το στείλετε αυτό ως μήνυμα;",
+    "Unrecognised command: %(commandText)s": "Μη αναγνωρισμένη εντολή: %(commandText)s",
+    "Unknown Command": "Αγνωστη εντολή",
+    "sends space invaders": "στέλνει διαστημικούς εισβολείς",
+    "Sends the given message with a space themed effect": "Στέλνει το δεδομένο μήνυμα με εφέ διαστημικού θέματος",
+    "sends snowfall": "Στέλνει χιονόπτωση",
+    "Sends the given message with snowfall": "Στέλνει το δεδομένο μήνυμα με χιονόπτωση",
+    "sends rainfall": "Στέλνει βροχόπτωση",
+    "sends confetti": "στέλνει κομφετί",
+    "Sends the given message with confetti": "Στέλνει το δεδομένο μήνυμα με κομφετί",
+    "Sends the given message with fireworks": "Στέλνει το δεδομένο μήνυμα με πυροτεχνήματα",
+    "Sends the given message with rainfall": "Στέλνει το δεδομένο μήνυμα με βροχόπτωση",
+    "sends fireworks": "στέλνει πυροτεχνήματα",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Αυτή είναι η λίστα με τους χρήστες/διακομιστές που έχετε αποκλείσει - μην φύγετε από το δωμάτιο!",
+    "My Ban List": "Η λίστα απαγορεύσεων μου",
+    "When rooms are upgraded": "Όταν τα δωμάτια αναβαθμίζονται",
+    "Encrypted messages in group chats": "Κρυπτογραφημένα μηνύματα σε ομαδικές συνομιλίες",
+    "Encrypted messages in one-to-one chats": "Κρυπτογραφημένα μηνύματα σε συνομιλίες ένας προς έναν",
+    "Messages containing @room": "Μηνύματα που περιέχουν @δωμάτιο",
+    "Messages containing my username": "Μηνύματα που περιέχουν το όνομα χρήστη μου",
+    "Downloading logs": "Λήψη αρχείων καταγραφής",
+    "Uploading logs": "Μεταφόρτωση αρχείων καταγραφής",
+    "Automatically send debug logs when key backup is not functioning": "Αυτόματη αποστολή αρχείων καταγραφής εντοπισμού σφαλμάτων όταν η δημιουργία αντίγραφου κλειδιού ασφαλείας δεν λειτουργεί",
+    "Automatically send debug logs on decryption errors": "Αυτόματη αποστολή αρχείων καταγραφής εντοπισμού σφαλμάτων για σφάλματα αποκρυπτογράφησης",
+    "Automatically send debug logs on any error": "Αυτόματη αποστολή αρχείων καταγραφής εντοπισμού σφαλμάτων για οποιοδήποτε σφάλμα",
+    "Heart": "Καρδιά",
+    "Cake": "Τούρτα",
+    "IRC (Experimental)": "IRC (Πειραματικό)",
+    "This upgrade will allow members of selected spaces access to this room without an invite.": "Αυτή η αναβάθμιση θα επιτρέψει σε μέλη επιλεγμένων Χώρων πρόσβαση σε αυτό το δωμάτιο χωρίς πρόσκληση.",
+    "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "Αυτό το δωμάτιο βρίσκεται σε ορισμένους Χώρους στους οποίους δεν είστε διαχειριστής. Σε αυτούς τους Χώρους, το παλιό δωμάτιο θα εξακολουθεί να εμφανίζεται, αλλά τα άτομα θα κληθούν να συμμετάσχουν στο νέο.",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Οποιοσδήποτε σε ένα Χώρο μπορεί να βρει και να εγγραφεί. Μπορείτε να επιλέξετε πολλούς Χώρους.",
+    "Aeroplane": "Αεροπλάνο",
+    "Bicycle": "Ποδήλατο",
+    "Train": "Τρένο",
+    "Flag": "Σημαία",
+    "Telephone": "Τηλέφωνο",
+    "Hammer": "Σφυρί",
+    "Key": "Κλειδί",
+    "Lock": "Κλειδαριά",
+    "Scissors": "Ψαλίδι",
+    "Paperclip": "Συνδετήρας",
+    "Pencil": "Μολύβι",
+    "Book": "Βιβλίο",
+    "Light bulb": "Λάμπα",
+    "Gift": "Δώρο",
+    "Clock": "Ρολόι",
+    "Hourglass": "Κλεψύδρα",
+    "Umbrella": "Ομπρέλα",
+    "Santa": "Άγιος Βασίλης",
+    "Glasses": "Γυαλιά",
+    "Hat": "Καπέλο",
+    "Robot": "Ρομπότ",
+    "Smiley": "Χαμογελαστό πρόσωπο",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Η δημιουργία αντιγράφων ασφαλείας έχει υπογραφή από <verify>άγνωστη</verify> συνεδρία με αναγνωριστικό %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Το αντίγραφο ασφαλείας έχει υπογραφή από <verify>άγνωστο</verify>χρήστη με αναγνωριστικό %(deviceId)s",
+    "Backup has a <validity>invalid</validity> signature from this user": "Η δημιουργία αντιγράφων ασφαλείας έχει μια <validity>μη έγκυρη</validity> υπογραφή από αυτόν τον χρήστη",
+    "Backup has a <validity>valid</validity> signature from this user": "Η δημιουργία αντιγράφων ασφαλείας έχει μια υπογραφή <validity>valid</validity> από αυτόν τον χρήστη",
+    "All keys backed up": "Δημιουργήθηκαν αντίγραφα ασφαλείας όλων των κλειδιών",
+    "Backing up %(sessionsRemaining)s keys...": "Δημιουργία αντιγράφων ασφαλείας κλειδιών %(sessionsRemaining)s...",
+    "Connect this session to Key Backup": "Συνδέστε αυτήν την συνεδρία με το αντίγραφο ασφαλείας κλειδιού",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Συνδέστε αυτήν την συνεδρία με το αντίγραφο ασφαλείας κλειδιού πριν αποσυνδεθείτε για να αποφύγετε την απώλεια κλειδιών που μπορεί να υπάρχουν μόνο σε αυτήν την συνεδρία.",
+    "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.": "Αυτή η συνεδρία <b>δεν δημιουργεί αντίγραφα ασφαλείας των κλειδιών σας</b>, αλλά έχετε ένα υπάρχον αντίγραφο ασφαλείας από το οποίο μπορείτε να επαναφέρετε και να προσθέσετε στη συνέχεια.",
+    "This session is backing up your keys. ": "Αυτή η συνεδρία δημιουργεί αντίγραφα ασφαλείας των κλειδιών σας. ",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Είσαι σίγουρος? Θα χάσετε τα κρυπτογραφημένα μηνύματά σας εάν δε δημιουργηθούν σωστά αντίγραφα ασφαλείας των κλειδιών σας.",
+    "<a>Upgrade</a> to your own domain": "<a>Αναβάθμιση</a> στη δικήσας διεύθυνση διαδικτύου",
+    "Global": "Παγκόσμια",
+    "Keyword": "Λέξη-κλειδί",
+    "Self signing private key:": "Αυτόματη υπογραφή ιδιωτικού κλειδιού:",
+    "not found locally": "δεν βρέθηκε τοπικά",
+    "cached locally": "αποθηκευμένο τοπικά",
+    "Master private key:": "Κύριο ιδιωτικό κλειδί:",
+    "not found in storage": "δεν βρέθηκε στην αποθήκευση",
+    "in secret storage": "σε μυστική αποθήκευση",
+    "Cross-signing private keys:": "Διασταυρούμενη υπογραφή ιδιωτικών κλειδιών:",
+    "in memory": "στη μνήμη",
+    "Cross-signing public keys:": "Διασταυρούμενη υπογραφή δημόσιων κλειδιών:",
+    "Cross-signing is not set up.": "Η διασταυρούμενη υπογραφή δεν έχει ρυθμιστεί.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ο λογαριασμός σας έχει ταυτότητα διασταυρούμενης υπογραφής σε μυστικό χώρο αποθήκευσης, αλλά δεν είναι ακόμη αξιόπιστος από αυτήν την συνεδρία.",
+    "Cross-signing is ready but keys are not backed up.": "Η διασταυρούμενη υπογραφή είναι έτοιμη, αλλά δεν δημιουργούνται αντίγραφα ασφαλείας κλειδιών.",
+    "Cross-signing is ready for use.": "Η διασταυρούμενη υπογραφή είναι έτοιμη για χρήση.",
+    "Your homeserver does not support cross-signing.": "Ο κεντρικός σας διακομιστής δεν υποστηρίζει διασταυρούμενη σύνδεση.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Η αλλαγή του κωδικού πρόσβασης θα επαναφέρει αυτήν τη στιγμή τυχόν κλειδιά κρυπτογράφησης από άκρο σε άκρο σε όλες τις συνεδρίες, καθιστώντας το κρυπτογραφημένο ιστορικό συνομιλιών μη αναγνώσιμο, εκτός εάν πρώτα εξαγάγετε τα κλειδιά του δωματίου σας και τα εισαγάγετε ξανά στη συνέχεια. Στο μέλλον αυτό θα βελτιωθεί.",
+    "Channel: <channelLink/>": "Κανάλι: <channelLink/>",
+    "Workspace: <networkLink/>": "Χώρος εργασίας: <networkLink/>",
+    "This bridge is managed by <user />.": "Αυτή τη γέφυρα τη διαχειρίζεται ο <user />.",
+    "This bridge was provisioned by <user />.": "Αυτή η γέφυρα παρέχεται από τον <user />.",
+    "Jump to first invite.": "Μετάβαση στην πρώτη πρόσκληση.",
+    "Jump to first unread room.": "Μετάβαση στο πρώτο μη αναγνωσμένο δωμάτιο.",
+    "Create": "Δημιουργία",
+    "Creating...": "Δημιουργίται...",
+    "You can change these anytime.": "Μπορείτε να τα αλλάξετε ανά πάσα στιγμή.",
+    "Your private space": "Ο ιδιωτικός σας χώρος",
+    "Your public space": "Ο δημόσιος χώρος σας",
+    "Go back": "Πηγαίνετε πίσω",
+    "To join a space you'll need an invite.": "Για να συμμετάσχετε σε ένα χώρο θα χρειαστείτε μια πρόσκληση.",
+    "You can also make Spaces from <a>communities</a>.": "Μπορείτε επίσης να δημιουργήσετε Χώρους από <a>κοινότητες</a>.",
+    "Invite only, best for yourself or teams": "Μόνο με πρόσκληση, καλύτερο για εσάς ή ομάδες",
+    "Private": "Ιδιωτικό",
+    "Open space for anyone, best for communities": "Ανοιχτός χώρος για οποιονδήποτε, καλύτερο για κοινότητες",
+    "Public": "Δημόσιο",
+    "Create a space": "Δημιουργήστε ένα χώρο",
+    "Address": "Διεύθυνση",
+    "e.g. my-space": "π.χ. ο-χώρος-μου",
+    "Give feedback.": "Σχολιάστε.",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Σας ευχαριστούμε που δοκιμάσατε τθς χώρους. Τα σχόλιά σας θα βοηθήσουν στην ενημέρωση των επόμενων εκδόσεων.",
+    "Spaces feedback": "Σχόλια για τους χώρους",
+    "Spaces are a new feature.": "Οι χώροι είναι ένα νέο χαρακτηριστικό.",
+    "Please enter a name for the space": "Εισαγάγετε ένα όνομα για το χώρο",
+    "Search %(spaceName)s": "Αναζήτηση %(spaceName)s",
+    "Description": "Περιγραφή",
+    "Upload": "Μεταφόρτωση",
+    "Delete": "Διαγραφή",
+    "Delete avatar": "Διαγραφή avatar",
+    "Space selection": "Επιλογή χώρου",
+    "Theme": "Θέμα",
+    "More options": "Περισσότερες επιλογές",
+    "Pin to sidebar": "Καρφίτσωμα στην πλαϊνή μπάρα",
+    "All settings": "Όλες οι ρυθμίσεις",
+    "Quick settings": "Γρήγορες ρυθμίσεις",
+    "Accept <policyLink /> to continue:": "Αποδεχτείτε το <policyLink /> για να συνεχίσετε:",
+    "Decline (%(counter)s)": "Απόρριψη (%(counter)s)",
+    "Your server isn't responding to some <a>requests</a>.": "Ο διακομιστής σας δεν ανταποκρίνεται σε ορισμένα <a>αιτήματα</a>.",
+    "Pin": "Καρφίτσα",
+    "Folder": "Φάκελος",
+    "Headphones": "Ακουστικά",
+    "Anchor": "Άγκυρα",
+    "Bell": "Κουδούνι",
+    "Trumpet": "Τρομπέτα",
+    "Guitar": "Κιθάρα",
+    "Ball": "Μπάλα",
+    "Trophy": "Τρόπαιο",
+    "Rocket": "Πύραυλος",
+    "%(peerName)s held the call": "%(peerName)s έβαλε την κλήση σε αναμονή",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Συμβουλευτική με %(transferTarget)s. <a>Μεταφορά στο %(transferee)s</a>",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Ερώτηση πριν από την αποστολή προσκλήσεων σε δυνητικά μη έγκυρα αναγνωριστικά matrix",
+    "%(value)sd": "%(value)sμέρες",
+    "%(value)sh": "%(value)sώρες",
+    "%(value)sm": "%(value)s'",
+    "%(value)ss": "%(value)s\"",
+    "Effects": "Εφέ",
+    "Backup key cached:": "Αποθηκευμένο εφεδρικό κλειδί στην κρυφή μνήμη:",
+    "not stored": "μη αποθηκευμένο",
+    "Backup key stored:": "Αποθηκευμένο εφεδρικό κλειδί:",
+    "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 Security Key.": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών κρυπτογράφησης με τα δεδομένα του λογαριασμού σας σε περίπτωση που χάσετε την πρόσβαση στις συνεδρίες σας. Τα κλειδιά σας θα ασφαλιστούν με ένα μοναδικό κλειδί ασφαλείας.",
+    "unexpected type": "μη αναμενόμενος τύπος",
+    "Back up your keys before signing out to avoid losing them.": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε για να μην τα χάσετε.",
+    "Your keys are <b>not being backed up from this session</b>.": "<b>Δεν δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας από αυτήν την συνεδρία</b>.",
+    "Backup has a <validity>valid</validity> signature from this session": "Η δημιουργία αντιγράφων ασφαλείας έχει μια <validity>έγκυρη</validity> υπογραφή από αυτήν τη συνεδρία",
+    "Backup has an <validity>invalid</validity> signature from this session": "Η δημιουργία αντιγράφων ασφαλείας έχει μια <validity>μη έγκυρη</validity> υπογραφή από αυτήν τη συνεδρία",
+    "This backup is trusted because it has been restored on this session": "Αυτό το αντίγραφο ασφαλείας είναι αξιόπιστο επειδή έχει αποκατασταθεί σε αυτήν τη συνεδρία",
+    "Backup is not signed by any of your sessions": "Το αντίγραφο ασφαλείας δεν υπογράφεται από καμία από τις συνεδρίες σας",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Το αντίγραφο ασφαλείας έχει μια <validity> μη έγκυρη </validity> υπογραφή από την <verify> μη επαληθευμένη </verify>συνεδρία <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Το αντίγραφο ασφαλείας έχει μια <validity> μη έγκυρη </validity> υπογραφή από την <verify> επαληθευμένη </verify>συνεδρία <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Το αντίγραφο ασφαλείας έχει μια <validity> έγκυρη </validity> υπογραφή από την <verify> μη επαληθευμένη </verify>συνεδρία <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Το αντίγραφο ασφαλείας έχει μια <validity> έγκυρη </validity> υπογραφή από την<verify>επαληθευμένη</verify>συνεδρία <device></device>",
+    "Click the button below to confirm signing out these devices.|other": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε αποσύνδεση αυτών των συσκευών.",
+    "Confirm signing out these devices": "Επιβεβαιώστε την αποσύνδεση αυτών των συσκευών",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Επιβεβαιώστε ότι αποσυνδέεστε από αυτήν τη συσκευή χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Επιβεβαιώστε την αποσύνδεση από αυτές τις συσκευές χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
+    "Unable to load device list": "Δεν είναι δυνατή η φόρτωση της λίστας συσκευών",
+    "Your homeserver does not support device management.": "Ο κεντρικός σας διακομιστής δεν υποστηρίζει τη διαχείριση συσκευών.",
+    "Session key:": "Κλειδί συνεδρίας:",
+    "Session ID:": "Αναγνωριστικό συνεδρίας:",
+    "exists": "υπάρχει",
+    "Homeserver feature support:": "Υποστήριξη λειτουργιών κεντρικού διακομιστή:",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Το προσαρμοσμένο μέγεθος γραμματοσειράς μπορεί να είναι μόνο μεταξύ %(min)s pt και %(max)s pt",
+    "Size must be a number": "Το μέγεθος πρέπει να είναι ένας αριθμός",
+    "Hey you. You're the best!": "Είσαι ο καλύτερος!",
+    "Message search initialisation failed": "Η αρχικοποίηση αναζήτησης μηνυμάτων απέτυχε",
+    "%(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.": "Το %(brand)s δεν μπορεί να αποθηκεύσει με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά ενώ εκτελείται σε πρόγραμμα περιήγησης ιστού. Χρησιμοποιήστε την <desktopLink>%(brand)s Επιφάνεια εργασίας</desktopLink> για να εμφανίζονται κρυπτογραφημένα μηνύματα στα αποτελέσματα αναζήτησης.",
+    "%(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>.": "Λείπουν ορισμένα στοιχεία από το %(brand)s που απαιτούνται για την ασφαλή αποθήκευση κρυπτογραφημένων μηνυμάτων τοπικά. Εάν θέλετε να πειραματιστείτε με αυτό το χαρακτηριστικό, δημιουργήστε μια προσαρμοσμένη %(brand)s επιφάνεια εργασίαςμε <nativeLink>προσθήκη στοιχείων αναζήτησης</nativeLink>.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης.",
+    "Manage": "Διαχειριστείτε",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από το %(rooms)sδωμάτιο .",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης, χρησιμοποιώντας %(size)s για αποθήκευση μηνυμάτων από τα %(rooms)sδωμάτια .",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Επαληθεύστε μεμονωμένα κάθε συνεδρία που χρησιμοποιείται από έναν χρήστη για να την επισημάνετε ως αξιόπιστη, χωρίς να εμπιστεύεστε συσκευές με διασταυρούμενη υπογραφή.",
+    "Rename": "Μετονομασία",
+    "Display Name": "Εμφανιζόμενο όνομα",
+    "Sign Out": "Αποσύνδεση",
+    "Last seen %(date)s at %(ip)s": "Τελευταία εμφάνιση %(date)s στο %(ip)s",
+    "This device": "Αυτή η συσκευή",
+    "You aren't signed into any other devices.": "Δεν είστε συνδεδεμένοι σε άλλες συσκευές.",
+    "Sign out %(count)s selected devices|one": "Αποσύνδεση%(count)s επιλεγμένων συσκευών",
+    "Sign out %(count)s selected devices|other": "Αποσύνδεση%(count)s επιλεγμένων συσκευών",
+    "Devices without encryption support": "Συσκευές χωρίς υποστήριξη κρυπτογράφησης",
+    "Unverified devices": "Μη επαληθευμένες συσκευές",
+    "Verified devices": "Επαληθευμένες συσκευές",
+    "Select all": "Επιλογή όλων",
+    "Deselect all": "Αποεπιλογή όλων",
+    "Sign out devices|one": "Αποσύνδεση συσκευής",
+    "Sign out devices|other": "Αποσύνδεση συσκευών",
+    "Click the button below to confirm signing out these devices.|one": "Κάντε κλικ στο κουμπί παρακάτω για επιβεβαίωση αποσύνδεση αυτής της συσκευής.",
+    "Account management": "Διαχείριση λογαριασμών",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Αποδεχτείτε τους Όρους χρήσης του διακομιστή ταυτότητας (%(serverName)s), ώστε να μπορείτε να είστε ανιχνεύσιμοι μέσω της διεύθυνσης ηλεκτρονικού ταχυδρομείου ή του αριθμού τηλεφώνου.",
+    "Spell check dictionaries": "Λεξικά ορθογραφικού ελέγχου",
+    "Language and region": "Γλώσσα και περιοχή",
+    "Set a new account password...": "Oρίστε νέο κωδικό πρόσβασης λογαριασμού...",
+    "Phone numbers": "Τηλεφωνικοί αριθμοί",
+    "Email addresses": "Διευθύνσεις ηλεκτρονικού ταχυδρομείου",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ο κωδικός πρόσβασής σας άλλαξε με επιτυχία. Δεν θα λαμβάνετε ειδοποιήσεις push για άλλες συνεδρίες μέχρι να συνδεθείτε ξανά σε αυτές",
+    "Appearance Settings only affect this %(brand)s session.": "Οι ρυθμίσεις εμφάνισης επηρεάζουν μόνο αυτή τη %(brand)s συνεδρία.",
+    "Customise your appearance": "Προσαρμόστε την εμφάνισή σας",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Ορίστε το όνομα μιας γραμματοσειράς που είναι εγκατεστημένη στο σύστημά σας και o %(brand)s θα προσπαθήσει να τη χρησιμοποιήσει.",
+    "New version available. <a>Update now.</a>": "Νέα έκδοση διαθέσιμη. <a>Ενημέρωση τώρα.</a>",
+    "Add theme": "Προσθήκη θέματος",
+    "Custom theme URL": "URL προσαρμοσμένου θέματος",
+    "Use high contrast": "Χρησιμοποιήστε υψηλή αντίθεση",
+    "Theme added!": "Το θέμα προστέθηκε!",
+    "Error downloading theme information.": "Σφάλμα κατά τη λήψη πληροφοριών θέματος.",
+    "Change": "Αλλαγή",
+    "Enter a new identity server": "Εισαγάγετε έναν νέο διακομιστή ταυτότητας",
+    "Do not use an identity server": "Μην χρησιμοποιείτε διακομιστή ταυτότητας",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Η χρήση διακομιστή ταυτότητας είναι προαιρετική. Εάν επιλέξετε να μην χρησιμοποιήσετε διακομιστή ταυτότητας, δεν θα μπορείτε να εντοπίσετε άλλους χρήστες και δεν θα μπορείτε να προσκαλέσετε άλλους μέσω email ή τηλεφώνου.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Η αποσύνδεση από τον διακομιστή ταυτότητάς σας θα σημαίνει ότι δεν θα μπορείτε να εντοπίσετε άλλους χρήστες και δεν θα μπορείτε να προσκαλέσετε άλλους μέσω email ή τηλεφώνου.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Αυτήν τη στιγμή δεν χρησιμοποιείτε διακομιστή ταυτότητας. Για να ανακαλύψετε και να είστε ανιχνεύσιμοι από υπάρχουσες επαφές που γνωρίζετε, προσθέστε μία παρακάτω.",
+    "Identity server": "Διακομιστής ταυτότητας",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Εάν δε θέλετε να χρησιμοποιήσετε το <server /> για να ανακαλύψετε και να είστε ανιχνεύσιμοι από τις υπάρχουσες επαφές που γνωρίζετε, εισαγάγετε έναν άλλο διακομιστή ταυτότητας παρακάτω.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Αυτήν τη στιγμή χρησιμοποιείτε το <server></server> για να ανακαλύψετε και να είστε ανιχνεύσιμοι από τις υπάρχουσες επαφές που γνωρίζετε. Μπορείτε να αλλάξετε τον διακομιστή ταυτότητάς σας παρακάτω.",
+    "Identity server (%(server)s)": "Διακομιστής ταυτότητας (%(server)s)",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Συνιστούμε να αφαιρέσετε τις διευθύνσεις του ηλεκτρονικού σας ταχυδρομείου και τους αριθμούς τηλεφώνου σας από τον διακομιστή ταυτότητας πριν αποσυνδεθείτε.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Εξακολουθείτε να <b>μοιράζεστε τα προσωπικά σας δεδομένα</b> στον διακομιστή ταυτότητας <idserver />.",
+    "Disconnect anyway": "Αποσυνδεθείτε ούτως ή άλλως",
+    "wait and try again later": "περιμένετε και δοκιμάστε ξανά αργότερα",
+    "contact the administrators of identity server <idserver />": "επικοινωνήστε με τους διαχειριστές του διακομιστή ταυτότητας <idserver />",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "ελέγξτε τις προσθήκες του προγράμματος περιήγησής σας που θα μπορούσε να αποκλείσει τον διακομιστή ταυτότητας (όπως το Privacy Badger)",
+    "You should:": "Θα πρέπει:",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Θα πρέπει να <b>καταργήσετε τα προσωπικά σας δεδομένα</b> από τον διακομιστή ταυτότητας <idserver /> πρίν αποσυνδεθείτε. Δυστυχώς, ο διακομιστής ταυτότητας <idserver /> αυτή τη στιγμή είναι εκτός σύνδεσης ή δεν είναι δυνατή η πρόσβαση.",
+    "Disconnect": "Αποσύνδεση",
+    "Disconnect from the identity server <idserver />?": "Αποσύνδεση από τον διακομιστή ταυτότητας <idserver />;",
+    "Disconnect identity server": "Αποσύνδεση διακομιστή ταυτότητας",
+    "Terms of service not accepted or the identity server is invalid.": "Οι όροι χρήσης δεν γίνονται αποδεκτοί ή ο διακομιστής ταυτότητας δεν είναι έγκυρος.",
+    "The identity server you have chosen does not have any terms of service.": "Ο διακομιστής ταυτότητας που επιλέξατε δεν έχει όρους χρήσης.",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Αποσύνδεση από τον διακομιστή ταυτότητας<current /> και σύνδεση στο <new /> ;",
+    "Change identity server": "Αλλαγή διακομιστή ταυτότητας",
+    "Checking server": "Έλεγχος διακομιστή",
+    "Could not connect to identity server": "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή ταυτότητας",
+    "Not a valid identity server (status code %(code)s)": "Μη έγκυρος διακομιστής ταυτότητας(κωδικός κατάστασης %(code)s)",
+    "Identity server URL must be HTTPS": "Η διεύθυνση URL διακομιστή ταυτότητας πρέπει να είναι HTTPS",
+    "not ready": "δεν είναι έτοιμο",
+    "ready": "έτοιμο",
+    "Secret storage:": "Μυστική αποθήκευση:",
+    "in account data": "στα δεδομένα λογαριασμού",
+    "Secret storage public key:": "Δημόσιο κλειδί μυστικής αποθήκευσης:",
+    "well formed": "καλοσχηματισμένο",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Οποιοσδήποτε στο <spaceName/> μπορεί να το βρει και να εγγραφεί. Μπορείτε να επιλέξετε και άλλους χώρους.",
+    "Spaces with access": "Χώροι με πρόσβαση",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Οποιοσδήποτε σε ένα χώρο μπορεί να το βρει και να εγγραφεί. <a>Επεξεργαστείτε τους χώρους που έχουν πρόσβαση εδώ.</a>",
+    "Currently, %(count)s spaces have access|one": "Αυτήν τη στιγμή, ένας χώρος έχει πρόσβαση",
+    "Currently, %(count)s spaces have access|other": "Αυτήν τη στιγμή, %(count)s χώροι έχουν πρόσβαση",
+    "& %(count)s more|one": "& %(count)s περισσότερα",
+    "& %(count)s more|other": "& %(count)s περισσότερα",
+    "Upgrade required": "Απαιτείται αναβάθμιση",
+    "Anyone can find and join.": "Οποιοσδήποτε μπορεί να το βρει και να εγγραφεί.",
+    "Private (invite only)": "Ιδιωτικό (μόνο με πρόσκληση)",
+    "Large": "Μεγάλο",
+    "Image size in the timeline": "Μέγεθος εικόνας στο χρονοδιάγραμμα",
+    "Use between %(min)s pt and %(max)s pt": "Χρήση μεταξύ %(min)s pt και %(max)s pt",
+    "Always show the window menu bar": "Να εμφανίζεται πάντα η μπάρα μενού παραθύρου",
+    "Warn before quitting": "Προειδοποιήστε πριν την παραίτηση",
+    "Create Space": "Δημιουργία χώρου",
+    "Open Space": "Ανοιχτός χώρος",
+    "Subscribe": "Εγγραφείτε",
+    "Room ID or address of ban list": "Ταυτότητα δωματίου ή διεύθυνση της λίστας απαγορευσων",
+    "If this isn't what you want, please use a different tool to ignore users.": "Εάν αυτό δεν είναι αυτό που θέλετε, χρησιμοποιήστε ένα διαφορετικό εργαλείο για να αγνοήσετε τους χρήστες.",
+    "Subscribing to a ban list will cause you to join it!": "Η εγγραφή σε μια λίστα απαγορεύσων θα σας κάνει να εγγραφείτε σε αυτήν!",
+    "Subscribed lists": "Εγγεγραμμένες λίστες",
+    "Ignore": "Αγνοήστε",
+    "eg: @bot:* or example.org": "π.χ.: @bot:* ή example.org",
+    "Server or user ID to ignore": "Αναγνωριστικό διακομιστή ή χρήστη για παράβλεψη",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Η προσωπική σας λίστα απαγορεύσεων περιέχει όλους τους χρήστες/διακομιστές από τους οποίους εσείς προσωπικά δεν θέλετε να βλέπετε μηνύματα. Αφού αγνοήσετε τον πρώτο σας χρήστη/διακομιστή, θα εμφανιστεί ένα νέο δωμάτιο στη λίστα των δωματίων σας με το όνομα \"Η λίστα απαγορευσων μου \" - μείνετε σε αυτό το δωμάτιο για να διατηρήσετε τη λίστα απαγόρευσων σε ισχύ.",
+    "Personal ban list": "Προσωπική λίστα απαγορεύσεων",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Η αγνόηση των ατόμων γίνεται μέσω λιστών απαγορεύσεων που περιέχουν κανόνες για το ποιος να απαγορεύσει. Η εγγραφή σε μια λίστα απαγορεύσεων σημαίνει ότι οι χρήστες/διακομιστές που έχουν αποκλειστεί από αυτήν τη λίστα θα είναι κρυμμένοι από εσάς.",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Προσθέστε χρήστες και διακομιστές που θέλετε να αγνοήσετε εδώ. Χρησιμοποιήστε αστερίσκους για να ταιριάζουν %(brand)s με οποιονδήποτε χαρακτήρα. Για παράδειγμα, το <code>@bot:*</code> θα αγνοούσε όλους τους χρήστες που έχουν το όνομα 'bot' σε οποιονδήποτε διακομιστή.",
+    "⚠ These settings are meant for advanced users.": "⚠ Αυτές οι ρυθμίσεις προορίζονται για προχωρημένους χρήστες.",
+    "Ignored users": "Χρήστες που αγνοήθηκαν",
+    "You are currently subscribed to:": "Αυτήν τη στιγμή είστε εγγεγραμμένοι σε:",
+    "View rules": "Προβολή κανόνων",
+    "Unsubscribe": "Απεγγραφή",
+    "You are not subscribed to any lists": "Δεν είστε εγγεγραμμένοι σε καμία λίστα",
+    "You are currently ignoring:": "Αυτήν τη στιγμή αγνοείτε:",
+    "You have not ignored anyone.": "Δεν έχετε αγνοήσει κανέναν.",
+    "User rules": "Κανόνες χρήστη",
+    "Server rules": "Κανόνες διακομιστή",
+    "Ban list rules - %(roomName)s": "Κανόνες απαγόρευσης λίστας - %(roomName)s",
+    "None": "Κανένα",
+    "Please try again or view your console for hints.": "Δοκιμάστε ξανά ή δείτε την κονσόλα σας για συμβουλές.",
+    "Error unsubscribing from list": "Σφάλμα κατά την απεγγραφή από τη λίστα",
+    "Error removing ignored user/server": "Σφάλμα κατά την αφαίρεση του χρήστη/διακομιστή που αγνοήθηκε",
+    "Please verify the room ID or address and try again.": "Επαληθεύστε την ταυτότητα ή τη διεύθυνση δωματίου και δοκιμάστε ξανά.",
+    "Error subscribing to list": "Σφάλμα εγγραφής στη λίστα",
+    "Something went wrong. Please try again or view your console for hints.": "Κάτι πήγε στραβά. Δοκιμάστε ξανά ή δείτε την κονσόλα σας για συμβουλές.",
+    "Error adding ignored user/server": "Σφάλμα κατά την προσθήκη χρήστη/διακομιστή που αγνοήθηκε",
+    "Ignored/Blocked": "Αγνοήθηκε/Αποκλείστηκε",
+    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Αισθάνεστε πειραματικοί; Τα εργαστήρια είναι ο καλύτερος τρόπος για να έχετε πρώιμη πρόσβαση, να δοκιμάσετε νέες δυνατότητες και να βοηθήσετε στη διαμόρφωση τους πριν παρουσιαστούν πραγματικά. <a>Μάθετε περισσότερα</a>.",
+    "Keyboard": "Πληκτρολόγιο",
+    "Clear cache and reload": "Εκκαθάριση προσωρινής μνήμης και επαναφόρτωση",
+    "Your access token gives full access to your account. Do not share it with anyone.": "Το διακριτικό πρόσβασής σας παρέχει πλήρη πρόσβαση στον λογαριασμό σας. Μην το μοιραστείτε με κανέναν.",
+    "Access Token": "Διακριτικό πρόσβασης",
+    "Versions": "Εκδόσεις",
+    "Keyboard Shortcuts": "Συντομεύσεις πληκτρολογίου",
+    "FAQ": "Συχνές ερωτήσεις",
+    "Help & About": "Βοήθεια & Σχετικά",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Για να αναφέρετε ένα ζήτημα ασφάλειας που σχετίζεται με το Matrix, διαβάστε την <a>Πολιτική Γνωστοποίησης Ασφαλείας</a> του Matrix.org.",
+    "Submit debug logs": "Υποβολή αρχείων καταγραφής εντοπισμού σφαλμάτων",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Τα αρχεία καταγραφής εντοπισμού σφαλμάτων περιέχουν δεδομένα χρήσης εφαρμογών, συμπεριλαμβανομένου του ονόματος χρήστη σας, των αναγνωριστικών ή των ψευδωνύμων των δωματίων ή των ομάδων που έχετε επισκεφτεί, τα στοιχεία διεπαφής χρήστη με τα οποία αλληλεπιδράσατε τελευταία και τα ονόματα χρήστη άλλων χρηστών. Δεν περιέχουν μηνύματα.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Εάν έχετε υποβάλει ένα σφάλμα μέσω του GitHub, τα αρχεία καταγραφής εντοπισμού σφαλμάτων μπορούν να μας βοηθήσουν να εντοπίσουμε το πρόβλημα. ",
+    "Bug reporting": "Αναφορά σφαλμάτων",
+    "Chat with %(brand)s Bot": "Συνομιλία με το %(brand)s Bot",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Για βοήθεια σχετικά με τη χρήση του %(brand)s, κάντε κλικ <a>εδώ</a> ή ξεκινήστε μια συνομιλία με το bot μας χρησιμοποιώντας το παρακάτω κουμπί.",
+    "For help with using %(brand)s, click <a>here</a>.": "Για βοήθεια σχετικά με τη χρήση του %(brand)s, κάντε κλικ <a>εδώ</a>.",
+    "Olm version:": "Έκδοση Olm:",
+    "Deactivate account": "Απενεργοποίηση λογαριασμού",
+    "Deactivating your account is a permanent action - be careful!": "Η απενεργοποίηση του λογαριασμού σας είναι μια μόνιμη ενέργεια - να είστε προσεκτικοί!",
+    "Interactively verify by Emoji": "Επαλήθευση με Emoji",
+    "Signature upload failed": "Αποτυχία μεταφόρτωσης υπογραφής",
+    "Signature upload success": "Επιτυχία μεταφόρτωσης υπογραφής",
+    "Cancelled signature upload": "Ακυρώθηκε η μεταφόρτωση υπογραφής",
+    "Upload completed": "Η μεταφόρτωση ολοκληρώθηκε",
+    "Space": "Χώρος",
+    "Clear all data in this session?": "Εκκαθάριση όλων των δεδομένων σε αυτήν την περίοδο σύνδεσης;",
+    "Clear all data": "Εκκαθάριση όλων των δεδομένων",
+    "Show": "Εμφάνιση",
+    "Hide": "Απόκρυψη",
+    "Remove %(count)s messages|other": "Αφαίρεση %(count)s μηνυμάτων",
+    "Remove %(count)s messages|one": "Αφαίρεση 1 μηνύματος",
+    "Backspace": "Backspace",
+    "Share content": "Κοινή χρήση περιεχομένου",
+    "Application window": "Παράθυρο εφαρμογής",
+    "Share entire screen": "Κοινή χρήση ολόκληρης της οθόνης",
+    "Copy": "Αντιγραφή",
+    "Sorry, you can't edit a poll after votes have been cast.": "Λυπούμαστε, δεν μπορείτε να επεξεργαστείτε μια δημοσκόπηση μετά την ψηφοφορία.",
+    "Can't edit poll": "Αδυναμία επεξεργασίας δημοσκόπησης",
+    "Zoom out": "Σμίκρυνση",
+    "Zoom in": "Μεγέθυνση",
+    "Unable to load map": "Αδυναμία φόρτωσης χάρτη",
+    "Expand map": "Ανάπτυξη χάρτη",
+    "You sent a verification request": "Στείλατε ένα αίτημα επαλήθευσης",
+    "Forget this room": "Ξεχάστε αυτό το δωμάτιο",
+    "Reason: %(reason)s": "Αιτία: %(reason)s",
+    "Loading room preview": "Φόρτωση προεπισκόπησης δωματίου",
+    "Sign Up": "Εγγραφή",
+    "Join the conversation with an account": "Συμμετοχή στη συζήτηση με λογιαριασμό",
+    "Rejecting invite …": "Απόρριψη πρόσκλησης …",
+    "Loading …": "Φόρτωση …",
+    "You do not have permissions to add spaces to this space": "Δεν έχετε δικαίωμα προσθήκης χώρων σε αυτόν τον χώρο",
+    "Add space": "Προσθήκη χώρου",
+    "%(count)s results|one": "%(count)s αποτελέσμα",
+    "%(count)s results|other": "%(count)s αποτελέσματα",
+    "Failed to find the general chat for this community": "Αποτυχία εύρεσης της γενικής συνομιλίας για αυτήν την κοινότητα",
+    "Community settings": "Ρυθμίσεις κοινότητας",
+    "Explore all public rooms": "Εξερευνήστε όλα τα δημόσια δωμάτια",
+    "Start a new chat": "Ξεκινήστε μια νέα συνομιλία",
+    "Can't see what you're looking for?": "Δεν μπορείτε να δείτε αυτό που ψάχνετε;",
+    "Empty room": "Άδειο δωμάτιο",
+    "Custom Tag": "Προσαρμοσμένη ετικέτα",
+    "Suggested Rooms": "Προτεινόμενα δωμάτια",
+    "System Alerts": "Ειδοποιήσεις συστήματος",
+    "Add room": "Προσθήκη δωματίου",
+    "Explore public rooms": "Εξερευνήστε δημόσια δωμάτια",
+    "Explore community rooms": "Εξερευνήστε τα δωμάτια της κοινότητας",
+    "You do not have permissions to add rooms to this space": "Δεν έχετε δικαίωμα προσθήκης δωματίων σε αυτόν τον χώρο",
+    "Add existing room": "Προσθήκη υπάρχοντος δωματίου",
+    "You do not have permissions to create new rooms in this space": "Δεν έχετε δικαίωμα δημιουργίας νέων δωματίων σε αυτόν τον χώρο",
+    "Add people": "Προσθήκη ατόμων",
+    "You do not have permissions to invite people to this space": "Δεν έχετε δικαίωμα πρόσκλησης ατόμων σε αυτόν τον χώρο",
+    "Invite to space": "Πρόσκληση στον χώρο",
+    "Start new chat": "Έναρξη νέας συνομιλίας",
+    "Room options": "Επιλογές δωματίου",
+    "No recently visited rooms": "Δεν υπάρχουν δωμάτια που επισκεφτήκατε πρόσφατα",
+    "Recently visited rooms": "Δωμάτια που επισκεφτήκατε πρόσφατα",
+    "Room %(name)s": "Δωμάτιο %(name)s",
+    "Recently viewed": "Προβλήθηκε πρόσφατα",
+    "Busy": "Απασχολημένος",
+    "View message": "Προβολή μηνύματος",
+    "Unpin": "Ξεκαρφίτσωμα",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Τα προσωπικά σας μηνύματα είναι συνήθως κρυπτογραφημένα, αλλά αυτό το δωμάτιο δεν είναι. Συνήθως αυτό οφείλεται σε μια μη υποστηριζόμενη συσκευή ή μέθοδο που χρησιμοποιείται, όπως προσκλήσεις μέσω email.",
+    "%(displayName)s created this room.": "%(displayName)s δημιούργησε αυτό το δωμάτιο.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Προσθέστε ένα θέμα</a> για να βοηθήσετε τους χρήστες να γνωρίζουν περί τίνος πρόκειται.",
+    "Topic: %(topic)s ": "Θέμα: %(topic)s ",
+    "This is the beginning of your direct message history with <displayName/>.": "Αυτή είναι η αρχή του ιστορικού των άμεσων μηνυμάτων σας με <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Μόνο οι δυο σας συμμετέχετε σε αυτήν τη συνομιλία, εκτός εάν κάποιος από εσάς προσκαλέσει κάποιον να συμμετάσχει.",
+    "%(seconds)ss left": "%(seconds)ss απομένουν",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Η αυθεντικότητα αυτού του κρυπτογραφημένου μηνύματος δεν είναι εγγυημένη σε αυτήν τη συσκευή.",
+    "Encrypted by a deleted session": "Κρυπτογραφήθηκε από μια διαγραμμένη συνεδρία",
+    "Unencrypted": "Μη κρυπτογραφημένο",
+    "Message Actions": "Ενέργειες μηνυμάτων",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Ένα μήνυμα sms έχει σταλεί στο +%(msisdn)s. Παρακαλώ εισαγάγετε τον κωδικό επαλήθευσης που περιέχει.",
+    "Remove %(phone)s?": "Κατάργηση %(phone)s;",
+    "Email Address": "Διεύθυνση Email",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Σας έχουμε στείλει ένα email για να επαληθεύσουμε τη διεύθυνσή σας. Ακολουθήστε τις οδηγίες εκεί και, στη συνέχεια, κάντε κλικ στο κουμπί παρακάτω.",
+    "Remove %(email)s?": "Κατάργηση %(email)s;",
+    "Discovery options will appear once you have added a phone number above.": "Οι επιλογές εντοπισμού θα εμφανιστούν μόλις προσθέσετε έναν αριθμό τηλεφώνου παραπάνω.",
+    "Verification code": "Κωδικός επαλήθευσης",
+    "Please enter verification code sent via text.": "Εισαγάγετε τον κωδικό επαλήθευσης που εστάλη μέσω μηνύματος sms.",
+    "Unable to verify phone number.": "Αδυναμία επαλήθευσης του αριθμού τηλεφώνου.",
+    "Unable to share phone number": "Αδυναμία κοινής χρήσης του αριθμού τηλεφώνου",
+    "Unable to revoke sharing for phone number": "Αδυναμία ανάκληση της κοινής χρήσης για τον αριθμό τηλεφώνου",
+    "Discovery options will appear once you have added an email above.": "Οι επιλογές εντοπισμού θα εμφανιστούν μόλις προσθέσετε ένα email παραπάνω.",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Δε συνιστάται να κάνετε δημόσια τα κρυπτογραφημένα δωμάτια.</b> Αυτό σημαίνει ότι οποιοσδήποτε μπορεί να βρει και να συμμετάσχει στο δωμάτιο, επομένως όλοι θα μπορούν να διαβάζουν τα μηνύματα. Δε θα έχετε κανένα από τα οφέλη της κρυπτογράφησης. Η κρυπτογράφηση μηνυμάτων σε δημόσιο δωμάτιο θα κάνει τη λήψη και την αποστολή μηνυμάτων πιο αργή.",
+    "Unknown failure": "Άγνωστο σφάλμα",
+    "Failed to update the join rules": "Αποτυχία ενημέρωσης των κανόνων συμμετοχής",
+    "Decide who can join %(roomName)s.": "Αποφασίστε ποιος μπορεί να συμμετάσχει στο %(roomName)s.",
+    "To link to this room, please add an address.": "Για να δημιουργήσετε σύνδεσμο σε αυτό το δωμάτιο, παρακαλώ προσθέστε μια διεύθυνση.",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Αφού ενεργοποιηθεί, η κρυπτογράφηση για ένα δωμάτιο δεν μπορεί να απενεργοποιηθεί. Τα μηνύματα που αποστέλλονται σε κρυπτογραφημένα δωμάτια δεν είναι ορατά από τον διακομιστή, παρά μόνο από τους συμμετέχοντες στην αίθουσα. Η ενεργοποίηση της κρυπτογράφησης μπορεί να αποτρέψει τη σωστή λειτουργία πολλών bots και γεφυρών. <a>Μάθετε περισσότερα σχετικά με την κρυπτογράφηση.</a>",
+    "Enable encryption?": "Ενεργοποίηση κρυπτογράφησης;",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "Για να αποφύγετε αυτά τα ζητήματα, δημιουργήστε ένα <a>νέα κρυπτογραφημένο δωμάτιο</a> για τη συνομιλία που σκοπεύετε να πραγματοποιήσετε.",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Δε συνιστάται η προσθήκη κρυπτογράφησης σε δημόσια δωμάτια.</b>Οποιοσδήποτε μπορεί να ανακαλύψει, να συμμετάσχει και επομένως να διαβάσει μηνύματα σε δημόσια δωμάτια. Δε θα λάβετε κανένα από τα οφέλη της κρυπτογράφησης και δε θα μπορείτε να την απενεργοποιήσετε αργότερα. Η κρυπτογράφηση μηνυμάτων σε δημόσιο δωμάτιο θα κάνει τη λήψη και την αποστολή μηνυμάτων πιο αργή.",
+    "Are you sure you want to add encryption to this public room?": "Είστε βέβαιοι ότι θέλετε να προσθέσετε κρυπτογράφηση σε αυτό το δημόσιο δωμάτιο;",
+    "Roles & Permissions": "Ρόλοι & Δικαιώματα",
+    "Muted Users": "Χρήστες σε Σίγαση",
+    "Notify everyone": "Ειδοποιήστε όλους",
+    "Ban users": "Αποκλεισμός χρηστών",
+    "Change settings": "Αλλαγή ρυθμίσεων",
+    "Remove messages sent by me": "Κατάργηση μηνυμάτων που έχω στείλει",
+    "Change server ACLs": "Αλλαγή ACLs του διακομιστή",
+    "Enable room encryption": "Ενεργοποίηση κρυπτογράφησης δωματίου",
+    "Upgrade the room": "Αναβάθμιση δωματίου",
+    "Change topic": "Αλλαγή θέματος",
+    "Change description": "Αλλαγή περιγραφής",
+    "Change permissions": "Αλλαγή δικαιωμάτων",
+    "Change history visibility": "Αλλαγή ορατότητας ιστορικού",
+    "Manage rooms in this space": "Διαχειριστείτε τα δωμάτια σε αυτόν τον χώρο",
+    "Change main address for the room": "Αλλαγή κύριας διεύθυνσης για το δωμάτιο",
+    "Change main address for the space": "Αλλαγή κύριας διεύθυνσης για το χώρο",
+    "Change room name": "Αλλαγή ονόματος δωματίου",
+    "Change space name": "Αλλαγή ονόματος χώρου",
+    "Change room avatar": "Αλλαγή εικόνας δωματίου",
+    "Change space avatar": "Αλλαγή εικόνας Χώρου",
+    "Browse": "Εξερεύνηση",
+    "Set a new custom sound": "Ορίστε έναν νέο προσαρμοσμένο ήχο",
+    "Notification sound": "Ήχος ειδοποίησης",
+    "Sounds": "Ήχοι",
+    "You won't get any notifications": "Δεν θα λαμβάνετε ειδοποιήσεις",
+    "Get notified only with mentions and keywords as set up in your <a>settings</a>": "Λάβετε ειδοποιήσεις μόνο με αναφορές και λέξεις-κλειδιά όπως έχουν ρυθμιστεί στις <a>ρυθμίσεις</a> σας",
+    "@mentions & keywords": "@αναφορές & λέξεις-κλειδιά",
+    "Get notified for every message": "Λάβετε ειδοποιήσεις για κάθε μήνυμα",
+    "Room Addresses": "Διευθύνσεις δωματίων",
+    "Bridges": "Γέφυρες",
+    "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Αυτό το δωμάτιο δε γεφυρώνει μηνύματα σε καμία πλατφόρμα. <a>Μάθετε περισσότερα.</a>",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Αυτό το δωμάτιο γεφυρώνει μηνύματα στις ακόλουθες πλατφόρμες. <a>Μάθετε περισσότερα.</a>",
+    "Developer options": "Επιλογές προγραμματιστή",
+    "Room version:": "Έκδοση δωματίου:",
+    "Room version": "Έκδοση δωματίου",
+    "Internal room ID": "Εσωτερικό ID δωματίου",
+    "Space information": "Πληροφορίες Χώρου",
+    "View older messages in %(roomName)s.": "Προβολή παλαιότερων μηνυμάτων στο %(roomName)s.",
+    "this room": "αυτό το δωμάτιο",
+    "Upgrade this room to the recommended room version": "Αναβαθμίστε αυτό το δωμάτιο στην προτεινόμενη έκδοση δωματίου",
+    "Voice & Video": "Φωνή & Βίντεο",
+    "No Audio Outputs detected": "Δεν εντοπίστηκαν Έξοδοι Ήχου",
+    "Audio Output": "Έξοδος ήχου",
+    "Request media permissions": "Ζητήστε άδειες πολυμέσων",
+    "Missing media permissions, click the button below to request.": "Λείπουν δικαιώματα πολυμέσων, κάντε κλικ στο κουμπί παρακάτω για να αιτηθείτε.",
+    "Group all your rooms that aren't part of a space in one place.": "Ομαδοποιήστε σε ένα μέρος όλα τα δωμάτιά σας που δεν αποτελούν μέρος ενός χώρου.",
+    "Show all your rooms in Home, even if they're in a space.": "Εμφάνιση όλων των δωματίων σας στην Αρχική, ακόμα κι αν βρίσκονται σε ένα χώρο.",
+    "Spaces to show": "Χώροι για εμφάνιση",
+    "Bulk options": "Μαζικές επιλογές",
+    "Click the link in the email you received to verify and then click continue again.": "Κάντε κλικ στον σύνδεσμο ηλεκτρονικής διεύθυνσης που λάβατε για επαλήθευση και μετα, κάντε ξανά κλικ στη συνέχεια.",
+    "Unable to revoke sharing for email address": "Δεν είναι δυνατή η ανάκληση της κοινής χρήσης για τη διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "People with supported clients will be able to join the room without having a registered account.": "Τα άτομα με υποστηριζόμενους πελάτες θα μπορούν να εγγραφούν στο δωμάτιο χωρίς να έχουν εγγεγραμμένο λογαριασμό.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Οι αλλαγές στα άτομα που μπορούν να διαβάσουν το ιστορικό θα ισχύουν μόνο για μελλοντικά μηνύματα σε αυτό το δωμάτιο. Η ορατότητα της υπάρχουσας ιστορίας θα παραμείνει αμετάβλητη.",
+    "Members only (since they joined)": "Μόνο μέλη (από τη στιγμή που έγιναν μέλη)",
+    "Members only (since they were invited)": "Μόνο μέλη (από τη στιγμή που προσκλήθηκαν)",
+    "Members only (since the point in time of selecting this option)": "Μόνο μέλη (από τη στιγμή που ορίστηκε αυτή η επιλογή)",
+    "Select the roles required to change various parts of the room": "Επιλέξτε τους ρόλους που απαιτούνται για να αλλάξετε διάφορα μέρη του δωματίου",
+    "Select the roles required to change various parts of the space": "Επιλέξτε τους ρόλους που απαιτούνται για να αλλάξετε διάφορα μέρη του χώρου",
+    "Send %(eventType)s events": "Στελιτε %(eventType)sσυμβάντα",
+    "Remove messages sent by others": "Καταργήστε τα μηνύματα που αποστέλλονται από άλλους",
+    "Remove users": "Καταργήστε χρήστες",
+    "Invite users": "Προσκαλέστε χρήστες",
+    "Send messages": "Στείλτε μηνύματα",
+    "Default role": "Προεπιλεγμένος ρόλος",
+    "Manage pinned events": "Διαχείριση καρφιτσωμένων συμβάντων",
+    "Modify widgets": "Τροποποίηση μικροεφαρμογών",
+    "Send reactions": "Στείλτε αντιδράσεις",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Παρουσιάστηκε σφάλμα κατά την αλλαγή του επιπέδου ισχύος του χρήστη. Βεβαιωθείτε ότι έχετε επαρκή δικαιώματα και δοκιμάστε ξανά.",
+    "Error changing power level": "Σφάλμα αλλαγής του επιπέδου ισχύος",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Παρουσιάστηκε σφάλμα κατά την αλλαγή των απαιτήσεων επιπέδου ισχύος του δωματίου. Βεβαιωθείτε ότι έχετε επαρκή δικαιώματα και δοκιμάστε ξανά.",
+    "Error changing power level requirement": "Σφάλμα αλλαγής της απαίτησης επιπέδου ισχύος",
+    "Banned by %(displayName)s": "Αποκλείστηκε από %(displayName)s",
+    "Get notifications as set up in your <a>settings</a>": "Λάβετε ειδοποιήσεις όπως έχoyn ρυθμιστεί στις <a>ρυθμίσεις</a> σας",
+    "Rooms outside of a space": "Δωμάτια εκτός χώρου",
+    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "Οι Χώροι είναι ένας τρόπος ομαδοποίησης δωματίων και ατόμων. Εκτός από τους χώρους στους οποίους βρίσκεστε, μπορείτε να χρησιμοποιήσετε και κάποιους προκατασκευασμένους.",
+    "Sidebar": "Πλαϊνή μπάρα",
+    "Privacy": "Ιδιωτικότητα",
+    "Cross-signing": "Διασταυρούμενη υπογραφή",
+    "Accept all %(invitedRooms)s invites": "Αποδεχτείτε όλες τις %(invitedRooms)sπροσκλήσεις",
+    "You have no ignored users.": "Δεν έχετε χρήστες που έχετε αγνοήσει.",
+    "Autocomplete delay (ms)": "Καθυστέρηση αυτόματης συμπλήρωσης (ms)",
+    "Timeline": "Χρονοδιάγραμμα",
+    "Code blocks": "Μπλοκ κώδικα",
+    "Displaying time": "Εμφάνιση χρόνου",
+    "To view all keyboard shortcuts, <a>click here</a>.": "Για να δείτε όλες τις συντομεύσεις πληκτρολογίου, <a>κάντε κλικ εδώ</a>.",
+    "Keyboard shortcuts": "Συντομεύσεις πληκτρολογίου",
+    "Room list": "Λίστα δωματίων",
+    "Preferences": "Προτιμήσεις",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Τα αρχεία καταγραφής εντοπισμού σφαλμάτων περιέχουν δεδομένα χρήσης εφαρμογών, συμπεριλαμβανομένου του ονόματος χρήστη σας, των αναγνωριστικών ή των ψευδωνύμων των δωματίων που έχετε επισκεφτεί, των στοιχείων διεπαφής χρήστη με τα οποία αλληλεπιδράσατε τελευταία και των ονομάτων χρήστη άλλων χρηστών. Δεν περιέχουν μηνύματα.",
+    "Legal": "Νομικό",
+    "Mic": "Μικρόφωνο",
+    "Mic off": "Απενεργοποιημένο μικρόφωνο",
+    "Video": "Βίντεο",
+    "Video off": "Απενεργοποίηση βίντεο",
+    "Connected": "Συνδεδεμένο",
+    "Voice & video rooms (under active development)": "Αίθουσες φωνής και βίντεο (υπό ενεργό ανάπτυξη)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Προσπαθείτε να αποκτήσετε πρόσβαση σε έναν σύνδεσμο κοινότητας (%(groupId)s).<br/>Οι κοινότητες δεν υποστηρίζονται πλέον και έχουν αντικατασταθεί από χώρους.<br2/><a>Μάθετε περισσότερα για τους χώρους εδώ.</a>",
+    "That link is no longer supported": "Αυτός ο σύνδεσμος δεν υποστηρίζεται πλέον",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Όπου αυτή η σελίδα περιλαμβάνει αναγνωρίσιμες πληροφορίες, όπως ένα δωμάτιο, αναγνωριστικό χρήστη, αυτά τα δεδομένα αφαιρούνται πριν σταλούν στον διακομιστή.",
+    "User signing private key:": "Ιδιωτικό κλειδί για υπογραφή χρήστη:",
+    "Your homeserver doesn't seem to support this feature.": "Ο διακομιστής σας δε φαίνεται να υποστηρίζει αυτήν τη δυνατότητα.",
+    "Verify session": "Επαλήθευση συνεδρίας",
+    "If they don't match, the security of your communication may be compromised.": "Εάν δεν ταιριάζουν, η ασφάλεια της επικοινωνίας σας μπορεί να τεθεί σε κίνδυνο.",
+    "Session key": "Κλειδί συνεδρίας",
+    "Session name": "Όνομα συνεδρίας",
+    "Select spaces": "Επιλέξτε χώρους",
+    "%(count)s rooms|one": "%(count)s δωμάτιο",
+    "%(count)s rooms|other": "%(count)s δωμάτια",
+    "%(count)s members|one": "%(count)s μέλος",
+    "%(count)s members|other": "%(count)s μέλη",
+    "Are you sure you want to sign out?": "Είσαστε σίγουροι ότι θέλετε να αποσυνδεθείτε;",
+    "You'll lose access to your encrypted messages": "Θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας",
+    "Manually export keys": "Μη αυτόματη εξαγωγή κλειδιών",
+    "I don't want my encrypted messages": "Δε θέλω τα κρυπτογραφημένα μηνύματά μου",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Τα κρυπτογραφημένα μηνύματα προστατεύονται με κρυπτογράφηση από άκρο σε άκρο. Μόνο εσείς και οι παραλήπτες έχετε τα κλειδιά για να διαβάσετε αυτά τα μηνύματα.",
+    "Leave space": "Αποχώρηση από τον χώρο",
+    "Leave all rooms": "Αποχώρηση από όλα τα δωμάτια",
+    "Leave some rooms": "Αποχώρηση από κάποια δωμάτια",
+    "Would you like to leave the rooms in this space?": "Θα θέλατε να αποχωρήσετε από τα δωμάτια σε αυτόν τον χώρο;",
+    "Don't leave any rooms": "Μην αφήνετε κανένα δωμάτιο",
+    "You are about to leave <spaceName/>.": "Πρόκειται να αποχωρήσετε από το <spaceName/>.",
+    "Leave %(spaceName)s": "Αποχωρήστε από %(spaceName)s",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "Είστε ο μοναδικός διαχειριστής ορισμένων από τα δωμάτια ή τους χώρους που θέλετε να αποχωρήσετε. Αν αποχωρήσετε, θα μείνουν χωρίς διαχειριστές.",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "Είστε ο μοναδικός διαχειριστής αυτού του χώρου. Αν αποχωρήσετε τότε κανείς άλλος δε θα τον ελέγχει.",
+    "You won't be able to rejoin unless you are re-invited.": "Δε θα μπορείτε να συμμετάσχετε ξανά εκτός αν προσκληθείτε και πάλι.",
+    "Clear cache and resync": "Εκκαθάριση προσωρινής μνήμης και επανασυγχρονισμός",
+    "Enter Security Phrase": "Εισαγάγετε τη Φράση Ασφαλείας",
+    "Moderation": "Συντονισμός",
+    "Light high contrast": "Ελαφριά υψηλή αντίθεση",
+    "Show %(count)s other previews|other": "Εμφάνιση %(count)s άλλων προεπισκοπήσεων",
+    "Encrypted by an unverified session": "Κρυπτογραφήθηκε από μια μη επαληθευμένη συνεδρία",
+    "Copy link to thread": "Αντιγραφή συνδέσμου στο νήμα εκτέλεσης",
+    "View in room": "Δείτε στο δωμάτιο",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Ζητήστε ξανά κλειδιά κρυπτογράφησης</requestLink> από τις άλλες σας συνεδρίες.",
+    "Key request sent.": "Το αίτημα κλειδιού στάλθηκε.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Εάν οι άλλες συνεδρίες σας δεν έχουν το κλειδί για αυτό το μήνυμα, δεν θα μπορείτε να τις αποκρυπτογραφήσετε.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Τα αιτήματα κοινής χρήσης κλειδιών αποστέλλονται αυτόματα στις άλλες συνεδρίες σας. Εάν απορρίψατε ή απδεσμεύσατε το αίτημα κοινής χρήσης κλειδιού στις άλλες συνεδρίες σας, κάντε κλικ εδώ για να ζητήσετε ξανά τα κλειδιά για αυτήν τη συνεδρία.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Το αίτημά σας για κοινή χρήση κλειδιού έχει σταλεί - ελέγξτε τις άλλες συνεδρίες σας για αιτήματα κοινής χρήσης κλειδιού.",
+    "This event could not be displayed": "Δεν ήταν δυνατή η εμφάνιση αυτού του συμβάντος",
+    "From a thread": "Από ένα νήμα εκτέλεσης",
+    "Continuing without email": "Συνέχεια χωρίς email",
+    "Upgrade Room Version": "Αναβάθμιση Έκδοσης Δωματίου",
+    "Upgrade this room to version %(version)s": "Αναβαθμίστε αυτό το δωμάτιο στην έκδοση %(version)s",
+    "The room upgrade could not be completed": "Δεν ήταν δυνατή η ολοκλήρωση της αναβάθμισης δωματίου",
+    "Failed to upgrade room": "Αποτυχία αναβάθμισης δωματίου",
+    "Room Settings - %(roomName)s": "Ρυθμίσεις Δωματίου - %(roomName)s",
+    "Report Content to Your Homeserver Administrator": "Αναφορά Περιεχομένου στον Διαχειριστή του Διακομιστή σας",
+    "Send report": "Αποστολή αναφοράς",
+    "Report the entire room": "Αναφορά ολόκληρου του δωματίου",
+    "Spam or propaganda": "Spam ή προπαγάνδα",
+    "Illegal Content": "Παράνομο Περιεχόμενο",
+    "Toxic Behaviour": "Τοξική Συμπεριφορά",
+    "Disagree": "Διαφωνώ",
+    "Report Content": "Αναφορά Περιεχομένου",
+    "Email (optional)": "Email (προαιρετικό)",
+    "You were banned from %(roomName)s by %(memberName)s": "Έχετε αποκλειστεί από το %(roomName)s από τον %(memberName)s",
+    "Re-join": "Επανασύνδεση",
+    "You were removed from %(roomName)s by %(memberName)s": "Αφαιρεθήκατε από το %(roomName)s από τον %(memberName)s",
+    "Joining room …": "Συμμετοχή σε δωμάτιο …",
+    "Joining space …": "Συμμετοχή σε χώρο …",
+    "%(spaceName)s menu": "%(spaceName)s μενού",
+    "Currently removing messages in %(count)s rooms|one": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτιο",
+    "Currently removing messages in %(count)s rooms|other": "Αυτήν τη στιγμή γίνεται κατάργηση μηνυμάτων σε %(count)s δωμάτια",
+    "Currently joining %(count)s rooms|one": "Αυτήν τη στιγμή συμμετέχετε σε%(count)sδωμάτιο",
+    "Currently joining %(count)s rooms|other": "Αυτήν τη στιγμή συμμετέχετε σε %(count)s δωμάτια",
+    "Join public room": "Εγγραφείτε στο δημόσιο δωμάτιο",
+    "Show Widgets": "Εμφάνιση μικροεφαρμογών",
+    "Hide Widgets": "Απόκρυψη μικροεφαρμογών",
+    "Replying": "Απαντώντας",
+    "Unknown": "Άγνωστο",
+    "Unknown for %(duration)s": "Άγνωστο για %(duration)s",
+    "This is the start of <roomName/>.": "Αυτή είναι η αρχή του <roomName/>.",
+    "Topic: %(topic)s (<a>edit</a>)": "Θέμα: %(topic)s (<a>επεξεργασία</a>)",
+    "Show %(count)s other previews|one": "Εμφάνιση%(count)s άλλων προεπισκοπήσεων",
+    "A connection error occurred while trying to contact the server.": "Παρουσιάστηκε σφάλμα σύνδεσης κατά την προσπάθεια επικοινωνίας με τον διακομιστή.",
+    "Your area is experiencing difficulties connecting to the internet.": "Η περιοχή σας αντιμετωπίζει δυσκολίες σύνδεσης στο διαδίκτυο.",
+    "The server has denied your request.": "Ο διακομιστής απέρριψε το αίτημά σας.",
+    "The server is offline.": "Ο διακομιστής είναι εκτός σύνδεσης.",
+    "A browser extension is preventing the request.": "Μια επέκταση προγράμματος περιήγησης αποτρέπει το αίτημα.",
+    "Your firewall or anti-virus is blocking the request.": "Το τείχος προστασίας ή το πρόγραμμα προστασίας από ιούς μπλοκάρει το αίτημα.",
+    "The server (%(serverName)s) took too long to respond.": "Ο διακομιστής (%(serverName)s) έκανε πολύ χρόνο να ανταποκριθεί.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Ο διακομιστής σας δεν ανταποκρίνεται σε ορισμένα από τα αιτήματά σας. Παρακάτω είναι μερικοί από τους πιο πιθανούς λόγους.",
+    "Server isn't responding": "Ο διακομιστής δεν ανταποκρίνεται",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Θα αναβαθμίσετε αυτό το δωμάτιο από <oldVersion /> σε <newVersion />.",
+    "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>Λάβετε υπόψη ότι η αναβάθμιση θα δημιουργήσει μια νέα έκδοση του δωματίου</b>. Όλα τα τρέχοντα μηνύματα θα παραμείνουν σε αυτό το αρχειοθετημένο δωμάτιο.",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Η αναβάθμιση ενός δωματίου είναι μια προηγμένη ενέργεια και συνήθως συνιστάται όταν ένα δωμάτιο είναι ασταθές λόγω σφαλμάτων, ελλείψεων λειτουργιών ή ευπάθειας ασφαλείας.",
+    "Upgrade public room": "Αναβάθμιση δημόσιου δωματίου",
+    "Upgrade private room": "Αναβάθμιση ιδιωτικού δωματίου",
+    "Automatically invite members from this room to the new one": "Αυτόματη πρόσκληση μελών αυτού του δωματίου στο νέο",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Βάλτε έναν σύνδεσμο προς το παλιό δωμάτιο στην αρχή του νέου δωματίου, ώστε οι χρήστες να μπορούν να δουν παλιά μηνύματα",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Εμποδίστε τους χρήστες να συνομιλούν στην παλιά έκδοση του δωματίου και αναρτήστε ένα μήνυμα που να τους συμβουλεύει να μετακινηθούν στο νέο δωμάτιο",
+    "Update any local room aliases to point to the new room": "Ενημερώστε τυχόν τοπικά ψευδώνυμα δωματίου για να οδηγούν στο νέο δωμάτιο",
+    "Create a new room with the same name, description and avatar": "Δημιουργήστε ένα νέο δωμάτιο με το ίδιο όνομα, περιγραφή και avatar",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Σημειώστε ότι συνδέεστε στον διακομιστή %(hs)s, όχι στο matrix.org.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Ένα email έχει σταλεί στη διεύθυνση %(emailAddress)s. Αφού ακολουθήσετε τον σύνδεσμο που περιέχει, κάντε κλικ παρακάτω.",
+    "A text message has been sent to %(msisdn)s": "Ένα μήνυμα κειμένου έχει σταλεί στη διεύθυνση %(msisdn)s",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Η διαγραφή μιας μικροεφαρμογής την καταργεί για όλους τους χρήστες σε αυτό το δωμάτιο. Είστε βέβαιοι ότι θέλετε να τη διαγράψετε;",
+    "Delete Widget": "Διαγραφή Μικροεφαρμογής",
+    "Edit": "Επεξεργασία",
+    "Delete widget": "Διαγραφή μικροεφαρμογής",
+    "Unable to copy a link to the room to the clipboard.": "Αδυναμία αντιγραφής στο πρόχειρο του συνδέσμου δωματίου.",
+    "Unable to copy room link": "Αδυναμία αντιγραφής του συνδέσμου δωματίου",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από τον χώρο %(spaceName)s;",
+    "This room is not public. You will not be able to rejoin without an invite.": "Αυτό το δωμάτιο δεν είναι δημόσιο. Δε θα μπορείτε να ξανασυμμετάσχετε χωρίς πρόσκληση.",
+    "This space is not public. You will not be able to rejoin without an invite.": "Αυτός ο χώρος δεν είναι δημόσιος. Δε θα μπορείτε να ξανασυμμετάσχετε χωρίς πρόσκληση.",
+    "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Είστε το μόνο άτομο εδώ μέσα. Εάν φύγετε, κανείς δε θα μπορεί αργότερα να συμμετάσχει, συμπεριλαμβανομένου και εσάς.",
+    "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "Εάν κάποιος σας είπε να κάνετε αντιγραφή και επικόλληση κάτι εδώ, υπάρχει μεγάλη πιθανότητα να σας έχουν εξαπατήσει!",
+    "Wait!": "Μια στιγμή!",
+    "Create a Group Chat": "Δημιουργήστε μια Ομαδική Συνομιλία",
+    "Own your conversations.": "Οι συνομιλίες σας ανήκουν σε εσάς.",
+    "Explore Public Rooms": "Εξερευνήστε Δημόσια Δωμάτια",
+    "Send a Direct Message": "Στείλτε ένα άμεσο μήνυμα",
+    "Welcome %(name)s": "Καλώς όρισες %(name)s",
+    "Welcome to %(appName)s": "Καλώς ορίσατε στο %(appName)s",
+    "Now, let's help you get started": "Τώρα, ας σας βοηθήσουμε να ξεκινήσετε",
+    "Add a photo so people know it's you.": "Προσθέστε μια φωτογραφία για να σας αναγνωρίζουν οι άλλοι ευκολότερα.",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Επισυνάψτε αρχεία από τη συνομιλία ή απλώς σύρετε και αποθέστε τα οπουδήποτε μέσα σε ένα δωμάτιο.",
+    "No files visible in this room": "Δεν υπάρχουν αρχεία ορατά σε αυτό το δωμάτιο",
+    "Couldn't load page": "Δεν ήταν δυνατή η φόρτωση της σελίδας",
+    "Play": "Αναπαραγωγή",
+    "Pause": "Παύση",
+    "Error downloading audio": "Σφάλμα λήψης ήχου",
+    "Sign in with SSO": "Συνδεθείτε με SSO",
+    "Add an email to be able to reset your password.": "Προσθέστε ένα email για να μπορείτε να κάνετε επαναφορά του κωδικού πρόσβασης σας.",
+    "Phone (optional)": "Τηλέφωνο (προαιρετικό)",
+    "Someone already has that username. Try another or if it is you, sign in below.": "Κάποιος έχει ήδη αυτό το όνομα χρήστη. Δοκιμάστε άλλο ή εάν είστε εσείς, συνδεθείτε παρακάτω.",
+    "Unable to check if username has been taken. Try again later.": "Δεν είναι δυνατός ο έλεγχος εάν το όνομα χρήστη είναι διαθέσιμο. Δοκιμάστε ξανά αργότερα.",
+    "Use lowercase letters, numbers, dashes and underscores only": "Χρησιμοποιήστε μόνο πεζά γράμματα, αριθμούς, παύλες και κάτω παύλες",
+    "Use an email address to recover your account": "Χρησιμοποιήστε μια διεύθυνση email για να ανακτήσετε τον λογαριασμό σας",
+    "Forgot password?": "Ξεχάσατε τον κωδικό;",
+    "Username": "Όνομα χρήστη",
+    "That phone number doesn't look quite right, please check and try again": "Αυτός ο αριθμός τηλεφώνου δε φαίνεται σωστός, ελέγξτε και δοκιμάστε ξανά",
+    "Enter phone number": "Εισάγετε αριθμό τηλεφώνου",
+    "Enter username": "Εισάγετε όνομα χρήστη",
+    "Keep going...": "Συνεχίστε...",
+    "Password is allowed, but unsafe": "Έγκυρος κωδικός πρόσβασης, αλλά δεν είναι ασφαλής",
+    "Nice, strong password!": "Πολύ καλά, ισχυρός κωδικός πρόσβασης!",
+    "Enter password": "Εισάγετε τον κωδικό πρόσβασης",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Κάτι πήγε στραβά στην επιβεβαίωση της ταυτότητάς σας. Ακυρώστε και δοκιμάστε ξανά.",
+    "Code": "Κωδικός",
+    "Open the link in the email to continue registration.": "Ανοίξτε τον σύνδεσμο στο email για να συνεχίσετε την εγγραφή.",
+    "A confirmation email has been sent to %(emailAddress)s": "Ένα email επιβεβαίωσης έχει σταλεί στο %(emailAddress)s",
+    "Confirm your identity by entering your account password below.": "Ταυτοποιηθείτε εισάγοντας παρακάτω τον κωδικό πρόσβασης του λογαριασμού σας.",
+    "Doesn't look like a valid email address": "Δε μοιάζει με έγκυρη διεύθυνση email",
+    "Enter email address": "Εισάγετε διεύθυνση email",
+    "This room is public": "Αυτό το δωμάτιο είναι δημόσιο",
+    "Click for more info": "Κλικ για περισσότερες πληροφορίες",
+    "This is a beta feature. Click for more info": "Αυτή είναι μια δυνατότητα beta. Κάντε κλικ για περισσότερες πληροφορίες",
+    "Move right": "Μετακίνηση δεξιά",
+    "Move left": "Μετακίνηση αριστερά",
+    "Revoke permissions": "Ανάκληση αδειών",
+    "Remove for everyone": "Κατάργηση για όλους",
+    "Take a picture": "Λήψη φωτογραφίας",
+    "Start audio stream": "Έναρξη ροής ήχου",
+    "Unable to start audio streaming.": "Δεν είναι δυνατή η έναρξη ροής ήχου.",
+    "Thread options": "Επιλογές νήματος συζήτησης",
+    "Report": "Αναφορά",
+    "Collapse reply thread": "Σύμπτυξη νήματος απάντησης",
+    "Show preview": "Εμφάνιση προεπισκόπησης",
+    "View source": "Προβολή πηγής",
+    "Forward": "Προώθηση",
+    "Open in OpenStreetMap": "Άνοιγμα στο OpenStreetMap",
+    "Not a valid Security Key": "Μη έγκυρο Κλειδί Ασφαλείας",
+    "This looks like a valid Security Key!": "Αυτό φαίνεται να είναι ένα έγκυρο Κλειδί Ασφαλείας!",
+    "Enter Security Key": "Εισάγετε το Κλειδί Ασφαλείας",
+    "Successfully restored %(sessionCount)s keys": "Επιτυχής επαναφορά %(sessionCount)s κλειδιών",
+    "Failed to decrypt %(failedCount)s sessions!": "Αποτυχία αποκρυπτογράφησης %(failedCount)s συνεδριών!",
+    "Keys restored": "Τα κλειδιά ανακτήθηκαν",
+    "No backup found!": "Δε βρέθηκε αντίγραφο ασφαλείας!",
+    "Unable to restore backup": "Δεν είναι δυνατή η επαναφορά του αντιγράφου ασφαλείας",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Δεν ήταν δυνατή η αποκρυπτογράφηση του αντιγράφου ασφαλείας με αυτή τη Φράση Ασφαλείας: Βεβαιωθείτε ότι έχετε εισαγάγει τη σωστή Φράση Ασφαλείας.",
+    "Incorrect Security Phrase": "Λανθασμένη Φράση Ασφαλείας",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Δεν ήταν δυνατή η αποκρυπτογράφηση του αντιγράφου ασφαλείας με αυτό το Κλειδί Ασφαλείας: Βεβαιωθείτε ότι έχετε εισαγάγει το σωστό Κλειδί Ασφαλείας.",
+    "Security Key mismatch": "Αναντιστοιχία Κλειδιού Ασφαλείας",
+    "Unable to load backup status": "Δεν είναι δυνατή η φόρτωση της κατάστασης αντιγράφου ασφαλείας",
+    "%(completed)s of %(total)s keys restored": "%(completed)s από %(total)s κλειδιά ανακτήθηκαν",
+    "Fetching keys from server...": "Λήψη κλειδιών από τον διακομιστή...",
+    "Restoring keys from backup": "Επαναφορά κλειδιών από αντίγραφο ασφαλείας",
+    "Unable to set up keys": "Δεν είναι δυνατή η ρύθμιση των κλειδιών",
+    "Click the button below to confirm setting up encryption.": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε τη ρύθμιση της κρυπτογράφησης.",
+    "Confirm encryption setup": "Επιβεβαιώστε τη ρύθμιση κρυπτογράφησης",
+    "Use your Security Key to continue.": "Χρησιμοποιήστε το Κλειδί Ασφαλείας σας για να συνεχίσετε.",
+    "Security Key": "Κλειδί Ασφαλείας",
+    "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Εισαγάγετε τη Φράση Ασφαλείας ή <button>χρησιμοποιήστε το Κλειδί Ασφαλείας</button> για να συνεχίσετε.",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Δεν είναι δυνατή η πρόσβαση στον κρυφό χώρο αποθήκευσης. Βεβαιωθείτε ότι έχετε εισαγάγει τη σωστή Φράση Ασφαλείας.",
+    "Security Phrase": "Φράση Ασφαλείας",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Εάν επαναφέρετε τα πάντα, θα κάνετε επανεκκίνηση χωρίς αξιόπιστες συνεδρίες, χωρίς αξιόπιστους χρήστες και ενδέχεται να μην μπορείτε να δείτε προηγούμενα μηνύματα.",
+    "Only do this if you have no other device to complete verification with.": "Κάντε αυτό μόνο όταν δεν έχετε άλλη συσκευή για να ολοκληρώσετε την επαλήθευση.",
+    "Reset everything": "Επαναφορά όλων",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Ξεχάσατε ή χάσατε όλες τις μεθόδους ανάκτησης; <a>Επαναφορά όλων</a>",
+    "Invalid Security Key": "Μη έγκυρο Κλειδί Ασφαλείας",
+    "Wrong Security Key": "Λάθος Κλειδί Ασφαλείας",
+    "Looks good!": "Φαίνεται καλό!",
+    "Wrong file type": "Λάθος τύπος αρχείου",
+    "Decline All": "Απόρριψη όλων",
+    "Approve": "Έγκριση",
+    "Verification Request": "Αίτημα επαλήθευσης",
+    "Verify other device": "Επαλήθευση άλλης συσκευής",
+    "Upload Error": "Σφάλμα μεταφόρτωσης",
+    "Cancel All": "Ακύρωση Όλων",
+    "Upload %(count)s other files|one": "Μεταφόρτωση %(count)s άλλου αρχείου",
+    "Upload %(count)s other files|other": "Μεταφόρτωση %(count)s άλλων αρχείων",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Ορισμένα αρχεία είναι <b>πολύ μεγάλα</b> για να μεταφορτωθούν. Το όριο μεγέθους αρχείου είναι %(limit)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Αυτά τα αρχεία είναι <b>πολύ μεγάλα</b> για μεταφόρτωση. Το όριο μεγέθους αρχείου είναι %(limit)s.",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Αυτό το αρχείο είναι <b>πολύ μεγάλο</b> για μεταφόρτωση. Το όριο μεγέθους αρχείου είναι %(limit)s αλλά αυτό το αρχείο είναι %(sizeOfThisFile)s.",
+    "Upload all": "Μεταφόρτωση όλων",
+    "Upload files": "Μεταφόρτωση αρχείων",
+    "Upload files (%(current)s of %(total)s)": "Μεταφόρτωση αρχείων %(current)s από %(total)s",
+    "Manually Verify by Text": "Μη αυτόματη Επαλήθευση μέσω Μηνύματος Κειμένου",
+    "Next": "Επόμενο",
+    "Document": "Έγγραφο",
+    "Summary": "Περίληψη",
+    "Service": "Υπηρεσία",
+    "To continue you need to accept the terms of this service.": "Για να συνεχίσετε, πρέπει να αποδεχτείτε τους όρους αυτής της υπηρεσίας.",
+    "Find others by phone or email": "Βρείτε άλλους μέσω τηλεφώνου ή email",
+    "Your browser likely removed this data when running low on disk space.": "Το πρόγραμμα περιήγησης σας πιθανότατα αφαίρεσε αυτά τα δεδομένα όταν ο χώρος στο δίσκο εξαντλήθηκε.",
+    "Missing session data": "Λείπουν δεδομένα της συνεδρίας (session)",
+    "Search Dialog": "Παράθυρο Αναζήτησης",
+    "Use <arrows/> to scroll": "Χρησιμοποιήστε τα <arrows/> για κύλιση",
+    "Clear": "Καθαρισμός",
+    "Recent searches": "Πρόσφατες αναζητήσεις",
+    "Other searches": "'Άλλες αναζητήσεις",
+    "Public rooms": "Δημόσια δωμάτια",
+    "Join %(roomAddress)s": "Συμμετοχή στο %(roomAddress)s",
+    "Other rooms in %(spaceName)s": "Άλλα δωμάτιο στο %(spaceName)s",
+    "Spaces you're in": "Χώροι που ανήκετε",
+    "Settings - %(spaceName)s": "Ρυθμίσεις - %(spaceName)s",
+    "Space settings": "Ρυθμίσεις χώρου",
+    "Sections to show": "Ενότητες προς εμφάνιση",
+    "Command Help": "Βοήθεια Εντολών",
+    "Link to room": "Σύνδεσμος στο δωμάτιο",
+    "Link to selected message": "Σύνδεσμος στο επιλεγμένο μήνυμα",
+    "Share Room Message": "Κοινή χρήση Μηνύματος Δωματίου",
+    "Share User": "Κοινή χρήση Χρήστη",
+    "Link to most recent message": "Σύνδεσμος προς το πιο πρόσφατο μήνυμα",
+    "Share Room": "Κοινή χρήση Δωματίου",
+    "We encountered an error trying to restore your previous session.": "Αντιμετωπίσαμε ένα σφάλμα κατά την επαναφορά της προηγούμενης συνεδρίας σας.",
+    "Refresh": "Ανανέωση",
+    "Send Logs": "Αποστολή Αρχείων καταγραφής",
+    "Clear Storage and Sign Out": "Εκκαθάριση Χώρου αποθήκευσης και Αποσύνδεση",
+    "Sign out and remove encryption keys?": "Αποσύνδεση και κατάργηση κλειδιών κρυπτογράφησης;",
+    "Sign into your homeserver": "Σύνδεση στον κεντρικό διακομιστή σας",
+    "Matrix.org is the biggest public homeserver in the world, so it's a good place for many.": "Το Matrix.org είναι ο μεγαλύτερος δημόσιος διακομιστής στον κόσμο, επομένως είναι ένα καλό μέρος για να ξεκινήσετε.",
+    "Specify a homeserver": "Καθορίστε τον κεντρικό διακομιστή σας",
+    "Invalid URL": "Μη έγκυρο URL",
+    "Unread messages.": "Μη αναγνωσμένα μηνύματα.",
+    "%(count)s unread messages.|one": "1 μη αναγνωσμένο μήνυμα.",
+    "%(count)s unread messages.|other": "%(count)s μη αναγνωσμένα μηνύματα.",
+    "%(count)s unread messages including mentions.|one": "1 μη αναγνωσμένη αναφορά.",
+    "%(count)s unread messages including mentions.|other": "%(count)s μη αναγνωσμένα μηνύματα συμπεριλαμβανομένων των αναφορών.",
+    "Voice room": "Αίθουσα φωνής",
+    "Join": "Συμμετοχή",
+    "Copy room link": "Αντιγραφή συνδέσμου δωματίου",
+    "Forget Room": "Ξεχάστε το δωμάτιο",
+    "Notification options": "Επιλογές ειδοποίησης",
+    "Mentions & Keywords": "Αναφορές & Λέξεις-κλειδιά",
+    "Use default": "Χρήση προεπιλογής",
+    "Show less": "Εμφάνιση λιγότερων",
+    "Show %(count)s more|one": "Εμφάνιση %(count)s περισσότερων",
+    "Show %(count)s more|other": "Εμφάνιση %(count)s περισσότερων",
+    "List options": "Επιλογές λίστας",
+    "A-Z": "Α-Ω",
+    "Activity": "Δραστηριότητα",
+    "Sort by": "Ταξινόμηση κατά",
+    "Show previews of messages": "Εμφάνιση προεπισκοπήσεων μηνυμάτων",
+    "Show rooms with unread messages first": "Εμφάνιση δωματίων με μη αναγνωσμένα μηνύματα πρώτα",
+    "Appearance": "Εμφάνιση",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Το %(errcode)s επιστράφηκε κατά την προσπάθεια πρόσβασης στο δωμάτιο. Εάν πιστεύετε ότι βλέπετε αυτό το μήνυμα κατά λάθος, <issueLink>υποβάλετε μια αναφορά σφάλματος</issueLink>.",
+    "Try again later, or ask a room admin to check if you have access.": "Δοκιμάστε ξανά αργότερα ή ζητήστε από έναν διαχειριστή δωματίου να ελέγξει εάν έχετε πρόσβαση.",
+    "This room doesn't exist. Are you sure you're at the right place?": "Αυτό το δωμάτιο δεν υπάρχει. Είστε σίγουροι ότι βρίσκεστε στο σωστό μέρος;",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Δεν είναι δυνατή η προεπισκόπηση του %(roomName)s. Θέλετε να συμμετάσχετε;",
+    "You're previewing %(roomName)s. Want to join it?": "Κάνετε προεπισκόπηση στο %(roomName)s. Θέλετε να συμμετάσχετε;",
+    "Reject & Ignore user": "Απόρριψη & Παράβλεψη χρήστη",
+    "<userName/> invited you": "Ο <userName/> σας προσκάλεσε",
+    "Do you want to join %(roomName)s?": "Θέλετε να εγγραφείτε στο %(roomName)s;",
+    "Start chatting": "Ξεκινήστε τη συνομιλία",
+    "<userName/> wants to chat": "Ο<userName/> θέλει να συνομιλήσετε",
+    "Do you want to chat with %(user)s?": "Θέλετε να συνομιλήσετε με %(user)s;",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Μοιραστείτε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου στις Ρυθμίσεις για να λαμβάνετε προσκλήσεις απευθείας σε %(brand)s.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Χρησιμοποιήστε έναν διακομιστή ταυτότητας στις Ρυθμίσεις για να λαμβάνετε προσκλήσεις απευθείας στο %(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s": "Αυτή η πρόσκληση στο %(roomName)s στάλθηκε στο %(email)s",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Συνδέστε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου με τον λογαριασμό σας στις Ρυθμίσεις για να λαμβάνετε προσκλήσεις απευθείας σε %(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Αυτή η πρόσκληση στο %(roomName)s στάλθηκε στο %(email)s που δεν σχετίζεται με τον λογαριασμό σας",
+    "Join the discussion": "Λάβετε μέρος στη συζήτηση",
+    "You can still join it because this is a public room.": "Μπορείτε ακόμα να συμμετάσχετε επειδή αυτό είναι ένα δημόσιο δωμάτιο.",
+    "Try to join anyway": "Προσπαθήστε να συμμετάσχετε ούτως ή άλλως",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Ένα σφάλμα (%(errcode)s) επιστράφηκε κατά την προσπάθεια επικύρωσης της πρόσκλησής σας. Θα μπορούσατε να προσπαθήσετε να μεταδώσετε αυτές τις πληροφορίες σε έναν διαχειριστή δωματίου.",
+    "Something went wrong with your invite to %(roomName)s": "Κάτι πήγε στραβά με την πρόσκλησή σας στο %(roomName)s",
+    "Uploaded sound": "Μεταφορτωμένος ήχος",
+    "Room Topic": "Θέμα Δωματίου",
+    "Room Name": "Όνομα Δωματίου",
+    "Back": "Πίσω",
+    "Failed to send logs: ": "Αποτυχία αποστολής αρχείων καταγραφής: ",
+    "Thank you!": "Ευχαριστώ!",
+    "Clear filter": "Καθαρισμός φίλτρου",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Δε θα μπορείτε να αναιρέσετε αυτήν την ενέργεια καθώς υποβιβάζετε τον εαυτό σας, εάν είστε ο τελευταίος προνομιούχος χρήστης στο δωμάτιο, θα είναι αδύνατο να ανακτήσετε τα προνόμια.",
+    "Old cryptography data detected": "Εντοπίστηκαν παλιά δεδομένα κρυπτογράφησης",
+    "expand": "επέκταση",
+    "collapse": "σύμπτηξη",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Αυτός ο κεντρικός διακομιστής δεν προσφέρει κάποιο τρόπο σύνδεσης που να υποστηρίζεται από αυτό το πρόγραμμα πελάτη.",
+    "URL previews are disabled by default for participants in this room.": "Η προεπισκόπηση διευθύνσεων URL είναι απενεργοποιημένη από προεπιλογή για τους συμμετέχοντες σε αυτό το δωμάτιο.",
+    "%(name)s wants to verify": "%(name)s θέλει να επαληθεύσει",
+    "Accepting …": "Αποδοχή …",
+    "%(name)s cancelled": "%(name)s ακύρωσε",
+    "%(name)s declined": "%(name)s αρνήθηκε",
+    "You cancelled": "Ακυρώσατε",
+    "You declined": "Αρνηθήκατε",
+    "%(name)s accepted": "Ο/η %(name)s αποδέχθηκε",
+    "You accepted": "Αποδεχθήκατε",
+    "%(name)s cancelled verifying": "%(name)s ακύρωσε την επαλήθευση",
+    "You cancelled verifying %(name)s": "Ακυρώσατε την επαλήθευση του χρήστη %(name)s",
+    "You verified %(name)s": "Επαληθεύσατε τον χρήστη %(name)s",
+    "Video conference started by %(senderName)s": "Η τηλεδιάσκεψη ξεκίνησε από %(senderName)s",
+    "Video conference updated by %(senderName)s": "Η τηλεδιάσκεψη ενημερώθηκε από %(senderName)s",
+    "Video conference ended by %(senderName)s": "Η τηλεδιάσκεψη τερματίστηκε από %(senderName)s",
+    "Join the conference at the top of this room": "Συμμετάσχετε στην τηλεδιάσκεψη από την κορυφή του δωματίου αυτού",
+    "Join the conference from the room information card on the right": "Συμμετάσχετε στην τηλεδιάσκεψη από την κάρτα πληροφοριών στα δεξιά",
+    "Image": "Εικόνα",
+    "Show image": "Εμφάνιση εικόνας",
+    "Click": "Κλικ",
+    "Expand quotes": "Ανάπτυξη εισαγωγικών",
+    "Collapse quotes": "Σύμπτυξη εισαγωγικών",
+    "Reply": "Απάντηση",
+    "Can't create a thread from an event with an existing relation": "Δεν είναι δυνατή η δημιουργία νήματος από ένα συμβάν με μια υπάρχουσα σχέση",
+    "Reply in thread": "Απάντηση στο νήμα",
+    "React": "Αντίδραση",
+    "Error processing audio message": "Σφάλμα επεξεργασίας του ηχητικού μηνύματος",
+    "Go": "Μετάβαση",
+    "Pick a date to jump to": "Επιλέξτε μια ημερομηνία για να μεταβείτε",
+    "Message pending moderation": "Μήνυμα σε εκκρεμότητα συντονισμού",
+    "Message pending moderation: %(reason)s": "Μήνυμα σε εκκρεμότητα συντονισμού: %(reason)s",
+    "The encryption used by this room isn't supported.": "Η κρυπτογράφηση που χρησιμοποιείται από αυτό το δωμάτιο δεν υποστηρίζεται.",
+    "Encryption not enabled": "Η κρυπτογράφηση δεν ενεργοποιήθηκε",
+    "Ignored attempt to disable encryption": "Αγνοήθηκε προσπάθεια απενεργοποίησης κρυπτογράφησης",
+    "Encryption enabled": "Η κρυπτογράφηση ενεργοποιήθηκε",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Τα μηνύματα σε αυτό το δωμάτιο είναι κρυπτογραφημένα από άκρο σε άκρο. Όταν εγγραφούν άτομα, μπορείτε να τα επαληθεύσετε στο προφίλ τους, απλώς πατήστε στο avatar τους.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Τα μηνύματα εδώ είναι κρυπτογραφημένα από άκρο σε άκρο. Επαληθεύστε τον χρήστη %(displayName)s στο προφίλ του - πατήστε στο avatar τους.",
+    "Some encryption parameters have been changed.": "Ορισμένες παράμετροι κρυπτογράφησης έχουν αλλάξει.",
+    "with state key %(stateKey)s": "με κλειδί κατάστασης %(stateKey)s",
+    "with an empty state key": "με ένα κενό κλειδί κατάστασης",
+    "Messages in this room are not end-to-end encrypted.": "Τα μηνύματα σε αυτό το δωμάτιο δεν είναι κρυπτογραφημένα από άκρο σε άκρο.",
+    "Messages in this room are end-to-end encrypted.": "Τα μηνύματα σε αυτό το δωμάτιο είναι κρυπτογραφημένα από άκρο σε άκρο.",
+    "Accepting…": "Αποδοχή …",
+    "To proceed, please accept the verification request on your other device.": "Για να συνεχίσετε, αποδεχτείτε το αίτημα επαλήθευσης στην άλλη συσκευή σας.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Όταν κάποιος εισάγει μια διεύθυνση URL στο μήνυμά του, μπορεί να εμφανιστεί μια προεπισκόπηση του URL για να δώσει περισσότερες πληροφορίες σχετικά με αυτόν τον σύνδεσμο, όπως τον τίτλο, την περιγραφή και μια εικόνα από τον ιστότοπο.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Σε κρυπτογραφημένα δωμάτια, όπως αυτό, οι προεπισκόπηση URL είναι απενεργοποιημένη από προεπιλογή για να διασφαλιστεί ότι ο κεντρικός σας διακομιστής (όπου δημιουργείται μια προεπισκόπηση) δεν μπορεί να συγκεντρώσει πληροφορίες σχετικά με συνδέσμους που βλέπετε σε αυτό το δωμάτιο.",
+    "Publish this room to the public in %(domain)s's room directory?": "Δημοσίευση αυτού του δωματίου στο κοινό κατάλογο δωματίων του %(domain)s;",
+    "Room avatar": "Εικόνα δωματίου",
+    "Show more": "Δείτε περισσότερα",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Ορίστε διευθύνσεις για αυτόν τον χώρο, ώστε οι χρήστες να μπορούν να τον βρίσκουν μέσω του κεντρικού σας διακομιστή (%(localDomain)s)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Ορίστε διευθύνσεις για αυτό το δωμάτιο, ώστε οι χρήστες να μπορούν να το βρίσκουν μέσω του κεντρικού σας διακομιστή (%(localDomain)s)",
+    "Local Addresses": "Τοπική Διεύθυνση",
+    "New published address (e.g. #alias:server)": "Νέα δημοσιευμένη διεύθυνση (π.χ. #alias:server)",
+    "No other published addresses yet, add one below": "Δεν υπάρχουν δημοσιευμένες διευθύνσεις, προσθέστε μία παρακάτω",
+    "Other published addresses:": "Άλλες δημοσιευμένες διευθύνσεις:",
+    "To publish an address, it needs to be set as a local address first.": "Για να δημοσιεύσετε μια διεύθυνση, πρέπει πρώτα να οριστεί ως τοπική.",
+    "Published addresses can be used by anyone on any server to join your room.": "Οι δημοσιευμένες διευθύνσεις μπορούν να χρησιμοποιηθούν από οποιονδήποτε σε οποιονδήποτε διακομιστή για να συμμετάσχει στο δωμάτιό σας.",
+    "Published addresses can be used by anyone on any server to join your space.": "Οι δημοσιευμένες διευθύνσεις μπορούν να χρησιμοποιηθούν από οποιονδήποτε σε οποιονδήποτε διακομιστή για να συμμετάσχει στο χώρο σας.",
+    "Published Addresses": "Δημοσιευμένες Διευθύνσεις",
+    "Local address": "Τοπική διεύθυνση",
+    "This space has no local addresses": "Αυτός ο χώρος δεν έχει τοπικές διευθύνσεις",
+    "Main address": "Κύρια διεύθυνση",
+    "Error removing address": "Σφάλμα διαγραφής διεύθυνσης",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Παρουσιάστηκε σφάλμα κατά την κατάργηση αυτής της διεύθυνσης. Μπορεί να μην υπάρχει πλέον ή να παρουσιάστηκε προσωρινό σφάλμα.",
+    "You don't have permission to delete the address.": "Δεν έχετε άδεια να διαγράψετε τη διεύθυνση.",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία αυτής της διεύθυνσης. Ενδέχεται να μην επιτρέπεται από τον διακομιστή ή να έχει παρουσιαστεί προσωρινή αποτυχία.",
+    "Error creating address": "Σφάλμα δημιουργίας διεύθυνσης",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των εναλλακτικών διευθύνσεων του δωματίου. Ενδέχεται να μην επιτρέπεται από τον διακομιστή ή να έχει παρουσιαστεί προσωρινή αποτυχία.",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση της κύριας διεύθυνσης του δωματίου. Ενδέχεται να μην επιτρέπεται από τον διακομιστή ή να συνέβηκε σφάλμα.",
+    "Error updating main address": "Σφάλμα κατά την ενημέρωση της κύριας διεύθυνσης",
+    "Stop recording": "Διακοπή εγγραφής",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "Δε βρέθηκε μικρόφωνο στη συσκευή σας. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και δοκιμάστε ξανά.",
+    "Unable to access your microphone": "Αδυναμία πρόσβασης μικροφώνου",
+    "Mark all as read": "Επισήμανση όλων ως αναγνωσμένων",
+    "Open thread": "Άνοιγμα νήματος",
+    "%(count)s reply|one": "%(count)s απάντηση",
+    "%(count)s reply|other": "%(count)s απαντήσεις",
+    "No microphone found": "Δε βρέθηκε μικρόφωνο",
+    "We were unable to access your microphone. Please check your browser settings and try again.": "Δεν ήταν δυνατή η πρόσβαση στο μικρόφωνο σας. Ελέγξτε τις ρυθμίσεις του προγράμματος περιήγησης σας και δοκιμάστε ξανά.",
+    "Your export was successful. Find it in your Downloads folder.": "Η εξαγωγή σας ήταν επιτυχής. Βρείτε τη στο φάκελο Λήψεις.",
+    "Export Successful": "Επιτυχής Εξαγωγή",
+    "The export was cancelled successfully": "Η εξαγωγή ακυρώθηκε με επιτυχία",
+    "Export Cancelled": "Η Εξαγωγή ακυρώθηκε",
+    "MB": "MB",
+    "Number of messages": "Αριθμός μηνυμάτων",
+    "End Poll": "Τερματισμός δημοσκόπησης",
+    "Room ID: %(roomId)s": "ID δωματίου: %(roomId)s",
+    "Developer Tools": "Εργαλεία προγραμματιστή",
+    "Toolbox": "Εργαλειοθήκη",
+    "Server info": "Πληροφορίες διακομιστή",
+    "Server did not require any authentication": "Ο διακομιστής δεν απαίτησε κάποιο έλεγχο ταυτότητας",
+    "Server did not return valid authentication information.": "Ο διακομιστής δεν επέστρεψε έγκυρες πληροφορίες ελέγχου ταυτότητας.",
+    "There was a problem communicating with the server. Please try again.": "Παρουσιάστηκε πρόβλημα κατά την επικοινωνία με τον διακομιστή. Παρακαλώ προσπαθήστε ξανά.",
+    "To continue, please enter your password:": "Για να συνεχίσετε παρακαλώ εισάγετε τον κωδικό σας:",
+    "Confirm account deactivation": "Επιβεβαίωση απενεργοποίησης λογαριασμού",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Είστε βέβαιοι ότι θέλετε να απενεργοποιήσετε τον λογαριασμό σας; Αυτό είναι μη αναστρέψιμο.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Επιβεβαιώστε την απενεργοποίηση του λογαριασμού σας χρησιμοποιώντας Single Sign On για να αποδείξετε την ταυτότητά σας.",
+    "Continue With Encryption Disabled": "Συνέχεια με Απενεργοποίηση Κρυπτογράφησης",
+    "Incompatible Database": "Μη συμβατή Βάση Δεδομένων",
+    "Adding...": "Προσθήκη...",
+    "Want to add an existing space instead?": "Θέλετε να προσθέσετε έναν υπάρχοντα χώρο;",
+    "Public space": "Δημόσιος χώρος",
+    "Private space (invite only)": "Ιδιωτικός χώρος (μόνο με πρόσκληση)",
+    "Space visibility": "Ορατότητα χώρου",
+    "Only people invited will be able to find and join this space.": "Μόνο τα άτομα που έχουν προσκληθεί θα μπορούν να βρουν και να εγγραφούν σε αυτόν τον χώρο.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτόν τον χώρο, όχι μόνο μέλη του <SpaceName/>.",
+    "Share location": "Κοινή χρήση τοποθεσίας",
+    "Click to move the pin": "Κλικ για να μετακινήσετε την καρφίτσα",
+    "Could not fetch location": "Δεν ήταν δυνατή η ανάκτηση της τοποθεσίας",
+    "Location": "Τοποθεσία",
+    "Can't load this message": "Δεν είναι δυνατή η φόρτωση αυτού του μηνύματος",
+    "Submit logs": "Υποβολή αρχείων καταγραφής",
+    "Edited at %(date)s. Click to view edits.": "Επεξεργάστηκε στις %(date)s. Κάντε κλικ για να δείτε τις τροποποιήσεις.",
+    "Edited at %(date)s": "Τροποποιήθηκε στις %(date)s",
+    "Click to view edits": "Κάντε κλικ για να δείτε τις τροποποιήσεις",
+    "This room is a continuation of another conversation.": "Αυτό το δωμάτιο είναι η συνέχεια μιας άλλης συνομιλίας.",
+    "Click here to see older messages.": "Κάντε κλικ εδώ για να δείτε παλαιότερα μηνύματα.",
+    "Message deleted on %(date)s": "Το μήνυμα διαγράφηκε στις %(date)s",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s αντέδρασαν με %(content)s",
+    "Reactions": "Αντιδράσεις",
+    "Show all": "Εμφάνιση όλων",
+    "Add reaction": "Προσθέστε αντίδραση",
+    "Error processing voice message": "Σφάλμα επεξεργασίας του φωνητικού μηνύματος",
+    "%(count)s votes|one": "%(count)s ψήφος",
+    "%(count)s votes|other": "%(count)s ψήφοι",
+    "edited": "επεξεργάστηκε",
+    "Based on %(count)s votes|one": "Με βάση %(count)s ψήφο",
+    "Based on %(count)s votes|other": "Με βάση %(count)s ψήφους",
+    "%(count)s votes cast. Vote to see the results|one": "%(count)s ψήφος. Ψηφίστε για να δείτε τα αποτελέσματα",
+    "%(count)s votes cast. Vote to see the results|other": "%(count)s ψήφοι. Ψηφίστε για να δείτε τα αποτελέσματα",
+    "No votes cast": "Καμία ψήφος",
+    "Results will be visible when the poll is ended": "Τα αποτελέσματα θα είναι ορατά όταν τελειώσει η δημοσκόπηση",
+    "Final result based on %(count)s votes|one": "Τελικό αποτέλεσμα με βάση %(count)s ψήφο",
+    "Final result based on %(count)s votes|other": "Τελικό αποτέλεσμα με βάση %(count)s ψήφους",
+    "Sorry, your vote was not registered. Please try again.": "Λυπούμαστε, η ψήφος σας δεν καταχωρήθηκε. Παρακαλώ προσπαθήστε ξανά.",
+    "Vote not registered": "Η ψήφος δεν έχει καταχωρηθεί",
+    "Download": "Λήψη",
+    "Decrypting": "Αποκρυπτογράφηση",
+    "Downloading": "Γίνεται λήψη",
+    "Jump to date": "Μετάβαση σε ημερομηνία",
+    "The beginning of the room": "Η αρχή του δωματίου",
+    "Last month": "Προηγούμενο μήνα",
+    "Last week": "Προηγούμενη εβδομάδα",
+    "Unable to find event at that date. (%(code)s)": "Δεν είναι δυνατή η εύρεση συμβάντος για εκείνη την ημερομηνία.( %(code)s)",
+    "The call is in an unknown state!": "Η κλήση βρίσκεται σε άγνωστη κατάσταση!",
+    "Missed call": "Αναπάντητη κλήση",
+    "Retry": "Προσπάθεια ξανά",
+    "Unknown failure: %(reason)s": "Άγνωστο σφάλμα: %(reason)s",
+    "An unknown error occurred": "Συνέβη ένα άγνωστο σφάλμα",
+    "Their device couldn't start the camera or microphone": "Η συσκευή τους δεν μπόρεσε να ξεκινήσει την κάμερα ή το μικρόφωνο",
+    "Connection failed": "Αποτυχία σύνδεσης",
+    "No answer": "Καμία απάντηση",
+    "Call back": "Καλέστε πίσω",
+    "Call declined": "Η κλήση απορρίφθηκε",
+    "Verification cancelled": "Η επαλήθευση ακυρώθηκε",
+    "You cancelled verification.": "Ακυρώσατε την επαλήθευση.",
+    "%(displayName)s cancelled verification.": "%(displayName)s ακύρωσε την επαλύθευση.",
+    "You cancelled verification on your other device.": "Ακυρώσατε την επαλήθευση στην άλλη συσκευή σας.",
+    "Verification timed out.": "Η επαλήθευση έληξε.",
+    "Start verification again from their profile.": "Ξεκινήστε ξανά την επαλήθευση από το προφίλ τους.",
+    "Start verification again from the notification.": "Ξεκινήστε ξανά την επαλήθευση από την ειδοποίηση.",
+    "Got it": "Κατανοώ",
+    "You've successfully verified %(displayName)s!": "Επαληθεύσατε με επιτυχία τον χρήστη %(displayName)s!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Επαληθεύσατε με επιτυχία το %(deviceName)s %(deviceId)s!",
+    "You've successfully verified your device!": "Επαληθεύσατε με επιτυχία τη συσκευή σας!",
+    "In encrypted rooms, verify all users to ensure it's secure.": "Σε κρυπτογραφημένα δωμάτια, επαληθεύστε όλους τους χρήστες για να βεβαιωθείτε ότι είναι ασφαλές.",
+    "Verify all users in a room to ensure it's secure.": "Επαληθεύστε όλους τους χρήστες σε ένα δωμάτιο για να βεβαιωθείτε ότι είναι ασφαλές.",
+    "Almost there! Is %(displayName)s showing the same shield?": "Σχεδόν έτοιμοι! Εμφανίζεται η ίδια ασπίδα και στον χρήστη %(displayName)s;",
+    "Almost there! Is your other device showing the same shield?": "Σχεδόν έτοιμοι! Εμφανίζεται η ίδια ασπίδα και στην άλλη συσκευή σας;",
+    "Verify by emoji": "Επαλήθευση με emoji",
+    "Verify by comparing unique emoji.": "Επαληθεύστε συγκρίνοντας μοναδικά emoji.",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Εάν δεν μπορείτε να σαρώσετε τον παραπάνω κώδικα, επαληθεύστε το συγκρίνοντας μοναδικά emoji.",
+    "Ask %(displayName)s to scan your code:": "Ζητήστε από τον χρήστη %(displayName)s να σαρώσει τον κωδικό σας:",
+    "Verify by scanning": "Επαλήθευση με σάρωση",
+    "Verify this device by completing one of the following:": "Επαληθεύστε αυτήν τη συσκευή συμπληρώνοντας ένα από τα παρακάτω:",
+    "or": "ή",
+    "Start": "Έναρξη",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Συγκρίνετε ένα μοναδικό σύνολο emoji εάν δεν έχετε κάμερα σε καμία από τις δύο συσκευές",
+    "Compare unique emoji": "Συγκρίνετε μοναδικά emoji",
+    "Scan this unique code": "Σαρώστε αυτόν τον μοναδικό κωδικό",
+    "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.": "Η συσκευή που προσπαθείτε να επαληθεύσετε δεν υποστηρίζει τη σάρωση κωδικού QR ή επαλήθευσης emoji, κάτι που υποστηρίζει το %(brand)s. Δοκιμάστε με διαφορετικό πρόγραμμα-πελάτη.",
+    "Security": "Ασφάλεια",
+    "Edit devices": "Επεξεργασία συσκευών",
+    "This client does not support end-to-end encryption.": "Αυτό το πρόγραμμα-πελάτης δεν υποστηρίζει κρυπτογράφηση από άκρο σε άκρο.",
+    "Role in <RoomName/>": "Ρόλος στο <RoomName/>",
+    "Failed to deactivate user": "Η απενεργοποίηση χρήστη απέτυχε",
+    "Deactivate user": "Απενεργοποίηση χρήστη",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Η απενεργοποίηση αυτού του χρήστη θα τον αποσυνδεθεί και θα αποτραπεί η επανασύνδεσή του. Επιπλέον, θα αποχωρήσει από όλα τα δωμάτια στα οποία συμμετέχει. Αυτή η ενέργεια δεν μπορεί να αντιστραφεί. Είστε βέβαιοι ότι θέλετε να απενεργοποιήσετε αυτόν τον χρήστη;",
+    "Deactivate user?": "Απενεργοποίηση χρήστη;",
+    "Remove recent messages": "Κατάργηση πρόσφατων μηνυμάτων",
+    "Remove from room": "Αφαίρεση από το δωμάτιο",
+    "Failed to remove user": "Αποτυχία κατάργησης χρήστη",
+    "Remove from %(roomName)s": "Κατάργηση από %(roomName)s",
+    "Disinvite from %(roomName)s": "Κατάργηση πρόσκλησης από %(roomName)s",
+    "Remove from chat": "Κατάργηση από τη συνομιλία",
+    "Demote": "Υποβιβασμός",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Δε θα μπορείτε να αναιρέσετε αυτήν την ενέργεια καθώς υποβιβάζετε τον εαυτό σας, εάν είστε ο τελευταίος προνομιούχος χρήστης στο δωμάτιο, θα είναι αδύνατο να ανακτήσετε τα προνόμια.",
+    "Share Link to User": "Κοινή χρήση Συνδέσμου με Χρήστη",
+    "Jump to read receipt": "Μετάβαση στο αποδεικτικό ανάγνωσης",
+    "Message": "Μήνυμα",
+    "Hide sessions": "Απόκρυψη συνεδριών",
+    "%(count)s sessions|one": "%(count)s συνεδρία",
+    "%(count)s sessions|other": "%(count)s συνεδρίες",
+    "Hide verified sessions": "Απόκρυψη επαληθευμένων συνεδριών",
+    "%(count)s verified sessions|one": "1 επαληθευμένη συνεδρία",
+    "%(count)s verified sessions|other": "%(count)s επαληθευμένες συνεδρίες",
+    "Unable to load session list": "Δεν είναι δυνατή η φόρτωση της λίστας συνεδριών",
+    "Trusted": "Έμπιστο",
+    "Room settings": "Ρυθμίσεις δωματίου",
+    "Share room": "Κοινή χρήση δωματίου",
+    "Export chat": "Εξαγωγή συνομιλίας",
+    "Pinned": "Καρφιτσωμένο",
+    "Files": "Αρχεία",
+    "About": "Σχετικά με",
+    "Not encrypted": "Μη κρυπτογραφημένο",
+    "Add widgets, bridges & bots": "Προσθήκη μικροεφαρμογών, γεφυρών & bots",
+    "Edit widgets, bridges & bots": "Επεξεργασία μικροεφαρμογών, γεφυρών & bots",
+    "Set my room layout for everyone": "Ορίστε τη διάταξη του δωματίου μου για όλους",
+    "Close this widget to view it in this panel": "Κλείστε αυτήν τη μικροεφαρμογή για να την προβάλετε σε αυτόν τον πίνακα",
+    "Unpin this widget to view it in this panel": "Ξεκαρφιτσώστε αυτήν τη μικροεφαρμογή για να την προβάλετε σε αυτόν τον πίνακα",
+    "Maximise": "Μεγιστοποίηση",
+    "You can only pin up to %(count)s widgets|other": "Μπορείτε να καρφιτσώσετε μόνο έως %(count)s μικρεοεφαρμογές",
+    "Room Info": "Πληροφορίες Δωματίου",
+    "Chat": "Συνομιλία",
+    "Pinned messages": "Καρφιτσωμένα μηνύματα",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "Εάν έχετε δικαιώματα, ανοίξτε το μενού σε οποιοδήποτε μήνυμα και επιλέξτε <b>Καρφίτσωμα</b> για να τα κολλήσετε εδώ.",
+    "Nothing pinned, yet": "Δεν έχει καρφιτσωθεί κάτι ακόμα",
+    "Yours, or the other users' session": "Η δική σας ή η συνεδρία άλλων χρηστών",
+    "Yours, or the other users' internet connection": "Η δική σας ή η σύνδεση στο διαδίκτυο των άλλων χρηστών",
+    "The homeserver the user you're verifying is connected to": "Ο κεντρικός διακομιστής στον οποίο είναι συνδεδεμένος ο χρήστης που επαληθεύετε",
+    "Your homeserver": "Ο κεντρικός σας διακομιστής",
+    "One of the following may be compromised:": "Ένα από τα παρακάτω μπορεί να τεθεί σε κίνδυνο:",
+    "Your messages are not secure": "Τα μηνύματά σας δεν είναι ασφαλή",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Για επιπλέον ασφάλεια, επαληθεύστε αυτόν τον χρήστη ελέγχοντας έναν κωδικό μίας χρήσης και στις δύο συσκευές σας.",
+    "Verify User": "Επαλήθευση Χρήστη",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Σε κρυπτογραφημένα δωμάτια, τα μηνύματά σας είναι ασφαλή και μόνο εσείς και ο παραλήπτης έχετε τα μοναδικά κλειδιά για να τα ξεκλειδώσετε.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Τα μηνύματά σας είναι ασφαλή και μόνο εσείς και ο παραλήπτης έχετε τα μοναδικά κλειδιά για να τα ξεκλειδώσετε.",
+    "Start Verification": "Έναρξη επαλήθευσης",
+    "Waiting for %(displayName)s to accept…": "Αναμονή αποδοχής από %(displayName)s…",
+    "URL previews are enabled by default for participants in this room.": "Η προεπισκόπηση διευθύνσεων URL είναι ενεργοποιημένη από προεπιλογή για τους συμμετέχοντες σε αυτό το δωμάτιο.",
+    "Invited by %(sender)s": "Προσκεκλημένος από %(sender)s",
+    "Revoke invite": "Ανάκληση πρόσκλησης",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Δεν ήταν δυνατή η ανάκληση της πρόσκλησης. Ο διακομιστής μπορεί να αντιμετωπίζει ένα προσωρινό πρόβλημα ή δεν έχετε επαρκή δικαιώματα για να ανακαλέσετε την πρόσκληση.",
+    "Failed to revoke invite": "Αποτυχία ανάκλησης πρόσκλησης",
+    "Stickerpack": "Πακέτο αυτοκόλλητων",
+    "You don't currently have any stickerpacks enabled": "Προς το παρόν δεν έχετε ενεργοποιημένο κάποιο πακέτο αυτοκόλλητων",
+    "Add some now": "Προσθέστε μερικά τώρα",
+    "Only room administrators will see this warning": "Μόνο οι διαχειριστές δωματίων θα βλέπουν αυτήν την προειδοποίηση",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Αυτό το δωμάτιο τρέχει την έκδοση <roomVersion />, την οποία ο κεντρικός διακομιστής έχει επισημάνει ως <i>ασταθής</i>.",
+    "This room has already been upgraded.": "Αυτό το δωμάτιο έχει ήδη αναβαθμιστεί.",
+    "Connecting...": "Σύνδεση...",
+    "Composer": "Συντάκτης μηνυμάτων",
+    "Credits": "Συντελεστές",
+    "Discovery": "Ανακάλυψη",
+    "Developer tools": "Εργαλεία προγραμματιστή",
+    "Got It": "Κατανοώ",
+    "Dial": "Κλήση",
+    "Export Chat": "Εξαγωγή Συνομιλίας",
+    "Sending": "Αποστολή",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτόν τον χώρο, όχι μόνο μέλη του <SpaceName/>.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες επιλογές διακομιστή για να συνδεθείτε σε άλλους διακομιστές Matrix, καθορίζοντας μια διαφορετική διεύθυνση URL του κεντρικού διακομιστή. Αυτό σας επιτρέπει να χρησιμοποιείτε το %(brand)s με έναν υπάρχοντα λογαριασμό Matrix σε διαφορετικό τοπικό διακομιστή.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Όλοι στο <SpaceName/> θα μπορούν να βρουν και να συμμετάσχουν σε αυτό το δωμάτιο.",
+    "Please enter a name for the room": "Εισάγετε ένα όνομα για το δωμάτιο",
+    "Message preview": "Προεπισκόπηση μηνύματος",
+    "Forward message": "Προώθηση μηνύματος",
+    "Open link": "Άνοιγμα συνδέσμου",
+    "You don't have permission to do this": "Δεν έχετε άδεια να το κάνετε αυτό",
+    "Send feedback": "Στείλετε τα σχόλιά σας",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Δείτε πρώτα τα <existingIssuesLink>υπάρχοντα ζητήματα (issues) στο Github</existingIssuesLink>. Δε βρήκατε κάτι; <newIssueLink>Ξεκινήστε ένα νέο</newIssueLink>.",
+    "Report a bug": "Αναφορά σφάλματος",
+    "You may contact me if you want to follow up or to let me test out upcoming ideas": "Μπορείτε να επικοινωνήσετε μαζί μου εάν θέλετε να έρθετε σε επαφή ή να με αφήσετε να δοκιμάσω επερχόμενες ιδέες",
+    "Your platform and username will be noted to help us use your feedback as much as we can.": "Η πλατφόρμα και το όνομα χρήστη σας θα καταγραφούν για να μας βοηθήσουν να χρησιμοποιήσουμε τα σχόλιά σας όσο μπορούμε περισσότερο.",
+    "Feedback sent": "Τα σχόλια στάλθηκαν",
+    "Select from the options below to export chats from your timeline": "Επιλέξτε από τις παρακάτω επιλογές για να εξαγάγετε συνομιλίες από το χρονολόγιό σας",
+    "Number of messages can only be a number between %(min)s and %(max)s": "Ο αριθμός των μηνυμάτων μπορεί να είναι μόνο ένας αριθμός μεταξύ %(min)s και %(max)s",
+    "Size can only be a number between %(min)s MB and %(max)s MB": "Το μέγεθος μπορεί να είναι μόνο ένας αριθμός μεταξύ %(min)s MB και %(max)s MB",
+    "Enter a number between %(min)s and %(max)s": "Εισαγάγετε έναν αριθμό μεταξύ %(min)s και %(max)s",
+    "Processing...": "Επεξεργασία...",
+    "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Είστε βέβαιοι ότι θέλετε να τερματίσετε αυτήν τη δημοσκόπηση; Αυτό θα εμφανίσει τα τελικά αποτελέσματα της δημοσκόπησης και θα εμποδίσει νέους ψήφους.",
+    "Sorry, the poll did not end. Please try again.": "Συγνώμη, η δημοσκόπηση δεν τερματίστηκε. Παρακαλώ προσπαθήστε ξανά.",
+    "Failed to end poll": "Αποτυχία τερματισμού της δημοσκόπησης",
+    "Active Widgets": "Ενεργές Μικροεφαρμογές",
+    "View servers in room": "Προβολή διακομιστών στο δωμάτιο",
+    "Explore room account data": "Εξερεύνηση δεδομένων λογαριασμού δωματίου",
+    "Explore room state": "Εξερεύνηση κατάστασης δωματίου",
+    "Anyone in <SpaceName/> will be able to find and join.": "Οποιοσδήποτε στο <SpaceName/> θα μπορεί να βρει και να συμμετάσχει σε αυτό το δωμάτιο.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Αποκλείστε οποιονδήποτε δεν είναι μέλος του %(serverName)s από τη συμμετοχή σε αυτό το δωμάτιο.",
+    "Visible to space members": "Ορατό στα μέλη του χώρου",
+    "Public room": "Δημόσιο δωμάτιο",
+    "Private room (invite only)": "Ιδιωτικό δωμάτιο (μόνο με πρόσκληση)",
+    "Room visibility": "Ορατότητα δωματίου",
+    "Topic (optional)": "Θέμα (προαιρετικό)",
+    "Room details": "Λεπτομέρειες δωματίου",
+    "Room type": "Τύπος δωματίου",
+    "Create a private room": "Δημιουργήστε ένα ιδιωτικό δωμάτιο",
+    "Create a public room": "Δημιουργήστε ένα δημόσιο δωμάτιο",
+    "Create a room": "Δημιουργήστε ένα δωμάτιο",
+    "Enable end-to-end encryption": "Ενεργοποίηση κρυπτογράφησης από άκρο-σε-άκρο",
+    "Only people invited will be able to find and join this room.": "Μόνο τα άτομα που έχουν προσκληθεί θα μπορούν να βρουν και να εγγραφούν σε αυτό τον δωμάτιο.",
+    "Anyone will be able to find and join this room.": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτό το δωμάτιο.",
+    "You can change this at any time from room settings.": "Μπορείτε να το αλλάξετε ανά πάσα στιγμή από τις ρυθμίσεις δωματίου.",
+    "Reason (optional)": "Αιτία (προαιρετικό)",
+    "Removing…": "Αφαίρεση…",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Καταργήστε την επιλογή εάν θέλετε επίσης να καταργήσετε τα μηνύματα συστήματος σε αυτόν τον χρήστη (π.χ. αλλαγή μέλους, αλλαγή προφίλ…)",
+    "Preserve system messages": "Διατήρηση μηνυμάτων συστήματος",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Για μεγάλο αριθμό μηνυμάτων, αυτό μπορεί να πάρει κάποιο χρόνο. Μην ανανεώνετε το προγράμμα-πελάτη σας στο μεταξύ.",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Πρόκειται να αφαιρέσετε %(count)s μηνύματα του χρήστη %(user)s. Αυτό θα τα καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Πρόκειται να αφαιρέσετε %(count)s μήνυμα του χρήστη %(user)s. Αυτό θα το καταργήσει οριστικά για όλους στη συνομιλία. Θέλετε να συνεχίσετε;",
+    "Remove recent messages by %(user)s": "Καταργήστε πρόσφατα μηνύματα από %(user)s",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Δοκιμάστε να κάνετε κύλιση στη γραμμή χρόνου για να δείτε αν υπάρχουν παλαιότερα.",
+    "No recent messages by %(user)s found": "Δε βρέθηκαν πρόσφατα μηνύματα από %(user)s",
+    "Notes": "Σημειώσεις",
+    "Download logs": "Λήψη αρχείων καταγραφής",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Προτού υποβάλετε αρχεία καταγραφής, πρέπει να <a>δημιουργήσετε ένα ζήτημα GitHub</a> για να περιγράψετε το πρόβλημά σας.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Υπενθύμιση: Το πρόγραμμα περιήγησής σας δεν υποστηρίζεται, επομένως η εμπειρία σας μπορεί να είναι απρόβλεπτη.",
+    "Preparing to download logs": "Προετοιμασία λήψης αρχείων καταγραφής",
+    "Logs sent": "Τα αρχεία καταγραφής στάλθηκαν",
+    "Preparing to send logs": "Προετοιμασία αποστολής αρχείων καταγραφής",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Πείτε μας τι πήγε στραβά ή, καλύτερα, δημιουργήστε ένα ζήτημα στο GitHub που να περιγράφει το πρόβλημα.",
+    "To leave the beta, visit your settings.": "Για να αποχωρήσετε από την έκδοση beta, μεταβείτε στις ρυθμίσεις σας.",
+    "Close dialog": "Κλείσιμο διαλόγου",
+    "Invite anyway": "Πρόσκληση ούτως ή άλλως",
+    "Invite anyway and never warn me again": "Προσκαλέστε ούτως ή άλλως και μην με προειδοποιήσετε ποτέ ξανά",
+    "The following users may not exist": "Οι παρακάτω χρήστες ενδέχεται να μην υπάρχουν",
+    "You can turn this off anytime in settings": "Μπορείτε να το απενεργοποιήσετε ανά πάσα στιγμή στις ρυθμίσεις",
+    "We <Bold>don't</Bold> share information with third parties": "<Bold>Δε</Bold> μοιραζόμαστε πληροφορίες με τρίτους",
+    "We <Bold>don't</Bold> record or profile any account data": "<Bold>Δεν</Bold> καταγράφουμε ούτε ιχνηλατούμε οποιαδήποτε δεδομένα λογαριασμού",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Βοηθήστε μας να εντοπίσουμε προβλήματα και να βελτιώσουμε το %(analyticsOwner)s κοινοποιώντας ανώνυμα δεδομένα χρήσης. Για να κατανοήσουμε πώς οι άνθρωποι χρησιμοποιούν πολλαπλές συσκευές, θα δημιουργήσουμε ένα τυχαίο αναγνωριστικό, κοινόχρηστο από τις συσκευές σας.",
+    "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Μπορείτε να διαβάσετε όλους τους όρους μας <PrivacyPolicyUrl>εδώ</PrivacyPolicyUrl>",
+    "Search for rooms": "Αναζητήστε δωμάτια",
+    "Create a new room": "Δημιουργήστε νέο δωμάτιο",
+    "Want to add a new space instead?": "Θέλετε να προσθέσετε ένα νέο χώρο αντί αυτού;",
+    "Want to add a new room instead?": "Θέλετε να προσθέσετε ένα νέο δωμάτιο αντί αυτού;",
+    "Add existing rooms": "Προσθέστε υπάρχοντα δωμάτια",
+    "Direct Messages": "Άμεσα Μηνύματα",
+    "Adding rooms... (%(progress)s out of %(count)s)|one": "Προσθήκη δωματίου...",
+    "Adding rooms... (%(progress)s out of %(count)s)|other": "Προσθήκη δωματίων... (%(progress)s από %(count)s)",
+    "Not all selected were added": "Δεν προστέθηκαν όλοι οι επιλεγμένοι",
+    "Search for spaces": "Αναζητήστε χώρους",
+    "Create a new space": "Δημιουργήστε ένα νέο χώρο",
+    "Add existing space": "Προσθήκη υπάρχοντος χώρου",
+    "Matrix rooms": "Δωμάτια Matrix",
+    "Add a new server...": "Προσθήκη νέου διακομιστή...",
+    "Server name": "Ονομα διακομιστή",
+    "Server Options": "Επιλογές Διακομιστή",
+    "This address had invalid server or is already in use": "Αυτή η διεύθυνση έχει μη έγκυρο διακομιστή ή χρησιμοποιείται ήδη",
+    "This address is already in use": "Αυτή η διεύθυνση χρησιμοποιείται ήδη",
+    "This address is available to use": "Αυτή η διεύθυνση είναι διαθέσιμη για χρήση",
+    "This address does not point at this room": "Αυτή η διεύθυνση δεν οδηγεί σε αυτό το δωμάτιο",
+    "Please provide an address": "Παρακαλώ δώστε μια διεύθυνση",
+    "Some characters not allowed": "Ορισμένοι χαρακτήρες δεν επιτρέπονται",
+    "Missing room name or separator e.g. (my-room:domain.org)": "Λείπει το όνομα δωματίου ή το διαχωριστικό τομέα π.χ (my-room:domain.org)",
+    "Missing domain separator e.g. (:domain.org)": "Λείπει το διαχωριστικό τομέα π.χ. (:domain.org)",
+    "e.g. my-room": "π.χ. my-room",
+    "Room address": "Διεύθυνση δωματίου",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Αδυναμία φόρτωσης του συμβάντος στο οποίο δόθηκε απάντηση, είτε δεν υπάρχει είτε δεν έχετε άδεια να το προβάλετε.",
+    "QR Code": "Κωδικός QR",
+    "Results are only revealed when you end the poll": "Τα αποτελέσματα αποκαλύπτονται μόνο όταν τελειώσετε τη δημοσκόπηση",
+    "Voters see results as soon as they have voted": "Οι ψηφοφόροι βλέπουν τα αποτελέσματα μόλις ψηφίσουν",
+    "Add option": "Προσθήκη επιλογής",
+    "Write an option": "Γράψτε μια επιλογή",
+    "Option %(number)s": "Επιλογή %(number)s",
+    "Create options": "Δημιουργία επιλογών",
+    "Write something...": "Γράψτε κάτι...",
+    "Question or topic": "Ερώτηση ή θέμα",
+    "What is your poll question or topic?": "Ποια είναι η ερώτηση ή το θέμα της δημοσκόπησης;",
+    "Closed poll": "Κλειστή δημοσκόπηση",
+    "Open poll": "Ανοιχτή δημοσκόπηση",
+    "Poll type": "Τύπος δημοσκόπησης",
+    "Sorry, the poll you tried to create was not posted.": "Λυπούμαστε, η δημοσκόπηση που προσπαθήσατε να δημιουργήσετε δε δημοσιεύτηκε.",
+    "Failed to post poll": "Αποτυχία δημοσίευσης δημοσκόπησης",
+    "Edit poll": "Επεξεργασία δημοσκόπησης",
+    "Create Poll": "Δημιουργία δημοσκόπησης",
+    "Create poll": "Δημιουργία δημοσκόπησης",
+    "Language Dropdown": "Επιλογή Γλώσσας",
+    "Information": "Πληροφορίες",
+    "Rotate Right": "Περιστροφή δεξιά",
+    "Rotate Left": "Περιστροφή αριστερά",
+    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "Εσείς",
+    "View all %(count)s members|one": "Προβολή 1 μέλους",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Παρακαλούμε <newIssueLink>δημιουργήστε ένα νέο issue</newIssueLink> στο GitHub ώστε να μπορέσουμε να διερευνήσουμε αυτό το σφάλμα.",
+    "This version of %(brand)s does not support searching encrypted messages": "Αυτή η έκδοση του %(brand)s δεν υποστηρίζει την αναζήτηση κρυπτογραφημένων μηνυμάτων",
+    "This version of %(brand)s does not support viewing some encrypted files": "Αυτή η έκδοση του %(brand)s δεν υποστηρίζει την προβολή ορισμένων κρυπτογραφημένων αρχείων",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Χρησιμοποιήστε την <a>εφαρμογή για υπολογιστή</a> για να δείτε όλα τα κρυπτογραφημένα μηνύματα",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Χρησιμοποιήστε την <a>εφαρμογή για υπολογιστή</a> για να δείτε όλα τα κρυπτογραφημένα αρχεία",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Η προετοιμασία της αναζήτησης μηνυμάτων απέτυχε, ελέγξτε τις <a>ρυθμίσεις σας</a> για περισσότερες πληροφορίες",
+    "Error - Mixed content": "Σφάλμα - Μικτό περιεχόμενο",
+    "Error loading Widget": "Σφάλμα φόρτωσης Μικροεφαρμογής",
+    "This widget may use cookies.": "Αυτή η μικροεφαρμογή μπορεί να χρησιμοποιεί cookies.",
+    "Widget added by": "Μικροεοεφαρμογή προστέθηκε από",
+    "Widgets do not use message encryption.": "Οι μικροεοεφαρμογές δε χρησιμοποιούν κρυπτογράφηση μηνυμάτων.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Η χρήση αυτής της μικροεφαρμογής ενδέχεται να μοιράζεται δεδομένα <helpIcon /> με %(widgetDomain)s.",
+    "Room ID": "ID Δωματίου",
+    "%(brand)s URL": "%(brand)s URL",
+    "Your theme": "Το θέμα εμφάνισης",
+    "Your user ID": "Το αναγνωριστικό (ID) χρήστη σας",
+    "Your avatar URL": "Το URL του avatar σας",
+    "Your display name": "Το εμφανιζόμενο όνομά σας",
+    "Any of the following data may be shared:": "Οποιοδήποτε από τα ακόλουθα δεδομένα μπορεί να κοινοποιηθεί:",
+    "Cancel search": "Ακύρωση αναζήτησης",
+    "Quick Reactions": "Γρήγορες Αντιδράσεις",
+    "Categories": "Κατηγορίες",
+    "Flags": "Σημαίες",
+    "Symbols": "Σύμβολα",
+    "Objects": "Αντικείμενα",
+    "Travel & Places": "Ταξίδια & Μέρη",
+    "Activities": "Δραστηριότητες",
+    "Food & Drink": "Φαγητό & Ποτό",
+    "Animals & Nature": "Ζώα & Φύση",
+    "Smileys & People": "Smileys & Άνθρωποι",
+    "Frequently Used": "Συχνά χρησιμοποιούμενα",
+    "What location type do you want to share?": "Τι τύπο τοποθεσίας θέλετε να μοιραστείτε;",
+    "Drop a Pin": "Εισάγετε μια Καρφίτσα",
+    "My live location": "Η ζωντανή τοποθεσία μου",
+    "My current location": "Η τρέχουσα τοποθεσία μου",
+    "%(displayName)s's live location": "Η τρέχουσα τοποθεσία του/της %(displayName)s",
+    "%(brand)s could not send your location. Please try again later.": "Το %(brand)s δεν μπόρεσε να στείλει την τοποθεσία σας. Παρακαλώ δοκιμάστε ξανά αργότερα.",
+    "We couldn't send your location": "Αδυναμία αποστολής της τοποθεσίας σας",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Αυτός ο κεντρικός διακομιστής δεν έχει ρυθμιστεί σωστά για εμφάνιση χαρτών ή ο διακομιστής χαρτών ενδέχεται να μην είναι προσβάσιμος.",
+    "This homeserver is not configured to display maps.": "Αυτός ο κεντρικός διακομιστής δεν έχει ρυθμιστεί για εμφάνιση χαρτών.",
+    "Unknown error fetching location. Please try again later.": "Άγνωστο σφάλμα λήψης της τοποθεσίας. Παρακαλώ δοκιμάστε ξανά αργότερα.",
+    "Timed out trying to fetch your location. Please try again later.": "Έληξε η προσπάθεια λήψης της τοποθεσίας σας. Παρακαλώ δοκιμάστε ξανά αργότερα.",
+    "Failed to fetch your location. Please try again later.": "Αποτυχία λήψης της τοποθεσίας σας. Παρακαλώ δοκιμάστε ξανά αργότερα.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "Δε δόθηκε άδεια στο %(brand)s να λάβει την τοποθεσία σας. Επιτρέψτε την πρόσβαση στην τοποθεσία από τις ρυθμίσεις του προγράμματος περιήγησής σας.",
+    "Click to drop a pin": "Κλικ για να εισάγετε μια καρφίτσα",
+    "Share for %(duration)s": "Κοινή χρήση για %(duration)s",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>αντέδρασε με %(shortName)s</reactedWith>",
+    "Shared a location: ": "Μοιράστηκε μια τοποθεσία: ",
+    "Shared their location: ": "Μοιράστηκαν την τοποθεσία τους: ",
+    "Declining …": "Απόρριψη…",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Έχετε αγνοήσει αυτόν τον χρήστη, επομένως τα μηνύματα του είναι κρυφά. <a>Εμφάνιση ούτως ή άλλως.</a>",
+    "They won't be able to access whatever you're not an admin of.": "Δε θα μπορούν να έχουν πρόσβαση σε λειτουργίες δεν είστε διαχειριστής.",
+    "Ban them from specific things I'm able to": "Αποκλεισμός από συγκεκριμένες λειτουργίες που έχω δικαίωμα",
+    "Unban them from specific things I'm able to": "Ακύρωση αποκλεισμού από συγκεκριμένες λειτουργίες που έχω δικαίωμα",
+    "Ban them from everything I'm able to": "Αποκλεισμός από οτιδήποτε έχω δικαίωμα",
+    "Unban them from everything I'm able to": "Ακύρωση αποκλεισμού από οτιδήποτε έχω δικαίωμα",
+    "Ban from %(roomName)s": "Αποκλεισμός από %(roomName)s",
+    "Unban from %(roomName)s": "Ακύρωση αποκλεισμού από %(roomName)s",
+    "They'll still be able to access whatever you're not an admin of.": "Θα εξακολουθούν να έχουν πρόσβαση σε οτιδήποτε λειτουργίες δεν είστε διαχειριστής.",
+    "Remove them from specific things I'm able to": "Αφαιρέστε τους από συγκεκριμένες λειτουργίες που έχω δικαίωμα",
+    "Remove them from everything I'm able to": "Αφαιρέστε τους από οτιδήποτε έχω δικαίωμα",
+    "Demote yourself?": "Υποβιβάστε τον εαυτό σας;",
+    "Not trusted": "Μη Έμπιστο",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Η αναβάθμιση αυτού του δωματίου θα τερματίσει το δωμάτιο και θα δημιουργήσει ένα αναβαθμισμένο δωμάτιο με το ίδιο όνομα.",
+    "Favourited": "Αγαπημένα",
+    "You can only join it with a working invite.": "Μπορείτε να συμμετάσχετε μόνο με ενεργή πρόσκληση.",
+    "Home options": "Επιλογές αρχικής",
+    "Unignore": "Αναίρεση αγνόησης",
+    "Read Marker off-screen lifetime (ms)": "Διάρκεια Δείκτη εκτός οθόνης (ms)",
+    "Read Marker lifetime (ms)": "Διάρκεια του Δείκτη Ανάγνωσης (ms)",
+    "Show tray icon and minimise window to it on close": "Εμφάνιση του εικονιδίου στη γραμμή εργασιών και ελαχιστοποίηση του παραθύρου στο κλείσιμο",
+    "Match system": "Ταίριασμα με του συστήματος",
+    "Spanner": "Γερμανικό κλειδί",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "Το %(brand)s είναι πειραματικό σε πρόγραμμα περιήγησης για κινητά. Για καλύτερη εμπειρία και τις πιο πρόσφατες δυνατότητες, χρησιμοποιήστε τη δωρεάν εφαρμογή μας για κινητά.",
+    "Search (must be enabled)": "Αναζήτηση (πρέπει να είναι ενεργοποιημένη)",
+    "New line": "Νέα γραμμή",
+    "Activate selected button": "Ενεργοποίηση επιλεγμένου κουμπιού",
+    "Open user settings": "Άνοιγμα ρυθμίσεων χρήστη",
+    "Switch to space by number": "Εναλλαγή σε χώρο με αριθμό",
+    "Previous recently visited room or space": "Προηγούμενο δωμάτιο ή χώρος που επισκεφτήκατε πρόσφατα",
+    "Next recently visited room or space": "Επόμενο δωμάτιο ή χώρος που επισκεφτήκατε πρόσφατα",
+    "Redo edit": "Ακύρωση αναίρεσης επεξεργασίας",
+    "Undo edit": "Αναίρεση επεξεργασίας",
+    "Jump to last message": "Μετάβαση στο τελευταίο μήνυμα",
+    "Jump to first message": "Μετάβαση στο πρώτο μήνυμα",
+    "Previous autocomplete suggestion": "Προηγούμενη πρόταση αυτόματης συμπλήρωσης",
+    "Next autocomplete suggestion": "Επόμενη πρόταση αυτόματης συμπλήρωσης",
+    "Cancel autocomplete": "Ακύρωση αυτόματης συμπλήρωσης",
+    "Next unread room or DM": "Επόμενο μη αναγνωσμένο δωμάτιο ή ΑΜ",
+    "Previous room or DM": "Προηγούμενο δωμάτιο ή ΑΜ",
+    "Next room or DM": "Επόμενο δωμάτιο ή ΑΜ",
+    "Previous unread room or DM": "Προηγούμενο μη αναγνωσμένο δωμάτιο ή ΑΜ",
+    "Open this settings tab": "Άνοιγμα της καρτέλας ρυθμίσεων",
+    "Navigate up in the room list": "Πλοήγηση προς τα πάνω στη λίστα δωματίων",
+    "Navigate down in the room list": "Πλοήγηση προς τα κάτω στη λίστα δωματίων",
+    "Expand room list section": "Ανάπτυξη ενότητας λίστας δωματίων",
+    "Collapse room list section": "Σύμπτυξη ενότητας λίστας δωματίων",
+    "Select room from the room list": "Επιλέξτε δωμάτιο από τη λίστα δωματίων",
+    "Jump to room search": "Μετάβαση στην αναζήτηση δωματίων",
+    "Scroll down in the timeline": "Κύλιση προς τα κάτω στη γραμμή χρόνου",
+    "Scroll up in the timeline": "Κύλιση προς τα πάνω στη γραμμή χρόνου",
+    "Upload a file": "Μεταφόρτωση αρχείου",
+    "Toggle webcam on/off": "Ενεργοποίηση/απενεργοποίηση κάμερας web",
+    "Toggle microphone mute": "Εναλλαγή σίγασης μικροφώνου",
+    "Send a sticker": "Αποστολή αυτοκόλλητου",
+    "Navigate to previous message to edit": "Μετάβαση στο προηγούμενο μήνυμα για επεξεργασία",
+    "Navigate to next message to edit": "Μετάβαση στο επόμενο μήνυμα για επεξεργασία",
+    "Cancel replying to a message": "Ακύρωση απάντησης σε μήνυμα",
+    "Autocomplete": "Αυτόματη συμπλήρωση",
+    "Navigation": "Πλοήγηση",
+    "Accessibility": "Προσβασιμότητα",
+    "Room List": "Λίστα Δωματίων",
+    "Calls": "Κλήσεις",
+    "Esc": "Esc",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s από %(totalRooms)s",
+    "Indexed rooms:": "Ευρετηριασμένα δωμάτια:",
+    "Indexed messages:": "Ευρετηριασμένα μηνύματα:",
+    "Disable": "Απενεργοποίηση",
+    "Go to Settings": "Μετάβαση στις Ρυθμίσεις",
+    "New Recovery Method": "Νέα Μέθοδος Ανάκτησης",
+    "Save your Security Key": "Αποθηκεύστε το κλειδί ασφαλείας σας",
+    "Confirm Security Phrase": "Επιβεβαίωση Φράσης Ασφαλείας",
+    "Set a Security Phrase": "Ορίστε μια Φράση Ασφαλείας",
+    "Upgrade your encryption": "Αναβαθμίστε την κρυπτογράφηση σας",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Θα χρειαστεί να πραγματοποιήσετε έλεγχο ταυτότητας με τον διακομιστή για να επιβεβαιώσετε την αναβάθμιση.",
+    "Restore": "Επαναφορά",
+    "Restore your key backup to upgrade your encryption": "Επαναφέρετε το αντίγραφο ασφαλείας του κλειδιού σας για να αναβαθμίσετε την κρυπτογράφηση",
+    "Enter your account password to confirm the upgrade:": "Εισαγάγετε τον κωδικό πρόσβασης του λογαριασμού σας για να επιβεβαιώσετε την αναβάθμιση:",
+    "Success!": "Επιτυχία!",
+    "Make a copy of your Security Key": "Δημιουργήστε ένα αντίγραφο του Κλειδιού Ασφαλείας σας",
+    "Confirm your Security Phrase": "Επιβεβαιώστε τη Φράση Ασφαλείας σας",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Αντιγράψτε το</b> στον προσωπικό σας χώρο αποθήκευσης στο cloud",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Αποθηκεύστε το</b> σε στικάκι USB ή σκληρό δίσκο",
+    "<b>Print it</b> and store it somewhere safe": "<b>Εκτυπώστε το</b> και αποθηκεύστε το σε ασφαλές μέρος",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Το Κλειδί Ασφαλείας σας βρίσκεται στο φάκελο <b>Λήψεις</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Το κλειδί ασφαλείας σας έχει <b>αντιγραφεί στο πρόχειρο σας</b>, επικολλήστε το στο:",
+    "Your Security Key": "Το Κλειδί Ασφαλείας σας",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Κρατήστε ένα αντίγραφό του σε ασφαλές μέρος, όπως έναν διαχειριστή κωδικών πρόσβασης ή ακόμα και ένα χρηματοκιβώτιο.",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Το Κλειδί Ασφαλείας λειτουργεί ως δίχτυ προστασίας - μπορείτε να το χρησιμοποιήσετε για να επαναφέρετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας εάν ξεχάσετε τη Φράση Ασφαλείας.",
+    "Repeat your Security Phrase...": "Επαναλάβετε τη φράση Ασφαλείας σας...",
+    "Enter your Security Phrase a second time to confirm it.": "Εισαγάγετε τη Φράση Ασφαλείας σας για δεύτερη φορά για να την επιβεβαιώσετε.",
+    "Go back to set it again.": "Επιστρέψτε για να το ρυθμίσετε ξανά.",
+    "That doesn't match.": "Αυτό δεν ταιριάζει.",
+    "Use a different passphrase?": "Να χρησιμοποιηθεί διαφορετική φράση;",
+    "That matches!": "Ταιριάζει!",
+    "Set up with a Security Key": "Ρύθμιση με Κλειδί Ασφαλείας",
+    "Great! This Security Phrase looks strong enough.": "Τέλεια! Αυτή η Φράση Ασφαλείας φαίνεται αρκετά ισχυρή.",
+    "Enter a Security Phrase": "Εισαγάγετε τη Φράση Ασφαλείας",
+    "For maximum security, this should be different from your account password.": "Για μέγιστη ασφάλεια, αυτή θα πρέπει να διαφέρει από τον κωδικό πρόσβασης του λογαριασμού σας.",
+    "User Autocomplete": "Αυτόματη συμπλήρωση Χρήστη",
+    "Space Autocomplete": "Αυτόματη συμπλήρωση Χώρου",
+    "Room Autocomplete": "Αυτόματη συμπλήρωση Δωματίου",
+    "Notification Autocomplete": "Αυτόματη συμπλήρωση Ειδοποίησης",
+    "Clear personal data": "Εκκαθάριση προσωπικών δεδομένων",
+    "You're signed out": "Εχετε αποσυνδεθεί",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Δεν μπορείτε να συνδεθείτε στον λογαριασμό σας. Επικοινωνήστε με τον διαχειριστή του κεντρικού διακομιστή σας για περισσότερες πληροφορίες.",
+    "Sign in and regain access to your account.": "Συνδεθείτε και αποκτήστε ξανά πρόσβαση στον λογαριασμό σας.",
+    "Enter your password to sign in and regain access to your account.": "Εισαγάγετε τον κωδικό πρόσβασης σας για να συνδεθείτε και να αποκτήσετε ξανά πρόσβαση στον λογαριασμό σας.",
+    "Forgotten your password?": "Ξεχάσετε τον κωδικό σας;",
+    "I'll verify later": "Θα επαληθεύσω αργότερα",
+    "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "Χωρίς επαλήθευση, δε θα έχετε πρόσβαση σε όλα τα μηνύματά σας και ενδέχεται να φαίνεστε ως αναξιόπιστος στους άλλους.",
+    "Your new device is now verified. Other users will see it as trusted.": "Η νέα σας συσκευή έχει πλέον επαληθευτεί. Οι άλλοι χρήστες θα τη δουν ως αξιόπιστη.",
+    "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Η νέα σας συσκευή έχει πλέον επαληθευτεί. Έχει πρόσβαση στα κρυπτογραφημένα μηνύματά σας και οι άλλοι χρήστες θα τη δουν ως αξιόπιστη.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Επαληθεύστε την ταυτότητά σας για να αποκτήσετε πρόσβαση σε κρυπτογραφημένα μηνύματα και να αποδείξετε την ταυτότητά σας σε άλλους.",
+    "Verify with another device": "Επαλήθευση με άλλη συσκευή",
+    "Verify with Security Key": "Επαλήθευση με Κλειδί ασφαλείας",
+    "Verify with Security Key or Phrase": "Επαλήθευση με Κλειδί Ασφαλείας ή Φράση Ασφαλείας",
+    "Proceed with reset": "Προχωρήστε με την επαναφορά",
+    "Create account": "Δημιουργία λογαριασμού",
+    "Registration Successful": "Επιτυχής Εγγραφή",
+    "You can now close this window or <a>log in</a> to your new account.": "Μπορείτε τώρα να κλείσετε αυτό το παράθυρο ή να <a>συνδεθείτε</a> στον νέο σας λογαριασμό.",
+    "<a>Log in</a> to your new account.": "<a>Συνδεθείτε</a> στον νέο σας λογαριασμό.",
+    "Continue with previous account": "Συνέχεια με τον προηγούμενο λογαριασμό",
+    "Already have an account? <a>Sign in here</a>": "Έχετε ήδη λογαριασμό; <a>Συνδεθείτε εδώ</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Ή %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Συνέχεια με %(ssoButtons)s",
+    "That e-mail address is already in use.": "Αυτή η διεύθυνση email χρησιμοποιείται ήδη.",
+    "Someone already has that username, please try another.": "Κάποιος έχει ήδη αυτό το όνομα χρήστη, δοκιμάστε ένα άλλο.",
+    "Registration has been disabled on this homeserver.": "Η εγγραφή έχει απενεργοποιηθεί σε αυτόν τον κεντρικό διακομιστή.",
+    "Unable to query for supported registration methods.": "Αδυναμία λήψης των υποστηριζόμενων μεθόδων εγγραφής.",
+    "New? <a>Create account</a>": "Πρώτη φορά εδώ; <a>Δημιουργήστε λογαριασμό</a>",
+    "If you've joined lots of rooms, this might take a while": "Εάν έχετε συμμετάσχει σε πολλά δωμάτια, αυτό μπορεί να διαρκέσει λίγο",
+    "Signing In...": "Σύνδεση...",
+    "Syncing...": "Συγχρονισμός...",
+    "There was a problem communicating with the homeserver, please try again later.": "Παρουσιάστηκε πρόβλημα κατά την επικοινωνία με τον κεντρικό διακομιστή. Παρακαλώ προσπαθήστε ξανά.",
+    "This account has been deactivated.": "Αυτός ο λογαριασμός έχει απενεργοποιηθεί.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Παρακαλούμε να <a>επικοινωνήσετε με τον διαχειριστή της υπηρεσίας σας</a> για να συνεχίσετε να χρησιμοποιείτε την υπηρεσία.",
+    "Set a new password": "Ορίστε νέο κωδικό πρόσβασης",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Έχετε αποσυνδεθεί από όλες τις συνεδρίες και δε θα λαμβάνετε πλέον ειδοποιήσεις push. Για να ενεργοποιήσετε ξανά τις ειδοποιήσεις, συνδεθείτε ξανά σε κάθε συσκευή.",
+    "Your password has been reset.": "Ο κωδικός πρόσβασής σας επαναφέρθηκε.",
+    "Sign in instead": "Εναλλακτικά συνδεθείτε",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Ένα email επαλήθευσης θα σταλεί στα εισερχόμενα σας για να επιβεβαιώσετε τη ρύθμιση του νέου σας κωδικού πρόσβασης.",
+    "The email address doesn't appear to be valid.": "Η διεύθυνση email δε φαίνεται να είναι έγκυρη.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Η αλλαγή του κωδικού πρόσβασης σας θα επαναφέρει τυχόν κλειδιά κρυπτογράφησης από άκρο σε άκρο σε όλες τις συνεδρίες σας, καθιστώντας το κρυπτογραφημένο ιστορικό συνομιλιών μη αναγνώσιμο. Ρυθμίστε τη δημιουργία Αντιγράφων Ασφαλείας Κλειδιού ή εξάγετε τα κλειδιά του δωματίου σας από άλλη συνεδρία πριν επαναφέρετε τον κωδικό πρόσβασης σας.",
+    "Skip verification for now": "Παράβλεψη επαλήθευσης προς το παρόν",
+    "Really reset verification keys?": "Είστε σίγουρος ότι θέλετε να επαναφέρετε τα κλειδιά επαλήθευσης;",
+    "Device verified": "Η συσκευή επαληθεύτηκε",
+    "Verify this device": "Επαληθεύστε αυτήν τη συσκευή",
+    "Unable to verify this device": "Αδυναμία επαλήθευσης αυτής της συσκευής",
+    "Event ID: %(eventId)s": "ID συμβάντος: %(eventId)s",
+    "Original event source": "Αρχική πηγή συμβάντος",
+    "Decrypted event source": "Αποκρυπτογραφημένη πηγή συμβάντος",
+    "Could not load user profile": "Αδυναμία φόρτωσης του προφίλ χρήστη",
+    "User menu": "Μενού χρήστη",
+    "Switch theme": "Αλλαγή θέματος",
+    "Switch to dark mode": "Αλλαγή σε σκοτεινό",
+    "Switch to light mode": "Αλλαγή σε φωτεινό",
+    "Do not disturb": "Μην ενοχλείτε",
+    "New here? <a>Create an account</a>": "Πρώτη φορά εδώ; <a>Δημιουργήστε λογαριασμό</a>",
+    "Got an account? <a>Sign in</a>": "Έχετε λογαριασμό; <a>Συνδεθείτε</a>",
+    "Set a new status": "Ορίστε νέα κατάσταση",
+    "Clear status": "Εκκαθάριση κατάστασης",
+    "Set status": "Ορισμός κατάστασης",
+    "Thread": "Νήμα",
+    "Show all threads": "Εμφάνιση όλων των νημάτων",
+    "Keep discussions organised with threads": "Διατηρήστε τις συζητήσεις οργανωμένες με νήματα",
+    "Show:": "Εμφάνισε:",
+    "Shows all threads you've participated in": "Εμφανίζει όλα τα νήματα στα οποία έχετε συμμετάσχει",
+    "My threads": "Τα νήματα μου",
+    "Shows all threads from current room": "Εμφανίζει όλα τα νήματα από το τρέχον δωμάτιο",
+    "All threads": "Όλα τα νήματα",
+    "We'll create rooms for each of them.": "Θα δημιουργήσουμε δωμάτια για καθένα από αυτά.",
+    "What projects are your team working on?": "Σε ποια έργα εργάζεται η ομάδα σας;",
+    "You can add more later too, including already existing ones.": "Μπορείτε επίσης να προσθέσετε περισσότερα αργότερα, συμπεριλαμβανομένων των ήδη υπαρχόντων.",
+    "Let's create a room for each of them.": "Ας δημιουργήσουμε ένα δωμάτιο για καθένα από αυτά.",
+    "What are some things you want to discuss in %(spaceName)s?": "Ποια είναι μερικά θέματα στα οποία θέλετε να συζητήσετε στο %(spaceName)s;",
+    "Invite by username": "Πρόσκληση με όνομα χρήστη",
+    "Make sure the right people have access. You can invite more later.": "Βεβαιωθείτε ότι τα κατάλληλα άτομα έχουν πρόσβαση. Μπορείτε να προσκαλέσετε περισσότερα αργότερα.",
+    "Invite your teammates": "Προσκαλέστε τους συνεργάτες σας",
+    "Inviting...": "Πρόσκληση...",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Αποτυχία πρόσκλησης των παρακάτω χρηστών στο χώρο σας: %(csvUsers)s",
+    "A private space for you and your teammates": "Ένας ιδιωτικός χώρος για εσάς και τους συνεργάτες σας",
+    "Me and my teammates": "Εγώ και οι συνεργάτες μου",
+    "A private space to organise your rooms": "Ένας ιδιωτικός χώρος για να οργανώσετε τα δωμάτιά σας",
+    "Just me": "Μόνο εγώ",
+    "Make sure the right people have access to %(name)s": "Βεβαιωθείτε ότι τα σωστά άτομα έχουν πρόσβαση στο %(name)s",
+    "Who are you working with?": "Με ποιους συνεργάζεσαι;",
+    "Go to my space": "Μετάβαση στο χώρο μου",
+    "Go to my first room": "Μετάβαση στο πρώτο μου δωμάτιο",
+    "It's just you at the moment, it will be even better with others.": "Είσαι μόνο εσείς προς το παρόν, θα είναι ακόμα καλύτερα με άλλους.",
+    "Search for rooms or spaces": "Αναζήτηση δωματίων ή χώρων",
+    "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Επιλέξτε δωμάτια ή συνομιλίες για προσθήκη. Αυτός είναι απλά ένας χώρος για εσάς, κανείς δε θα ενημερωθεί. Μπορείτε να προσθέσετε περισσότερα αργότερα.",
+    "What do you want to organise?": "Τι θέλετε να οργανώσετε;",
+    "Creating rooms...": "Δημιουργία δωματίων...",
+    "Skip for now": "Παράλειψη προς το παρόν",
+    "Room name": "Όνομα δωματίου",
+    "Support": "Υποστήριξη",
+    "Random": "Τυχαία",
+    "Welcome to <name/>": "Καλώς ήρθατε στο <name/>",
+    "To view %(spaceName)s, you need an invite": "Για να δείτε το %(spaceName)s, χρειάζεστε μια πρόσκληση",
+    "<inviter/> invites you": "<inviter/> σας προσκαλεί",
+    "Private space": "Ιδιωτικός χώρος",
+    "Search names and descriptions": "Αναζήτηση ονομάτων και περιγραφών",
+    "Rooms and spaces": "Δωμάτια και Χώροι",
+    "Results": "Αποτελέσματα",
+    "You may want to try a different search or check for typos.": "Μπορεί να θέλετε να δοκιμάσετε μια διαφορετική αναζήτηση ή να ελέγξετε για ορθογραφικά λάθη.",
+    "Your server does not support showing space hierarchies.": "Ο διακομιστής σας δεν υποστηρίζει την εμφάνιση ιεραρχιών χώρου.",
+    "Review terms and conditions": "Ελέγξτε τους όρους και τις προϋποθέσεις",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Για να συνεχίσετε να χρησιμοποιείτε τον κεντρικό διακομιστή %(homeserverDomain)s πρέπει να διαβάσετε και να συμφωνήσετε με τους όρους και τις προϋποθέσεις μας.",
+    "Terms and Conditions": "Οροι και Προϋποθέσεις",
+    "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "Εάν ξέρετε τι κάνετε, το Element είναι ανοιχτού κώδικα, ανατρέξετε στο GitHub (https://github.com/vector-im/element-web/) και συνεισφέρετε!",
+    "Open dial pad": "Άνοιγμα πληκτρολογίου κλήσης",
+    "Great, that'll help people know it's you": "Τέλεια, αυτό θα βοηθήσει άλλα άτομα να καταλάβουν ότι είστε εσείς",
+    "Unnamed audio": "Ήχος χωρίς όνομα",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Χρησιμοποιήστε email ή τηλέφωνο για να είστε προαιρετικά ανιχνεύσιμος από υπάρχουσες επαφές.",
+    "Use email to optionally be discoverable by existing contacts.": "Χρησιμοποιήστε email για να είστε προαιρετικά ανιχνεύσιμος από υπάρχουσες επαφές.",
+    "Enter phone number (required on this homeserver)": "Εισαγάγετε τον αριθμό τηλεφώνου (απαιτείται σε αυτόν τον κεντρικό διακομιστή)",
+    "Other users can invite you to rooms using your contact details": "Άλλοι χρήστες μπορούν να σας προσκαλέσουν σε δωμάτια χρησιμοποιώντας τα στοιχεία επικοινωνίας σας",
+    "Enter email address (required on this homeserver)": "Εισαγάγετε τη διεύθυνση email (απαιτείται σε αυτόν τον κεντρικό διακομιστή)",
+    "Please review and accept the policies of this homeserver:": "Παρακαλώ διαβάστε και αποδεχτείτε όλες τις πολιτικές αυτού του κεντρικού διακομιστή:",
+    "Please review and accept all of the homeserver's policies": "Παρακαλώ διαβάστε και αποδεχτείτε όλες τις πολιτικές του κεντρικού διακομιστή",
+    "Country Dropdown": "Αναπτυσσόμενο μενού Χώρας",
+    "This homeserver would like to make sure you are not a robot.": "Αυτός ο κεντρικός διακομιστής θα ήθελε να βεβαιωθεί ότι δεν είστε ρομπότ.",
+    "You are sharing your live location": "Μοιράζεστε την τρέχουσα τοποθεσία σας",
+    "Join the beta": "Συμμετοχή στη beta",
+    "Leave the beta": "Αποχώρηση από τη beta",
+    "Beta": "Beta",
+    "This is a beta feature": "Αυτή είναι μια δυνατότητα beta",
+    "Ready": "Έτοιμα",
+    "Failed to load list of rooms.": "Αποτυχία φόρτωσης λίστας δωματίων.",
+    "Mark as suggested": "Επισήμανση ως προτεινόμενο",
+    "Mark as not suggested": "Επισήμανση ως μη προτεινόμενο",
+    "Removing...": "Κατάργηση...",
+    "Failed to remove some rooms. Try again later": "Αποτυχία κατάργησης ορισμένων δωματίων. Δοκιμάστε ξανά αργότερα",
+    "Select a room below first": "Επιλέξτε πρώτα ένα δωμάτιο παρακάτω",
+    "Suggested": "Προτεινόμενα",
+    "This room is suggested as a good one to join": "Αυτό το δωμάτιο προτείνεται ως ένα καλό δωμάτιο για συμμετοχή",
+    "You don't have permission": "Δεν έχετε άδεια",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Έχετε %(count)s μη αναγνωσμένη ειδοποιήση σε προηγούμενη έκδοση αυτού του δωματίου.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Έχετε %(count)s μη αναγνωσμένες ειδοποιήσεις σε προηγούμενη έκδοση αυτού του δωματίου.",
+    "You can select all or individual messages to retry or delete": "Μπορείτε να επιλέξετε όλα ή μεμονωμένα μηνύματα για επανάληψη ή διαγραφή",
+    "Retry all": "Επανάληψη όλων",
+    "Delete all": "Διαγραφή όλων",
+    "Some of your messages have not been sent": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί",
+    "Filter rooms and people": "Φιλτράρετε δωμάτια και άτομα",
+    "Filter": "Φίλτρο",
+    "Find a room… (e.g. %(exampleRoom)s)": "Βρείτε ένα δωμάτιο... (π.χ. %(exampleRoom)s)",
+    "Find a room…": "Βρείτε ένα δωμάτιο…",
+    "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Δοκιμάστε διαφορετικές λέξεις ή ελέγξτε για λάθη. Ορισμένα αποτελέσματα ενδέχεται να μην είναι ορατά καθώς είναι ιδιωτικά και χρειάζεστε μια πρόσκληση για να συμμετάσχετε σε αυτά.",
+    "No results for \"%(query)s\"": "Κανένα αποτέλεσμα για \"%(query)s\"",
+    "View": "Προβολή",
+    "Preview": "Προεπισκόπηση",
+    "The homeserver may be unavailable or overloaded.": "Ο κεντρικός διακομιστής ενδέχεται να είναι μη διαθέσιμος ή υπερφορτωμένος.",
+    "You have no visible notifications.": "Δεν έχετε ορατές ειδοποιήσεις.",
+    "Verification requested": "Ζητήθηκε επαλήθευση",
+    "Search spaces": "Αναζήτηση χώρων",
+    "Updating %(brand)s": "Ενημέρωση %(brand)s",
+    "Unable to upload": "Αδυναμία μεταφόρτωσης",
+    "Suggestions": "Προτάσεις",
+    "Recent Conversations": "Πρόσφατες Συνομιλίες",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Οι ακόλουθοι χρήστες ενδέχεται να μην υπάρχουν ή να μην είναι έγκυροι και δεν μπορούν να προσκληθούν: %(csvNames)s",
+    "Failed to find the following users": "Αποτυχία εύρεσης των παρακάτω χρηστών",
+    "A call can only be transferred to a single user.": "Μια κλήση μπορεί να μεταφερθεί μόνο σε έναν χρήστη.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Δεν ήταν δυνατή η πρόσκληση αυτών των χρηστών. Ελέγξτε τους χρήστες που θέλετε να προσκαλέσετε και δοκιμάστε ξανά.",
+    "Something went wrong trying to invite the users.": "Κάτι πήγε στραβά στην προσπάθεια πρόσκλησης των χρηστών.",
+    "Click the button below to confirm your identity.": "Κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε την ταυτότητά σας.",
+    "Confirm to continue": "Επιβεβαιώστε για να συνεχίσετε",
+    "To continue, use Single Sign On to prove your identity.": "Για να συνεχίσετε, χρησιμοποιήστε σύνδεση Single Sign On για να αποδείξετε την ταυτότητά σας.",
+    "Feedback": "Ανατροφοδότηση",
+    "Include Attachments": "Συμπεριλάβετε Συνημμένα",
+    "Size Limit": "Όριο Μεγέθους",
+    "Format": "Μορφή",
+    "Enter the name of a new server you want to explore.": "Εισαγάγετε το όνομα ενός νέου διακομιστή που θέλετε να εξερευνήσετε.",
+    "Add a new server": "Προσθήκη νέου διακομιστή",
+    "Remove server": "Κατάργηση διακομιστή",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Είστε βέβαιοι ότι θέλετε να αφαιρέσετε το <b>%(serverName)s</b>",
+    "Your server": "Ο διακομιστής σας",
+    "Can't find this server or its room list": "Αδυναμία εύρεσης του διακομιστή ή της λίστας δωματίων του",
+    "You are not allowed to view this server's rooms list": "Δεν επιτρέπεται να δείτε τη λίστα δωματίων αυτού του διακομιστή",
+    "Looks good": "Φαίνεται καλό",
+    "Enter a server name": "Εισαγάγετε ένα όνομα διακομιστή",
+    "Sign in with single sign-on": "Συνδεθείτε με απλή σύνδεση",
+    "Continue with %(provider)s": "Συνεχίστε με %(provider)s",
+    "Join millions for free on the largest public server": "Συμμετέχετε δωρεάν στον μεγαλύτερο δημόσιο διακομιστή",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sάλλαξε το avatar τους %(count)s φορές",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sάλλαξαν το avatar τους",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sάλλαξαν το avatar τους %(count)s φορές",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sάλλαξε το όνομα τους",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sάλλαξε το όνομα τους %(count)s φορές",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sάλλαξαν το όνομα τους",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sάλλαξαν το όνομα τους %(count)s φορές",
+    "was removed %(count)s times|one": "αφαιρέθηκε",
+    "was removed %(count)s times|other": "αφαιρέθηκε %(count)s φορές",
+    "were removed %(count)s times|one": "αφαιρέθηκαν",
+    "were removed %(count)s times|other": "αφαιρέθηκαν %(count)s φορές",
+    "was banned %(count)s times|one": "αποκλείστηκε",
+    "was banned %(count)s times|other": "αποκλείστηκε %(count)s φορές",
+    "were banned %(count)s times|one": "αποκλείστηκαν",
+    "were banned %(count)s times|other": "αποκλείστηκαν %(count)s φορές",
+    "was invited %(count)s times|one": "προσκλήθηκε",
+    "was invited %(count)s times|other": "προσκλήθηκε %(count)s φορές",
+    "were invited %(count)s times|one": "προσκλήθηκαν",
+    "were invited %(count)s times|other": "προσκλήθηκαν %(count)s φορές",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sαπέσυρε την πρόσκληση του",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sαπέσυρε την πρόσκληση του %(count)s φορές",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sαπέσυραν τις προσκλήσεις τους%(count)s φορές",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sέφυγε και επανασυνδέθηκε %(count)s φορές",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sjσυνδέθηκε και έφυγε",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sσυνδέθηκε και έφυγε%(count)s φορές",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sσυνδέθηκαν και έφυγαν",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sσυνδέθηκαν και έφυγαν %(count)s φορές",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sέφυγε",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sέφυγαν %(count)s φορές",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sέφυγαν",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sέφυγαν %(count)s φορές",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sσυνδέθηκαν",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sσυνδέθηκαν %(count)s φορές",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sσυνδέθηκαν",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sσυνδέθηκαν %(count)s φορές",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "Popout widget": "Αναδυόμενη μικροεφαρμογή",
+    "Widget ID": "Ταυτότητα μικροεφαρμογής",
+    "toggle event": "μεταβολή συμβάντος",
+    "Could not connect media": "Δεν ήταν δυνατή η σύνδεση πολυμέσων",
+    "Secure Backup": "Ασφαλές αντίγραφο ασφαλείας",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sάλλαξε %(count)s μηνύματα",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sάλλαξαν ένα μήνυμα",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sάλλαξαν %(count)s μηνύματα",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "Οι %(severalUsers)sάλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "Οι %(severalUsers)s άλλαξαν τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "Ο/η %(oneUser)s άλλαξε τα <a>καρφιτσωμένα μηνύματα</a> για το δωμάτιο %(count)s φορές",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sάλλαξε τα ACLs του διακομιστή",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή %(count)s φορές",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sάλλαξαν τα ACLs του διακομιστή",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sάλλαξε τα ACLs του διακομιστή %(count)s φορές",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sδεν έκανε αλλαγές",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sδεν έκανε αλλαγές %(count)s φορές",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sδεν έκαναν αλλαγές",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sδεν έκαναν αλλαγές %(count)s φορές",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sάλλαξε το avatar τους",
+    "Home is useful for getting an overview of everything.": "Ο Αρχικός χώρος είναι χρήσιμος για να έχετε μια επισκόπηση των πάντων.",
+    "Exporting your data": "Εξαγωγή των δεδομένων σας",
+    "Are you sure you want to stop exporting your data? If you do, you'll need to start over.": "Είστε βέβαιοι ότι θέλετε να διακόψετε την εξαγωγή των δεδομένων σας; Εάν το κάνετε, θα πρέπει να ξεκινήσετε από την αρχή.",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Δεν είναι δυνατή η εύρεση προφίλ για τα αναγνωριστικά Matrix που αναφέρονται παρακάτω - θα θέλατε να τα προσκαλέσετε ούτως ή άλλως;",
+    "Offline encrypted messaging using dehydrated devices": "Κρυπτογραφημένα μηνύματα εκτός σύνδεσης με χρήση αφυδατωμένων συσκευών",
+    "Adding spaces has moved.": "Η προσθήκη χώρων μετακινήθηκε.",
+    "%(networkName)s rooms": "%(networkName)s δωμάτια",
+    "Matrix": "Matrix",
+    "And %(count)s more...|other": "Και %(count)s ακόμα...",
+    "Homeserver": "Κεντρικός διακομιστής",
+    "In reply to <a>this message</a>": "Ως απαντηση σε<a>αυτό το μήνυμα</a>",
+    "<a>In reply to</a> <pill>": "<a>Ως απαντηση σε</a> <pill>",
+    "Power level": "Επίπεδο ισχύος",
+    "%(count)s people you know have already joined|one": "%(count)s άτομο που γνωρίζετε έχει ήδη εγγραφεί",
+    "%(count)s people you know have already joined|other": "%(count)s άτομα που γνωρίζετε έχουν ήδη εγγραφεί",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s μέλη συμπεριλαμβανομένων των %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s μέλη, συμπεριλαμβανομένων εσάς και %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s μέλη συμπεριλαμβανομένου εσάς, %(commaSeparatedMembers)s",
+    "View all %(count)s members|other": "Προβολή όλων των %(count)s μελών",
+    "Including %(commaSeparatedMembers)s": "Συμπεριλαμβανομένου %(commaSeparatedMembers)s",
+    "Including you, %(commaSeparatedMembers)s": "Συμπεριλαμβανομένου σας, %(commaSeparatedMembers)s",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sέστειλε ένα κρυφό μήνυμα",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sέστειλε %(count)s κρυφά μηνύματα",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sέστειλαν ένα κρυφό μήνυμα",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sέστειλαν %(count)s κρυφά μηνύματα",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sαφαίρεσε ένα μήνυμα",
+    "were unbanned %(count)s times|one": "αφαιρέθηκε η απόκλιση σας",
+    "were unbanned %(count)s times|other": "αφαιρέθηκε η απόκλιση σας %(count)s φορές",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Έχετε χρησιμοποιήσει στο παρελθόν μια νεότερη έκδοση του %(brand)s με αυτήν την συνεδρία. Για να χρησιμοποιήσετε ξανά αυτήν την έκδοση με κρυπτογράφηση από άκρο σε άκρο, θα πρέπει να αποσυνδεθείτε και να συνδεθείτε ξανά.",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Για να αποφύγετε να χάσετε το ιστορικό των συνομιλιών σας, πρέπει να εξαγάγετε τα κλειδιά του δωματίου σας πριν αποσυνδεθείτε. Για να το κάνετε αυτό, θα χρειαστεί να επιστρέψετε στη νεότερη έκδοση του %(brand)s",
+    "Add a space to a space you manage.": "Προσθέστε έναν χώρο σε ένα χώρο που διαχειρίζεστε.",
+    "Voice & video room": "Δωμάτιο φωνής & βίντεο",
+    "Text room": "Δωμάτιου κειμένου",
+    "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Μπορείτε να το απενεργοποιήσετε εάν το δωμάτιο θα χρησιμοποιηθεί για συνεργασία με εξωτερικές ομάδες που έχουν τον δικό τους κεντρικό διακομιστή. Αυτό δεν μπορεί να αλλάξει αργότερα.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Μπορείτε να το ενεργοποιήσετε εάν το δωμάτιο θα χρησιμοποιηθεί μόνο για τη συνεργασία με εσωτερικές ομάδες στον κεντρικό σας διακομιστή. Αυτό δεν μπορεί να αλλάξει αργότερα.",
+    "Your server requires encryption to be enabled in private rooms.": "Ο διακομιστής σας απαιτεί την ενεργοποίηση της κρυπτογράφησης σε ιδιωτικά δωμάτια.",
+    "You can't disable this later. Bridges & most bots won't work yet.": "Δεν μπορείτε να το απενεργοποιήσετε αργότερα. Οι γέφυρες και τα περισσότερα ρομπότ δεν μπορούν να λειτουργήσουν ακόμα.",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Η εκκαθάριση όλων των δεδομένων από αυτήν τη συνεδρία είναι μόνιμη. Τα κρυπτογραφημένα μηνύματα θα χαθούν εκτός εάν έχουν δημιουργηθεί αντίγραφα ασφαλείας των κλειδιών τους.",
+    "Unable to load commit detail: %(msg)s": "Δεν είναι δυνατή η φόρτωση των λεπτομερειών δέσμευσης: %(msg)s",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Εάν υπάρχουν πρόσθετες ππληροφορίες που θα βοηθούσαν στην ανάλυση του ζητήματος, όπως τι κάνατε εκείνη τη στιγμή, αναγνωριστικά δωματίων, αναγνωριστικά χρηστών κ.λπ., συμπεριλάβετε τα εδώ.",
+    "GitHub issue": "Ζήτημα GitHub",
+    "%(featureName)s beta feedback": "%(featureName)s σχόλια beta",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Αυτό θα καταστήσει τον λογαριασμό σας μόνιμα εκτός χρήσης. Δεν θα μπορείτε να συνδεθείτε και κανείς δεν θα μπορεί να εγγράφει ξανά με το ίδιο αναγνωριστικό χρήστη. Αυτό θα κάνει τον λογαριασμό σας να εγκαταλείψει όλα τα δωμάτια στα οποία συμμετέχει και θα αφαιρέσει τα στοιχεία του από τον διακομιστή ταυτότητάς σας. <b>Αυτή η ενέργεια είναι μη αναστρέψιμη.</b>",
+    "Use bots, bridges, widgets and sticker packs": "Χρησιμοποιήστε bots, γέφυρες, μικροεφαρμογές και πακέτα αυτοκόλλητων",
+    "Data on this screen is shared with %(widgetDomain)s": "Τα δεδομένα σε αυτήν την οθόνη μοιράζονται με το %(widgetDomain)s",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Η χρήση αυτής της μικροεφαρμογής μπορεί να μοιραστεί δεδομένα <helpIcon /> με το %(widgetDomain)s και τον διαχειριστή πρόσθετων.",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Οι διαχειριστές πρόσθετων λαμβάνουν δεδομένα διαμόρφωσης και μπορούν να τροποποιούν μικροεφαρμογές, να στέλνουν προσκλήσεις για δωμάτια και να ορίζουν δικαιώματα πρόσβασης για λογαριασμό σας.",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Χρησιμοποιήστε έναν διαχειριστή πρόσθετων για να διαχειριστείτε bots, μικροεφαρμογές και πακέτα αυτοκόλλητων.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Χρησιμοποιήστε έναν διαχειριστή πρόσθετων <b>(%(serverName)s)</b> για να διαχειριστείτε bots, μικροεφαρμογές και πακέτα αυτοκόλλητων.",
+    "Other spaces or rooms you might not know": "Άλλοι χώροι ή δωμάτια που ίσως δε γνωρίζετε",
+    "Spaces you know that contain this space": "Χώροι που γνωρίζετε ότι περιέχουν αυτόν το χώρο",
+    "Spaces you know that contain this room": "Χώροι που γνωρίζετε ότι περιέχουν αυτό το δωμάτιο",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Αποφασίστε ποιοι χώροι μπορούν να έχουν πρόσβαση σε αυτό το δωμάτιο. Εάν επιλεγεί ένας χώρος, τα μέλη του μπορούν να βρουν και να εγγραφούν στο <RoomName/>.",
+    "Dial pad": "Πληκτρολόγιο κλήσης",
+    "Transfer": "Μεταφορά",
+    "Abort": "Ακύρωση",
+    "Sent": "Απεσταλμένα",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "ΣΥΜΒΟΥΛΗ: Εάν αναφέρετε ένα σφάλμα, υποβάλετε <debugLogsLink>αρχεία καταγραφής εντοπισμού σφαλμάτων</debugLogsLink> για να μας βοηθήσετε να εντοπίσουμε το πρόβλημα.",
+    "Verification explorer": "Εξερευνητής επαλήθευσης",
+    "Mod": "Συντονιστής",
+    "Clear room list filter field": "Εκκαθάριση πεδίου φίλτρου λίστας δωματίων",
+    "Jump to oldest unread message": "Μετάβαση στο παλαιότερο μη αναγνωσμένο μήνυμα",
+    "Jump to end of the composer": "Μετάβαση στο τέλους του επεξεργαστή κειμένου",
+    "Jump to start of the composer": "Μετάβαση στην αρχή του επεξεργαστή κειμένου",
+    "Toggle Link": "Σύνδεσμος",
+    "Toggle Code Block": "Μπλοκ Κώδικα",
+    "Toggle Italics": "Πλάγια Γραφή",
+    "Toggle Bold": "Έντονη Γραφή",
+    "[number]": "[αριθμός]",
+    "End": "End",
+    "Enter": "Enter",
+    "Page Down": "Page Down",
+    "Page Up": "Page Up",
+    "Alt": "Alt",
+    "Shift": "Shift",
+    "Ctrl": "Ctrl",
+    "Space used:": "Χώρος που χρησιμοποιείται:",
+    "Not currently indexing messages for any room.": "Αυτήν τη στιγμή δεν υπάρχει ευρετηρίαση μηνυμάτων για κανένα δωμάτιο.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Εάν απενεργοποιηθεί, τα μηνύματα από κρυπτογραφημένα δωμάτια δε θα εμφανίζονται στα αποτελέσματα αναζήτησης.",
+    "Recovery Method Removed": "Η Μέθοδος Ανάκτησης Καταργήθηκε",
+    "This session is encrypting history using the new recovery method.": "Αυτή η συνεδρία κρυπτογραφεί το ιστορικό χρησιμοποιώντας τη νέα μέθοδο ανάκτησης.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Χωρίς τη ρύθμιση της Ασφαλούς Ανάκτησης Μηνυμάτων, δε θα μπορείτε να επαναφέρετε το ιστορικό κρυπτογραφημένων μηνυμάτων εάν αποσυνδεθείτε ή χρησιμοποιήσετε άλλη συνεδρία.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας (το πρώτο αντίγραφο ασφαλείας μπορεί να διαρκέσει μερικά λεπτά).",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Θα αποθηκεύσουμε ένα κρυπτογραφημένο αντίγραφο των κλειδιών σας στον διακομιστή μας. Κρατήστε ένα εφεδρικό αντίγραφο με μια Φράση Ασφαλείας.",
+    "Emoji Autocomplete": "Αυτόματη συμπλήρωση Emoji",
+    "Command Autocomplete": "Αυτόματη συμπλήρωση εντολών",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Προειδοποίηση: Τα προσωπικά σας δεδομένα (συμπεριλαμβανομένων των κλειδιών κρυπτογράφησης) εξακολουθούν να αποθηκεύονται σε αυτήν τη συνεδρία. Διαγράψτε τα εάν ολοκληρώσατε αυτή τη συνεδρία ή εάν θέλετε να συνδεθείτε σε άλλο λογαριασμό.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "Αποκτήστε ξανά πρόσβαση στον λογαριασμό σας και ανακτήστε τα κλειδιά κρυπτογράφησης που είναι αποθηκευμένα σε αυτήν τη συνεδρία. Χωρίς αυτά, δε θα μπορείτε να διαβάσετε όλα τα ασφαλή μηνύματά σας σε καμία συνεδρία.",
+    "Failed to re-authenticate": "Απέτυχε ο εκ νέου έλεγχος ταυτότητας",
+    "Please only proceed if you're sure you've lost all of your other devices and your security key.": "Συνεχίστε μόνο εάν είστε βέβαιοι ότι έχετε χάσει όλες τις άλλες συσκευές σας και το κλειδί ασφαλείας σας.",
+    "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.": "Δεν είναι δυνατή η αναίρεση της επαναφοράς των κλειδιών επαλήθευσης. Μετά την επαναφορά, δε θα έχετε πρόσβαση σε παλιά κρυπτογραφημένα μηνύματα και όλοι οι φίλοι που σας έχουν προηγουμένως επαληθεύσει θα βλέπουν προειδοποιήσεις ασφαλείας μέχρι να επαληθεύσετε ξανά μαζί τους.",
+    "It looks like you don't have a Security 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.": "Φαίνεται ότι δε διαθέτετε Κλειδί Ασφαλείας ή άλλες συσκευές με τις οποίες μπορείτε να επαληθεύσετε. Αυτή η συσκευή δε θα έχει πρόσβαση σε παλιά κρυπτογραφημένα μηνύματα. Για να επαληθεύσετε την ταυτότητά σας σε αυτήν τη συσκευή, θα πρέπει να επαναφέρετε τα κλειδιά επαλήθευσης.",
+    "Decide where your account is hosted": "Αποφασίστε πού θα φιλοξενείται ο λογαριασμός σας",
+    "Host account on": "Φιλοξενία λογαριασμού στο",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Ο νέος λογαριασμός σας (%(newAccountId)s) έχει εγγραφεί, αλλά έχετε ήδη συνδεθεί με διαφορετικό λογαριασμό (%(loggedInUserId)s).",
+    "General failure": "Γενική αποτυχία",
+    "Failed to create initial space rooms": "Αποτυχία δημιουργίας των αρχικών δωματίων του χώρου",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Δεν μπορείτε να στείλετε μηνύματα μέχρι να ελέγξετε και να συμφωνήσετε με τους <consentLink>όρους και τις προϋποθέσεις μας</consentLink>.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Εάν δεν μπορείτε να βρείτε το δωμάτιο που ψάχνετε, ζητήστε μια πρόσκληση ή <a>δημιουργήστε ένα νέο δωμάτιο</a>.",
+    "delete the address.": "διαγράψτε τη διεύθυνση.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Διαγραφή της διεύθυνσης δωματίου %(alias)s και κατάργηση του %(name)s από τον κατάλογο;",
+    "%(brand)s failed to get the public room list.": "Ο %(brand)s απέτυχε να λάβει τη λίστα δημόσιων δωματίων.",
+    "%(creator)s created and configured the room.": "Ο/η %(creator)s δημιούργησε και διαμόρφωσε το δωμάτιο.",
+    "%(creator)s created this DM.": "Ο/η %(creator)s δημιούργησε αυτό το απευθείας μήνυμα.",
+    "Stop sharing": "Διακοπή κοινής χρήσης",
+    "%(timeRemaining)s left": "%(timeRemaining)s απομένουν",
+    "Failed to start livestream": "Η έναρξη της ζωντανής ροής απέτυχε",
+    "Manage & explore rooms": "Διαχειριστείτε και εξερευνήστε δωμάτια",
+    "Mentions only": "Αναφορές μόνο",
+    "Methods": "Μέθοδοι",
+    "Phase": "Φάση",
+    "Transaction": "Συναλλαγή",
+    "Cancelled": "Ακυρώθηκαν",
+    "Started": "Ξεκίνησαν",
+    "Unsent": "Μη απεσταλμένα",
+    "Value in this room": "Τιμή σε αυτό το δωμάτιο",
+    "Value": "Τιμή",
+    "Value in this room:": "Τιμή σε αυτό το δωμάτιο:",
+    "Value:": "Τιμή:",
+    "Level": "Επίπεδο",
+    "Setting definition:": "Ορισμός ρύθμισης:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Αυτό το UI ΔΕΝ ελέγχει τους τύπους των τιμών. Χρησιμοποιήστε το με δική σας ευθύνη.",
+    "Caution:": "Προσοχή:",
+    "Setting:": "Ρύθμιση:",
+    "Save setting values": "Αποθήκευση τιμών ρύθμισης",
+    "Failed to save settings.": "Αποτυχία αποθήκευσης ρυθμίσεων.",
+    "Number of users": "Αριθμός χρηστών",
+    "Server": "Διακομιστής",
+    "Failed to load.": "Αποτυχία φόρτωσης.",
+    "Capabilities": "Δυνατότητες",
+    "<%(count)s spaces>|one": "<χώρος>",
+    "<%(count)s spaces>|other": "<%(count)s χώροι>",
+    "No results found": "Δε βρέθηκαν αποτελέσματα",
+    "Filter results": "Φιλτράρισμα αποτελεσμάτων",
+    "Doesn't look like valid JSON.": "Δε μοιάζει με έγκυρο JSON.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Για να μας βοηθήσετε να το αποτρέψουμε αυτό στο μέλλον, <a>στείλτε μας τα αρχεία καταγραφής</a>.",
+    "Results not as expected? Please <a>give feedback</a>.": "Τα αποτελέσματα δεν είναι τα αναμενόμενα; Παρακαλώ <a>δώστε σχόλια</a>.",
+    "To search messages, look for this icon at the top of a room <icon/>": "Για να αναζητήσετε μηνύματα, βρείτε αυτό το εικονίδιο στην κορυφή ενός δωματίου <icon/>",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Η εκκαθάριση του αποθηκευτικού χώρου του προγράμματος περιήγησής σας μπορεί να διορθώσει το πρόβλημα, αλλά θα αποσυνδεθείτε και θα κάνει τυχόν κρυπτογραφημένο ιστορικό συνομιλιών να μην είναι αναγνώσιμο.",
+    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Εάν το κάνετε, σημειώστε ότι κανένα από τα μηνύματά σας δε θα διαγραφεί, αλλά η εμπειρία αναζήτησης ενδέχεται να υποβαθμιστεί για λίγα λεπτά κατά τη δημιουργία του ευρετηρίου",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Χρησιμοποιήστε τον Matrix διακομιστή που προτιμάτε εάν έχετε, ή φιλοξενήστε τον δικό σας.",
+    "We call the places where you can host your account 'homeservers'.": "Ονομάζουμε τα μέρη όπου μπορείτε να φιλοξενήσετε τον λογαριασμό σας 'κεντρικούς διακομιστές'.",
+    "Recent changes that have not yet been received": "Πρόσφατες αλλαγές που δεν έχουν ληφθεί ακόμη",
+    "The server is not configured to indicate what the problem is (CORS).": "Ο διακομιστής δεν έχει ρυθμιστεί για να υποδεικνύει ποιο είναι το πρόβλημα (CORS).",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Αυτό συνήθως επηρεάζει μόνο τον τρόπο επεξεργασίας του δωματίου στον διακομιστή. Εάν αντιμετωπίζετε προβλήματα με το %(brand)s σας, <a>αναφέρετε ένα σφάλμα</a>.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Αυτό συνήθως επηρεάζει μόνο τον τρόπο επεξεργασίας του δωματίου στον διακομιστή. Εάν αντιμετωπίζετε προβλήματα με το %(brand)s σας, αναφέρετε ένα σφάλμα.",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Η αναβάθμιση αυτού του δωματίου απαιτεί τη διαγραφή του και τη δημιουργία ενός νέου δωματίου στη θέση του. Για να προσφέρουμε στα μέλη του την καλύτερη δυνατή εμπειρία, θα:",
+    "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.": "Η αναφορά αυτού του μηνύματος θα στείλει το μοναδικό «αναγνωριστικό συμβάντος» στον διαχειριστή του διακομιστή σας. Εάν τα μηνύματα σε αυτό το δωμάτιο είναι κρυπτογραφημένα, ο διαχειριστής του διακομιστή σας δε θα μπορεί να διαβάσει το κείμενο του μηνύματος ή να προβάλει αρχεία και εικόνες.",
+    "Please pick a nature and describe what makes this message abusive.": "Παρακαλώ επιλέξτε το είδος και περιγράψτε τι κάνει αυτό το μήνυμα καταχρηστικό.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Οποιοσδήποτε άλλος λόγος. Παρακαλώ περιγράψτε το πρόβλημα.\nΑυτό θα αναφερθεί στους συντονιστές του δωματίου.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Αυτός ο χρήστης στέλνει ανεπιθύμητα μηνύματα στην αίθουσα με διαφημίσεις, συνδέσμους προς διαφημίσεις ή προπαγάνδα.\nΑυτό θα αναφερθεί στους συντονιστές του δωματίου.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Αυτός ο χρήστης εμφανίζει παράνομη συμπεριφορά, για παράδειγμα, διαρρέει απόρρητες πληροφορίες ατόμων ή απειλεί με βία.\nΑυτό θα αναφερθεί στους συντονιστές του δωματίου, οι οποίοι ενδέχεται να το αναφέρουν στις αρμόδιες αρχές.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Αυτός ο χρήστης επιδεικνύει τοξική συμπεριφορά, για παράδειγμα προσβάλλοντας άλλους χρήστες ή μοιράζοντας περιεχόμενο μόνο για ενήλικες σε δωμάτιο κατάλληλο για οικογένειες ή παραβιάζοντας με άλλον τρόπο τους κανόνες αυτού του δωματίου.\nΑυτό θα αναφερθεί στους συντονιστές του δωματίου.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Αυτό που γράφει αυτός ο χρήστης είναι λάθος.\nΑυτό θα αναφερθεί στους συντονιστές του δωματίου.",
+    "Please fill why you're reporting.": "Παρακαλώ πείτε μας γιατί κάνετε αναφορά.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Μια προειδοποίηση, αν δεν προσθέσετε ένα email και ξεχάσετε τον κωδικό πρόσβασης, ενδέχεται να <b>χάσετε οριστικά την πρόσβαση στον λογαριασμό σας</b>.",
+    "Incompatible local cache": "Μη συμβατή τοπική κρυφή μνήμη",
+    "%(brand)s encountered an error during upload of:": "Το %(brand)s αντιμετώπισε ένα σφάλμα κατά τη μεταφόρτωση του:",
+    "User Directory": "Κατάλογος Χρηστών",
+    "Consult first": "Συμβουλευτείτε πρώτα",
+    "Invited people will be able to read old messages.": "Οι προσκεκλημένοι θα μπορούν να διαβάζουν παλιά μηνύματα.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Προσκαλέστε κάποιον χρησιμοποιώντας το όνομά του, το όνομα χρήστη (όπως <userId/>) ή <a>κοινή χρήση αυτού του δωματίου</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Προσκαλέστε κάποιον χρησιμοποιώντας το όνομά του, τη διεύθυνση ηλεκτρονικού ταχυδρομείου, το όνομα χρήστη (όπως <userId/>) ή <a>κοινή χρήση αυτού του δωματίου</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Προσκαλέστε κάποιον χρησιμοποιώντας το όνομά του, το όνομα χρήστη (όπως <userId/>) ή <a>κοινή χρήση αυτού του χώρου</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Προσκαλέστε κάποιον χρησιμοποιώντας το όνομά του, τη διεύθυνση ηλεκτρονικού ταχυδρομείου, το όνομα χρήστη (όπως <userId/>) ή <a>κοινή χρήση αυτού του χώρου</a>.",
+    "Invite to %(roomName)s": "Πρόσκληση στο %(roomName)s",
+    "Unnamed Space": "Χώρος χωρίς όνομα",
+    "Or send invite link": "Ή στείλτε σύνδεσμο πρόσκλησης",
+    "If you can't see who you're looking for, send them your invite link below.": "Εάν δεν μπορείτε να βρείτε αυτόν που ψάχνετε, στείλτε τους τον παρακάτω σύνδεσμο πρόσκλησης.",
+    "Some suggestions may be hidden for privacy.": "Ορισμένες προτάσεις ενδέχεται να είναι κρυφές λόγω απορρήτου.",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Ξεκινήστε μια συνομιλία με κάποιον χρησιμοποιώντας το όνομά του ή το όνομα χρήστη (όπως <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Ξεκινήστε μια συνομιλία με κάποιον χρησιμοποιώντας το όνομα, τη διεύθυνση email ή το όνομα χρήστη του (όπως <userId/>).",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Χρησιμοποιήστε έναν διακομιστή ταυτότητας για πρόσκληση μέσω email. Διαχείριση στις <settings>Ρυθμίσεις</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Χρησιμοποιήστε έναν διακομιστή ταυτότητας για πρόσκληση μέσω email. <default> Χρησιμοποιήστε τον προεπιλεγμένο (%(defaultIdentityServerName)s)</default> ή διαμορφώστε στις <settings>Ρυθμίσεις</settings>.",
+    "Recently Direct Messaged": "Πρόσφατα Απευθείας Μηνύματα",
+    "Invite by email": "Πρόσκληση μέσω email",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Το %(brand)s σας δε σας επιτρέπει να χρησιμοποιήσετε έναν διαχειριστή πρόσθετων για να το κάνετε αυτό. Επικοινωνήστε με έναν διαχειριστή.",
+    "Integrations not allowed": "Δεν επιτρέπονται πρόσθετα",
+    "Enable 'Manage Integrations' in Settings to do this.": "Ενεργοποιήστε τη 'Διαχείριση πρόσθετων' στις Ρυθμίσεις για να το κάνετε αυτό.",
+    "Integrations are disabled": "Τα πρόσθετα έχουν απενεργοποιηθεί",
+    "Incoming Verification Request": "Εισερχόμενο Αίτημα Επαλήθευσης",
+    "Waiting for partner to confirm...": "Αναμονή για επιβεβαίωση του συνεργάτη...",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Η επαλήθευση αυτής της συσκευής θα την επισημάνει ως αξιόπιστη και οι χρήστες που έχουν επαληθευτεί μαζί σας θα εμπιστεύονται αυτήν τη συσκευή.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Επαληθεύστε αυτήν τη συσκευή για να την επισημάνετε ως αξιόπιστη. Η εμπιστοσύνη αυτής της συσκευής προσφέρει σε εσάς και σε άλλους χρήστες επιπλέον ηρεμία όταν χρησιμοποιείτε μηνύματα με κρυπτογράφηση από άκρο σε άκρο.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Η επαλήθευση αυτού του χρήστη θα επισημάνει τη συνεδρία του ως αξιόπιστη και θα επισημάνει επίσης τη συνεδρία σας ως αξιόπιστη σε αυτόν.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Επαληθεύστε αυτόν τον χρήστη για να τον επισημάνετε ως αξιόπιστο. Η εμπιστοσύνη των χρηστών σάς προσφέρει επιπλέον ηρεμία όταν χρησιμοποιείτε μηνύματα με κρυπτογράφηση από άκρο σε άκρο.",
+    "Upgrade to %(hostSignupBrand)s": "Αναβάθμιση σε %(hostSignupBrand)s",
+    "Minimise dialog": "Ελαχιστοποίηση διαλόγου",
+    "Maximise dialog": "Μεγιστοποίηση διαλόγου",
+    "You should know": "Θα πρέπει να γνωρίζετε",
+    "Terms of Service": "Όροι Χρήσης",
+    "Privacy Policy": "Πολιτική Απορρήτου",
+    "Cookie Policy": "Πολιτική Cookie",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Μάθετε περισσότερα στα <privacyPolicyLink />,<termsOfServiceLink /> και <cookiePolicyLink />.",
+    "You may contact me if you have any follow up questions": "Μπορείτε να επικοινωνήσετε μαζί μου εάν έχετε περαιτέρω ερωτήσεις",
+    "Feedback sent! Thanks, we appreciate it!": "Τα σχόλια ανατροφοδότησης στάλθηκαν! Ευχαριστούμε, το εκτιμούμε!",
+    "Search for rooms or people": "Αναζήτηση δωματίων ή ατόμων",
+    "Comment": "Σχόλιο",
+    "The poll has ended. Top answer: %(topAnswer)s": "Η δημοσκόπηση έληξε. Κορυφαία απάντηση: %(topAnswer)s",
+    "The poll has ended. No votes were cast.": "Η δημοσκόπηση έληξε. Δεν υπάρχουν ψήφοι.",
+    "Settings explorer": "Εξερεύνηση ρυθμίσεων",
+    "Explore account data": "Εξερεύνηση δεδομένων λογαριασμού",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Παρακαλώ διαγράψτε όλα τα μηνύματα που έχω στείλει όταν απενεργοποιηθεί ο λογαριασμός μου (<b>Προειδοποίηση:</b> αυτό θα κάνει τους μελλοντικούς χρήστες να βλέπουν μια ελλιπή προβολή συνομιλιών)",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Η ορατότητα των μηνυμάτων στο Matrix είναι παρόμοια με το email. Η διαγραφή των μηνυμάτων σας σημαίνει ότι τα μηνύματα που έχετε στείλει δε θα κοινοποιούνται σε νέους ή μη εγγεγραμμένους χρήστες, αλλά οι εγγεγραμμένοι χρήστες που έχουν ήδη πρόσβαση σε αυτά θα εξακολουθούν να έχουν πρόσβαση στο αντίγραφό τους.",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Η απενεργοποίηση του λογαριασμού σας <b>δεν προκαλεί από προεπιλογή τη διαγραφή των μηνυματων που έχετε στείλει.</b> Εάν θέλετε να διαγράψουμε τα μηνύματά σας, επιλέξτε το παρακάτω πλαίσιο.",
+    "Failed to connect to integration manager": "Αποτυχία σύνδεσης με τον διαχειριστή πρόσθετων",
+    "Invalid theme schema.": "Μη έγκυρο σχήμα θέματος.",
+    "Manage integrations": "Διαχείριση πρόσθετων",
+    "Integration manager": "Διαχειριστής πρόσθετων",
+    "Cannot connect to integration manager": "Δεν είναι δυνατή η σύνδεση με τον διαχειριστή πρόσθετων",
+    "Connecting to integration manager...": "Σύνδεση με τον διαχειριστή πρόσθετων...",
+    "Failed to re-authenticate due to a homeserver problem": "Απέτυχε ο εκ νέου έλεγχος ταυτότητας λόγω προβλήματος με τον κεντρικό διακομιστή",
+    "Failed to perform homeserver discovery": "Αποτυχία εκτέλεσης εντοπισμού του κεντρικού διακομιστή",
+    "This homeserver does not support login using email address.": "Αυτός ο κεντρικός διακομιστής δεν υποστηρίζει σύνδεση με χρήση διεύθυνσης email.",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Η διεύθυνση URL του κεντρικού διακομιστή δε φαίνεται να αντιστοιχεί σε έγκυρο διακομιστή Matrix",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Το μήνυμά σας δεν στάλθηκε επειδή αυτός ο κεντρικός διακομιστής έχει υπερβεί ένα όριο πόρων. Παρακαλώ <a>επικοινωνήστε με τον διαχειριστή</a> για να συνεχίσετε να χρησιμοποιείτε την υπηρεσία.",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Το μήνυμά σας δεν στάλθηκε επειδή αυτός ο κεντρικός διακομιστής έχει αποκλειστεί από τον διαχειριστή του. Παρακαλώ <a>επικοινωνήστε με τον διαχειριστή</a> για να συνεχίσετε να χρησιμοποιείτε την υπηρεσία.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Το μήνυμά σας δε στάλθηκε επειδή αυτός ο κεντρικός διακομιστής έχει φτάσει το μηνιαίο όριο ενεργού χρήστη. Παρακαλώ <a>επικοινωνήστε με τον διαχειριστή</a> για να συνεχίσετε να χρησιμοποιείτε την υπηρεσία.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Το %(brand)s απέτυχε να λάβει τη λίστα πρωτοκόλλων από τον κεντρικό διακομιστή. Ο διακομιστής μπορεί να είναι πολύ παλιός για να υποστηρίζει δίκτυα τρίτων.",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Λείπει το δημόσιο κλειδί captcha από τη διαμόρφωση του κεντρικού διακομιστή. Αναφέρετε αυτό στον διαχειριστή του.",
+    "About homeservers": "Σχετικά με τους κεντρικούς διακομιστές",
+    "Other homeserver": "Άλλος κεντρικός διακομιστής",
+    "Unable to validate homeserver": "Δεν είναι δυνατή η επικύρωση του κεντρικού διακομιστή",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Αυτό το δωμάτιο είναι αφιερωμένο σε παράνομο ή τοξικό περιεχόμενο ή οι συντονιστές αποτυγχάνουν να μετριάσουν το παράνομο ή τοξικό περιεχόμενο.\nΑυτό θα αναφερθεί στους διαχειριστές του %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Αυτό το δωμάτιο είναι αφιερωμένο σε παράνομο ή τοξικό περιεχόμενο ή οι συντονιστές αποτυγχάνουν να μετριάσουν το παράνομο ή τοξικό περιεχόμενο.\nΑυτό θα αναφερθεί στους διαχειριστές του %(homeserver)s. Οι διαχειριστές ΔΕ θα μπορούν να διαβάσουν το κρυπτογραφημένο περιεχόμενο αυτού του δωματίου.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Αποτυχία σύνδεσης με τον κεντρικό διακομιστή σας. Κλείστε αυτό το παράθυρο διαλόγου και δοκιμάστε ξανά.",
+    "The integration manager is offline or it cannot reach your homeserver.": "Ο διαχειριστής πρόσθετων είναι εκτός σύνδεσης ή δεν μπορεί να επικοινωνήσει με κεντρικό διακομιστή σας.",
+    "There was an error finding this widget.": "Παρουσιάστηκε σφάλμα κατά την εύρεση αυτής της μικροεφαρμογής.",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Η μικροεφαρμογή θα επαληθεύσει το αναγνωριστικό χρήστη σας, αλλά δε θα μπορεί να εκτελέσει ενέργειες για εσάς:",
+    "Allow this widget to verify your identity": "Επιτρέψτε σε αυτήν τη μικροεφαρμογή να επαληθεύσει την ταυτότητά σας",
+    "Remember my selection for this widget": "Να θυμάστε την επιλογή μου για αυτήν τη μικροεφαρμογή",
+    "This widget would like to:": "Αυτή η μικροεφαρμογή θα ήθελε να:",
+    "Approve widget permissions": "Έγκριση αδειών μικροεφαρμογών",
+    "You're removing all spaces. Access will default to invite only": "Καταργείτε όλους τους χώρους. Η πρόσβαση θα είναι προεπιλεγμένη μόνο για πρόσκληση",
+    "Start using Key Backup": "Ξεκινήστε να χρησιμοποιείτε το αντίγραφο ασφαλείας κλειδιού",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Το %(brand)s χρησιμοποιεί πλέον 3-5 φορές λιγότερη μνήμη, φορτώνοντας πληροφορίες για άλλους χρήστες μόνο όταν χρειάζεται. Περιμένετε όσο γίνεται εκ νέου συγχρονισμός με τον διακομιστή!",
+    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Εάν η άλλη έκδοση του %(brand)s εξακολουθεί να είναι ανοιχτή σε άλλη καρτέλα, κλείστε την, καθώς η χρήση του %(brand)s στον ίδιο κεντρικό υπολογιστή με ενεργοποιημένη και απενεργοποιημένη την αργή φόρτωση ταυτόχρονα , θα προκαλέσει προβλήματα.",
+    "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Έχετε χρησιμοποιήσει στο παρελθόν %(brand)s στον %(host)s με ενεργοποιημένη την αργή φόρτωση μελών. Σε αυτήν την έκδοση η αργή φόρτωση είναι απενεργοποιημένη. Η τοπική κρυφή μνήμη δεν είναι συμβατή μεταξύ αυτών των δύο ρυθμίσεων και έτσι το %(brand)s πρέπει να συγχρονίσει ξανά τον λογαριασμό σας.",
+    "a key signature": "μια υπογραφή κλειδιού",
+    "a device cross-signing signature": "μια υπογραφή διασταυρούμενης υπογραφής συσκευής",
+    "a new cross-signing key signature": "μια νέα υπογραφή κλειδιού διασταυρούμενης υπογραφής",
+    "a new master key signature": "μια νέα υπογραφή κύριου κλειδιού",
+    "We couldn't create your DM.": "Δεν μπορέσαμε να δημιουργήσουμε το DM σας.",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Εγκατάσταση",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Η συνέχιση επιτρέπει προσωρινά στη %(hostSignupBrand)s διαδικασία εγκατάστασης πρόσβαση στον λογαριασμό σας για ανάκτηση επαληθευμένων διευθύνσεων ηλεκτρονικού ταχυδρομείου. Αυτά τα δεδομένα δεν αποθηκεύονται.",
+    "Send custom timeline event": "Αποστολή προσαρμοσμένου συμβάντος χρονολογίου",
+    "was unbanned %(count)s times|one": "αφαιρέθηκε η απόκλιση του",
+    "was unbanned %(count)s times|other": "αφαιρέθηκε η απόκλιση του %(count)s φορές",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Το %(errcode)s επιστράφηκε κατά την προσπάθεια πρόσβασης στο δωμάτιο ή στο χώρο. Εάν πιστεύετε ότι βλέπετε αυτό το μήνυμα κατά λάθος, <issueLink>υποβάλετε μια αναφορά σφάλματος</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Δοκιμάστε ξανά αργότερα ή ζητήστε από έναν διαχειριστή δωματίου ή χώρου να ελέγξει εάν έχετε πρόσβαση.",
+    "This room or space is not accessible at this time.": "Αυτό το δωμάτιο ή ο χώρος δεν είναι προσβάσιμος αυτήν τη στιγμή.",
+    "Are you sure you're at the right place?": "Είστε σίγουροι ότι βρίσκεστε στο σωστό μέρος;",
+    "This room or space does not exist.": "Αυτό το δωμάτιο ή ο χώρος δεν υπάρχει.",
+    "There's no preview, would you like to join?": "Δεν υπάρχει προεπισκόπηση, θα θέλατε να εγγραφείτε;",
+    "This invite was sent to %(email)s": "Αυτή η πρόσκληση στάλθηκε στο %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Αυτή η πρόσκληση στάλθηκε στο %(email)s που δεν σχετίζεται με τον λογαριασμό σας",
+    "You can still join here.": "Μπορείτε ακόμα να εγγραφείτε εδώ.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Επιστράφηκε ένα σφάλμα (%(errcode)s) κατά την προσπάθεια επικύρωσης της πρόσκλησής σας. Θα μπορούσατε να διαβιβάστε αυτή την πληροφορία στο άτομο που σας προσκάλεσε.",
+    "Something went wrong with your invite.": "Κάτι πήγε στραβά με την πρόσκλησή σας.",
+    "You were banned by %(memberName)s": "Αποκλειστήκατε από %(memberName)s",
+    "Forget this space": "Ξεχάστε αυτόν τον χώρο",
+    "You were removed by %(memberName)s": "Αφαιρεθήκατε από %(memberName)s",
+    "Loading preview": "Φόρτωση προεπισκόπησης",
+    "Joining …": "Συμμετοχή…",
+    "View older version of %(spaceName)s.": "Προβολή παλαιότερης έκδοσης του %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Αναβαθμίστε αυτόν τον χώρο στην προτεινόμενη έκδοση δωματίου",
+    "Set up": "Εγκατάσταση",
+    "Failed to join": "Αποτυχία συμμετοχής",
+    "The person who invited you has already left, or their server is offline.": "Το άτομο που σας προσκάλεσε έχει ήδη αποχωρήσει ή ο διακομιστής του είναι εκτός σύνδεσης.",
+    "The person who invited you has already left.": "Το άτομο που σας προσκάλεσε έχει ήδη φύγει.",
+    "Sorry, your homeserver is too old to participate here.": "Λυπούμαστε, ο κεντρικός σας διακομιστής είναι πολύ παλιός για να συμμετέχει εδώ.",
+    "There was an error joining.": "Παρουσιάστηκε σφάλμα κατά τη σύνδεση.",
+    "The user's homeserver does not support the version of the space.": "Ο κεντρικός διακομιστής του χρήστη δεν υποστηρίζει την έκδοση του χώρου.",
+    "User may or may not exist": "Ο χρήστης μπορεί να υπάρχει ή να μην υπάρχει",
+    "User does not exist": "Ο χρήστης δεν υπάρχει",
+    "User is already in the room": "Ο χρήστης βρίσκεται ήδη στο δωμάτιο",
+    "User is already in the space": "Ο χρήστης έχει ήδη προσκληθεί στο χώρο",
+    "User is already invited to the room": "Ο χρήστης έχει ήδη προσκληθεί στο δωμάτιο",
+    "User is already invited to the space": "Ο χρήστης έχει ήδη προσκληθεί στο χώρο",
+    "You do not have permission to invite people to this space.": "Δεν έχετε άδεια να προσκαλέσετε άτομα σε αυτόν τον χώρο.",
+    "Failed to invite users to %(roomName)s": "Αποτυχία πρόσκλησης χρηστών στο %(roomName)s",
+    "Joined": "Συνδέθηκε",
+    "Joining": "Συνδέετε",
+    "You're all caught up": "Είστε πλήρως ενημερωμένοι",
+    "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Έχουν εντοπιστεί δεδομένα από μια παλαιότερη έκδοση του %(brand)s. Αυτό θα έχει προκαλέσει δυσλειτουργία της κρυπτογράφησης από άκρο σε άκρο στην παλαιότερη έκδοση. Τα κρυπτογραφημένα μηνύματα από άκρο σε άκρο που ανταλλάχθηκαν πρόσφατα κατά τη χρήση της παλαιότερης έκδοσης ενδέχεται να μην μπορούν να αποκρυπτογραφηθούν σε αυτήν την έκδοση. Αυτό μπορεί επίσης να προκαλέσει την αποτυχία των μηνυμάτων που ανταλλάσσονται με αυτήν την έκδοση. Εάν αντιμετωπίζετε προβλήματα, αποσυνδεθείτε και συνδεθείτε ξανά. Για να διατηρήσετε το ιστορικό μηνυμάτων, εξάγετε και εισαγάγετε ξανά τα κλειδιά σας.",
+    "We're testing a new search to make finding what you want quicker.\n": "Δοκιμάζουμε μια νέα αναζήτηση για να κάνουμε πιο γρήγορη την εύρεση αυτού που θέλετε.\n",
+    "New search beta available": "Διατίθεται νέα beta αναζήτησης",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Αυτή θα είναι μια μετάβαση εφάπαξ, καθώς τα νήματα εκτέλεσης αποτελούν πλέον μέρος των προδιαγραφών του Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Καθώς προετοιμαζόμαστε για αυτό, πρέπει να κάνουμε κάποιες αλλαγές: τα νήματα εκτέλεσης που δημιουργήθηκαν πριν από αυτό το σημείο θα <strong>εμφανίζονται ως κανονικές απαντήσεις</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Πλησιάζουμε στην κυκλοφορία μιας δημόσιας Beta για νήματα εκτέλεσης.",
+    "Threads Approaching Beta 🎉": "Νήματα εκτέλεσης που προσεγγίζουν την Beta 🎉",
+    "Away": "Απομακρυσμένος",
+    "Avatar": "Avatar",
+    "See room timeline (devtools)": "Εμφάνιση χρονοδιαγράμματος δωματίου (develtools)",
+    "Forget": "Ξεχάστε",
+    "Resend %(unsentCount)s reaction(s)": "Επανάληψη αποστολής %(unsentCount)s αντιδράσεων",
+    "No verification requests found": "Δεν βρέθηκαν αιτήματα επαλήθευσης",
+    "Observe only": "Παρατηρήστε μόνο",
+    "Requester": "Aιτών",
+    "Timeout": "Λήξη χρόνου",
+    "Requested": "Απαιτείται",
+    "Edit setting": "Επεξεργασία ρύθμισης",
+    "Setting ID": "Ρύθμιση αναγνωριστικού",
+    "Values at explicit levels in this room:": "Τιμές σε σαφή επίπεδα σε αυτό το δωμάτιο:",
+    "Values at explicit levels:": "Τιμές σε σαφή επίπεδα:",
+    "Edit values": "Επεξεργασία τιμών",
+    "Values at explicit levels in this room": "Αξίες σε σαφής επίπεδα σε αυτό το δωμάτιο",
+    "Values at explicit levels": "Αξίες σε σαφής επίπεδα",
+    "Settable at room": "Ρυθμιζόμενο σε δωμάτιο",
+    "Settable at global": "Ρυθμιζόμενο σε παγκόσμιο",
+    "Server Versions": "Εκδόσεις διακομιστή",
+    "Client Versions": "Εκδόσεις πελάτη",
+    "Send custom state event": "Αποστολή προσαρμοσμένου συμβάντος κατάστασης",
+    "<%(count)s spaces>|zero": "<empty string>",
+    "Event Content": "Περιεχόμενο συμβάντος",
+    "Event sent!": "Το συμβάν στάλθηκε!",
+    "Failed to send event!": "Αποτυχία αποστολής συμβάντος!",
+    "State Key": "Κλειδί κατάστασης",
+    "Event Type": "Τύπος συμβάντος",
+    "Send custom account data event": "Αποστολή προσαρμοσμένου συμβάντος δεδομένων λογαριασμού",
+    "Send custom room account data event": "Αποστολή προσαρμοσμένου συμβάντος δεδομένων λογαριασμού δωματίου",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Εάν έχετε ξεχάσει το κλειδί ασφαλείας σας, μπορείτε να <button>ρυθμίσετε νέες επιλογές ανάκτησης</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Αποκτήστε πρόσβαση στο ιστορικό ασφαλών μηνυμάτων σας και ρυθμίστε την ασφαλή ανταλλαγή μηνυμάτων εισάγοντας το Κλειδί ασφαλείας σας.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Προειδοποίηση</b>: Θα πρέπει να δημιουργήτε αντίγραφο ασφαλείας κλειδιού μόνο από έναν αξιόπιστο υπολογιστή.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Εάν έχετε ξεχάσει τη φράση ασφαλείας σας, μπορείτε να <button1>χρησιμοποιήσετε το κλειδί ασφαλείας</button1> ή <button2>να ρυθμίστε νέες επιλογές ανάκτησης</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Αποκτήστε πρόσβαση στο ιστορικό ασφαλών μηνυμάτων σας και ρυθμίστε την ασφαλή ανταλλαγή μηνυμάτων εισάγοντας τη Φράση Ασφαλείας σας.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Προειδοποίηση</b>: θα πρέπει να δημιουργήσετε αντίγραφο ασφαλείας κλειδιού μόνο από έναν αξιόπιστο υπολογιστή.",
+    "Clear cross-signing keys": "Διαγράψτε τα κλειδιά διασταυρούμενης υπογραφής",
+    "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.": "Η διαγραφή κλειδιών διασταυρούμενης υπογραφής είναι μόνιμη. Οποιοσδήποτε με τον οποίο έχετε επαληθευτεί θα λάβει ειδοποιήσεις ασφαλείας. Πιθανότατα δεν θέλετε να το κάνετε αυτό, εκτός και αν έχετε χάσει όλες τις συσκευές από τις οποίες μπορείτε να υπογράψετε.",
+    "Destroy cross-signing keys?": "Να καταστραφούν τα κλειδιά διασταυρούμενης υπογραφής;",
+    "Remember this": "Να το θυμάσαι αυτό",
+    "Be found by phone or email": "Να βρεθεί μέσω τηλεφώνου ή email",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Ορισμένα δεδομένα συνεδρίας, συμπεριλαμβανομένων των κρυπτογραφημένων κλειδιών μηνυμάτων, λείπουν. Αποσυνδεθείτε και συνδεθείτε για να το διορθώσετε, επαναφέροντας τα κλειδιά από το αντίγραφο ασφαλείας.",
+    "Use \"%(query)s\" to search": "Χρησιμοποιήστε το \"%(query)s\" για αναζήτηση",
+    "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Αυτό ομαδοποιεί τις συνομιλίες σας με μέλη αυτού του χώρου. Η απενεργοποίηση του θα αποκρύψει αυτές τις συνομιλίες από την προβολή του %(spaceName)s.",
+    "Reset event store": "Επαναφορά καταστήματος συμβάντων",
+    "Reset event store?": "Eπαναφoρά στο κατάστημα συμβάντων;",
+    "You most likely do not want to reset your event index store": "Πιθανότατα δεν θέλετε να επαναφέρετε το κατάστημα ευρετηρίου συμβάντων",
+    "You're all caught up.": "Είστε πλήρως ενημερωμένοι.",
+    "Modal Widget": "Modal Widget",
+    "Message edits": "Επεξεργασίες μηνυμάτων",
+    "Confirm this user's session by comparing the following with their User Settings:": "Επιβεβαιώστε την συνεδρία αυτού του χρήστη συγκρίνοντας τα ακόλουθα με τις Ρυθμίσεις του:",
+    "Confirm by comparing the following with the User Settings in your other session:": "Επιβεβαιώστε συγκρίνοντας τα ακόλουθα με τις Ρυθμίσεις χρήστη στην άλλη συνεδρία σας:",
+    "Set up Secure Message Recovery": "Ρυθμίστε την ασφαλή ανάκτηση μηνυμάτων",
+    "Invalid homeserver discovery response": "Μη έγκυρη απόκριση εντοπισμού κεντρικού διακομιστή",
+    "Invalid identity server discovery response": "Μη έγκυρη απόκριση εντοπισμού διακομιστή ταυτότητας",
+    "Failed to get autodiscovery configuration from server": "Απέτυχε η λήψη της διαμόρφωσης αυτόματης ανακάλυψης από τον διακομιστή",
+    "Your status will be shown to people you have a DM with.": "Η κατάστασή σας θα εμφανίζεται σε άτομα με τα οποία έχετε DM.",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Απαντήστε σε ένα νήμα εκτέλεσης που βρίσκεται σε εξέλιξη ή χρησιμοποιήστε το \"%(replyInThread)s\" όταν τοποθετείτε το δείκτη του ποντικιού πάνω από ένα μήνυμα για να ξεκινήσετε ένα νέο.",
+    "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Αυτή είναι μια πειραματική λειτουργία.</b> Προς το παρόν, οι νέοι χρήστες που λαμβάνουν πρόσκληση θα πρέπει να ανοίξουν την πρόσκληση στο <link/> για να συμμετάσχουν πραγματικά.",
+    "Hold": "Αναμονή",
+    "These are likely ones other room admins are a part of.": "Πιθανότατα αυτά είναι μέρος στα οποία συμμετέχουν και άλλοι διαχειριστές δωματίου.",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Είστε βέβαιοι ότι θέλετε να ματαιώσετε τη δημιουργία του κεντρικού υπολογιστή; Η διαδικασία δεν μπορεί να συνεχιστεί.",
+    "Confirm abort of host creation": "Επιβεβαιώστε τη ματαίωση της δημιουργίας κεντρικού υπολογιστή",
+    "Toggle hidden event visibility": "Εναλλαγή ορατότητας κρυφού συμβάντος",
+    "Toggle space panel": "Εναλλαγή πίνακα χώρου",
+    "Go to Home View": "Μεταβείτε στην Αρχική προβολή",
+    "Toggle right panel": "Εναλλαγή δεξιού πίνακα",
+    "Toggle the top left menu": "Εναλλάξτε το επάνω αριστερό μενού",
+    "Dismiss read marker and jump to bottom": "Παραβλέψτε το δείκτη ανάγνωσης και μεταβείτε στο τέλος",
+    "Navigate to previous message in composer history": "Πλοηγηθείτε στο προηγούμενο μήνυμα στο ιστορικό συνθέτη",
+    "Navigate to next message in composer history": "Πλοηγηθείτε στο επόμενο μήνυμα στο ιστορικό συνθέτη",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "Το %(brand)s αποθηκεύει με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης:",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Εάν δεν καταργήσατε τη μέθοδο ανάκτησης, ένας εισβολέας μπορεί να προσπαθεί να αποκτήσει πρόσβαση στον λογαριασμό σας. Αλλάξτε τον κωδικό πρόσβασης του λογαριασμού σας και ορίστε μια νέα μέθοδο ανάκτησης αμέσως στις Ρυθμίσεις.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Εάν το κάνατε κατά λάθος, μπορείτε να ρυθμίσετε τα Ασφαλή Μηνύματα σε αυτήν τη συνεδρία, τα οποία θα κρυπτογραφούν εκ νέου το ιστορικό μηνυμάτων αυτής της συνεδρίας με μια νέα μέθοδο ανάκτησης.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Αυτή η συνεδρία εντόπισε ότι η φράση ασφαλείας σας και το κλειδί για τα ασφαλή μηνύματα σας έχουν αφαιρεθεί.",
+    "Set up Secure Messages": "Ρύθμιση ασφαλών μηνυμάτων",
+    "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.": "Εάν δεν έχετε ορίσει τη νέα μέθοδο ανάκτησης, ένας εισβολέας μπορεί να προσπαθεί να αποκτήσει πρόσβαση στον λογαριασμό σας. Αλλάξτε τον κωδικό πρόσβασης του λογαριασμού σας και ορίστε μια νέα μέθοδο ανάκτησης αμέσως στις Ρυθμίσεις.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Εντοπίστηκε νέα φράση ασφαλείας και κλειδί για ασφαλή μηνύματα.",
+    "Unable to set up secret storage": "Δεν είναι δυνατή η ρύθμιση του μυστικού χώρου αποθήκευσης",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Μπορείτε επίσης να ρυθμίσετε το Ασφαλές αντίγραφο ασφαλείας και να διαχειριστείτε τα κλειδιά σας στις Ρυθμίσεις.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Εάν ακυρώσετε τώρα, ενδέχεται να χάσετε κρυπτογραφημένα μηνύματα και δεδομένα εάν χάσετε την πρόσβαση στα στοιχεία σύνδεσής σας.",
+    "Unable to query secret storage status": "Δεν είναι δυνατή η υποβολή ερωτήματος για την κατάσταση του μυστικού χώρου αποθήκευσης",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "Αποθηκεύστε το Κλειδί ασφαλείας σας σε ασφαλές μέρος, όπως έναν διαχείριστη κωδικών πρόσβασης ή ένα χρηματοκιβώτιο, καθώς χρησιμοποιείται για την προστασία των κρυπτογραφημένων δεδομένων σας.",
+    "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "Εισαγάγετε μια φράση ασφαλείας που μόνο εσείς γνωρίζετε, καθώς χρησιμοποιείται για την προστασία των δεδομένων σας. Για να είστε ασφαλείς, δεν θα πρέπει να χρησιμοποιείτε ξανά τον κωδικό πρόσβασης του λογαριασμού σας.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Αναβαθμίστε αυτήν την συνεδρία για να της επιτρέψετε να επαληθεύει άλλες συνεδρίες, παραχωρώντας τους πρόσβαση σε κρυπτογραφημένα μηνύματα και επισημαίνοντάς τα ως αξιόπιστα για άλλους χρήστες.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Προστατευτείτε από την απώλεια πρόσβασης σε κρυπτογραφημένα μηνύματα και δεδομένα, δημιουργώντας αντίγραφα ασφαλείας των κλειδιών κρυπτογράφησης στον διακομιστή σας.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Χρησιμοποιήστε μια μυστική φράση που γνωρίζετε μόνο εσείς και προαιρετικά αποθηκεύστε ένα κλειδί ασφαλείας για να το χρησιμοποιήσετε για τη δημιουργία αντιγράφων ασφαλείας.",
+    "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Θα δημιουργήσουμε ένα κλειδί ασφαλείας για να το αποθηκεύσετε σε ασφαλές μέρος, όπως έναν διαχειριστή κωδικών πρόσβασης ή ένα χρηματοκιβώτιο.",
+    "Generate a Security Key": "Δημιουργήστε ένα κλειδί ασφαλείας",
+    "Unable to create key backup": "Δεν είναι δυνατή η δημιουργία αντιγράφου ασφαλείας κλειδιού",
+    "Create key backup": "Δημιουργία αντιγράφου ασφαλείας κλειδιού",
+    "Starting backup...": "Έναρξη δημιουργίας αντιγράφων ασφαλείας...",
+    "Secure your backup with a Security Phrase": "Ασφαλίστε το αντίγραφο ασφαλείας σας με μια φράση ασφαλείας",
+    "Share %(name)s": "Κοινή χρήση %(name)s",
+    "Space home": "Αρχική σελίδα χώρου",
+    "An error occurred while stopping your live location, please try again": "Παρουσιάστηκε σφάλμα κατά τη διακοπή της ζωντανής τοποθεσίας σας, δοκιμάστε ξανά",
+    "Resume": "Συνέχιση",
+    "Use new room breadcrumbs": "Χρησιμοποιήστε νέα ίχνη δωματίου",
+    "Invalid base_url for m.identity_server": "Μη έγκυρο base_url για m.identity_server",
+    "Invalid base_url for m.homeserver": "Μη έγκυρο base_url για m.homeserver",
+    "Thumbs up": "Μπράβο",
+    "Message downloading sleep time(ms)": "Χρόνος αδράνειας λήψης μηνύματος (ms)",
+    "Identity server URL does not appear to be a valid identity server": "Η διεύθυνση URL διακομιστή ταυτοποίησης δε φαίνεται να είναι έγκυρη",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Κοινή χρήση τοποθεσίας - κοινή χρήση της τρέχουσας τοποθεσίας (ενεργή ανάπτυξη και προσωρινά, οι τοποθεσίες παραμένουν στο ιστορικό δωματίων)",
+    "Toggle Quote": "Εναλλαγή Παράθεσης",
+    "Currently indexing: %(currentRoom)s": "Γίνεται ευρετηρίαση: %(currentRoom)s",
+    "An error occured whilst sharing your live location, please try again": "Παρουσιάστηκε σφάλμα κατά την κοινή χρήση της τρέχουσας τοποθεσίας σας, δοκιμάστε ξανά",
+    "An error occured whilst sharing your live location": "Παρουσιάστηκε σφάλμα κατά την κοινή χρήση της τρέχουσας τοποθεσίας σας",
+    "Force complete": "Εξαναγκασμός ολοκλήρωσης",
+    "Close dialog or context menu": "Κλείσιμο διαλόγου ή μενού περιβάλλοντος",
+    "Stop sharing and close": "Σταματήστε την κοινή χρήση και κλείστε",
+    "Video rooms (under active development)": "Βίντεο δωμάτια (υπό ανάπτυξη)",
+    "To leave, return to this page and use the “Leave the beta” button.": "Για να αποχωρήσετε, επιστρέψτε σε αυτήν τη σελίδα και χρησιμοποιήστε το κουμπί \"Αποχώρηση από την έκδοση beta\".",
+    "Use \"Reply in thread\" when hovering over a message.": "Χρησιμοποιήστε την \"Απάντηση στο νήμα\" όταν τοποθετείτε το δείκτη του ποντικιού πάνω από ένα μήνυμα.",
+    "How can I start a thread?": "Πώς μπορώ να ξεκινήσω ένα νήμα;",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Τα νήματα βοηθούν στην καλύτερη οργάνωση των συζητήσεων και στην εύκολη παρακολούθηση. <a>Μάθετε περισσότερα</a>.",
+    "Keep discussions organised with threads.": "Διατηρήστε τις συζητήσεις οργανωμένες σε νήματα."
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8f6e26cbbb9..c8521d10db9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -31,7 +31,7 @@
     "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.",
     "Analytics": "Analytics",
     "Some examples of the information being sent to us to help make %(brand)s better includes:": "Some examples of the information being sent to us to help make %(brand)s better includes:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.",
     "Error": "Error",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
@@ -71,9 +71,6 @@
     "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "End conference": "End conference",
     "This will end the conference for everyone. Continue?": "This will end the conference for everyone. Continue?",
-    "Replying With Files": "Replying With Files",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
-    "Continue": "Continue",
     "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
     "Upload Failed": "Upload Failed",
@@ -106,21 +103,12 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(date)s at %(time)s": "%(date)s at %(time)s",
-    "Who would you like to add to this community?": "Who would you like to add to this community?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID",
-    "Invite new community members": "Invite new community members",
-    "Name or Matrix ID": "Name or Matrix ID",
-    "Invite to Community": "Invite to Community",
-    "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
-    "Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
-    "Add rooms to the community": "Add rooms to the community",
-    "Room name or address": "Room name or address",
-    "Add to community": "Add to community",
-    "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
-    "Failed to invite users to community": "Failed to invite users to community",
-    "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
+    "%(value)sd": "%(value)sd",
+    "%(value)sh": "%(value)sh",
+    "%(value)sm": "%(value)sm",
+    "%(value)ss": "%(value)ss",
+    "That link is no longer supported": "That link is no longer supported",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>",
     "Identity server has no terms of service": "Identity server has no terms of service",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.",
     "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
@@ -396,13 +384,9 @@
     "Custom (%(level)s)": "Custom (%(level)s)",
     "Failed to invite": "Failed to invite",
     "Operation failed": "Operation failed",
-    "Failed to invite users to the room:": "Failed to invite users to the room:",
+    "Failed to invite users to %(roomName)s": "Failed to invite users to %(roomName)s",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "We sent the others, but the below people couldn't be invited to <RoomName/>",
     "Some invites couldn't be sent": "Some invites couldn't be sent",
-    "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s",
-    "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
-    "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other",
     "You need to be logged in.": "You need to be logged in.",
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "Unable to create widget.": "Unable to create widget.",
@@ -437,7 +421,7 @@
     "Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
     "Upgrades a room to a new version": "Upgrades a room to a new version",
     "You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
-    "Jump to the given date in the timeline (YYYY-MM-DD)": "Jump to the given date in the timeline (YYYY-MM-DD)",
+    "Jump to the given date in the timeline": "Jump to the given date in the timeline",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.",
     "Changes your display nickname": "Changes your display nickname",
     "Changes your display nickname in the current room only": "Changes your display nickname in the current room only",
@@ -451,6 +435,7 @@
     "Invites user with given id to current room": "Invites user with given id to current room",
     "Use an identity server": "Use an identity server",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.",
+    "Continue": "Continue",
     "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
     "Joins room with given address": "Joins room with given address",
     "Leave room": "Leave room",
@@ -537,14 +522,9 @@
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s has allowed guests to join the room.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s has prevented guests from joining the room.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s changed guest access to %(rule)s",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s set the server ACLs for this room.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s changed the server ACLs for this room.",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 All servers are banned from participating! This room can no longer be used.",
-    "Message deleted": "Message deleted",
-    "Message deleted by %(name)s": "Message deleted by %(name)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s sent a sticker.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
@@ -593,6 +573,8 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "%(senderName)s has shared their location": "%(senderName)s has shared their location",
+    "Message deleted": "Message deleted",
+    "Message deleted by %(name)s": "Message deleted by %(name)s",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s has started a poll - %(pollQuestion)s",
     "%(senderName)s has ended a poll": "%(senderName)s has ended a poll",
     "Light": "Light",
@@ -699,21 +681,29 @@
     "%(num)s hours from now": "%(num)s hours from now",
     "about a day from now": "about a day from now",
     "%(num)s days from now": "%(num)s days from now",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s",
+    "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others",
+    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
+    "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
-    "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile",
-    "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Unexpected server error trying to leave the room": "Unexpected server error trying to leave the room",
     "Can't leave Server Notices room": "Can't leave Server Notices room",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.",
     "Error leaving room": "Error leaving room",
+    "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
+    "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile",
+    "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Unrecognised address": "Unrecognised address",
+    "You do not have permission to invite people to this space.": "You do not have permission to invite people to this space.",
     "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
-    "User %(userId)s is already invited to the room": "User %(userId)s is already invited to the room",
-    "User %(userId)s is already in the room": "User %(userId)s is already in the room",
-    "User %(user_id)s does not exist": "User %(user_id)s does not exist",
-    "User %(user_id)s may or may not exist": "User %(user_id)s may or may not exist",
+    "User is already invited to the space": "User is already invited to the space",
+    "User is already invited to the room": "User is already invited to the room",
+    "User is already in the space": "User is already in the space",
+    "User is already in the room": "User is already in the room",
+    "User does not exist": "User does not exist",
+    "User may or may not exist": "User may or may not exist",
     "The user must be unbanned before they can be invited.": "The user must be unbanned before they can be invited.",
+    "The user's homeserver does not support the version of the space.": "The user's homeserver does not support the version of the space.",
     "The user's homeserver does not support the version of the room.": "The user's homeserver does not support the version of the room.",
     "Unknown server error": "Unknown server error",
     "Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
@@ -743,11 +733,20 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "Unnamed room": "Unnamed room",
+    "Unable to join network": "Unable to join network",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s does not know how to join a room on this network",
+    "Room not found": "Room not found",
+    "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
+    "Fetching third party location failed": "Fetching third party location failed",
+    "Unable to look up room ID from server": "Unable to look up room ID from server",
     "Error upgrading room": "Error upgrading room",
     "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
     "Invite to %(spaceName)s": "Invite to %(spaceName)s",
     "Share your public space": "Share your public space",
     "Unknown App": "Unknown App",
+    "This homeserver is not configured to display maps.": "This homeserver is not configured to display maps.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.",
     "Are you sure you want to exit during this export?": "Are you sure you want to exit during this export?",
     "Generating a ZIP": "Generating a ZIP",
     "Fetched %(count)s events out of %(total)s|other": "Fetched %(count)s events out of %(total)s",
@@ -803,7 +802,7 @@
     "Sound on": "Sound on",
     "Silence call": "Silence call",
     "Use app for a better experience": "Use app for a better experience",
-    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.",
     "Use app": "Use app",
     "Your homeserver has exceeded its user limit.": "Your homeserver has exceeded its user limit.",
     "This homeserver has been blocked by it's administrator.": "This homeserver has been blocked by it's administrator.",
@@ -827,12 +826,12 @@
     "Update %(brand)s": "Update %(brand)s",
     "New version of %(brand)s is available": "New version of %(brand)s is available",
     "Guest": "Guest",
-    "There was an error joining the room": "There was an error joining the room",
-    "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
+    "There was an error joining.": "There was an error joining.",
+    "Sorry, your homeserver is too old to participate here.": "Sorry, your homeserver is too old to participate here.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
-    "The person who invited you already left the room.": "The person who invited you already left the room.",
-    "The person who invited you already left the room, or their server is offline.": "The person who invited you already left the room, or their server is offline.",
-    "Failed to join room": "Failed to join room",
+    "The person who invited you has already left.": "The person who invited you has already left.",
+    "The person who invited you has already left, or their server is offline.": "The person who invited you has already left, or their server is offline.",
+    "Failed to join": "Failed to join",
     "All rooms": "All rooms",
     "Home": "Home",
     "Favourites": "Favourites",
@@ -873,11 +872,19 @@
     "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators",
     "Show options to enable 'Do not disturb' mode": "Show options to enable 'Do not disturb' mode",
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
     "Message Pinning": "Message Pinning",
     "Threaded messaging": "Threaded messaging",
+    "Keep discussions organised with threads.": "Keep discussions organised with threads.",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.",
+    "How can I start a thread?": "How can I start a thread?",
+    "Use “%(replyInThread)s” when hovering over a message.": "Use “%(replyInThread)s” when hovering over a message.",
+    "Reply in thread": "Reply in thread",
+    "How can I leave the beta?": "How can I leave the beta?",
+    "To leave, return to this page and use the “%(leaveTheBeta)s” button.": "To leave, return to this page and use the “%(leaveTheBeta)s” button.",
+    "Leave the beta": "Leave the beta",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Thank you for trying the beta, please go into as much detail as you can so we can improve it.",
     "Custom user status messages": "Custom user status messages",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
+    "Video rooms (under active development)": "Video rooms (under active development)",
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers (requires manual setup)": "Multiple integration managers (requires manual setup)",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
@@ -895,13 +902,13 @@
     "This feature is a work in progress, we'd love to hear your feedback.": "This feature is a work in progress, we'd love to hear your feedback.",
     "How can I give feedback?": "How can I give feedback?",
     "To feedback, join the beta, start a search and click on feedback.": "To feedback, join the beta, start a search and click on feedback.",
-    "How can I leave the beta?": "How can I leave the beta?",
     "To leave, just return to this page or click on the beta badge when you search.": "To leave, just return to this page or click on the beta badge when you search.",
-    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Thank you for trying the beta, please go into as much detail as you can so we can improve it.",
     "Right panel stays open (defaults to room member list)": "Right panel stays open (defaults to room member list)",
     "Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)",
     "Don't send read receipts": "Don't send read receipts",
-    "Location sharing - pin drop (under active development)": "Location sharing - pin drop (under active development)",
+    "Right-click message context menu": "Right-click message context menu",
+    "Location sharing - pin drop": "Location sharing - pin drop",
+    "Live Location Sharing (temporary implementation: locations persist in room history)": "Live Location Sharing (temporary implementation: locations persist in room history)",
     "Font size": "Font size",
     "Use custom size": "Use custom size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
@@ -932,8 +939,9 @@
     "Use Ctrl + Enter to send a message": "Use Ctrl + Enter to send a message",
     "Surround selected text when typing special characters": "Surround selected text when typing special characters",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
+    "Enable Markdown": "Enable Markdown",
+    "Start messages with <code>/plain</code> to send without markdown and <code>/md</code> to send with.": "Start messages with <code>/plain</code> to send without markdown and <code>/md</code> to send with.",
     "Mirror local video feed": "Mirror local video feed",
-    "Enable Community Filter Panel": "Enable Community Filter Panel",
     "Match system theme": "Match system theme",
     "Use a system font": "Use a system font",
     "System font name": "System font name",
@@ -946,7 +954,6 @@
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
-    "Show developer tools": "Show developer tools",
     "Order rooms by name": "Order rooms by name",
     "Show rooms with unread notifications first": "Show rooms with unread notifications first",
     "Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
@@ -961,12 +968,14 @@
     "Show chat effects (animations when receiving e.g. confetti)": "Show chat effects (animations when receiving e.g. confetti)",
     "Show all rooms in Home": "Show all rooms in Home",
     "All rooms you're in will appear in Home.": "All rooms you're in will appear in Home.",
-    "Display Communities instead of Spaces": "Display Communities instead of Spaces",
-    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.",
     "Developer mode": "Developer mode",
     "Automatically send debug logs on any error": "Automatically send debug logs on any error",
     "Automatically send debug logs on decryption errors": "Automatically send debug logs on decryption errors",
     "Automatically send debug logs when key backup is not functioning": "Automatically send debug logs when key backup is not functioning",
+    "Partial Support for Threads": "Partial Support for Threads",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.",
+    "Do you want to enable threads anyway?": "Do you want to enable threads anyway?",
+    "Yes, enable": "Yes, enable",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading logs": "Uploading logs",
@@ -995,6 +1004,8 @@
     "sends snowfall": "sends snowfall",
     "Sends the given message with a space themed effect": "Sends the given message with a space themed effect",
     "sends space invaders": "sends space invaders",
+    "Sends the given message with hearts": "Sends the given message with hearts",
+    "sends hearts": "sends hearts",
     "Server error": "Server error",
     "Command error": "Command error",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
@@ -1014,6 +1025,15 @@
     "%(peerName)s held the call": "%(peerName)s held the call",
     "Connecting": "Connecting",
     "Dial": "Dial",
+    "%(count)s people connected|other": "%(count)s people connected",
+    "%(count)s people connected|one": "%(count)s person connected",
+    "Audio devices": "Audio devices",
+    "Mute microphone": "Mute microphone",
+    "Unmute microphone": "Unmute microphone",
+    "Video devices": "Video devices",
+    "Turn off camera": "Turn off camera",
+    "Turn on camera": "Turn on camera",
+    "Connect now": "Connect now",
     "Dialpad": "Dialpad",
     "Mute the microphone": "Mute the microphone",
     "Unmute the microphone": "Unmute the microphone",
@@ -1115,6 +1135,7 @@
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Quick settings": "Quick settings",
     "All settings": "All settings",
+    "Developer tools": "Developer tools",
     "Pin to sidebar": "Pin to sidebar",
     "More options": "More options",
     "Settings": "Settings",
@@ -1137,14 +1158,11 @@
     "e.g. my-space": "e.g. my-space",
     "Address": "Address",
     "Create a space": "Create a space",
-    "Spaces are a new way to group rooms and people.": "Spaces are a new way to group rooms and people.",
-    "What kind of Space do you want to create?": "What kind of Space do you want to create?",
-    "You can change this later.": "You can change this later.",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.",
     "Public": "Public",
     "Open space for anyone, best for communities": "Open space for anyone, best for communities",
     "Private": "Private",
     "Invite only, best for yourself or teams": "Invite only, best for yourself or teams",
-    "You can also make Spaces from <a>communities</a>.": "You can also make Spaces from <a>communities</a>.",
     "To join a space you'll need an invite.": "To join a space you'll need an invite.",
     "Go back": "Go back",
     "Your public space": "Your public space",
@@ -1195,7 +1213,9 @@
     "Upload new:": "Upload new:",
     "No display name": "No display name",
     "Warning!": "Warning!",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
+    "Changing your password on this homeserver will cause all of your other devices to be signed out. This will delete the message encryption keys stored on them, and may make encrypted chat history unreadable.": "Changing your password on this homeserver will cause all of your other devices to be signed out. This will delete the message encryption keys stored on them, and may make encrypted chat history unreadable.",
+    "If you want to retain access to your chat history in encrypted rooms you should first export your room keys and re-import them afterwards.": "If you want to retain access to your chat history in encrypted rooms you should first export your room keys and re-import them afterwards.",
+    "You can also ask your homeserver admin to upgrade the server to change this behaviour.": "You can also ask your homeserver admin to upgrade the server to change this behaviour.",
     "Export E2E room keys": "Export E2E room keys",
     "New passwords don't match": "New passwords don't match",
     "Passwords can't be empty": "Passwords can't be empty",
@@ -1233,7 +1253,8 @@
     "Unable to load device list": "Unable to load device list",
     "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirm logging out these devices by using Single Sign On to prove your identity.",
     "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirm logging out this device by using Single Sign On to prove your identity.",
-    "Confirm signing out these devices": "Confirm signing out these devices",
+    "Confirm signing out these devices|other": "Confirm signing out these devices",
+    "Confirm signing out these devices|one": "Confirm signing out this device",
     "Click the button below to confirm signing out these devices.|other": "Click the button below to confirm signing out these devices.",
     "Click the button below to confirm signing out these devices.|one": "Click the button below to confirm signing out this device.",
     "Sign out devices|other": "Sign out devices",
@@ -1406,10 +1427,10 @@
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
     "Customise your appearance": "Customise your appearance",
     "Appearance Settings only affect this %(brand)s session.": "Appearance Settings only affect this %(brand)s session.",
-    "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    "Your password was successfully changed.": "Your password was successfully changed.",
+    "You will not receive push notifications on other devices until you sign back in to them.": "You will not receive push notifications on other devices until you sign back in to them.",
     "Success": "Success",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
     "Set a new account password...": "Set a new account password...",
@@ -1430,7 +1451,8 @@
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.",
     "Chat with %(brand)s Bot": "Chat with %(brand)s Bot",
     "Bug reporting": "Bug reporting",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.",
     "Submit debug logs": "Submit debug logs",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "Help & About": "Help & About",
@@ -1478,18 +1500,12 @@
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
     "Room ID or address of ban list": "Room ID or address of ban list",
     "Subscribe": "Subscribe",
-    "Open Space": "Open Space",
-    "Create Space": "Create Space",
     "Start automatically after system login": "Start automatically after system login",
     "Warn before quitting": "Warn before quitting",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimise window to it on close": "Show tray icon and minimise window to it on close",
     "Preferences": "Preferences",
     "Room list": "Room list",
-    "Communities": "Communities",
-    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.",
-    "Show my Communities": "Show my Communities",
-    "If a community isn't shown you may not have permission to convert it.": "If a community isn't shown you may not have permission to convert it.",
     "Keyboard shortcuts": "Keyboard shortcuts",
     "To view all keyboard shortcuts, <a>click here</a>.": "To view all keyboard shortcuts, <a>click here</a>.",
     "Displaying time": "Displaying time",
@@ -1537,15 +1553,14 @@
     "Voice & Video": "Voice & Video",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
+    "Upgrade this space to the recommended room version": "Upgrade this space to the recommended room version",
     "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
-    "this room": "this room",
+    "View older version of %(spaceName)s.": "View older version of %(spaceName)s.",
     "View older messages in %(roomName)s.": "View older messages in %(roomName)s.",
     "Space information": "Space information",
     "Internal room ID": "Internal room ID",
     "Room version": "Room version",
     "Room version:": "Room version:",
-    "Developer options": "Developer options",
-    "Open Devtools": "Open Devtools",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "This room is bridging messages to the following platforms. <a>Learn more.</a>",
     "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "This room isn't bridging messages to any platforms. <a>Learn more.</a>",
     "Bridges": "Bridges",
@@ -1662,9 +1677,6 @@
     "Edit message": "Edit message",
     "Mod": "Mod",
     "From a thread": "From a thread",
-    "%(count)s reply|other": "%(count)s replies",
-    "%(count)s reply|one": "%(count)s reply",
-    "Open thread": "Open thread",
     "This event could not be displayed": "This event could not be displayed",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Your key share request has been sent - please check your other sessions for key share requests.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.",
@@ -1694,7 +1706,6 @@
     "and %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "and one other...",
     "Invite to this room": "Invite to this room",
-    "Invite to this community": "Invite to this community",
     "Invite to this space": "Invite to this space",
     "Invited": "Invited",
     "Filter room members": "Filter room members",
@@ -1743,6 +1754,7 @@
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
     "%(duration)sd": "%(duration)sd",
+    "Busy": "Busy",
     "Online for %(duration)s": "Online for %(duration)s",
     "Idle for %(duration)s": "Idle for %(duration)s",
     "Offline for %(duration)s": "Offline for %(duration)s",
@@ -1751,17 +1763,16 @@
     "Idle": "Idle",
     "Offline": "Offline",
     "Unknown": "Unknown",
-    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+    "Preview": "Preview",
+    "View": "View",
+    "Join": "Join",
+    "Seen by %(count)s people|other": "Seen by %(count)s people",
+    "Seen by %(count)s people|one": "Seen by %(count)s person",
     "Recently viewed": "Recently viewed",
     "Replying": "Replying",
     "Room %(name)s": "Room %(name)s",
     "Recently visited rooms": "Recently visited rooms",
     "No recently visited rooms": "No recently visited rooms",
-    "No rooms to show": "No rooms to show",
-    "Unnamed room": "Unnamed room",
-    "World readable": "World readable",
-    "Guests can join": "Guests can join",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "Join Room": "Join Room",
@@ -1770,17 +1781,18 @@
     "Hide Widgets": "Hide Widgets",
     "Show Widgets": "Show Widgets",
     "Search": "Search",
+    "Invite": "Invite",
     "Start new chat": "Start new chat",
     "Invite to space": "Invite to space",
     "You do not have permissions to invite people to this space": "You do not have permissions to invite people to this space",
     "Add people": "Add people",
     "Start chat": "Start chat",
     "Explore rooms": "Explore rooms",
-    "Create new room": "Create new room",
+    "New room": "New room",
     "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
+    "New video room": "New video room",
     "Add existing room": "Add existing room",
     "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
-    "Explore community rooms": "Explore community rooms",
     "Explore public rooms": "Explore public rooms",
     "Add room": "Add room",
     "Invites": "Invites",
@@ -1788,47 +1800,50 @@
     "System Alerts": "System Alerts",
     "Historical": "Historical",
     "Suggested Rooms": "Suggested Rooms",
-    "Custom Tag": "Custom Tag",
     "Empty room": "Empty room",
     "Can't see what you're looking for?": "Can't see what you're looking for?",
     "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
-    "Community settings": "Community settings",
-    "Failed to find the general chat for this community": "Failed to find the general chat for this community",
-    "Members": "Members",
     "%(count)s results|other": "%(count)s results",
     "%(count)s results|one": "%(count)s result",
-    "Invite": "Invite",
     "Add space": "Add space",
     "You do not have permissions to add spaces to this space": "You do not have permissions to add spaces to this space",
     "Join public room": "Join public room",
     "Currently joining %(count)s rooms|other": "Currently joining %(count)s rooms",
     "Currently joining %(count)s rooms|one": "Currently joining %(count)s room",
+    "Currently removing messages in %(count)s rooms|other": "Currently removing messages in %(count)s rooms",
+    "Currently removing messages in %(count)s rooms|one": "Currently removing messages in %(count)s room",
     "%(spaceName)s menu": "%(spaceName)s menu",
     "Home options": "Home options",
-    "This room": "This room",
     "Joining space …": "Joining space …",
     "Joining room …": "Joining room …",
+    "Joining …": "Joining …",
     "Loading …": "Loading …",
     "Rejecting invite …": "Rejecting invite …",
     "Join the conversation with an account": "Join the conversation with an account",
     "Sign Up": "Sign Up",
-    "Loading room preview": "Loading room preview",
+    "Loading preview": "Loading preview",
     "You were removed from %(roomName)s by %(memberName)s": "You were removed from %(roomName)s by %(memberName)s",
+    "You were removed by %(memberName)s": "You were removed by %(memberName)s",
     "Reason: %(reason)s": "Reason: %(reason)s",
+    "Forget this space": "Forget this space",
     "Forget this room": "Forget this room",
     "Re-join": "Re-join",
     "You were banned from %(roomName)s by %(memberName)s": "You were banned from %(roomName)s by %(memberName)s",
+    "You were banned by %(memberName)s": "You were banned by %(memberName)s",
     "Something went wrong with your invite to %(roomName)s": "Something went wrong with your invite to %(roomName)s",
-    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.",
+    "Something went wrong with your invite.": "Something went wrong with your invite.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.",
     "unknown error code": "unknown error code",
     "You can only join it with a working invite.": "You can only join it with a working invite.",
     "Try to join anyway": "Try to join anyway",
-    "You can still join it because this is a public room.": "You can still join it because this is a public room.",
+    "You can still join here.": "You can still join here.",
     "Join the discussion": "Join the discussion",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "This invite to %(roomName)s was sent to %(email)s which is not associated with your account",
+    "This invite was sent to %(email)s which is not associated with your account": "This invite was sent to %(email)s which is not associated with your account",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Link this email with your account in Settings to receive invites directly in %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "This invite to %(roomName)s was sent to %(email)s",
+    "This invite was sent to %(email)s": "This invite was sent to %(email)s",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Use an identity server in Settings to receive invites directly in %(brand)s.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Share this email in Settings to receive invites directly in %(brand)s.",
     "Do you want to chat with %(user)s?": "Do you want to chat with %(user)s?",
@@ -1840,11 +1855,14 @@
     "Reject & Ignore user": "Reject & Ignore user",
     "You're previewing %(roomName)s. Want to join it?": "You're previewing %(roomName)s. Want to join it?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",
+    "There's no preview, would you like to join?": "There's no preview, would you like to join?",
     "%(roomName)s does not exist.": "%(roomName)s does not exist.",
-    "This room doesn't exist. Are you sure you're at the right place?": "This room doesn't exist. Are you sure you're at the right place?",
+    "This room or space does not exist.": "This room or space does not exist.",
+    "Are you sure you're at the right place?": "Are you sure you're at the right place?",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
-    "Try again later, or ask a room admin to check if you have access.": "Try again later, or ask a room admin to check if you have access.",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.",
+    "This room or space is not accessible at this time.": "This room or space is not accessible at this time.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Try again later, or ask a room or space admin to check if you have access.",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.",
     "Appearance": "Appearance",
     "Show rooms with unread messages first": "Show rooms with unread messages first",
     "Show previews of messages": "Show previews of messages",
@@ -1864,6 +1882,11 @@
     "Low Priority": "Low Priority",
     "Copy room link": "Copy room link",
     "Leave": "Leave",
+    "Video": "Video",
+    "Connecting...": "Connecting...",
+    "Connected": "Connected",
+    "%(count)s participants|other": "%(count)s participants",
+    "%(count)s participants|one": "1 participant",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",
     "%(count)s unread messages.|other": "%(count)s unread messages.",
@@ -1885,6 +1908,9 @@
     "Admin Tools": "Admin Tools",
     "Revoke invite": "Revoke invite",
     "Invited by %(sender)s": "Invited by %(sender)s",
+    "%(count)s reply|other": "%(count)s replies",
+    "%(count)s reply|one": "%(count)s reply",
+    "Open thread": "Open thread",
     "Jump to first unread message.": "Jump to first unread message.",
     "Mark all as read": "Mark all as read",
     "Unable to access your microphone": "Unable to access your microphone",
@@ -1916,13 +1942,6 @@
     "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
     "Show more": "Show more",
-    "Error updating flair": "Error updating flair",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
     "Room Name": "Room Name",
     "Room Topic": "Room Topic",
     "Room avatar": "Room avatar",
@@ -1987,25 +2006,21 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Demote": "Demote",
-    "Disinvite": "Disinvite",
-    "Remove from chat": "Remove from chat",
+    "Disinvite from space": "Disinvite from space",
+    "Remove from space": "Remove from space",
+    "Disinvite from room": "Disinvite from room",
+    "Remove from room": "Remove from room",
     "Disinvite from %(roomName)s": "Disinvite from %(roomName)s",
     "Remove from %(roomName)s": "Remove from %(roomName)s",
     "Remove them from everything I'm able to": "Remove them from everything I'm able to",
     "Remove them from specific things I'm able to": "Remove them from specific things I'm able to",
     "They'll still be able to access whatever you're not an admin of.": "They'll still be able to access whatever you're not an admin of.",
     "Failed to remove user": "Failed to remove user",
-    "Remove from room": "Remove from room",
-    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
-    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "You are about to remove 1 message by %(user)s. This cannot be undone. Do you wish to continue?",
-    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
-    "Remove %(count)s messages|other": "Remove %(count)s messages",
-    "Remove %(count)s messages|one": "Remove 1 message",
     "Remove recent messages": "Remove recent messages",
-    "Ban": "Ban",
+    "Unban from space": "Unban from space",
+    "Ban from space": "Ban from space",
+    "Unban from room": "Unban from room",
+    "Ban from room": "Ban from room",
     "Unban from %(roomName)s": "Unban from %(roomName)s",
     "Ban from %(roomName)s": "Ban from %(roomName)s",
     "Unban them from everything I'm able to": "Unban them from everything I'm able to",
@@ -2017,11 +2032,6 @@
     "Failed to mute user": "Failed to mute user",
     "Unmute": "Unmute",
     "Mute": "Mute",
-    "Remove from community": "Remove from community",
-    "Disinvite this user from community?": "Disinvite this user from community?",
-    "Remove this user from community?": "Remove this user from community?",
-    "Failed to withdraw invitation": "Failed to withdraw invitation",
-    "Failed to remove user from community": "Failed to remove user from community",
     "Failed to change power level": "Failed to change power level",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
     "Are you sure?": "Are you sure?",
@@ -2101,12 +2111,16 @@
     "Pick a date to jump to": "Pick a date to jump to",
     "Go": "Go",
     "Error processing audio message": "Error processing audio message",
+    "View live location": "View live location",
     "React": "React",
+    "Can't create a thread from an event with an existing relation": "Can't create a thread from an event with an existing relation",
+    "Beta feature": "Beta feature",
+    "Beta feature. Click to learn more.": "Beta feature. Click to learn more.",
     "Edit": "Edit",
-    "Reply in thread": "Reply in thread",
     "Reply": "Reply",
-    "Collapse quotes │ ⇧+click": "Collapse quotes │ ⇧+click",
-    "Expand quotes │ ⇧+click": "Expand quotes │ ⇧+click",
+    "Collapse quotes": "Collapse quotes",
+    "Expand quotes": "Expand quotes",
+    "Click": "Click",
     "Download %(text)s": "Download %(text)s",
     "Error decrypting attachment": "Error decrypting attachment",
     "Decrypt %(text)s": "Decrypt %(text)s",
@@ -2134,9 +2148,9 @@
     "%(name)s wants to verify": "%(name)s wants to verify",
     "You sent a verification request": "You sent a verification request",
     "Expand map": "Expand map",
-    "Failed to load map": "Failed to load map",
-    "Zoom in": "Zoom in",
-    "Zoom out": "Zoom out",
+    "Unable to load map": "Unable to load map",
+    "Shared their location: ": "Shared their location: ",
+    "Shared a location: ": "Shared a location: ",
     "Can't edit poll": "Can't edit poll",
     "Sorry, you can't edit a poll after votes have been cast.": "Sorry, you can't edit a poll after votes have been cast.",
     "Vote not registered": "Vote not registered",
@@ -2173,36 +2187,28 @@
     "Submit logs": "Submit logs",
     "Can't load this message": "Can't load this message",
     "toggle event": "toggle event",
+    "Live location sharing": "Live location sharing",
+    "Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.": "Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.",
+    "Enable live location sharing": "Enable live location sharing",
+    "Share for %(duration)s": "Share for %(duration)s",
     "Location": "Location",
     "Could not fetch location": "Could not fetch location",
+    "Click to move the pin": "Click to move the pin",
+    "Click to drop a pin": "Click to drop a pin",
     "Share location": "Share location",
-    "Element was denied permission to fetch your location. Please allow location access in your browser settings.": "Element was denied permission to fetch your location. Please allow location access in your browser settings.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.",
     "Failed to fetch your location. Please try again later.": "Failed to fetch your location. Please try again later.",
     "Timed out trying to fetch your location. Please try again later.": "Timed out trying to fetch your location. Please try again later.",
     "Unknown error fetching location. Please try again later.": "Unknown error fetching location. Please try again later.",
     "We couldn't send your location": "We couldn't send your location",
     "%(brand)s could not send your location. Please try again later.": "%(brand)s could not send your location. Please try again later.",
+    "%(displayName)s's live location": "%(displayName)s's live location",
     "My current location": "My current location",
     "My live location": "My live location",
     "Drop a Pin": "Drop a Pin",
     "What location type do you want to share?": "What location type do you want to share?",
-    "Failed to load group members": "Failed to load group members",
-    "Filter community members": "Filter community members",
-    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
-    "Removing a room from the community will also remove it from the community page.": "Removing a room from the community will also remove it from the community page.",
-    "Failed to remove room from community": "Failed to remove room from community",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
-    "Something went wrong!": "Something went wrong!",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "The visibility of '%(roomName)s' in %(groupId)s could not be updated.",
-    "Visibility in Room List": "Visibility in Room List",
-    "Visible to everyone": "Visible to everyone",
-    "Only visible to community members": "Only visible to community members",
-    "Add rooms to this community": "Add rooms to this community",
-    "Filter community rooms": "Filter community rooms",
-    "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
-    "Loading...": "Loading...",
-    "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
-    "You're not currently a member of any communities.": "You're not currently a member of any communities.",
+    "Zoom in": "Zoom in",
+    "Zoom out": "Zoom out",
     "Frequently Used": "Frequently Used",
     "Smileys & People": "Smileys & People",
     "Animals & Nature": "Animals & Nature",
@@ -2229,6 +2235,7 @@
     "Widgets do not use message encryption.": "Widgets do not use message encryption.",
     "Widget added by": "Widget added by",
     "This widget may use cookies.": "This widget may use cookies.",
+    "Loading...": "Loading...",
     "Error loading Widget": "Error loading Widget",
     "Error - Mixed content": "Error - Mixed content",
     "Popout widget": "Popout widget",
@@ -2242,8 +2249,8 @@
     "Application window": "Application window",
     "Share content": "Share content",
     "Backspace": "Backspace",
-    "Join": "Join",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
+    "Something went wrong!": "Something went wrong!",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sjoined",
@@ -2313,17 +2320,6 @@
     "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)ssent a hidden message",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)ssent %(count)s hidden messages",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)ssent a hidden message",
-    "Including you, %(commaSeparatedMembers)s": "Including you, %(commaSeparatedMembers)s",
-    "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
-    "View all %(count)s members|other": "View all %(count)s members",
-    "View all %(count)s members|one": "View 1 member",
-    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s members including you, %(commaSeparatedMembers)s",
-    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "You",
-    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s members including you and %(commaSeparatedMembers)s",
-    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s members including %(commaSeparatedMembers)s",
-    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
-    "%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
-    "%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
     "collapse": "collapse",
     "expand": "expand",
     "Rotate Left": "Rotate Left",
@@ -2364,8 +2360,19 @@
     "This address is available to use": "This address is available to use",
     "This address is already in use": "This address is already in use",
     "This address had invalid server or is already in use": "This address had invalid server or is already in use",
+    "Including you, %(commaSeparatedMembers)s": "Including you, %(commaSeparatedMembers)s",
+    "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
+    "View all %(count)s members|other": "View all %(count)s members",
+    "View all %(count)s members|one": "View 1 member",
+    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s members including you, %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "You",
+    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s members including you and %(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s members including %(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
+    "%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
     "Server Options": "Server Options",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.",
     "Join millions for free on the largest public server": "Join millions for free on the largest public server",
     "Homeserver": "Homeserver",
     "Continue with %(provider)s": "Continue with %(provider)s",
@@ -2398,16 +2405,8 @@
     "Create a new room": "Create a new room",
     "Search for rooms": "Search for rooms",
     "Adding spaces has moved.": "Adding spaces has moved.",
-    "Matrix ID": "Matrix ID",
-    "Matrix Room ID": "Matrix Room ID",
-    "email address": "email address",
-    "That doesn't look like a valid email address": "That doesn't look like a valid email address",
-    "You have entered an invalid address.": "You have entered an invalid address.",
-    "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use an identity server to invite by email. Manage in <settings>Settings</settings>.",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>",
-    "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.",
     "We <Bold>don't</Bold> record or profile any account data": "We <Bold>don't</Bold> record or profile any account data",
     "We <Bold>don't</Bold> share information with third parties": "We <Bold>don't</Bold> share information with third parties",
     "You can turn this off anytime in settings": "You can turn this off anytime in settings",
@@ -2416,7 +2415,7 @@
     "Invite anyway and never warn me again": "Invite anyway and never warn me again",
     "Invite anyway": "Invite anyway",
     "Close dialog": "Close dialog",
-    "%(featureName)s beta feedback": "%(featureName)s beta feedback",
+    "%(featureName)s Beta feedback": "%(featureName)s Beta feedback",
     "To leave the beta, visit your settings.": "To leave the beta, visit your settings.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
     "Preparing to send logs": "Preparing to send logs",
@@ -2425,25 +2424,25 @@
     "Failed to send logs: ": "Failed to send logs: ",
     "Preparing to download logs": "Preparing to download logs",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
     "Download logs": "Download logs",
     "GitHub issue": "GitHub issue",
     "Notes": "Notes",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.",
     "Send logs": "Send logs",
+    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
+    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "You are about to remove %(count)s message by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
+    "Preserve system messages": "Preserve system messages",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)",
+    "Remove %(count)s messages|other": "Remove %(count)s messages",
+    "Remove %(count)s messages|one": "Remove 1 message",
     "Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
     "Unavailable": "Unavailable",
     "Changelog": "Changelog",
-    "Email address": "Email address",
-    "Add another email": "Add another email",
-    "People you know on %(brand)s": "People you know on %(brand)s",
-    "Hide": "Hide",
-    "Show": "Show",
-    "Skip": "Skip",
-    "Send %(count)s invites|other": "Send %(count)s invites",
-    "Send %(count)s invites|one": "Send %(count)s invite",
-    "Invite people to join %(communityName)s": "Invite people to join %(communityName)s",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Removing…": "Removing…",
     "Confirm Removal": "Confirm Removal",
@@ -2452,24 +2451,7 @@
     "Clear all data in this session?": "Clear all data in this session?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
     "Clear all data": "Clear all data",
-    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "There was an error creating your community. The name may be taken or the server is unable to process your request.",
-    "Community ID: +<localpart />:%(domain)s": "Community ID: +<localpart />:%(domain)s",
-    "Use this when referencing your community to others. The community ID cannot be changed.": "Use this when referencing your community to others. The community ID cannot be changed.",
-    "You can change this later if needed.": "You can change this later if needed.",
-    "What's the name of your community or team?": "What's the name of your community or team?",
-    "Enter name": "Enter name",
-    "Add image (optional)": "Add image (optional)",
-    "An image will help people identify your community.": "An image will help people identify your community.",
-    "Community IDs cannot be empty.": "Community IDs cannot be empty.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
-    "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
-    "Create Community": "Create Community",
-    "Community Name": "Community Name",
-    "Example": "Example",
-    "Community ID": "Community ID",
-    "example": "example",
     "Please enter a name for the room": "Please enter a name for the room",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.",
     "Everyone in <SpaceName/> will be able to find and join this room.": "Everyone in <SpaceName/> will be able to find and join this room.",
     "You can change this at any time from room settings.": "You can change this at any time from room settings.",
     "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Anyone will be able to find and join this room, not just members of <SpaceName/>.",
@@ -2480,8 +2462,8 @@
     "Enable end-to-end encryption": "Enable end-to-end encryption",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.",
+    "Create a video room": "Create a video room",
     "Create a room": "Create a room",
-    "Create a room in %(communityName)s": "Create a room in %(communityName)s",
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Topic (optional)": "Topic (optional)",
@@ -2490,27 +2472,15 @@
     "Public room": "Public room",
     "Visible to space members": "Visible to space members",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Block anyone not part of %(serverName)s from ever joining this room.",
-    "Create Room": "Create Room",
-    "This community has been upgraded into a Space": "This community has been upgraded into a Space",
-    "To view Spaces, hide communities in <a>Preferences</a>": "To view Spaces, hide communities in <a>Preferences</a>",
-    "Space created": "Space created",
-    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.",
-    "To create a Space from another community, just pick the community in Preferences.": "To create a Space from another community, just pick the community in Preferences.",
-    "Failed to migrate community": "Failed to migrate community",
-    "Fetching data...": "Fetching data...",
-    "Creating Space...": "Creating Space...",
-    "Create Space from community": "Create Space from community",
-    "A link to the Space will be put in your community description.": "A link to the Space will be put in your community description.",
-    "All rooms will be added and all community members will be invited.": "All rooms will be added and all community members will be invited.",
-    "Flair won't be available in Spaces for the foreseeable future.": "Flair won't be available in Spaces for the foreseeable future.",
-    "This description will be shown to people when they view your space": "This description will be shown to people when they view your space",
-    "Space visibility": "Space visibility",
-    "Private space (invite only)": "Private space (invite only)",
-    "Public space": "Public space",
+    "Create video room": "Create video room",
+    "Create room": "Create room",
     "Anyone in <SpaceName/> will be able to find and join.": "Anyone in <SpaceName/> will be able to find and join.",
     "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Anyone will be able to find and join this space, not just members of <SpaceName/>.",
     "Only people invited will be able to find and join this space.": "Only people invited will be able to find and join this space.",
     "Add a space to a space you manage.": "Add a space to a space you manage.",
+    "Space visibility": "Space visibility",
+    "Private space (invite only)": "Private space (invite only)",
+    "Public space": "Public space",
     "Want to add an existing space instead?": "Want to add an existing space instead?",
     "Adding...": "Adding...",
     "Sign out": "Sign out",
@@ -2521,58 +2491,31 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
-    "To continue, please enter your password:": "To continue, please enter your password:",
+    "To continue, please enter your account password:": "To continue, please enter your account password:",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
     "Server did not require any authentication": "Server did not require any authentication",
     "Server did not return valid authentication information.": "Server did not return valid authentication information.",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)",
-    "Send": "Send",
-    "Send Custom Event": "Send Custom Event",
-    "You must specify an event type!": "You must specify an event type!",
-    "Event sent!": "Event sent!",
-    "Failed to send custom event.": "Failed to send custom event.",
-    "Event Type": "Event Type",
-    "State Key": "State Key",
-    "Event Content": "Event Content",
-    "Send Account Data": "Send Account Data",
-    "Filter results": "Filter results",
-    "Explore Room State": "Explore Room State",
-    "<%(count)s spaces>|other": "<%(count)s spaces>",
-    "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|zero": "<empty string>",
-    "Explore Account Data": "Explore Account Data",
-    "View Servers in Room": "View Servers in Room",
-    "Verification Requests": "Verification Requests",
+    "Confirm that you would like to deactivate your account. If you proceed:": "Confirm that you would like to deactivate your account. If you proceed:",
+    "You will not be able to reactivate your account": "You will not be able to reactivate your account",
+    "You will no longer be able to log in": "You will no longer be able to log in",
+    "No one will be able to reuse your username (MXID), including you: this username will remain unavailable": "No one will be able to reuse your username (MXID), including you: this username will remain unavailable",
+    "You will leave all rooms and DMs that you are in": "You will leave all rooms and DMs that you are in",
+    "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number": "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number",
+    "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?": "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?",
+    "Hide my messages from new joiners": "Hide my messages from new joiners",
+    "Room": "Room",
+    "Send custom timeline event": "Send custom timeline event",
+    "Explore room state": "Explore room state",
+    "Explore room account data": "Explore room account data",
+    "View servers in room": "View servers in room",
+    "Verification explorer": "Verification explorer",
     "Active Widgets": "Active Widgets",
-    "There was an error finding this widget.": "There was an error finding this widget.",
-    "Settings Explorer": "Settings Explorer",
-    "Failed to save settings": "Failed to save settings",
-    "Setting ID": "Setting ID",
-    "Value": "Value",
-    "Value in this room": "Value in this room",
-    "Edit setting": "Edit setting",
-    "Setting:": "Setting:",
-    "Caution:": "Caution:",
-    "This UI does NOT check the types of the values. Use at your own risk.": "This UI does NOT check the types of the values. Use at your own risk.",
-    "Setting definition:": "Setting definition:",
-    "Level": "Level",
-    "Settable at global": "Settable at global",
-    "Settable at room": "Settable at room",
-    "Values at explicit levels": "Values at explicit levels",
-    "Values at explicit levels in this room": "Values at explicit levels in this room",
-    "Save setting values": "Save setting values",
-    "Value:": "Value:",
-    "Value in this room:": "Value in this room:",
-    "Values at explicit levels:": "Values at explicit levels:",
-    "Values at explicit levels in this room:": "Values at explicit levels in this room:",
-    "Edit Values": "Edit Values",
+    "Explore account data": "Explore account data",
+    "Settings explorer": "Settings explorer",
+    "Server info": "Server info",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
-    "There was an error updating your community. The server is unable to process your request.": "There was an error updating your community. The server is unable to process your request.",
-    "Update community": "Update community",
+    "Room ID: %(roomId)s": "Room ID: %(roomId)s",
     "The poll has ended. No votes were cast.": "The poll has ended. No votes were cast.",
     "The poll has ended. Top answer: %(topAnswer)s": "The poll has ended. Top answer: %(topAnswer)s",
     "Failed to end poll": "Failed to end poll",
@@ -2611,6 +2554,7 @@
     "Sending": "Sending",
     "Sent": "Sent",
     "Open link": "Open link",
+    "Send": "Send",
     "Forward message": "Forward message",
     "Message preview": "Message preview",
     "Search for rooms or people": "Search for rooms or people",
@@ -2652,16 +2596,17 @@
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
     "Recent Conversations": "Recent Conversations",
     "Suggestions": "Suggestions",
-    "May include members not in %(communityName)s": "May include members not in %(communityName)s",
     "Recently Direct Messaged": "Recently Direct Messaged",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use an identity server to invite by email. Manage in <settings>Settings</settings>.",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start a conversation with someone using their name, email address or username (like <userId/>).",
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
-    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Some suggestions may be hidden for privacy.": "Some suggestions may be hidden for privacy.",
     "If you can't see who you're looking for, send them your invite link below.": "If you can't see who you're looking for, send them your invite link below.",
     "Or send invite link": "Or send invite link",
     "Unnamed Space": "Unnamed Space",
     "Invite to %(roomName)s": "Invite to %(roomName)s",
+    "Unnamed Room": "Unnamed Room",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
@@ -2801,11 +2746,12 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.",
     "Verification Pending": "Verification Pending",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
+    "Email address": "Email address",
     "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
+    "Skip": "Skip",
     "Share Room": "Share Room",
     "Link to most recent message": "Link to most recent message",
     "Share User": "Share User",
-    "Share Community": "Share Community",
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
     "Link to room": "Link to room",
@@ -2907,29 +2853,76 @@
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
     "Access your secure message history and set up secure messaging by entering your Security Key.": "Access your secure message history and set up secure messaging by entering your Security Key.",
     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "If you've forgotten your Security Key you can <button>set up new recovery options</button>",
+    "Send custom account data event": "Send custom account data event",
+    "Send custom room account data event": "Send custom room account data event",
+    "Event Type": "Event Type",
+    "State Key": "State Key",
+    "Doesn't look like valid JSON.": "Doesn't look like valid JSON.",
+    "Failed to send event!": "Failed to send event!",
+    "Event sent!": "Event sent!",
+    "Event Content": "Event Content",
+    "Filter results": "Filter results",
+    "No results found": "No results found",
+    "<%(count)s spaces>|other": "<%(count)s spaces>",
+    "<%(count)s spaces>|one": "<space>",
+    "<%(count)s spaces>|zero": "<empty string>",
+    "Send custom state event": "Send custom state event",
+    "Capabilities": "Capabilities",
+    "Failed to load.": "Failed to load.",
+    "Client Versions": "Client Versions",
+    "Server Versions": "Server Versions",
+    "Server": "Server",
+    "Number of users": "Number of users",
+    "Failed to save settings.": "Failed to save settings.",
+    "Save setting values": "Save setting values",
+    "Setting:": "Setting:",
+    "Caution:": "Caution:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "This UI does NOT check the types of the values. Use at your own risk.",
+    "Setting definition:": "Setting definition:",
+    "Level": "Level",
+    "Settable at global": "Settable at global",
+    "Settable at room": "Settable at room",
+    "Values at explicit levels": "Values at explicit levels",
+    "Values at explicit levels in this room": "Values at explicit levels in this room",
+    "Edit values": "Edit values",
+    "Value:": "Value:",
+    "Value in this room:": "Value in this room:",
+    "Values at explicit levels:": "Values at explicit levels:",
+    "Values at explicit levels in this room:": "Values at explicit levels in this room:",
+    "Setting ID": "Setting ID",
+    "Value": "Value",
+    "Value in this room": "Value in this room",
+    "Edit setting": "Edit setting",
+    "Unsent": "Unsent",
+    "Requested": "Requested",
+    "Ready": "Ready",
+    "Started": "Started",
+    "Cancelled": "Cancelled",
+    "Transaction": "Transaction",
+    "Phase": "Phase",
+    "Timeout": "Timeout",
+    "Methods": "Methods",
+    "Requester": "Requester",
+    "Observe only": "Observe only",
+    "No verification requests found": "No verification requests found",
+    "There was an error finding this widget.": "There was an error finding this widget.",
     "Resume": "Resume",
     "Hold": "Hold",
-    "Reject invitation": "Reject invitation",
-    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
-    "Unable to reject invite": "Unable to reject invite",
     "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
     "Open in OpenStreetMap": "Open in OpenStreetMap",
     "Forward": "Forward",
     "View source": "View source",
     "Show preview": "Show preview",
+    "Copy link": "Copy link",
     "Source URL": "Source URL",
     "Collapse reply thread": "Collapse reply thread",
     "Report": "Report",
     "Forget": "Forget",
     "Mentions only": "Mentions only",
     "See room timeline (devtools)": "See room timeline (devtools)",
-    "Room": "Room",
     "Space": "Space",
     "Space home": "Space home",
     "Manage & explore rooms": "Manage & explore rooms",
-    "Move up": "Move up",
-    "Move down": "Move down",
-    "View Community": "View Community",
     "Thread options": "Thread options",
     "Unable to start audio streaming.": "Unable to start audio streaming.",
     "Failed to start livestream": "Failed to start livestream",
@@ -2942,12 +2935,28 @@
     "Revoke permissions": "Revoke permissions",
     "Move left": "Move left",
     "Move right": "Move right",
-    "This is a beta feature. Click for more info": "This is a beta feature. Click for more info",
     "This is a beta feature": "This is a beta feature",
     "Click for more info": "Click for more info",
     "Beta": "Beta",
-    "Leave the beta": "Leave the beta",
     "Join the beta": "Join the beta",
+    "Updated %(humanizedUpdateTime)s": "Updated %(humanizedUpdateTime)s",
+    "Live until %(expiryTime)s": "Live until %(expiryTime)s",
+    "Loading live location...": "Loading live location...",
+    "Live location ended": "Live location ended",
+    "Live location error": "Live location error",
+    "No live locations": "No live locations",
+    "View list": "View list",
+    "View List": "View List",
+    "Close sidebar": "Close sidebar",
+    "An error occurred while stopping your live location": "An error occurred while stopping your live location",
+    "An error occured whilst sharing your live location": "An error occured whilst sharing your live location",
+    "You are sharing your live location": "You are sharing your live location",
+    "%(timeRemaining)s left": "%(timeRemaining)s left",
+    "Live location enabled": "Live location enabled",
+    "An error occured whilst sharing your live location, please try again": "An error occured whilst sharing your live location, please try again",
+    "An error occurred while stopping your live location, please try again": "An error occurred while stopping your live location, please try again",
+    "Stop sharing": "Stop sharing",
+    "Stop sharing and close": "Stop sharing and close",
     "Avatar": "Avatar",
     "This room is public": "This room is public",
     "Away": "Away",
@@ -3006,53 +3015,6 @@
     "You must join the room to see its files": "You must join the room to see its files",
     "No files visible in this room": "No files visible in this room",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Attach files from chat or just drag and drop them anywhere in a room.",
-    "Create community": "Create community",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n",
-    "Add rooms to the community summary": "Add rooms to the community summary",
-    "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
-    "Add to summary": "Add to summary",
-    "Failed to add the following rooms to the summary of %(groupId)s:": "Failed to add the following rooms to the summary of %(groupId)s:",
-    "Add a Room": "Add a Room",
-    "Failed to remove the room from the summary of %(groupId)s": "Failed to remove the room from the summary of %(groupId)s",
-    "The room '%(roomName)s' could not be removed from the summary.": "The room '%(roomName)s' could not be removed from the summary.",
-    "Add users to the community summary": "Add users to the community summary",
-    "Who would you like to add to this summary?": "Who would you like to add to this summary?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Failed to add the following users to the summary of %(groupId)s:",
-    "Add a User": "Add a User",
-    "Failed to remove a user from the summary of %(groupId)s": "Failed to remove a user from the summary of %(groupId)s",
-    "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary.",
-    "Failed to upload image": "Failed to upload image",
-    "Failed to update community": "Failed to update community",
-    "Unable to accept invite": "Unable to accept invite",
-    "Unable to join community": "Unable to join community",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.",
-    "Leave Community": "Leave Community",
-    "Leave %(groupName)s?": "Leave %(groupName)s?",
-    "Unable to leave community": "Unable to leave community",
-    "Community Settings": "Community Settings",
-    "Want more than a community? <a>Get your own server</a>": "Want more than a community? <a>Get your own server</a>",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
-    "You can create a Space from this community <a>here</a>.": "You can create a Space from this community <a>here</a>.",
-    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.",
-    "Communities can now be made into Spaces": "Communities can now be made into Spaces",
-    "Spaces are a new way to make a community, with new features coming.": "Spaces are a new way to make a community, with new features coming.",
-    "Communities won't receive further updates.": "Communities won't receive further updates.",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
-    "Featured Rooms:": "Featured Rooms:",
-    "Featured Users:": "Featured Users:",
-    "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
-    "Join this community": "Join this community",
-    "Leave this community": "Leave this community",
-    "You are an administrator of this community": "You are an administrator of this community",
-    "You are a member of this community": "You are a member of this community",
-    "Who can join this community?": "Who can join this community?",
-    "Only people who have been invited": "Only people who have been invited",
-    "Everyone": "Everyone",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
-    "Long Description (HTML)": "Long Description (HTML)",
-    "Community %(groupId)s not found": "Community %(groupId)s not found",
-    "This homeserver does not support communities": "This homeserver does not support communities",
-    "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Great, that'll help people know it's you": "Great, that'll help people know it's you",
     "Add a photo so people know it's you.": "Add a photo so people know it's you.",
     "Welcome %(name)s": "Welcome %(name)s",
@@ -3063,16 +3025,12 @@
     "Explore Public Rooms": "Explore Public Rooms",
     "Create a Group Chat": "Create a Group Chat",
     "Open dial pad": "Open dial pad",
-    "Public community": "Public community",
-    "Private community": "Private community",
-    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "To view %(communityName)s, swap to communities in your <a>preferences</a>",
-    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "To join %(communityName)s, swap to communities in your <a>preferences</a>",
     "Wait!": "Wait!",
     "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!",
     "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!",
+    "Reject invitation": "Reject invitation",
+    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Failed to reject invitation": "Failed to reject invitation",
-    "Cannot create rooms in this community": "Cannot create rooms in this community",
-    "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
     "You are the only person here. If you leave, no one will be able to join in the future, including you.": "You are the only person here. If you leave, no one will be able to join in the future, including you.",
     "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
@@ -3081,6 +3039,10 @@
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Unable to copy room link": "Unable to copy room link",
     "Unable to copy a link to the room to the clipboard.": "Unable to copy a link to the room to the clipboard.",
+    "Threads Approaching Beta 🎉": "Threads Approaching Beta 🎉",
+    "We're getting closer to releasing a public Beta for Threads.": "We're getting closer to releasing a public Beta for Threads.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "This will be a one-off transition, as threads are now part of the Matrix specification.",
     "New search beta available": "New search beta available",
     "We're testing a new search to make finding what you want quicker.\n": "We're testing a new search to make finding what you want quicker.\n",
     "Signed Out": "Signed Out",
@@ -3094,12 +3056,6 @@
     "Logout": "Logout",
     "%(creator)s created this DM.": "%(creator)s created this DM.",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
-    "Your Communities": "Your Communities",
-    "Did you know: you can use communities to filter your %(brand)s experience!": "Did you know: you can use communities to filter your %(brand)s experience!",
-    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.",
-    "Error whilst fetching joined communities": "Error whilst fetching joined communities",
-    "Create a new community": "Create a new community",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
     "You're all caught up": "You're all caught up",
     "You have no visible notifications.": "You have no visible notifications.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
@@ -3111,20 +3067,12 @@
     "remove %(name)s from the directory.": "remove %(name)s from the directory.",
     "delete the address.": "delete the address.",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
-    "Unable to join network": "Unable to join network",
-    "%(brand)s does not know how to join a room on this network": "%(brand)s does not know how to join a room on this network",
-    "Room not found": "Room not found",
-    "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
-    "Fetching third party location failed": "Fetching third party location failed",
-    "Unable to look up room ID from server": "Unable to look up room ID from server",
-    "Preview": "Preview",
-    "View": "View",
+    "Create new room": "Create new room",
     "No results for \"%(query)s\"": "No results for \"%(query)s\"",
     "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.": "Try different words or check for typos. Some results may not be visible as they're private and you need an invite to join them.",
     "Find a room…": "Find a room…",
     "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
-    "Explore rooms in %(communityName)s": "Explore rooms in %(communityName)s",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
     "Filter": "Filter",
     "Filter rooms and people": "Filter rooms and people",
     "Clear filter": "Clear filter",
@@ -3158,17 +3106,13 @@
     "Mark as suggested": "Mark as suggested",
     "Failed to load list of rooms.": "Failed to load list of rooms.",
     "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
-    "No results found": "No results found",
     "You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.",
     "Results": "Results",
     "Rooms and spaces": "Rooms and spaces",
     "Search names and descriptions": "Search names and descriptions",
     "Private space": "Private space",
     "<inviter/> invites you": "<inviter/> invites you",
-    "To view this Space, hide communities in your <a>preferences</a>": "To view this Space, hide communities in your <a>preferences</a>",
-    "To join this Space, hide communities in your <a>preferences</a>": "To join this Space, hide communities in your <a>preferences</a>",
     "To view %(spaceName)s, you need an invite": "To view %(spaceName)s, you need an invite",
-    "Created from <Community />": "Created from <Community />",
     "Welcome to <name/>": "Welcome to <name/>",
     "Random": "Random",
     "Support": "Support",
@@ -3199,15 +3143,19 @@
     "Let's create a room for each of them.": "Let's create a room for each of them.",
     "You can add more later too, including already existing ones.": "You can add more later too, including already existing ones.",
     "What projects are your team working on?": "What projects are your team working on?",
-    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We'll create rooms for each of them. You can add more later too, including already existing ones.",
+    "We'll create rooms for each of them.": "We'll create rooms for each of them.",
     "All threads": "All threads",
     "Shows all threads from current room": "Shows all threads from current room",
     "My threads": "My threads",
     "Shows all threads you've participated in": "Shows all threads you've participated in",
     "Show:": "Show:",
-    "Keep discussions organised with threads": "Keep discussions organised with threads",
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.",
     "Show all threads": "Show all threads",
+    "Threads help keep your conversations on-topic and easy to track.": "Threads help keep your conversations on-topic and easy to track.",
+    "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.": "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.",
+    "Keep discussions organised with threads": "Keep discussions organised with threads",
+    "Threads are a beta feature": "Threads are a beta feature",
+    "<a>Give feedback</a>": "<a>Give feedback</a>",
     "Thread": "Thread",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
@@ -3229,24 +3177,28 @@
     "Could not load user profile": "Could not load user profile",
     "Decrypted event source": "Decrypted event source",
     "Original event source": "Original event source",
+    "Event ID: %(eventId)s": "Event ID: %(eventId)s",
     "Unable to verify this device": "Unable to verify this device",
     "Verify this device": "Verify this device",
     "Device verified": "Device verified",
     "Really reset verification keys?": "Really reset verification keys?",
     "Skip verification for now": "Skip verification for now",
     "Failed to send email": "Failed to send email",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.",
+    "Resetting your password on this homeserver will cause all of your devices to be signed out. This will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Resetting your password on this homeserver will cause all of your devices to be signed out. This will delete the message encryption keys stored on them, making encrypted chat history unreadable.",
+    "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.": "Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.",
+    "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.": "If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "The email address doesn't appear to be valid.": "The email address doesn't appear to be valid.",
     "A new password must be entered.": "A new password must be entered.",
     "New passwords must match each other.": "New passwords must match each other.",
+    "Sign out all devices": "Sign out all devices",
     "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",
     "Send Reset Email": "Send Reset Email",
     "Sign in instead": "Sign in instead",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
     "I have verified my email address": "I have verified my email address",
     "Your password has been reset.": "Your password has been reset.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
     "Return to login screen": "Return to login screen",
     "Set a new password": "Set a new password",
     "Invalid homeserver discovery response": "Invalid homeserver discovery response",
@@ -3271,8 +3223,8 @@
     "Signing In...": "Signing In...",
     "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
     "New? <a>Create account</a>": "New? <a>Create account</a>",
-    "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
+    "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "Someone already has that username, please try another.": "Someone already has that username, please try another.",
     "That e-mail address is already in use.": "That e-mail address is already in use.",
@@ -3312,7 +3264,6 @@
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
     "Commands": "Commands",
     "Command Autocomplete": "Command Autocomplete",
-    "Community Autocomplete": "Community Autocomplete",
     "Emoji Autocomplete": "Emoji Autocomplete",
     "Notify the whole room": "Notify the whole room",
     "Room Notification": "Room Notification",
@@ -3422,6 +3373,8 @@
     "Toggle Bold": "Toggle Bold",
     "Toggle Italics": "Toggle Italics",
     "Toggle Quote": "Toggle Quote",
+    "Toggle Code Block": "Toggle Code Block",
+    "Toggle Link": "Toggle Link",
     "Cancel replying to a message": "Cancel replying to a message",
     "Navigate to next message to edit": "Navigate to next message to edit",
     "Navigate to previous message to edit": "Navigate to previous message to edit",
@@ -3429,6 +3382,7 @@
     "Jump to end of the composer": "Jump to end of the composer",
     "Navigate to next message in composer history": "Navigate to next message in composer history",
     "Navigate to previous message in composer history": "Navigate to previous message in composer history",
+    "Send a sticker": "Send a sticker",
     "Toggle microphone mute": "Toggle microphone mute",
     "Toggle webcam on/off": "Toggle webcam on/off",
     "Dismiss read marker and jump to bottom": "Dismiss read marker and jump to bottom",
@@ -3460,8 +3414,8 @@
     "Jump to last message": "Jump to last message",
     "Undo edit": "Undo edit",
     "Redo edit": "Redo edit",
-    "Previous recently visited room or community": "Previous recently visited room or community",
-    "Next recently visited room or community": "Next recently visited room or community",
+    "Previous recently visited room or space": "Previous recently visited room or space",
+    "Next recently visited room or space": "Next recently visited room or space",
     "Switch to space by number": "Switch to space by number",
     "Open user settings": "Open user settings",
     "Close dialog or context menu": "Close dialog or context menu",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 80ae4b94e6d..8f70a33ce06 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -5,7 +5,7 @@
     "Always show message timestamps": "Mostrar siempre la fecha y hora de envío junto a los mensajes",
     "Authentication": "Autenticación",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(count)s others...|other": "y otros %(count)s…",
+    "and %(count)s others...|other": "y %(count)s más…",
     "and %(count)s others...|one": "y otro más…",
     "A new password must be entered.": "Debes ingresar una contraseña nueva.",
     "An error has occurred.": "Un error ha ocurrido.",
@@ -19,7 +19,7 @@
     "Change Password": "Cambiar la contraseña",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambió el nivel de acceso de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el tema a \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el asunto a «%(topic)s».",
     "Changes your display nickname": "Cambia tu apodo público",
     "Command error": "Error de comando",
     "Commands": "Comandos",
@@ -37,7 +37,7 @@
     "Download %(text)s": "Descargar %(text)s",
     "Email": "Correo electrónico",
     "Email address": "Dirección de correo electrónico",
-    "Emoji": "Emoticones",
+    "Emoji": "Emoji",
     "Error": "Error",
     "Error decrypting attachment": "Error al descifrar adjunto",
     "Export E2E room keys": "Exportar claves de salas con cifrado de extremo a extremo",
@@ -402,7 +402,7 @@
     "Unignored user": "Usuario no ignorado",
     "You are no longer ignoring %(userId)s": "Ya no ignoras a %(userId)s",
     "Opens the Developer Tools dialog": "Abre el diálogo de herramientas de desarrollo",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes anclados de la sala.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes fijados de la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s modificó el accesorio %(widgetName)s%(widgetName)sx",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s añadió el accesorio %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "componente %(widgetName)s eliminado por %(senderName)s",
@@ -455,7 +455,7 @@
     "Muted Users": "Usuarios silenciados",
     "Members only (since the point in time of selecting this option)": "Solo participantes (desde el momento en que se selecciona esta opción)",
     "Members only (since they were invited)": "Solo participantes (desde que fueron invitados)",
-    "Members only (since they joined)": "Solo participantes (desde que se unieron)",
+    "Members only (since they joined)": "Solo participantes (desde que se unieron a la sala)",
     "You don't currently have any stickerpacks enabled": "Actualmente no tienes ningún paquete de pegatinas activado",
     "Stickerpack": "Paquete de pegatinas",
     "Hide Stickers": "Ocultar Pegatinas",
@@ -469,8 +469,8 @@
     "URL previews are enabled by default for participants in this room.": "La vista previa de URLs se activa por defecto en los participantes de esta sala.",
     "URL previews are disabled by default for participants in this room.": "La vista previa de URLs se desactiva por defecto para los participantes de esta sala.",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "En salas cifradas como ésta, la vista previa de las URLs se desactiva por defecto para asegurar que el servidor base (donde se generan) no pueda recopilar información de los enlaces que veas en esta sala.",
-    "URL Previews": "Vista previa de URLs",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cuando alguien incluye una URL en su mensaje, se mostrará una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.",
+    "URL Previews": "Vista previa de enlaces",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cuando alguien incluya una dirección URL en su mensaje, puede mostrarse una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.",
     "Error decrypting image": "Error al descifrar imagen",
     "Error decrypting video": "Error al descifrar el vídeo",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambió el avatar para %(roomName)s",
@@ -706,7 +706,7 @@
     "Theme": "Tema",
     "Voice & Video": "Voz y vídeo",
     "Gets or sets the room topic": "Ver o cambiar el asunto de la sala",
-    "This room has no topic.": "Esta sala no tiene tema.",
+    "This room has no topic.": "Esta sala no tiene asunto.",
     "Sets the room name": "Establece el nombre de la sala",
     "Phone numbers": "Números de teléfono",
     "Email addresses": "Correos electrónicos",
@@ -718,7 +718,7 @@
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizó esta sala.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s hizo la sala pública a cualquiera que conozca el enlace.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s restringió la sala a invitados.",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s ha permitido a los invitados unirse a la sala.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s autorizó a unirse a la sala a personas todavía sin cuenta.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ha prohibido que los invitados se unan a la sala.",
     "%(displayName)s is typing …": "%(displayName)s está escribiendo…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s y otros %(count)s están escribiendo…",
@@ -881,7 +881,7 @@
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Los cambios que se hagan sobre quién puede leer el historial se aplicarán solo a nuevos mensajes. La visibilidad del historial actual no cambiará.",
     "Security & Privacy": "Seguridad y privacidad",
     "Encryption": "Cifrado",
-    "Once enabled, encryption cannot be disabled.": "Una vez actives el cifrado ya no podrás desactivarlo.",
+    "Once enabled, encryption cannot be disabled.": "Una vez actives el cifrado, no podrás desactivarlo.",
     "Encrypted": "Cifrado",
     "Ignored users": "Usuarios ignorados",
     "Bulk options": "Opciones generales",
@@ -1169,14 +1169,14 @@
     "View older messages in %(roomName)s.": "Ver mensajes más antiguos en %(roomName)s.",
     "Sounds": "Sonidos",
     "Notification sound": "Sonido para las notificaciones",
-    "Set a new custom sound": "Usar un nuevo sonido personalizado",
+    "Set a new custom sound": "Usar un sonido personalizado",
     "Browse": "Seleccionar",
     "Change room avatar": "Cambiar el avatar de la sala",
     "Change room name": "Cambiar el nombre de sala",
     "Change main address for the room": "Cambiar la dirección principal de la sala",
     "Change history visibility": "Cambiar la visibilidad del historial",
     "Change permissions": "Cambiar los permisos",
-    "Change topic": "Cambiar el tema",
+    "Change topic": "Cambiar el asunto",
     "Upgrade the room": "Actualizar la sala",
     "Enable room encryption": "Activar cifrado para la sala",
     "Modify widgets": "Modificar accesorios",
@@ -1414,7 +1414,7 @@
     "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes desactivar esto después. Los puentes y la mayoría de los bots no funcionarán todavía.",
     "Create a public room": "Crear una sala pública",
     "Create a private room": "Crear una sala privada",
-    "Topic (optional)": "Tema (opcional)",
+    "Topic (optional)": "Asunto (opcional)",
     "Hide advanced": "Ocultar ajustes avanzados",
     "Show advanced": "Mostrar ajustes avanzados",
     "Server did not require any authentication": "El servidor no requirió ninguna autenticación",
@@ -1523,9 +1523,9 @@
     "Published Addresses": "Direcciones publicadas",
     "Other published addresses:": "Otras direcciones publicadas:",
     "No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo",
-    "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
+    "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:servidor)",
     "Local Addresses": "Direcciones locales",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establecer las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor base (%(localDomain)s)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Define las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor base (%(localDomain)s)",
     "Error updating flair": "Error al actualizar el botón",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Error al actualizar el botón para esta sala. Posiblemente el servidor no lo permita o que se produjo un error temporal.",
     "Waiting for %(displayName)s to accept…": "Esperando a que %(displayName)s acepte…",
@@ -1702,7 +1702,7 @@
     "The homeserver may be unavailable or overloaded.": "Es posible el servidor de base no esté disponible o esté sobrecargado.",
     "Preview": "Ver",
     "View": "Ver",
-    "Find a room…": "Encuentrar una sala…",
+    "Find a room…": "Encuentra una sala…",
     "Find a room… (e.g. %(exampleRoom)s)": "Encuentra una sala... (ej.: %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Si no encuentras la sala que buscas, pide que te inviten a ella o <a>crea una nueva</a>.",
     "Explore rooms": "Explorar salas",
@@ -1735,7 +1735,7 @@
     "You joined the call": "Te has unido a la llamada",
     "%(senderName)s joined the call": "%(senderName)s se ha unido a la llamada",
     "Call in progress": "Llamada en progreso",
-    "Call ended": "La llamada ha finalizado",
+    "Call ended": "La llamada ha terminado",
     "You started a call": "Has iniciado una llamada",
     "%(senderName)s started a call": "%(senderName)s inicio una llamada",
     "Waiting for answer": "Esperado por una respuesta",
@@ -1958,8 +1958,8 @@
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Protéjase contra la pérdida de acceso a los mensajes y datos cifrados haciendo una copia de seguridad de las claves de cifrado en su servidor.",
     "Generate a Security Key": "Generar una llave de seguridad",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Generaremos una llave de seguridad para que la guardes en un lugar seguro, como un administrador de contraseñas o una caja fuerte.",
-    "Enter a Security Phrase": "Ingrese una frase de seguridad",
-    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Use una frase secreta que solo usted conozca y, opcionalmente, guarde una clave de seguridad para usarla como respaldo.",
+    "Enter a Security Phrase": "Escribe una frase de seguridad",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Usa una frase secreta que solo tú conozcas y, opcionalmente, guarda una clave de seguridad para usarla como respaldo.",
     "Enter your account password to confirm the upgrade:": "Ingrese la contraseña de su cuenta para confirmar la actualización:",
     "Restore your key backup to upgrade your encryption": "Restaure la copia de seguridad de su clave para actualizar su cifrado",
     "Restore": "Restaurar",
@@ -2373,8 +2373,8 @@
     "%(displayName)s created this room.": "%(displayName)s creó esta sala.",
     "You created this room.": "Creaste esta sala.",
     "<a>Add a topic</a> to help people know what it is about.": "<a>Añade un asunto</a> para que la gente sepa de qué va la sala.",
-    "Topic: %(topic)s ": "Tema: %(topic)s ",
-    "Topic: %(topic)s (<a>edit</a>)": "Tema: %(topic)s (<a>cambiar</a>)",
+    "Topic: %(topic)s ": "Asunto: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Asunto: %(topic)s (<a>cambiar</a>)",
     "Remove messages sent by others": "Eliminar los mensajes enviados por otras personas",
     "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 Security Key.": "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.",
     "The operation could not be completed": "No se ha podido completar la operación",
@@ -2401,7 +2401,7 @@
     "Safeguard against losing access to encrypted messages & data": "Evita perder acceso a datos y mensajes cifrados",
     "Use app": "Usar la aplicación",
     "Use app for a better experience": "Usa la aplicación para una experiencia mejor",
-    "Enable desktop notifications": "Activa las notificaciones de escritorio",
+    "Enable desktop notifications": "Activar las notificaciones de escritorio",
     "Don't miss a reply": "No te pierdas ninguna respuesta",
     "Send messages as you in your active room": "Enviar mensajes en tu sala activa",
     "See messages posted to your active room": "Ver los mensajes publicados en tu sala activa",
@@ -2538,7 +2538,7 @@
     "The call was answered on another device.": "Esta llamada fue respondida en otro dispositivo.",
     "Answered Elsewhere": "Respondida en otra parte",
     "The call could not be established": "No se ha podido establecer la llamada",
-    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Tu clave de seguridad es una red de seguridad. Puedes usarla para volver a tener acceso a tus mensajes cifrados si te olvidas de tu frase de seguridad.",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Tu clave de recuperación es una red de seguridad. Puedes usarla para volver a tener acceso a tus mensajes cifrados si te olvidas de tu frase de seguridad.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Almacenaremos una copia cifrada de tus claves en nuestros servidores. Asegura tu copia de seguridad con una frase de seguridad.",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML para tu página de comunidad</h1>\n<p>\n\tUsa la descripción extendida para presentar la comunidad a nuevos participantes, o difunde\n\t<a href=\"foo\">enlaces</a> importantes\n</p>\n<p>\n\tPuedes incluso añadir imágenes con direcciones URL de Matrix <img src=\"mxc://url\" />\n</p>\n",
     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Si te has olvidado de tu clave de seguridad puedes <button>configurar nuevos métodos de recuperación</button>",
@@ -2596,7 +2596,7 @@
     "Abort": "Cancelar",
     "Confirm abort of host creation": "Confirma que quieres cancelar la creación del host",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSEJO: Si creas una incidencia, adjunta <debugLogsLink>tus registros de depuración</debugLogsLink> para ayudarnos a localizar el problema.",
-    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Por favor, echa un vistazo primero a <existingIssuesLink>las incidenias de Github</existingIssuesLink>. Si no encuentras nada relacionado, <newIssueLink>crea una nueva incidencia</newIssueLink>.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Por favor, echa un vistazo primero a <existingIssuesLink>las incidencias de Github</existingIssuesLink>. Si no encuentras nada relacionado, <newIssueLink>crea una nueva incidencia</newIssueLink>.",
     "Edit Values": "Editar valores",
     "Values at explicit levels in this room:": "Valores a niveles explícitos en esta sala:",
     "Values at explicit levels:": "Valores a niveles explícitos:",
@@ -2787,7 +2787,7 @@
     "Play": "Reproducir",
     "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>Esto es una funcionalidad experimental.</b> Por ahora, los usuarios nuevos que reciban una invitación tendrán que abrirla en <link/> para unirse.",
     "Select a room below first": "Selecciona una sala de abajo primero",
-    "Join the beta": "Unirse a la beta",
+    "Join the beta": "Unirme a la beta",
     "Leave the beta": "Salir de la beta",
     "Beta": "Beta",
     "Tap for more info": "Pulsa para más información",
@@ -2918,7 +2918,7 @@
     "%(senderName)s changed their profile picture": "%(senderName)s cambió su foto de perfil",
     "%(senderName)s removed their profile picture": "%(senderName)s ha eliminado su foto de perfil",
     "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s cambió su nombre a %(displayName)s",
-    "%(senderName)s invited %(targetName)s": "%(senderName)s ha invitado a %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s invitó a %(targetName)s",
     "%(targetName)s accepted an invitation": "%(targetName)s ha aceptado una invitación",
     "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s ha aceptado la invitación a %(displayName)s",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Hemos enviado el resto, pero no hemos podido invitar las siguientes personas a la sala <RoomName/>",
@@ -3176,7 +3176,7 @@
     "Export chat": "Exportar conversación",
     "File Attached": "Archivo adjunto",
     "Error fetching file": "Error al recuperar el archivo",
-    "Topic: %(topic)s": "Tema:",
+    "Topic: %(topic)s": "Asunto: %(topic)s",
     "%(creatorName)s created this room.": "%(creatorName)s creó esta sala.",
     "Current Timeline": "Línea de tiempo actual",
     "Specify a number of messages": "Un número máximo de mensajes",
@@ -3247,7 +3247,7 @@
     "Loading new room": "Cargando la nueva sala",
     "Upgrading room": "Actualizar sala",
     "Polls (under active development)": "Encuestas (en construcción)",
-    "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Escribe tu frase de seguridad o <button>usa tu llave de seguridad</button> para continuar.",
+    "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "Escribe tu frase de seguridad o <button>usa tu clave de seguridad</button> para continuar.",
     "See room timeline (devtools)": "Ver línea de tiempo de la sala (herramientas de desarrollo)",
     "That e-mail address is already in use.": "Esa dirección de correo ya está en uso.",
     "The email address doesn't appear to be valid.": "La dirección de correo no parece ser válida.",
@@ -3314,7 +3314,7 @@
     "Meta Spaces": "Metaespacios",
     "Show tray icon and minimise window to it on close": "Mostrar un icono en la barra de tareas y minimizar la ventana a él cuando se cierre",
     "Spaces are ways to group rooms and people.": "Los espacios son una manera de agrupar salas y personas.",
-    "Spaces to show": "Espacios que mostrar",
+    "Spaces to show": "Qué espacios mostrar",
     "Home is useful for getting an overview of everything.": "La pantalla de Inicio es útil para tener una vista general de todas tus conversaciones.",
     "Show all your rooms in Home, even if they're in a space.": "Incluir todas tus salas en inicio, aunque estén dentro de un espacio.",
     "Automatically group all your favourite rooms and people together in one place.": "Agrupar automáticamente todas tus salas favoritas y personas en un mismo lugar.",
@@ -3374,17 +3374,17 @@
     "Use <arrows/> to scroll results": "Usa <arrows/> para moverte por los resultados",
     "Clear": "Borrar",
     "Recent searches": "Búsquedas recientes",
-    "To search messages, look for this icon at the top of a room <icon/>": "Para buscar mensajes, usa este icono en la parte de arriba de una sala <icon/>",
+    "To search messages, look for this icon at the top of a room <icon/>": "Para buscar contenido de mensajes, usa este icono en la parte de arriba de una sala: <icon/>",
     "Other searches": "Otras búsquedas",
     "Public rooms": "Salas públicas",
-    "Use \"%(query)s\" to search": "Usa «%(query)s» para buscar",
+    "Use \"%(query)s\" to search": "Buscar «%(query)s» en",
     "Other rooms in %(spaceName)s": "Otras salas en %(spaceName)s",
-    "Spaces you're in": "Espacios a los que perteneces",
+    "Spaces you're in": "Tus espacios",
     "Link to room": "Enlace a la sala",
     "Spaces you know that contain this space": "Espacios que conoces que contienen este espacio",
     "You may contact me if you want to follow up or to let me test out upcoming ideas": "Podéis poneros en contacto conmigo para responderme o informarme sobre nuevas ideas",
     "Processing...": "Escrutando…",
-    "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "¿Seguro que quieres terminar la encuesta? Se publicarán los resultados finales y no se podrá votar más.",
+    "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "¿Seguro que quieres terminar la encuesta? Publicarás los resultados finales y no se podrá votar más.",
     "End Poll": "Terminar encuesta",
     "Sorry, the poll did not end. Please try again.": "Lo sentimos, la encuesta no ha terminado. Por favor, inténtalo otra vez.",
     "Failed to end poll": "No se ha podido terminar la encuesta",
@@ -3420,7 +3420,7 @@
     "Invite to space": "Invitar al espacio",
     "Start new chat": "Crear conversación",
     "Share location": "Compartir ubicación",
-    "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Esta sala no está conectada con ninguna otra plataforma de mensajería. <a>Más información</a>.",
+    "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Esta sala no está conectada con ninguna otra plataforma de mensajería. <a>Más información.</a>",
     "Automatically group all your rooms that aren't part of a space in one place.": "Agrupar automáticamente en un único sitio a todas las salas en las que estés que no formen parte de un espacio.",
     "Automatically group all your people together in one place.": "Agrupar automáticamente en un único sitio a todos tus contactos.",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Comparte datos anónimos para ayudarnos a descubrir fallos. No incluye nada personal, y no se comparten con terceros.",
@@ -3431,7 +3431,7 @@
     "Use new room breadcrumbs": "Usar la nueva navegación de salas",
     "Location sharing (under active development)": "Compartir ubicación (todavía en desarrollo)",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Comparte datos anónimos con nosotros para ayudarnos a descubrir fallos. No incluye nada personal, y no se comparten con terceros. <LearnMoreLink>Más información</LearnMoreLink>",
-    "You previously consented to share anonymous usage data with us. We're updating how that works.": "En su momento aceptaste compartir información anónima de uso con nosotros. Estamos cambiando el funcionamiento del sistema.",
+    "You previously consented to share anonymous usage data with us. We're updating how that works.": "En su momento, aceptaste compartir información anónima de uso con nosotros. Estamos cambiando cómo funciona el sistema.",
     "Help improve %(analyticsOwner)s": "Ayúdanos a mejorar %(analyticsOwner)s",
     "That's fine": "Vale",
     "Creating output...": "Creando el resultado…",
@@ -3471,7 +3471,7 @@
     "Expand map": "Expandir mapa",
     "Send reactions": "Enviar reacciones",
     "Dial": "Llamar",
-    "Verify this device by confirming the following number appears on its screen.": "Verific",
+    "Verify this device by confirming the following number appears on its screen.": "Verifica este dispositivo confirmando que el siguiente número aparece en pantalla.",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Confirma que los siguientes emojis aparecen en los dos dispositivos y en el mismo orden:",
     "Widget": "Accesorio",
     "Automatically send debug logs on decryption errors": "Enviar los registros de depuración automáticamente de fallos al descifrar",
@@ -3489,7 +3489,7 @@
     "Command failed: Unable to find room (%(roomId)s": "El comando ha fallado: no se ha encontrado la sala %(roomId)s",
     "Removes user with given id from this room": "Saca al usuario con la ID dada de esta sala",
     "Unrecognised room address: %(roomAlias)s": "Dirección de sala no reconocida: %(roomAlias)s",
-    "Failed to get room topic: Unable to find room (%(roomId)s": "Fallo al obtener el tema de la sala: No se ha podido encontrar la sala (%(roomId)s",
+    "Failed to get room topic: Unable to find room (%(roomId)s": "Fallo al obtener el asunto de la sala: No se ha podido encontrar la sala (%(roomId)s",
     "Command error: Unable to handle slash command.": "Error en el comando: no se ha podido gestionar el comando de barra.",
     "Command error: Unable to find rendering type (%(renderingType)s)": "Error en el comando: no se ha encontrado el tipo de renderizado (%(renderingType)s)",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "Guarda tu clave de seguridad en un lugar seguro (por ejemplo, un gestor de contraseñas o una caja fuerte) porque sirve para proteger tus datos cifrados.",
@@ -3500,7 +3500,7 @@
     "Your new device is now verified. Other users will see it as trusted.": "Has verificado tu nuevo dispositivo. El resto verá que es de confianza.",
     "Verify with another device": "Verificar con otro dispositivo",
     "Unable to verify this device": "No se ha podido verificar el dispositivo",
-    "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Aquí encontrarás tus conversaciones con los miembros del espacio. Si lo desactivas, las conversaciones no aparecerán mientras veas el espacio %(spaceName)s.",
+    "This groups your chats with members of this space. Turning this off will hide those chats from your view of %(spaceName)s.": "Aquí encontrarás tus conversaciones con los miembros del espacio. Si lo desactivas, estas no aparecerán mientras veas el espacio %(spaceName)s.",
     "This address had invalid server or is already in use": "Esta dirección tiene un servidor no válido o ya está siendo usada",
     "Sections to show": "Secciones que mostrar",
     "was removed %(count)s times|one": "fue sacado",
@@ -3510,8 +3510,8 @@
     "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s miembros incluyendo a %(commaSeparatedMembers)s y a ti",
     "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s miembros incluyéndote a ti, %(commaSeparatedMembers)s",
     "Backspace": "Tecta de retroceso",
-    "Unknown error fetching location. Please try again later.": "Error desconocido al conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde",
-    "Failed to fetch your location. Please try again later.": "No se ha podido conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde",
+    "Unknown error fetching location. Please try again later.": "Error desconocido al conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde.",
+    "Failed to fetch your location. Please try again later.": "No se ha podido conseguir tu ubicación. Por favor, inténtalo de nuevo más tarde.",
     "Element was denied permission to fetch your location. Please allow location access in your browser settings.": "Element no tiene permisos para conseguir tu ubicación. Por favor, dale permisos de ubicación en los ajustes de tu navegador.",
     "Could not fetch location": "No se ha podido conseguir la ubicación",
     "Element could not send your location. Please try again later.": "Element no ha podido enviar tu ubicación. Por favor, inténtalo de nuevo más tarde.",
@@ -3530,14 +3530,14 @@
     "Close this widget to view it in this panel": "Cierra este accesorio para verlo en este panel",
     "Unpin this widget to view it in this panel": "Deja de fijar este accesorio para verlo en este panel",
     "Maximise widget": "Maximizar accesorio",
-    "To proceed, please accept the verification request on your other device.": "Para continuar, acepta la solicitud de verificación en tu otro dispositivo",
+    "To proceed, please accept the verification request on your other device.": "Para continuar, acepta la solicitud de verificación en tu otro dispositivo.",
     "You were removed from %(roomName)s by %(memberName)s": "%(memberName)s te ha sacado de %(roomName)s",
     "Remove users": "Sacar usuarios",
-    "Manage pinned events": "",
-    "Get notified only with mentions and keywords as set up in your <a>settings</a>": "",
+    "Manage pinned events": "Gestionar eventos fijados",
+    "Get notified only with mentions and keywords as set up in your <a>settings</a>": "Recibir notificaciones solo cuando me mencionen o escriban una palabra vigilada configurada en los <a>ajustes</a>",
     "Along with the spaces you're in, you can use some pre-built ones too.": "",
     "Waiting for you to verify on your other device…": "Esperando a que verifiques en tu otro dispositivo…",
-    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "",
+    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "Esperando a que verifiques en tu otro dispositivo, %(deviceName)s (%(deviceId)s)…",
     "From a thread": "Desde un hilo",
     "Back to thread": "Volver al hilo",
     "Open this settings tab": "Abrir esta pestaña de ajustes",
@@ -3579,10 +3579,10 @@
     "Call": "Llamar",
     "New search beta available": "Hay una nueva búsqueda en beta disponible",
     "This is a beta feature": "Esta funcionalidad está en beta",
-    "Feedback sent! Thanks, we appreciate it!": "¡Opinión enviada! Gracias.",
+    "Feedback sent! Thanks, we appreciate it!": "¡Opinión enviada! Gracias, te lo agradecemos.",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)senvió un mensaje oculto",
-    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)senvió un mensaje oculto",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)senvió %(count)s mensaje oculto",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s enviaron %(count)s mensajes ocultos",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s envió un mensaje oculto",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)senviaron %(count)s mensajes ocultos",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)seliminaron %(count)s mensajes",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)seliminó un mensaje",
@@ -3604,10 +3604,245 @@
     "You don't have permission to view messages from before you were invited.": "No tienes permisos para ver mensajes enviados antes de que te invitaran.",
     "Click for more info": "Haz clic para más info.",
     "How can I leave the beta?": "¿Cómo salgo de la beta?",
-    "To feedback, join the beta, start a search and click on feedback.": "Para darnos tu opinión únete a la beta, haz una búsqueda y dale a «danos tu opinión».",
+    "To feedback, join the beta, start a search and click on feedback.": "Para darnos tu opinión, únete a la beta, haz una búsqueda y dale a «danos tu opinión».",
     "How can I give feedback?": "¿Cómo puedo dar mi opinión?",
-    "A new, quick way to search spaces and rooms you're in.": "Una nueva y rápida manera de buscar entre tus espacios y salas.",
-    "The new search": "La nueva búsqueda",
+    "A new, quick way to search spaces and rooms you're in.": "Una nueva forma rápida de buscar entre tus salas y espacios.",
+    "The new search": "Nueva búsqueda",
     "New search experience": "Nueva experiencia de búsqueda",
-    "%(space1Name)s and %(space2Name)s": "%(space1Name)s y %(space2Name)s"
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s y %(space2Name)s",
+    "Scroll up in the timeline": "Subir en la línea de tiempo",
+    "Navigate to previous message in composer history": "Ir al anterior mensaje en el historial del editor",
+    "Navigate to next message in composer history": "Ir al siguiente mensaje en el historial del editor",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Responde a un hilo en curso o usa «%(replyInThread)s» al pasar el ratón por encima de un mensaje para iniciar uno nuevo.",
+    "This address does not point at this room": "La dirección no apunta a esta sala",
+    "Missing room name or separator e.g. (my-room:domain.org)": "Falta el nombre de la sala o el separador (ej.: mi-sala:dominio.org)",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala.",
+    "Timed out trying to fetch your location. Please try again later.": "Tras un tiempo intentándolo, no hemos podido obtener tu ubicación. Por favor, inténtalo de nuevo más tarde.",
+    "Pinned": "Fijado",
+    "This feature is a work in progress, we'd love to hear your feedback.": "Todavía estamos trabajando en esta funcionalidad, nos gustaría saber tu opinión.",
+    "Open user settings": "Abrir los ajustes de usuario",
+    "Accessibility": "Accesibilidad",
+    "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "Si sabes de estos temas, Element es de código abierto. ¡Echa un vistazo a nuestro GitHub (https://github.com/vector-im/element-web/) y colabora!",
+    "Unable to check if username has been taken. Try again later.": "No ha sido posible comprobar si el nombre de usuario está libre. Inténtalo de nuevo más tarde.",
+    "This is a beta feature. Click for more info": "Esta funcionalidad está en beta. Haz clic para más info",
+    "Search Dialog": "Ventana de búsqueda",
+    "Join %(roomAddress)s": "Unirte a %(roomAddress)s",
+    "Export Cancelled": "Exportación cancelada",
+    "<%(count)s spaces>|zero": "<texto vacío>",
+    "<%(count)s spaces>|one": "<espacio>",
+    "<%(count)s spaces>|other": "<%(count)s espacios>",
+    "Results are only revealed when you end the poll": "Los resultados se mostrarán cuando cierres la encuesta",
+    "Voters see results as soon as they have voted": "Quienes voten podrán ver los resultados",
+    "Closed poll": "Encuesta cerrada",
+    "Open poll": "Encuesta abierta",
+    "Poll type": "Tipo de encuesta",
+    "Edit poll": "Editar encuesta",
+    "What location type do you want to share?": "¿Qué ubicación quieres compartir?",
+    "Drop a Pin": "Elige un punto en el mapa",
+    "My live location": "Mi ubicación en tiempo real",
+    "My current location": "Mi ubicación actual",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s no ha podido enviar tu ubicación. Por favor, inténtalo de nuevo más tarde.",
+    "We couldn't send your location": "No hemos podido enviar tu ubicación",
+    "Results will be visible when the poll is ended": "Los resultados podrán verse cuando la encuesta termine",
+    "Sorry, you can't edit a poll after votes have been cast.": "Lo siento, no puedes editar una encuesta después de que alguien haya votado en ella.",
+    "Unable to find event at that date. (%(code)s)": "No se ha podido encontrar un evento en esa fecha. (%(code)s)",
+    "Can't edit poll": "Encuesta no editable",
+    "Open thread": "Abrir hilo",
+    "Remove messages sent by me": "Borrar los mensajes enviados por mi",
+    "Group all your rooms that aren't part of a space in one place.": "Agrupa en un mismo sitio todas tus salas que no formen parte de un espacio.",
+    "Group all your people in one place.": "Agrupa a toda tu gente en un mismo sitio.",
+    "Group all your favourite rooms and people in one place.": "Agrupa en un mismo sitio todas tus salas y personas favoritas.",
+    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "Los espacios permiten agrupar salas y personas. Además de los espacios de los que ya formes parte, puedes usar algunos que vienen incluidos.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Confirma que quieres cerrar sesión en este dispositivo usando Single Sign On para probar tu identidad.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Confirma que quieres cerrar sesión de estos dispositivos usando Single Sign On para probar tu identidad.",
+    "Automatically send debug logs when key backup is not functioning": "Enviar automáticamente los registros de depuración cuando la clave de respaldo no funcione",
+    "Insert a trailing colon after user mentions at the start of a message": "Inserta automáticamente dos puntos después de las menciones que hagas al principio de los mensajes",
+    "Location sharing - pin drop (under active development)": "Compartir ubicación – elige un sitio del mapa (en desarrollo)",
+    "Jump to date (adds /jumptodate and jump to date headers)": "Saltar a una fecha (añade el comando /jumptodate y enlaces para saltar en los encabezados de fecha)",
+    "Right panel stays open (defaults to room member list)": "El panel derecho se queda abierto (por defecto tendrá la lista de miembros de la sala)",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Gracias por probar la beta. Por favor, incluye todos los detalles que puedas para que podamos mejorar.",
+    "Show current avatar and name for users in message history": "Mostrar el nombre y avatar actual de las personas junto a sus mensajes en el historial",
+    "Switches to this room's virtual room, if it has one": "Cambia a la sala virtual de esta sala, si tiene una",
+    "No virtual room for this room": "Esta sala no tiene una sala virtual",
+    "To leave, just return to this page or click on the beta badge when you search.": "Para salir, vuelve a esta página o haz clic en el indicador de «beta» cuando busques.",
+    "Match system": "Usar el del sistema",
+    "Switch to space by number": "Ir a un espacio por número",
+    "Next recently visited room or community": "Siguiente sala o comunidad visitada recientemente",
+    "Previous recently visited room or community": "Anterior sala o comunidad visitada recientemente",
+    "Toggle hidden event visibility": "Alternar visibilidad del evento oculto",
+    "Navigate up in the room list": "Subir en la lista de salas",
+    "Navigate down in the room list": "Navegar hacia abajo en la lista de salas",
+    "Scroll down in the timeline": "Bajar en la línea de tiempo",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala %(count)s veces",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s cambió los <a>mensajes fijados</a> de la sala",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s cambiaron los <a>mensajes fijados</a> de la sala %(count)s veces",
+    "Location sharing - share your current location with live updates (under active development)": "Compartir ubicación – comparte tu ubicación en tiempo real (en desarrollo)",
+    "Show polls button": "Mostrar botón de encuestas",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Los espacios son una nueva manera de agrupar salas y personas. ¿Qué tipo de espacio quieres crear? Lo puedes cambiar más tarde.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Si ya has informado de un fallo a través de GitHub, los registros de depuración nos pueden ayudar a investigar mejor el problema. ",
+    "Can't create a thread from an event with an existing relation": "No ha sido posible crear un hilo a partir de un evento con una relación existente",
+    "Toggle Code Block": "Alternar bloque de código",
+    "Toggle Link": "Alternar enlace",
+    "We'll create rooms for each of them.": "Crearemos una sala para cada uno.",
+    "Thank you for helping us testing Threads!": "¡Gracias por ayudarnos a probar los hilos!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Todos los hilos creados durante el periodo experimental pasarán a aparecer en la conversación principal como respuestas. Solo hace falta convertirlos una vez. Los ahora forman parte de la especificación de Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Hemos incluido importantes mejoras a la estabilidad de los hilos, por lo que poco a poco dejaremos de mantener los hilos experimentales.",
+    "Threads are no longer experimental! 🎉": "¡Los hilos ya no son un experimento! 🎉",
+    "You are sharing your live location": "Estás compartiendo tu ubicación en tiempo real",
+    "This homeserver is not configured to display maps.": "Este servidor base no está configurado para mostrar mapas.",
+    "Click to drop a pin": "Haz clic para colocar un marcador",
+    "Click to move the pin": "Haz clic para mover el marcador",
+    "Shared a location: ": "Compartió una ubicación: ",
+    "Shared their location: ": "Compartió su ubicación: ",
+    "Unable to load map": "No se ha podido cargar el mapa",
+    "Click": "Clic",
+    "Expand quotes": "Expandir citas",
+    "Collapse quotes": "Plegar citas",
+    "Busy": "Ocupado",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Este servidor base no está configurado apropiadamente para mostrar mapas, o el servidor de mapas no responde.",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Estás a punto de borrar %(count)s mensajes de %(user)s. También se borrarán permanentemente de los dispositivos de todos en la conversación. ¿Quieres continuar?",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "No marques esta casilla si quieres borrar también los mensajes del sistema sobre el usuario (ej.: entradas y salidas, cambios en su perfil…)",
+    "Preserve system messages": "Mantener mensajes del sistema",
+    "%(displayName)s's live location": "Ubicación en tiempo real de %(displayName)s",
+    "Share for %(duration)s": "Compartir durante %(duration)s",
+    "Currently removing messages in %(count)s rooms|one": "Borrando mensajes en %(count)s sala",
+    "Currently removing messages in %(count)s rooms|other": "Borrando mensajes en %(count)s salas",
+    "%(value)ss": "%(value)s s",
+    "%(value)sm": "%(value)s min",
+    "%(value)sh": "%(value)s h",
+    "%(value)sd": "%(value)s d",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Este cambio solo ocurrirá esta vez, pues ahora los hilos forman parte de la especificación de Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Para prepararnos, tenemos que hacer los siguientes cambios: los hilos creados hasta ahora <strong>aparecerán como respuestas normales</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Dentro de poco lanzaremos una beta pública para de los hilos.",
+    "Threads Approaching Beta 🎉": "Ya casi está aquí la beta de los hilos 🎉",
+    "Send custom state event": "Enviar evento de estado personalizado",
+    "Failed to send event!": "¡Fallo al enviar el evento!",
+    "Send custom account data event": "Enviar evento personalizado de cuenta de sala",
+    "Explore room account data": "Explorar datos de cuenta de la sala",
+    "Explore room state": "Explorar estado de la sala",
+    "Next recently visited room or space": "Siguiente sala o espacio visitado",
+    "Previous recently visited room or space": "Anterior sala o espacio visitado",
+    "Event ID: %(eventId)s": "ID del evento: %(eventId)s",
+    "Stop sharing": "Dejar de compartir",
+    "%(timeRemaining)s left": "Queda %(timeRemaining)s",
+    "No verification requests found": "Ninguna solicitud de verificación encontrada",
+    "Observe only": "Solo observar",
+    "Requester": "Solicitante",
+    "Methods": "Métodos",
+    "Timeout": "Tiempo de espera",
+    "Phase": "Fase",
+    "Transaction": "Transacción",
+    "Cancelled": "Cancelado",
+    "Started": "Empezado",
+    "Ready": "Listo",
+    "Requested": "Solicitado",
+    "Unsent": "No enviado",
+    "Edit values": "Editar valores",
+    "Failed to save settings.": "Fallo al guardar los ajustes.",
+    "Number of users": "Número de usuarios",
+    "Server": "Servidor",
+    "Server Versions": "Versiones de servidor",
+    "Client Versions": "Versiones de clientes",
+    "Failed to load.": "Fallo al cargar.",
+    "Capabilities": "Funcionalidades",
+    "Doesn't look like valid JSON.": "No parece ser JSON válido.",
+    "Room ID: %(roomId)s": "ID de la sala: %(roomId)s",
+    "Server info": "Info del servidor",
+    "Settings explorer": "Explorar ajustes",
+    "Explore account data": "Explorar datos de la cuenta",
+    "Verification explorer": "Explorador de verificación",
+    "View servers in room": "Ver servidores en la sala",
+    "Room details": "Detalles de la sala",
+    "Voice & video room": "Sala de voz y vídeo",
+    "Text room": "Sala de texto",
+    "Room type": "Tipo de sala",
+    "Connecting...": "Conectando…",
+    "Voice room": "Sala de voz",
+    "Developer tools": "Herramientas de desarrollo",
+    "Mic": "Micro",
+    "Mic off": "Micro apagado",
+    "Video": "Vídeo",
+    "Video off": "Vídeo apagado",
+    "Connected": "Conectado",
+    "Voice & video rooms (under active development)": "Salas de voz y vídeo (en desarrollo actualmente)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s en navegadores para móviles está en prueba. Para una mejor experiencia y para poder usar las últimas funcionalidades, usa nuestra aplicación nativa gratuita.",
+    "That link is no longer supported": "Ese enlace ya no es compatible",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Aunque esta página incluye información que te identifica (como salas o ID de usuario), esta se quita antes de enviar al servidor.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Estás intentando acceder a un enlace de comunidad (%(groupId)s). <br/>Las comunidades ya no son compatibles, han sido sustituidas por los espacios.<br2/><a>Obtén más información sobre los espacios aquí.</a>",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Los registros de depuración contienen datos sobre cómo usas la aplicación, incluyendo tu nombre de usuario, identificadores o alias de las salas que hayas visitado, una lista de los últimos elementos de la interfaz con los que has interactuado, así como los nombres de usuarios de otras personas. No contienen mensajes.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "Se le han denegado a %(brand)s los permisos para acceder a tu ubicación. Por favor, permite acceso a tu ubicación en los ajustes de tu navegador.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión a otro servidor de Matrix, escribiendo una dirección URL de servidor base diferente. Esto te permite usar %(brand)s con una cuenta de Matrix que ya exista en otro servidor base.",
+    "Send custom room account data event": "Enviar evento personalizado de cuenta de la sala",
+    "Send custom timeline event": "Enviar evento personalizado de historial de mensajes",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Si no encuentras la sala que buscas, pide que te inviten a ella o <a>crea una nueva</a>.",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Ayúdanos a identificar problemas y a mejorar %(analyticsOwner)s. Comparte datos anónimos sobre cómo usas la aplicación para que entendamos mejor cómo usa la gente varios dispositivos. Generaremos un identificador aleatorio que usarán todos tus dispositivos.",
+    "<a>Give feedback</a>": "<a>Danos tu opinión</a>",
+    "Threads are a beta feature": "Los hilos son una funcionalidad beta",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Consejo:</b> Usa «Responder en un hilo» al pasar el ratón sobre un mensaje.",
+    "Stop sharing and close": "Dejar de compartir y cerrar",
+    "Create room": "Crear sala",
+    "Create a video room": "Crear una sala de vídeo",
+    "Create video room": "Crear sala de vídeo",
+    "%(featureName)s Beta feedback": "Danos tu opinión sobre la beta de %(featureName)s",
+    "Beta feature. Click to learn more.": "Funcionalidad beta. Haz clic para más información.",
+    "Beta feature": "Funcionalidad beta",
+    "%(count)s participants|one": "1 participante",
+    "%(count)s participants|other": "%(count)s participantes",
+    "Try again later, or ask a room or space admin to check if you have access.": "Inténtalo más tarde, o pídele a alguien con permisos de administrador dentro de la sala o espacio que compruebe si tienes acceso.",
+    "This room or space is not accessible at this time.": "Esta sala o espacio no es accesible en este momento.",
+    "Are you sure you're at the right place?": "¿Seguro que estás en el sitio correcto?",
+    "This room or space does not exist.": "Esta sala o espacio no existe.",
+    "There's no preview, would you like to join?": "No hay previsualización. ¿Te quieres unir?",
+    "You can still join here.": "Todavía puedes unirte.",
+    "You were banned by %(memberName)s": "%(memberName)s te ha vetado",
+    "Forget this space": "Olvidar este espacio",
+    "You were removed by %(memberName)s": "%(memberName)s te ha sacado",
+    "Loading preview": "Cargando previsualización",
+    "Joining …": "Entrando…",
+    "New video room": "Nueva sala de vídeo",
+    "New room": "Nueva sala",
+    "View older version of %(spaceName)s.": "Ver versión antigua de %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Actualiza la versión de este espacio a la recomendada",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Compartir ubicación en tiempo real: comparte tu ubicación actual (en desarrollo y, temporalmente, las ubicaciones persisten en el historial de la sala)",
+    "Video rooms (under active development)": "Salas de vídeo (actualmente en desarrollo)",
+    "To leave, return to this page and use the “Leave the beta” button.": "Para salir, vuelve a esta página y usa el botón «Salir de la beta».",
+    "Use \"Reply in thread\" when hovering over a message.": "Usa «Responder en hilo» mientras pasas el ratón sobre un mensaje.",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Los hilos ayudan a mantener las conversaciones centradas en un único tema y las hace fáciles de seguir. <a>Más información</a>.",
+    "How can I start a thread?": "¿Cómo puedo empezar un hilo?",
+    "The person who invited you has already left.": "La persona que te invitó ya no está aquí.",
+    "Sorry, your homeserver is too old to participate here.": "Lo siento, tu servidor base es demasiado antiguo. No puedes participar aquí.",
+    "There was an error joining.": "Ha ocurrido un error al entrar.",
+    "The user's homeserver does not support the version of the space.": "El servidor base del usuario no es compatible con la versión de este espacio.",
+    "User may or may not exist": "El usuario podría no existir",
+    "User does not exist": "El usuario no existe",
+    "User is already in the room": "El usuario ya está en la sala",
+    "User is already in the space": "El usuario ya está en el espacio",
+    "User is already invited to the room": "El usuario ya está invitado a la sala",
+    "User is already invited to the space": "El usuario ya está invitado al espacio",
+    "Threads help keep your conversations on-topic and easy to track.": "Los hilos ayudan a mantener tus conversaciones centradas y a que sean fáciles de seguir.",
+    "Live location enabled": "Ubicación en tiempo real activada",
+    "An error occured whilst sharing your live location": "Ha ocurrido un error al compartir tu ubicación en tiempo real",
+    "Live location error": "Error en la ubicación en tiempo real",
+    "Live location ended": "La ubicación en tiempo real ha terminado",
+    "Loading live location...": "Cargando ubicación en tiempo real…",
+    "Live until %(expiryTime)s": "En directo hasta %(expiryTime)s",
+    "View live location": "Ver ubicación en tiempo real",
+    "Ban from room": "Vetar de la sala",
+    "Unban from room": "Dejar de vetar de la sala",
+    "Ban from space": "Vetar del espacio",
+    "Unban from space": "Dejar de vetar del espacio",
+    "Disinvite from room": "Retirar la invitación a la sala",
+    "Remove from space": "Quitar del espacio",
+    "Disinvite from space": "Retirar la invitación al espacio",
+    "Confirm signing out these devices|other": "Confirma el cierre de sesión en estos dispositivos",
+    "Sends the given message with hearts": "Envía corazones junto al mensaje",
+    "sends hearts": "envía corazones",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Tu servidor base no es compatible con los hilos en este momento, por lo que podrían funcionar de forma inestable. Algunos mensajes en los hilos podrían no estar disponibles de forma estable. <a>Más información</a>.",
+    "Yes, enable": "Sí, activar",
+    "Do you want to enable threads anyway?": "¿Quieres activar los hilos de todos modos?",
+    "Partial Support for Threads": "Compatibilidad parcial con los hilos",
+    "Failed to join": "No ha sido posible unirse",
+    "You do not have permission to invite people to this space.": "No tienes permiso para invitar gente a este espacio."
 }
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b2e7afbab5b..52ee41160c1 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -364,7 +364,7 @@
     "System Alerts": "Süsteemi teated",
     "This room": "See jututuba",
     "Joining room …": "Liitun jututoaga …",
-    "Loading …": "Laadin …",
+    "Loading …": "Laadime…",
     "e.g. %(exampleValue)s": "näiteks %(exampleValue)s",
     "Could not find user in room": "Jututoast ei leidnud kasutajat",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näita ajatempleid 12-tunnises vormingus (näiteks 2:30pl)",
@@ -3626,7 +3626,7 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s ja %(space2Name)s",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s saatis ühe peidetud sõnumi",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s saatis %(count)s peidetud sõnumit",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s saatsid %(count)s ühe peidetud sõnumi",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s saatsid ühe peidetud sõnumi",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s saatsid %(count)s peidetud sõnumit",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s kustutas sõnumi",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s kustutas %(count)s sõnumit",
@@ -3648,5 +3648,221 @@
     "Closed poll": "Lõppenud küsitlus",
     "Voters see results as soon as they have voted": "Osalejad näevad tulemusi kohe peale oma valiku tegemist",
     "Results are only revealed when you end the poll": "Tulemused on näha vaid siis, kui küsitlus in lõppenud",
-    "Search Dialog": "Otsinguvaade"
+    "Search Dialog": "Otsinguvaade",
+    "Open user settings": "Ava kasutaja seadistused",
+    "Next recently visited room or community": "Järgmine viimati külastatud jututuba või kogukond",
+    "Previous recently visited room or community": "Eelmine viimati külastatud jututuba või kogukond",
+    "Open thread": "Ava jutulõng",
+    "Remove messages sent by me": "Eemalda minu saadetud sõnumid",
+    "Location sharing - pin drop (under active development)": "Asukoha jagamine (arendus on veel pooleli)",
+    "Export Cancelled": "Eksport on katkestatud",
+    "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel",
+    "Accessibility": "Ligipääsetavus",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Vasta jätkuvas jutulõngas või uue jutulõnga loomiseks kasuta „%(replyInThread)s“ valikut, mida kuvatakse hiire liigutamisel sõnumi kohal.",
+    "This is a beta feature. Click for more info": "See funktsionaalsus on veel katsetamisel. Lisateavet leiad",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s muutis selle jututoa <a>klammerdatud sõnumeid</a>",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s muutis jututoa <a>klammerdatud sõnumeid</a> %(count)s korda",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s muutsid selle jututoa <a>klammerdatud sõnumeid</a>",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s muutsid jututoa <a>klammerdatud sõnumeid</a> %(count)s korda",
+    "What location type do you want to share?": "Missugust asukohta sa soovid jagada?",
+    "Drop a Pin": "Märgi nööpnõelaga",
+    "My live location": "Minu asukoht reaalajas",
+    "My current location": "Minu praegune asukoht",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s ei saanud sinu asukohta edastada. Palun proovi hiljem uuesti.",
+    "We couldn't send your location": "Sinu asukoha saatmine ei õnnestunud",
+    "Pinned": "Klammerdatud",
+    "Insert a trailing colon after user mentions at the start of a message": "Mainimiste järel näita sõnumi alguses koolonit",
+    "Show polls button": "Näita küsitluste nuppu",
+    "No virtual room for this room": "Sellel jututoal pole virtuaalset olekut",
+    "Switches to this room's virtual room, if it has one": "Kui jututoal on virtuaalne olek, siis kasuta seda",
+    "Match system": "Kasuta süsteemset väärtust",
+    "Location sharing - share your current location with live updates (under active development)": "Asukoha jagamine - jaga teistele oma asukohta ning pidevalt uuenda andmeid (see funktsionaalsus on hetkel aktiivselt arendamisel)",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Kogukonnakeskused on uus võimalus jututubade ja inimeste liitmiseks. Missugust kogukonnakeskust sa tahaksid luua? Sa saad seda hiljem muuta.",
+    "Expand quotes": "Näita viidatud sisu",
+    "Collapse quotes": "Peida viidatud sisu",
+    "Click": "Klõpsi",
+    "We'll create rooms for each of them.": "Loome siis igaühe jaoks oma jututoa.",
+    "Click to move the pin": "Asukoha teisaldamiseks klõpsi",
+    "Click to drop a pin": "Asukoha märkimiseks klõpsi",
+    "Unable to load map": "Kaardi laadimine ei õnnestu",
+    "Shared their location: ": "Jagas oma asukohta: ",
+    "Shared a location: ": "Jagatud asukoht: ",
+    "This homeserver is not configured to display maps.": "See koduserver pole seadistatud kuvama kaarte.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "See koduserver kas pole korrektselt seadistatud kuvama kaarte või seadistatud kaardiserver ei tööta.",
+    "Can't create a thread from an event with an existing relation": "Jutulõnga ei saa luua sõnumist, mis juba on jutulõnga osa",
+    "Busy": "Hõivatud",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Kui sa oled GitHub'is teinud meile veateate, siis silumislogid võivad aidata vea lahendamisel. ",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Me oleme hiljuti parandanud jutulõngade funktsionaalsust ja töökindlust ning sellega on ka lõppenud antud lahenduse katseperiood.",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Kõik testperioodil koostatud jutulõnga sõnumid näidatakse jututoa ajajoonel ning kuvatakse vastustena. See on ühekordne muutus liidese loogikas. Tänaseks on jutulõngad osa Matrix'i spetsifikatsioonist.",
+    "Toggle Code Block": "Lülita koodiblokk sisse/välja",
+    "Toggle Link": "Lülita link sisse/välja",
+    "Threads are no longer experimental! 🎉": "Jutulõngad ei ole enam katsetusjärgus! 🎉",
+    "Thank you for helping us testing Threads!": "Täname, et aitad meil testida jutulõngade lahendust!",
+    "You are sharing your live location": "Sa jagad oma asukohta reaalajas",
+    "%(displayName)s's live location": "%(displayName)s asukoht reaalajas",
+    "Currently removing messages in %(count)s rooms|other": "Kustutame sõnumeid %(count)s jututoas",
+    "Currently removing messages in %(count)s rooms|one": "Kustutame sõnumeid %(count)s jututoas",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Sa oled kustutamas %(count)s sõnumit kasutajalt %(user)s. Sellega kustutatakse nad püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Sa oled kustutamas %(count)s sõnumi kasutajalt %(user)s. Sellega kustutatakse ta püsivalt ka kõikidelt vestluses osalejatelt. Kas sa soovid jätkata?",
+    "Preserve system messages": "Näita süsteemseid teateid",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Kui sa samuti soovid mitte kuvada selle kasutajaga seotud süsteemseid teateid (näiteks liikmelisuse muutused, profiili muutused, jne), siis eemalda see valik",
+    "Share for %(duration)s": "Jaga nii kaua - %(duration)s",
+    "%(value)ss": "%(value)s s",
+    "%(value)sm": "%(value)s m",
+    "%(value)sh": "%(value)s t",
+    "%(value)sd": "%(value)s p",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Kuna jutulõngad on nüüd osa Matrix'i spetsifikatsioonist, siis see on ühekordne muudatus.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Valmistudes järgnevaks, me peame tegema natuke muudatusi: enne seda hetke loodud jutulõngad <strong>kuvatakse tavaliste vastustena</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Me oleme valmis avaldama jutulõngade funktsionaalsuse beetaversiooni.",
+    "Threads Approaching Beta 🎉": "Jutulõngad on peaaegu valmis 🎉",
+    "Stop sharing": "Lõpeta asukoha jagamine",
+    "You are sharing %(count)s live locations|one": "Sa jagad oma asukohta reaalajas",
+    "You are sharing %(count)s live locations|other": "Sa jagad reaalajas %(count)s'te asukohta",
+    "%(timeRemaining)s left": "jäänud %(timeRemaining)s",
+    "Room details": "Jututoa üksikasjad",
+    "Voice & video room": "Hääl- ja videovestluse tuba",
+    "Text room": "Tekstipõhine jututuba",
+    "Room type": "Jututoa tüüp",
+    "Connecting...": "Ühendamisel…",
+    "Voice room": "Häälvestluse tuba",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade tunnuseid või nimesid, viimatikasutatud liidese funktsionaalsusi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "Mic": "Mikker",
+    "Mic off": "Mikrofon on välja lülitatud",
+    "Video": "Video",
+    "Video off": "Video on välja lülitatud",
+    "Connected": "Ühendatud",
+    "Voice & video rooms (under active development)": "Kõne- ja videotoad (hetkel arendamisel)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Sa proovid avada vana tüüpi kogukonna vaadet (%(groupId)s).<br/>Vana tüüpi kogukonnad pole enam kasutusel ning nende asemel on kogukonnakeskused.<br/><a>Lisateavet leiad siit.</a>",
+    "That link is no longer supported": "See link pole enam toetatud",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Kui antud lehel leidub isikustatavaid andmeid, nagu jututoa või kasutaja tunnus, siis need andmed eemaldatakse enne serveri poole saatmist.",
+    "Next recently visited room or space": "Järgmine viimati külastatud jututuba või kogukond",
+    "Previous recently visited room or space": "Eelmine viimati külastatud jututuba või kogukond",
+    "Event ID: %(eventId)s": "Sündmuse tunnus: %(eventId)s",
+    "No verification requests found": "Verifitseerimispäringuid ei leidu",
+    "Observe only": "Ainult vaatle",
+    "Requester": "Päringu tegija",
+    "Methods": "Meetodid",
+    "Timeout": "Aegumine",
+    "Phase": "Faas",
+    "Transaction": "Transaktsioon",
+    "Cancelled": "Katkestatud",
+    "Started": "Alustatud",
+    "Ready": "Valmis",
+    "Requested": "Päring tehtud",
+    "Unsent": "Saatmata",
+    "Edit values": "Muuda väärtusi",
+    "Failed to save settings.": "Seadistuste salvestamine ei õnnestunud.",
+    "Number of users": "Kasutajate arv",
+    "Server": "Server",
+    "Server Versions": "Serveri versioonid",
+    "Client Versions": "Klientrakenduste versioonid",
+    "Failed to load.": "Laadimine ei õnnestunud.",
+    "Capabilities": "Funktsionaalsused ja võimed",
+    "Send custom state event": "Saada kohandatud olekusündmus",
+    "Failed to send event!": "Päringu või sündmuse saatmine ei õnnestunud!",
+    "Doesn't look like valid JSON.": "See ei tundu olema korrektse json-andmestikuna.",
+    "Send custom room account data event": "Saada kohandatud jututoa kontoandmete päring",
+    "Send custom account data event": "Saada kohandatud kontoandmete päring",
+    "Room ID: %(roomId)s": "Jututoa tunnus: %(roomId)s",
+    "Server info": "Serveri teave",
+    "Settings explorer": "Seadistuste haldur",
+    "Explore account data": "Uuri konto andmeid",
+    "Verification explorer": "Verifitseerimise haldus",
+    "View servers in room": "Näita jututoas kasutatavaid servereid",
+    "Explore room account data": "Uuri kasutajakonto olekut",
+    "Explore room state": "Uuri jututoa olekut",
+    "Send custom timeline event": "Saada kohandatud sündmus ajajoonele",
+    "Developer tools": "Arendusvahendid",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Võimalike vigade leidmiseks ja %(analyticsOwner)s'i arendamiseks jaga meiega anonüümseid andmeid. Selleks, et mõistaksime, kuidas kasutajad erinevaid seadmeid pruugivad me loome sinu seadmetele ühise juhusliku tunnuse.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Kohandatud serveriseadistusi saad kasutada selleks, et logida sisse sinu valitud koduserverisse. See võimaldab sinul kasutada %(brand)s'i mõnes teises koduserveri hallatava kasutajakontoga.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s ei saanud asukohta tuvastada. Palun luba vastavad õigused brauseri seadistustes.",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s toimib nutiseadme veebibrauseris kastseliselt. Parima kasutajakogemuse ja uusima funktsionaalsuse jaoks kasuta meie rakendust.",
+    "Force complete": "Sunni lõpetama",
+    "<%(count)s spaces>|zero": "<tühi string>",
+    "Call": "Helista",
+    "Show extensible event representation of events": "Näita laiendatavat sündmuste kujutamist",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>.",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Astumisel jututuppa või liitumisel kogukonnaga tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Proovi hiljem uuesti või küsi jututoa või kogukonna haldurilt, kas sul on ligipääs olemas.",
+    "This room or space is not accessible at this time.": "See jututuba või kogukond pole hetkel ligipääsetav.",
+    "Are you sure you're at the right place?": "Kas sa oled kindel, et viibid õiges asukohas?",
+    "This room or space does not exist.": "Seda jututuba või kogukonda pole olemas.",
+    "There's no preview, would you like to join?": "Eelvaade puudub. Kas sa siiski soovid liituda?",
+    "This invite was sent to %(email)s": "See kutse saadeti e-posti aadressile %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "See kutse saadeti e-posti aadressile %(email)s, mis ei ole seotud sinu kontoga",
+    "You can still join here.": "Sa võid siiski siin liituda.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Sinu kutse kontrollimisel tekkis viga (%(errcode)s). Kui saad, siis edasta see teave kutsujale.",
+    "Something went wrong with your invite.": "Sinu kutsega läks midagi valesti.",
+    "You were banned by %(memberName)s": "%(memberName)s keelas sulle ligipääsu",
+    "Forget this space": "Unusta see kogukond",
+    "You were removed by %(memberName)s": "%(memberName)s eemaldas sinu liikmelisuse",
+    "Loading preview": "Laadin eelvaadet",
+    "Joining …": "Liitun…",
+    "View older version of %(spaceName)s.": "Vaata %(spaceName)s kogukonna varasemaid versioone.",
+    "Upgrade this space to the recommended room version": "Uuenda selle kogukonna versioon soovitatud versioonini",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Praeguse asukoha jagamine reaalajas (funktsionaalsus on arendamisel ning ajutiselt on asukohad jututoa ajaloos näha)",
+    "Failed to join": "Liitumine ei õnnestunud",
+    "The person who invited you has already left, or their server is offline.": "See, sulle saatis kutse, kas juba on lahkunud või tema koduserver on võrgust väljas.",
+    "The person who invited you has already left.": "See, kes saatis sulle kutse, on juba lahkunud.",
+    "Sorry, your homeserver is too old to participate here.": "Vabandust, sinu koduserver on siin osalemiseks liiga vana.",
+    "There was an error joining.": "Liitumisel tekkis viga.",
+    "The user's homeserver does not support the version of the space.": "Kasutaja koduserver ei toeta selle kogukonna versiooni.",
+    "User may or may not exist": "Kasutaja võib olla, aga ka võib mitte olla olemas",
+    "User does not exist": "Sellist kasutajat pole olemas",
+    "User is already in the room": "Kasutaja juba on jututoa selle liige",
+    "User is already in the space": "Kasutaja juba on kogukonna selle liige",
+    "User is already invited to the room": "Sellel kasutajal juba on kutse siia jututuppa",
+    "User is already invited to the space": "Sellel kasutajal juba on kutse siia kogukonda",
+    "You do not have permission to invite people to this space.": "Sul pole õigusi siia kogukonda osalejate kutsumiseks.",
+    "Failed to invite users to %(roomName)s": "Kasutajate kutsumine %(roomName)s jututuppa ei õnnestunud",
+    "An error occurred while stopping your live location, please try again": "Asukoha jagamise lõpetamisel tekkis viga, palun proovi mõne hetke pärast uuesti",
+    "Stop sharing and close": "Lõpeta asukoha jagamine ja sulge vaade",
+    "An error occured whilst sharing your live location, please try again": "Asukoha reaalajas jagamisel tekkis viga, palun proovi mõne hetke pärast uuesti",
+    "An error occured whilst sharing your live location": "Sinu asukoha jagamisel reaalajas tekkis viga",
+    "Create room": "Loo jututuba",
+    "Create video room": "Loo videotuba",
+    "Create a video room": "Loo uus videotuba",
+    "%(count)s participants|one": "1 osaleja",
+    "%(count)s participants|other": "%(count)s oselejat",
+    "New video room": "Uus videotuba",
+    "New room": "Uus jututuba",
+    "Video rooms (under active development)": "Videotoad (hetkel arendamisel)",
+    "<a>Give feedback</a>": "<a>Jaga tagasisidet</a>",
+    "Threads are a beta feature": "Jutulõngad on beetajärgus funktsionaalsus",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Soovitus:</b> Sõnumi kohal avanevast valikust kasuta „Vasta jutulõngas“ võimalust.",
+    "Threads help keep your conversations on-topic and easy to track.": "Jutulõngad aitavad hoida vestlused teemakohastena ning mugavalt loetavatena.",
+    "%(featureName)s Beta feedback": "%(featureName)s beetaversiooni tagasiside",
+    "Beta feature. Click to learn more.": "Beetafunktsionaalsus. Lisateabe lugemiseks klõpsi siin.",
+    "Beta feature": "Beetafunktsionaalsus",
+    "To leave, return to this page and use the “Leave the beta” button.": "Lahkumiseks ava sama vaade ning klõpsi nuppu „Lõpeta beetaversiooni kasutamine“.",
+    "Use \"Reply in thread\" when hovering over a message.": "Sõnumi kohal avanevast valikust kasuta „Vasta jutulõngas“ võimalust.",
+    "How can I start a thread?": "Kuidas ma alustan jutulõnga?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Jutulõngad aitavad hoida vestlusi teemakohastena ja jälgitavatena. <a>Lisateavet leiad siit</a>.",
+    "Keep discussions organised with threads.": "Halda vestlusi jutulõngadena.",
+    "sends hearts": "saadame südameid",
+    "Sends the given message with hearts": "Lisab sellele sõnumile südamed",
+    "Live location ended": "Reaalajas asukoha jagamine on lõppenud",
+    "Loading live location...": "Reaalajas asukoha laadmine...",
+    "View live location": "Vaata asukohta reaalajas",
+    "Confirm signing out these devices|one": "Kinnita selle seadme väljalogimine",
+    "Confirm signing out these devices|other": "Kinnita nende seadmete väljalogimine",
+    "Live location enabled": "Reaalajas asukoha jagamine on kasutusel",
+    "Live location error": "Viga asukoha jagamisel reaalajas",
+    "Live until %(expiryTime)s": "Kuvamine toimib kuni %(expiryTime)s",
+    "Ban from room": "Määra suhtluskeeld jututoas",
+    "Unban from room": "Eemalda suhtluskeeld jututoas",
+    "Ban from space": "Määra suhtluskeeld kogukonnas",
+    "Unban from space": "Eemalda suhtluskeeld kogukonnas",
+    "Yes, enable": "Jah, võta kasutusele",
+    "Do you want to enable threads anyway?": "Kas sa ikkagi soovid jutulõngad kasutusele võtta?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Sinu koduserver hetkel ei toeta jutulõngasid ning seega antud funktsionaalsus ei pruugi toimida korralikult. Kõik sõnumid jutulõngas ilmselt ei ole loetavad. <a>Lisateave</a>.",
+    "Partial Support for Threads": "Osaline jutulõngade tugi",
+    "Right-click message context menu": "Parema hiireklõpsuga ava sõnumi kontekstimenüü",
+    "Jump to the given date in the timeline": "Vaata ajajoont alates sellest kuupäevast",
+    "Remove from space": "Eemalda sellest kogukonnast",
+    "Disinvite from room": "Eemalda kutse jututuppa",
+    "Disinvite from space": "Eemalda kutse kogukonda",
+    "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.": "<b>Soovitus:</b> Sõnumi kohal avanevast valikust kasuta „%(replyInThread)s“ võimalust.",
+    "To leave, return to this page and use the “%(leaveTheBeta)s” button.": "Lahkumiseks ava sama vaade ning klõpsi nuppu „%(leaveTheBeta)s“.",
+    "Use “%(replyInThread)s” when hovering over a message.": "Sõnumi kohal avanevast valikust kasuta „%(replyInThread)s“ võimalust."
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c41e39f04ac..7dce75a7bda 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -3142,5 +3142,215 @@
     "%(senderName)s has shared their location": "%(senderName)s on jakanut sijaintinsa",
     "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun",
     "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun: %(reason)s",
-    "Failed to get room topic: Unable to find room (%(roomId)s": "Huoneen aiheen hakeminen epäonnistui: huonetta (%(roomId)s ei löydy."
+    "Failed to get room topic: Unable to find room (%(roomId)s": "Huoneen aiheen hakeminen epäonnistui: huonetta (%(roomId)s ei löydy.",
+    "In reply to <a>this message</a>": "Vastauksena <a>tähän viestiin</a>",
+    "Results are only revealed when you end the poll": "Tulokset paljastetaan vasta kun päätät kyselyn",
+    "Voters see results as soon as they have voted": "Äänestäjät näkevät tulokset heti äänestettyään",
+    "Add option": "Lisää vaihtoehto",
+    "Write an option": "Kirjoita vaihtoehto",
+    "Option %(number)s": "Vaihtoehto %(number)s",
+    "Create options": "Luo vaihtoehdot",
+    "Write something...": "Kirjoita jotain...",
+    "Question or topic": "Kysymys tai aihe",
+    "What is your poll question or topic?": "Mikä on kyselysi kysymys tai aihe?",
+    "Closed poll": "Suljettu kysely",
+    "Open poll": "Avoin kysely",
+    "Poll type": "Kyselyn tyyppi",
+    "Edit poll": "Muokkaa kyselyä",
+    "Create Poll": "Luo kysely",
+    "Create poll": "Luo kysely",
+    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "Sinä",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)spoisti viestin",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)spoistivat %(count)s viestiä",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)spoistivat viestin",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)spoistivat %(count)s viestiä",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a>.",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)svaihtoivat huoneen <a>kiinnittettyjä viestejä</a> %(count)s kertaa.",
+    "was removed %(count)s times|one": "poistettiin",
+    "was removed %(count)s times|other": "poistettiin %(count)s kertaa",
+    "were removed %(count)s times|one": "poistettiin",
+    "were removed %(count)s times|other": "poistettiin %(count)s kertaa",
+    "My current location": "Tämänhetkinen sijaintini",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s ei voinut lähettää sijaintiasi. Yritä myöhemmin uudelleen.",
+    "Unknown error fetching location. Please try again later.": "Tuntematon virhe sijaintia noudettaessa. Yritä myöhemmin uudelleen.",
+    "Timed out trying to fetch your location. Please try again later.": "Sijaintisi noutaminen aikakatkaistiin. Yritä myöhemmin uudelleen.",
+    "Failed to fetch your location. Please try again later.": "Sijaintisi noutaminen epäonnistui. Yritä myöhemmin uudelleen.",
+    "Element was denied permission to fetch your location. Please allow location access in your browser settings.": "Element ei saanut lupaa noutaa sijaintiasi. Salli sijainnin käyttö selaimen asetuksissa.",
+    "Share location": "Jaa sijainti",
+    "Could not fetch location": "Sijaintia ei voitu noutaa",
+    "Results will be visible when the poll is ended": "Tulokset näkyvät, kun kysely on päättynyt",
+    "Sorry, you can't edit a poll after votes have been cast.": "Et voi muokata kyselyä äänestyksen jälkeen.",
+    "Can't edit poll": "Kyselyä ei voi muokata",
+    "Failed to load map": "Kartan lataaminen epäonnistui",
+    "Pick a date to jump to": "Valitse päivämäärä, mihin siirrytään",
+    "Jump to date": "Siirry päivämäärään",
+    "Close this widget to view it in this panel": "Sulje sovelma näyttääksesi sen tässä paneelissa",
+    "Unpin this widget to view it in this panel": "Poista sovelman kiinnitys näyttääksesi sen tässä paneelissa",
+    "Maximise": "Suurenna",
+    "Chat": "Keskustelu",
+    "Add people": "Lisää ihmisiä",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>Salauksen lisäämistä julkisiin huoneisiin ei suositella.</b>Kuka vain voi löytää julkisen huoneen ja liittyä siihen, joten kuka vain voi lukea sen viestejä. Salauksesta ei ole hyötyä eikä sitä voi poistaa myöhemmin käytöstä. Julkisen huoneen viestien salaaminen hidastaa viestien vastaanottamista ja lähettämistä.",
+    "Manage pinned events": "Hallitse kiinnitettyjä tapahtumia",
+    "Remove messages sent by me": "Poista lähettämäni viestit",
+    "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "Tämä huone ei siltaa viestejä millekään alustalle. <a>Lue lisää.</a>",
+    "If a community isn't shown you may not have permission to convert it.": "Jos yhteisöä ei näytetä, sinulla ei ehkä ole oikeuksia muuntaa sitä.",
+    "Sign out devices|one": "Kirjaa laite ulos",
+    "Sign out devices|other": "Kirjaa laitteet ulos",
+    "How can I leave the beta?": "Miten poistun beetasta?",
+    "How can I give feedback?": "Miten voin antaa palautetta?",
+    "This feature is a work in progress, we'd love to hear your feedback.": "Tämä ominaisuus on keskeneräinen – haluaisimme kuulla palautetta.",
+    "Creating HTML...": "Luodaan HTML:ää...",
+    "No virtual room for this room": "Tällä huoneella ei ole virtuaalihuonetta",
+    "Switches to this room's virtual room, if it has one": "Vaihtaa tämän huoneen virtuaalihuoneeseen, mikäli huoneella sellainen on",
+    "Removes user with given id from this room": "Poistaa tunnuksen mukaisen käyttäjän tästä huoneesta",
+    "Failed to send event!": "Tapahtuman lähettäminen epäonnistui!",
+    "%(value)ss": "%(value)s s",
+    "%(value)sm": "%(value)s m",
+    "Recent searches": "Viimeaikaiset haut",
+    "Other searches": "Muut haut",
+    "Public rooms": "Julkiset huoneet",
+    "Export Cancelled": "Vienti peruttu",
+    "Processing...": "Käsitellään...",
+    "The poll has ended. Top answer: %(topAnswer)s": "Kysely on päättynyt. Suosituin vastaus: %(topAnswer)s",
+    "The poll has ended. No votes were cast.": "Kysely on päättynyt. Ääniä ei annettu.",
+    "Text room": "Tekstihuone",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Olet poistamassa käyttäjän %(user)s %(count)s viestiä. Toimenpide poistaa ne pysyvästi kaikilta keskustelun osapuolilta. Haluatko jatkaa?",
+    "To leave the beta, visit your settings.": "Poistu beetasta asetuksista.",
+    "You can turn this off anytime in settings": "Tämän voi poistaa käytöstä koska tahansa asetuksista",
+    "We <Bold>don't</Bold> share information with third parties": "<Bold>Emme</Bold> jaa tietoja kolmansille tahoille",
+    "We <Bold>don't</Bold> record or profile any account data": "<Bold>Emme</Bold> tallenna tai profiloi tilin tietoja",
+    "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Voit lukea kaikki ehdot <PrivacyPolicyUrl>tästä</PrivacyPolicyUrl>",
+    "This address does not point at this room": "Tämä osoite ei osoita tähän huoneeseen",
+    "Missing room name or separator e.g. (my-room:domain.org)": "Puuttuva huoneen nimi tai erotin, esim. (oma-huone:verkkotunnus.org)",
+    "Sorry, the poll you tried to create was not posted.": "Kyselyä, jota yritit luoda, ei valitettavasti julkaistu.",
+    "Failed to post poll": "Kyselyn julkaiseminen epäonnistui",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)slähetti piilotetun viestin",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)slähetti %(count)s piilotettua viestiä",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)slähettivät piilotetun viestin",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)slähettivät %(count)s piilotettua viestiä",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a>",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)svaihtoi huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a>",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)svaihtoivat huoneen <a>kiinnitettyjä viestejä</a> %(count)s kertaa",
+    "Backspace": "Askelpalautin",
+    "We couldn't send your location": "Emme voineet lähettää sijaintiasi",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s ei saanut lupaa noutaa sijaintiasi. Salli sijainnin käyttäminen selaimen asetuksista.",
+    "Unable to load map": "Kartan lataaminen ei onnistu",
+    "Expand map": "Laajenna kartta",
+    "Unable to find event at that date. (%(code)s)": "Päivämäärän kohdalta ei löydy tapahtumaa. (%(code)s)",
+    "Connecting...": "Yhdistetään...",
+    "Are you sure you're at the right place?": "Oletko varma, että olet oikeassa paikassa?",
+    "There's no preview, would you like to join?": "Esikatselua ei ole. Haluaisitko liittyä?",
+    "This invite was sent to %(email)s": "Tämä kutsu lähetettiin osoitteeseen %(email)s",
+    "You were banned by %(memberName)s": "%(memberName)s antoi sinulle porttikiellon",
+    "You were removed by %(memberName)s": "%(memberName)s poisti sinut",
+    "Loading preview": "Ladataan esikatselua",
+    "Joining …": "Liitytään …",
+    "Currently removing messages in %(count)s rooms|one": "Poistetaan parhaillaan viestejä yhdessä huoneessa",
+    "Currently removing messages in %(count)s rooms|other": "Poistetaan parhaillaan viestejä %(count)s huoneesta",
+    "Busy": "Varattu",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Tämän salatun viestin aitoutta ei voida taata tällä laitteella.",
+    "Developer tools": "Kehittäjätyökalut",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Varmista, että alla olevat emojit näkyvät molemmilla laitteilla samassa järjestyksessä:",
+    "Mic": "Mikrofoni",
+    "Video": "Video",
+    "Show polls button": "Näytä kyselypainike",
+    "Voice & video rooms (under active development)": "Ääni- ja videohuoneet (kehitystyö käynnissä)",
+    "Failed to join": "Liittyminen epäonnistui",
+    "The person who invited you has already left.": "Henkilö, joka kutsui sinut on jo poistunut.",
+    "The person who invited you has already left, or their server is offline.": "Henkilö, joka kutsui sinut on jo poistunut tai hänen palvelimensa on poissa verkosta.",
+    "There was an error joining.": "Liittymisessä tapahtui virhe.",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s on mobiiliselaimissa kokeellinen. Paremman kokemuksen ja uusimmat ominaisuudet saat ilmaisella mobiilisovelluksellamme.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Tätä kotipalvelinta ei ole säädetty kunnolla näyttämään karttoja tai valittu karttapalvelin saattaa olla tavoittamattomissa.",
+    "This homeserver is not configured to display maps.": "Tätä kotipalvelinta ei ole säädetty näyttämään karttoja.",
+    "User may or may not exist": "Käyttäjä on tai ei ole olemassa",
+    "User does not exist": "Käyttäjää ei ole olemassa",
+    "User is already in the room": "Käyttäjä on jo huoneessa",
+    "User is already invited to the room": "Käyttäjä on jo kutsuttu huoneeseen",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s ja %(space2Name)s",
+    "Failed to invite users to %(roomName)s": "Käyttäjien kutsuminen huoneeseen %(roomName)s epäonnistui",
+    "Open user settings": "Avaa käyttäjäasetukset",
+    "Redo edit": "Tee uudelleen muokkaus",
+    "Undo edit": "Kumoa muokkaus",
+    "Jump to last message": "Siirry viimeiseen viestiin",
+    "Jump to first message": "Siirry ensimmäiseen viestiin",
+    "Accessibility": "Saavutettavuus",
+    "Toggle webcam on/off": "Kamera päälle/pois",
+    "[number]": "[numero]",
+    "Your new device is now verified. Other users will see it as trusted.": "Uusi laitteesi on nyt vahvistettu. Muut käyttäjät näkevät sen luotettuna.",
+    "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uusi laitteesi on nyt vahvistettu. Laitteella on pääsy salattuihin viesteihisi, ja muut käyttäjät näkevät sen luotettuna.",
+    "Verify with another device": "Vahvista toisella laitteella",
+    "The email address doesn't appear to be valid.": "Sähköpostiosoite ei vaikuta kelvolliselta.",
+    "Device verified": "Laite vahvistettu",
+    "Verify this device": "Vahvista tämä laite",
+    "Unable to verify this device": "Tätä laitetta ei voitu vahvistaa",
+    "Do not disturb": "Älä häiritse",
+    "Set a new status": "Aseta uusi tila",
+    "<a>Give feedback</a>": "<a>Anna palautetta</a>",
+    "Failed to load list of rooms.": "Huoneluettelon lataaminen epäonnistui.",
+    "Joined": "Liitytty",
+    "Joining": "Liitytään",
+    "Wait!": "Odota!",
+    "Own your conversations.": "Omista keskustelusi.",
+    "Unnamed audio": "Nimetön ääni",
+    "Stop sharing and close": "Lopeta jakaminen ja sulje",
+    "Stop sharing": "Lopeta jakaminen",
+    "%(timeRemaining)s left": "%(timeRemaining)s jäljellä",
+    "Click for more info": "Napsauta tästä saadaksesi lisätietoja",
+    "This is a beta feature": "Tämä on beetaominaisuus",
+    "Start audio stream": "Käynnistä äänen suoratoisto",
+    "Unable to start audio streaming.": "Äänen suoratoiston aloittaminen ei onnistu.",
+    "Open in OpenStreetMap": "Avaa OpenStreetMapissa",
+    "No verification requests found": "Vahvistuspyyntöjä ei löytynyt",
+    "Observe only": "Tarkkaile ainoastaan",
+    "Requester": "Pyytäjä",
+    "Methods": "Menetelmät",
+    "Timeout": "Aikakatkaisu",
+    "Phase": "Vaihe",
+    "Transaction": "Transaktio",
+    "Cancelled": "Peruttu",
+    "Started": "Käynnistetty",
+    "Ready": "Valmis",
+    "Requested": "Pyydetty",
+    "Edit setting": "Muokkaa asetusta",
+    "Edit values": "Muokkaa arvoja",
+    "Failed to save settings.": "Asetusten tallentaminen epäonnistui.",
+    "Number of users": "Käyttäjämäärä",
+    "Server": "Palvelin",
+    "Failed to load.": "Lataaminen epäonnistui.",
+    "Capabilities": "Kyvykkyydet",
+    "Doesn't look like valid JSON.": "Ei vaikuta kelvolliselta JSON:ilta.",
+    "Verify other device": "Vahvista toinen laite",
+    "Use <arrows/> to scroll": "Käytä <arrows/> vierittääksesi",
+    "Clear": "Tyhjennä",
+    "Join %(roomAddress)s": "Liity %(roomAddress)s",
+    "Link to room": "Linkitä huoneeseen",
+    "Matrix.org is the biggest public homeserver in the world, so it's a good place for many.": "Matrix.org on maailman suurin julkinen kotipalvelin, joten se on hyvä valinta useimmille.",
+    "Automatically invite members from this room to the new one": "Kutsu jäsenet tästä huoneesta automaattisesti uuteen huoneeseen",
+    "Spam or propaganda": "Roskapostitusta tai propagandaa",
+    "Toxic Behaviour": "Myrkyllinen käyttäytyminen",
+    "Feedback sent! Thanks, we appreciate it!": "Palaute lähetetty. Kiitos, arvostamme sitä!",
+    "Server info": "Palvelimen tiedot",
+    "Create room": "Luo huone",
+    "Create video room": "Luo videohuone",
+    "Create a video room": "Luo videohuone",
+    "%(featureName)s Beta feedback": "Ominaisuuden %(featureName)s beetapalaute",
+    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s jäsentä mukaan lukien sinä ja %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s jäsentä mukaan lukien sinä, %(commaSeparatedMembers)s",
+    "Including you, %(commaSeparatedMembers)s": "Mukaan lukien sinä, %(commaSeparatedMembers)s",
+    "Beta feature. Click to learn more.": "Beetaominaisuus. Napsauta saadaksesi lisätietoja.",
+    "Beta feature": "Beetaominaisuus",
+    "The beginning of the room": "Huoneen alku",
+    "Last month": "Viime kuukausi",
+    "Last week": "Viime viikko",
+    "%(count)s participants|one": "1 osallistuja",
+    "%(count)s participants|other": "%(count)s osallistujaa",
+    "Connected": "Yhdistetty",
+    "Copy room link": "Kopioi huoneen linkki",
+    "New video room": "Uusi videohuone",
+    "New room": "Uusi huone",
+    "The new search": "Uusi haku",
+    "New search experience": "Uusi hakukokemus",
+    "That link is no longer supported": "Se linkki ei ole enää tuettu"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c7b7687189f..7f359f98a04 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -645,7 +645,7 @@
     "Review terms and conditions": "Voir les conditions générales",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d’identité. <b>Cette action est irréversible.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Par défaut, la désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j’ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
@@ -2863,7 +2863,7 @@
     "Move down": "Descendre",
     "Move up": "Remonter",
     "Report": "Signaler",
-    "Collapse reply thread": "Masquer le fil de réponse",
+    "Collapse reply thread": "Masquer le fil de discussion",
     "Show preview": "Afficher l’aperçu",
     "View source": "Afficher la source",
     "Forward": "Transférer",
@@ -2928,7 +2928,7 @@
     "Some invites couldn't be sent": "Certaines invitations n’ont pas pu être envoyées",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Nous avons envoyé les invitations, mais les personnes ci-dessous n’ont pas pu être invitées à rejoindre <RoomName/>",
     "Integration manager": "Gestionnaire d’intégration",
-    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Votre %(brand)s ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Votre %(brand)s ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Merci de contacter un administrateur.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s et votre gestionnaire d’intégrations.",
     "Identity server is": "Le serveur d'identité est",
     "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Les gestionnaires d’intégrations reçoivent les données de configuration et peuvent modifier les widgets, envoyer des invitations aux salons et définir les rangs à votre place.",
@@ -2972,7 +2972,7 @@
     "Space members": "Membres de l’espace",
     "Anyone in a space can find and join. You can select multiple spaces.": "Tout le monde dans un espace peut trouver et venir. Vous pouvez sélectionner plusieurs espaces.",
     "Spaces with access": "Espaces avec accès",
-    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Tout le monde dans un espace peut trouver et venir. <a>Éditer les accès des espaces ici.</a>",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Tout le monde dans un espace peut trouver et venir. <a>Modifier les accès des espaces ici.</a>",
     "Currently, %(count)s spaces have access|other": "%(count)s espaces ont actuellement l’accès",
     "& %(count)s more|other": "& %(count)s de plus",
     "Upgrade required": "Mise-à-jour nécessaire",
@@ -3135,8 +3135,8 @@
     "Role in <RoomName/>": "Rôle dans <RoomName/>",
     "Explore %(spaceName)s": "Explorer %(spaceName)s",
     "Send a sticker": "Envoyer un autocollant",
-    "Reply to thread…": "Répondre au fil…",
-    "Reply to encrypted thread…": "Répondre au fil chiffré…",
+    "Reply to thread…": "Répondre au fil de discussion…",
+    "Reply to encrypted thread…": "Répondre au fil de discussion chiffré…",
     "Add emoji": "Ajouter une émoticône",
     "To join this Space, hide communities in your <a>preferences</a>": "Pour rejoindre cet espace, cachez les communautés dans vos <a>préférences</a>",
     "To view this Space, hide communities in your <a>preferences</a>": "Pour voir cet espace, cachez les communautés dans vos <a>préférences</a>",
@@ -3173,7 +3173,7 @@
     "Include Attachments": "Inclure les fichiers attachés",
     "Size Limit": "Taille maximale",
     "Format": "Format",
-    "Select from the options below to export chats from your timeline": "Sélectionner les options ci-dessous pour exporter les conversations privées de votre historique",
+    "Select from the options below to export chats from your timeline": "Sélectionner les options ci-dessous pour exporter les conversations de votre historique",
     "Export Chat": "Exporter la conversation privée",
     "Exporting your data": "Export de vos données",
     "Stop": "Arrêter",
@@ -3237,7 +3237,7 @@
     "Kick them from everything I'm able to": "Les expulser de partout où j’ai le droit de le faire",
     "Kick from %(roomName)s": "Expulser de %(roomName)s",
     "Disinvite from %(roomName)s": "Annuler l’invitation à %(roomName)s",
-    "Threads": "Fils",
+    "Threads": "Fils de discussion",
     "To proceed, please accept the verification request on your other login.": "Pour continuer, veuillez accepter la demande de vérification sur votre autre connexion.",
     "Create poll": "Créer un sondage",
     "Updating spaces... (%(progress)s out of %(count)s)|one": "Mise-à-jour de l’espace…",
@@ -3310,7 +3310,7 @@
     "Someone already has that username, please try another.": "Quelqu’un possède déjà ce nom d’utilisateur, veuillez en essayer un autre.",
     "Own your conversations.": "Contrôlez vos conversations.",
     "Someone already has that username. Try another or if it is you, sign in below.": "Quelqu’un d’autre a déjà ce nom d’utilisateur. Essayez-en un autre ou bien, si c’est vous, connecter vous ci-dessous.",
-    "Copy link to thread": "Copier le lien dans le fil",
+    "Copy link to thread": "Copier le lien du fil de discussion",
     "Thread options": "Options des fils de discussion",
     "Add option": "Ajouter un choix",
     "Option %(number)s": "Choix %(number)s",
@@ -3585,8 +3585,8 @@
     "Navigate to next message in composer history": "Aller au prochain message de l’historique du compositeur",
     "Jump to end of the composer": "Avancer à la fin du compositeur",
     "Jump to start of the composer": "Revenir au début du compositeur",
-    "Navigate to previous message to edit": "Allez vers le précédent message à éditer",
-    "Navigate to next message to edit": "Aller vers le prochain message à éditer",
+    "Navigate to previous message to edit": "Allez vers le précédent message à modifier",
+    "Navigate to next message to edit": "Aller vers le prochain message à modifier",
     "Unable to check if username has been taken. Try again later.": "Impossible de vérifier si le nom d’utilisateur est déjà utilisé. Veuillez réessayer plus tard.",
     "Force complete": "Terminer de force",
     "Redo edit": "Restaurer la modification",
@@ -3617,5 +3617,243 @@
     "This feature is a work in progress, we'd love to hear your feedback.": "Cette fonctionnalité est en cours de développement, nous aimerions entendre vos commentaires.",
     "New search experience": "Nouvelle expérience de recherche",
     "Show current avatar and name for users in message history": "Afficher l'avatar et le nom actuels des utilisateurs dans l'historique des messages",
-    "%(space1Name)s and %(space2Name)s": "%(space1Name)s et %(space2Name)s"
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s et %(space2Name)s",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Merci d'avoir essayé la bêta, veuillez donner le plus de détails possible pour que nous puissions l'améliorer.",
+    "To leave, just return to this page or click on the beta badge when you search.": "Pour quitter, il suffit de revenir à cette page ou de cliquer sur le badge bêta lors de votre recherche.",
+    "How can I leave the beta?": "Comment puis-je quitter la bêta ?",
+    "A new, quick way to search spaces and rooms you're in.": "Un nouveau moyen rapide de rechercher les espaces et les salons dans lesquels vous vous trouvez.",
+    "No virtual room for this room": "Aucun salon virtuel pour ce salon",
+    "Switches to this room's virtual room, if it has one": "Bascule dans le salon virtuel de ce salon, s'il en a un",
+    "Automatically send debug logs when key backup is not functioning": "Envoyer automatiquement les journaux de débogage lorsque la sauvegarde des clés ne fonctionne pas",
+    "Maximise": "Maximiser",
+    "You do not have permissions to add spaces to this space": "Vous n'avez pas les permissions nécessaires pour ajouter des espaces à cet espace",
+    "Remove messages sent by me": "Supprimer les messages que j'ai moi-même envoyés",
+    "Open thread": "Ouvrir le fil de discussion",
+    "Pinned": "Épinglé",
+    "Results will be visible when the poll is ended": "Les résultats seront visibles lorsque le sondage sera terminé",
+    "Can't edit poll": "Impossible de modifier le sondage",
+    "Sorry, you can't edit a poll after votes have been cast.": "Désolé, vous ne pouvez pas modifier un sondage après que les votes aient été exprimés.",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s a supprimé un message",
+    "Drop a Pin": "Choisir sur la carte",
+    "Location sharing - pin drop (under active development)": "Partage de la position - choisir sur la carte (en développement actif)",
+    "The new search": "La nouvelle interface de recherche",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s a supprimé %(count)s messages",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s ont supprimé un message",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s ont supprimé %(count)s messages",
+    "What location type do you want to share?": "Quel type de localisation voulez-vous partager ?",
+    "My live location": "Ma position en continu",
+    "My current location": "Ma position actuelle",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)s ont modifié les <a>messages épinglés</a> pour le salon.",
+    "Search Dialog": "Fenêtre de recherche",
+    "Use <arrows/> to scroll": "Utilisez <arrows/> pour faire défiler",
+    "Join %(roomAddress)s": "Rejoindre %(roomAddress)s",
+    "Export Cancelled": "Export annulé",
+    "<%(count)s spaces>|zero": "<chaîne de caractères vide>",
+    "<%(count)s spaces>|one": "<espace>",
+    "<%(count)s spaces>|other": "<%(count)s espaces>",
+    "Results are only revealed when you end the poll": "Les résultats ne sont révélés que lorsque vous terminez le sondage",
+    "Voters see results as soon as they have voted": "Les participants voient les résultats dès qu'ils ont voté",
+    "Closed poll": "Sondage terminé",
+    "Open poll": "Ouvrir le sondage",
+    "Poll type": "Type de sondage",
+    "Edit poll": "Modifier le sondage",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s a envoyé un message caché",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s ont envoyé %(count)s messages cachés",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s ont envoyé un message caché",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s ont envoyé %(count)s messages cachés",
+    "Click for more info": "Cliquez pour en savoir plus",
+    "This is a beta feature": "Il s'agit d'une fonctionnalité bêta",
+    "Results not as expected? Please <a>give feedback</a>.": "Les résultats ne sont pas ceux escomptés ? Merci de <a>donner votre avis</a>.",
+    "This is a beta feature. Click for more info": "Il s'agit d'une fonctionnalité en version bêta. Cliquez pour en savoir plus",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s n'a pas pu envoyer votre position. Veuillez réessayer plus tard.",
+    "We couldn't send your location": "Nous n'avons pas pu envoyer votre position",
+    "Open user settings": "Ouvrir les paramètres de l'utilisateur",
+    "Switch to space by number": "Basculer vers l'espace par numéro",
+    "Next recently visited room or community": "Prochain salon ou communauté récemment visité",
+    "Previous recently visited room or community": "Précédent salon ou communauté récemment visité",
+    "Accessibility": "Accessibilité",
+    "Reply to an ongoing thread or use “Reply in thread”when hovering over a message to start a new one.": "Répondez à un fil de discussion en cours ou utilisez l'option \"Répondre dans le fil de discussion\" lorsque vous passez la souris sur un message pour en créer un nouveau.",
+    "We're testing a new search to make finding what you want quicker.\n": "Nous testons une nouvelle interface de recherche pour vous permettre de trouver plus rapidement ce que vous cherchez.\n",
+    "New search beta available": "Nouvelle interface de recherche disponible en version bêta",
+    "Match system": "S’adapter au système",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Répondez à un fil de discussion en cours ou utilisez \"%(replyInThread)s\" lorsque vous passez la souris sur un message pour en commencer un nouveau.",
+    "Insert a trailing colon after user mentions at the start of a message": "Insérer deux-points après les mentions de l'utilisateur au début d'un message",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s a changé les <a>messages épinglés</a> du salon",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s a changé %(count)s fois les <a>messages épinglés</a> du salon",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s ont modifié les <a>messages épinglés</a> pour le salon",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s ont changé %(count)s fois les <a>messages épinglés</a> du salon",
+    "Show polls button": "Afficher le bouton des sondages",
+    "Location sharing - share your current location with live updates (under active development)": "Partage de la position - partagez votre position en direct (en développement actif)",
+    "We'll create rooms for each of them.": "Nous allons créer un salon pour chacun d’entre eux.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Ce serveur d’accueil n’est pas configuré correctement pour afficher des cartes, ou bien le serveur de carte configuré est peut-être injoignable.",
+    "This homeserver is not configured to display maps.": "Ce serveur d’accueil n’est pas configuré pour afficher des cartes.",
+    "Click to drop a pin": "Cliquer pour mettre un marqueur",
+    "Click to move the pin": "Cliquer pour déplacer le marqueur",
+    "Shared a location: ": "A partagé une position : ",
+    "Shared their location: ": "Ont partagé leur position : ",
+    "Unable to load map": "Impossible de charger la carte",
+    "Click": "Clic",
+    "Expand quotes": "Étendre les citations",
+    "Collapse quotes": "Réduire les citations",
+    "Can't create a thread from an event with an existing relation": "Impossible de créer un fil de discussion à partir d’un événement avec une relation existante",
+    "Busy": "Occupé",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Si vous avez soumis une anomalie via GitHub, les journaux de débogage peuvent nous aider à cibler le problème. ",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Les espaces sont une nouvelle manière de regrouper les salons et les personnes. Quel type d’espace voulez-vous créer ? Vous pouvez changer ceci plus tard.",
+    "Next recently visited room or space": "Prochain salon ou espace récemment visité",
+    "Previous recently visited room or space": "Salon ou espace précédemment visité",
+    "Toggle Link": "Afficher/masquer le lien",
+    "Toggle Code Block": "Afficher/masquer le bloc de code",
+    "Event ID: %(eventId)s": "Identifiant d’événement : %(eventId)s",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Ce sera une transition unique, étant donné que les fils de discussion sont maintenant intégrés à la spécification de Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Pendant que nous la préparons, nous avons besoin de faire certains changements : les fils de discussion créés avant aujourd’hui seront <strong>affichés comme des réponses classiques</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Nous sommes tout proche de publier une version Beta publique des fils de discussions.",
+    "Threads Approaching Beta 🎉": "Les fils de discussion se rapproche de la Beta 🎉",
+    "Stop sharing": "Arrêter le partage",
+    "%(timeRemaining)s left": "%(timeRemaining)s restant",
+    "You are sharing your live location": "Vous partagez votre position en direct",
+    "No verification requests found": "Aucune demande de vérification trouvée",
+    "Observe only": "Observer uniquement",
+    "Requester": "Demandeur",
+    "Methods": "Méthodes",
+    "Timeout": "Temps d’attente",
+    "Phase": "Phase",
+    "Transaction": "Transaction",
+    "Cancelled": "Annulé",
+    "Started": "Démarré",
+    "Ready": "Prêt",
+    "Requested": "Envoyé",
+    "Unsent": "Non envoyé",
+    "Edit values": "Modifier les valeurs",
+    "Failed to save settings.": "Échec lors de la sauvegarde des paramètres.",
+    "Number of users": "Nombre d’utilisateurs",
+    "Server": "Serveur",
+    "Server Versions": "Versions des serveurs",
+    "Client Versions": "Versions des clients",
+    "Failed to load.": "Échec du chargement.",
+    "Capabilities": "Capacités",
+    "Send custom state event": "Envoyer des événements d’état personnalisés",
+    "Failed to send event!": "Échec de l’envoi de l’événement !",
+    "Doesn't look like valid JSON.": "Ne semble pas être du JSON valide.",
+    "Send custom room account data event": "Envoyer des événements personnalisés de données du compte du salon",
+    "Send custom account data event": "Envoyer des événements personnalisés de données du compte",
+    "Room ID: %(roomId)s": "Identifiant du salon : %(roomId)s",
+    "Server info": "Infos du serveur",
+    "Settings explorer": "Explorateur de paramètres",
+    "Explore account data": "Parcourir les données du compte",
+    "Verification explorer": "Explorateur de vérification",
+    "View servers in room": "Voir les serveurs dans le salon",
+    "Explore room account data": "Parcourir les données de compte du salon",
+    "Explore room state": "Parcourir l’état du salon",
+    "Send custom timeline event": "Envoyer des événements d’historique personnalisé",
+    "Room details": "Détails du salon",
+    "Voice & video room": "Salon vocal & visio",
+    "Text room": "Salon textuel",
+    "Room type": "Type de salon",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Décocher si vous voulez également retirer les messages systèmes de cet utilisateur (par exemple changement de statut ou de profil…)",
+    "Preserve system messages": "Préserver les messages systèmes",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Vous êtes sur le point de supprimer %(count)s messages de %(user)s. Ils seront supprimés définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Vous êtes sur le point de supprimer %(count)s message de %(user)s. Il sera supprimé définitivement et pour tout le monde dans la conversation. Voulez-vous continuer ?",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Aidez nous à identifier les problèmes et améliorer %(analyticsOwner)s en envoyant des rapports d’usage anonymes. Pour comprendre de quelle manière les gens utilisent plusieurs appareils, nous créeront un identifiant aléatoire commun à tous vos appareils.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser l’option de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Cela vous permet d’utiliser %(brand)s avec un compte Matrix existant sur un serveur d’accueil différent.",
+    "%(displayName)s's live location": "Position en direct de %(displayName)s",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s n’a pas obtenu la permission de récupérer votre position. Veuillez autoriser l’accès à votre position dans les paramètres du navigateur.",
+    "Share for %(duration)s": "Partagé pendant %(duration)s",
+    "Connecting...": "Connexion…",
+    "Voice room": "Salon vocal",
+    "Currently removing messages in %(count)s rooms|one": "Actuellement en train de supprimer les messages dans %(count)s salon",
+    "Currently removing messages in %(count)s rooms|other": "Actuellement en train de supprimer les messages dans %(count)s salons",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Les journaux de débogage contiennent les données d’utilisation de l’application incluant votre nom d’utilisateur, les identifiants ou les alias des salons que vous avez visités, les derniers élément de l’interface avec lesquels vous avez interagis, et les noms d’utilisateurs des autres utilisateurs. Ils ne contiennent pas de messages.",
+    "Developer tools": "Outils de développement",
+    "Mic": "Micro",
+    "Mic off": "Micro désactivé",
+    "Video": "Vidéo",
+    "Video off": "Vidéo désactivée",
+    "Connected": "Connecté",
+    "Voice & video rooms (under active development)": "Salon vocaux & visios (en développement actif)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s est expérimental sur un navigateur mobile. Pour une meilleure expérience et bénéficier des dernières fonctionnalités, utilisez notre application native gratuite.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Vous essayez d’accéder à un lien de communauté (%(groupId)s).<br/>Les communautés ne sont plus supportées et ont été remplacées par les espaces.<br2/><a>Cliquez ici pour en savoir plus sur les espaces.</a>",
+    "That link is no longer supported": "Ce lien n’est plus supporté",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Si la page contient des informations permettant de vous identifier, comme un salon ou un identifiant d’utilisateur, ces données sont enlevées avant qu’elle ne soit envoyée au serveur.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Si vous ne trouvez pas le salon que vous cherchez, demandez une invitation ou <a>créez un nouveau salon</a>.",
+    "<a>Give feedback</a>": "<a>Faire un commentaire</a>",
+    "Threads are a beta feature": "Les fils de discussion sont une fonctionnalité bêta",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Conseil :</b> Utilisez « Répondre dans le fil de discussion » en survolant un message.",
+    "Threads help keep your conversations on-topic and easy to track.": "Les fils de discussion vous permettent de recentrer vos conversations et de les rendre facile à suivre.",
+    "Stop sharing and close": "Arrêter le partage et fermer",
+    "An error occurred while stopping your live location, please try again": "Une erreur s’est produite en arrêtant le partage de votre position, veuillez réessayer",
+    "An error occured whilst sharing your live location, please try again": "Une erreur s’est produite pendant le partage de votre position, veuillez réessayer plus tard",
+    "An error occured whilst sharing your live location": "Une erreur s’est produite pendant le partage de votre position",
+    "Create room": "Créer un salon",
+    "Create video room": "Crée le salon visio",
+    "Create a video room": "Créer un salon visio",
+    "%(featureName)s Beta feedback": "Commentaires sur la bêta de %(featureName)s",
+    "Beta feature. Click to learn more.": "Fonctionnalité bêta. Cliquez pour en savoir plus.",
+    "Beta feature": "Fonctionnalité bêta",
+    "%(count)s participants|one": "1 participant",
+    "%(count)s participants|other": "%(count)s participants",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s a été retourné en essayant d’accéder au salon. Si vous pensez que vous ne devriez pas voir ce message, veuillez <issueLink>soumettre un rapport d’anomalie</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Réessayez plus tard ou demandez à l’administrateur du salon ou de l’espace si vous y avez accès.",
+    "This room or space is not accessible at this time.": "Ce salon ou cet espace n’est pas accessible en ce moment.",
+    "Are you sure you're at the right place?": "Êtes-vous sûr d’être au bon endroit ?",
+    "This room or space does not exist.": "Ce salon ou cet espace n’existe pas.",
+    "There's no preview, would you like to join?": "Il n’y a pas d’aperçu, voulez-vous rejoindre ?",
+    "This invite was sent to %(email)s": "Cet invitation a été envoyée à %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Cette invitation a été envoyée à %(email)s qui n’est pas associé à votre compte",
+    "You can still join here.": "Vous pouvez toujours rejoindre cet endroit.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Une erreur (%(errcode)s) s’est produite en essayant de valider votre invitation. Vous pouvez essayer de transmettre cette information à la personne qui vous a invité(e).",
+    "Something went wrong with your invite.": "Quelque chose s’est mal passé avec votre invitation.",
+    "You were banned by %(memberName)s": "Vous avez été banni par %(memberName)s",
+    "Forget this space": "Oublier cet espace",
+    "You were removed by %(memberName)s": "Vous avez été retiré par %(memberName)s",
+    "Loading preview": "Chargement de l’aperçu",
+    "Joining …": "En train de rejoindre…",
+    "New video room": "Nouveau salon visio",
+    "New room": "Nouveau salon",
+    "View older version of %(spaceName)s.": "Voir l’ancienne version de %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Mettre à niveau cet espace vers la version recommandée",
+    "sends hearts": "envoie des cœurs",
+    "Sends the given message with hearts": "Envoie le message donné avec des cœurs",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Partage de position en direct – partage votre position actuelle (développement en cours, et temporairement, les positions sont persistantes dans l’historique du salon)",
+    "Video rooms (under active development)": "Salons visios (en développement actif)",
+    "To leave, return to this page and use the “Leave the beta” button.": "Pour quitter, revenez à cette page et utilisez le bouton « Quitter la bêta ».",
+    "Use \"Reply in thread\" when hovering over a message.": "Utilisez « Répondre dans le fil de discussion » en survolant un message.",
+    "How can I start a thread?": "Comment démarrer un fil de discussion ?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Les fils de discussion aident à recentrer les conversations et les rends faciles à suivre. <a>En savoir plus</a>.",
+    "Keep discussions organised with threads.": "Gardez vos conversations organisées avec les fils de discussion.",
+    "Failed to join": "Impossible de rejoindre",
+    "The person who invited you has already left, or their server is offline.": "La personne qui vous a invité(e) a déjà quitté le salon, ou son serveur est hors-ligne.",
+    "The person who invited you has already left.": "La personne qui vous a invité(e) a déjà quitté le salon.",
+    "Sorry, your homeserver is too old to participate here.": "Désolé, votre serveur d'accueil est trop vieux pour participer ici.",
+    "There was an error joining.": "Il y a eu une erreur en rejoignant.",
+    "The user's homeserver does not support the version of the space.": "Le serveur d’accueil de l’utilisateur ne prend pas en charge la version de cet espace.",
+    "User may or may not exist": "L’utilisateur existe peut-être",
+    "User does not exist": "L’utilisateur n’existe pas",
+    "User is already in the room": "L’utilisateur est déjà dans ce salon",
+    "User is already in the space": "L’utilisateur est déjà dans cet espace",
+    "User is already invited to the room": "L’utilisateur a déjà été invité dans ce salon",
+    "User is already invited to the space": "L’utilisateur a déjà été invité dans cet espace",
+    "You do not have permission to invite people to this space.": "Vous n’avez pas la permission d’inviter des personnes dans cet espace.",
+    "Failed to invite users to %(roomName)s": "Impossible d’inviter les utilisateurs dans %(roomName)s",
+    "Jump to the given date in the timeline": "Aller à la date correspondante dans la discussion",
+    "View live location": "Voir la position en direct",
+    "Ban from room": "Bannir du salon",
+    "Unban from room": "Révoquer le bannissement du salon",
+    "Ban from space": "Bannir de l'espace",
+    "Confirm signing out these devices|one": "Confirmer la déconnexion de cet appareil",
+    "Confirm signing out these devices|other": "Confirmer la déconnexion de ces appareils",
+    "Yes, enable": "Oui, activer",
+    "Do you want to enable threads anyway?": "Voulez-vous activer les fils de discussions malgré tout ?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Votre serveur d'accueil ne prend pas actuellement en charge les fils de discussions, cette fonctionnalité peut donc ne pas être fiable. Certains messages dans les fils de discussions peuvent ne pas être disponibles de manière fiable. <a>En savoir plus</a>.",
+    "Live location enabled": "Position en temps réel activée",
+    "Live location error": "Erreur de positionnement en temps réel",
+    "Live location ended": "Position en temps réel terminée",
+    "Loading live location...": "Chargement de la position en direct…",
+    "Live until %(expiryTime)s": "En direct jusqu’à %(expiryTime)s",
+    "Unban from space": "Révoquer le bannissement de l’espace",
+    "Partial Support for Threads": "Prise en charge partielle des fils de discussions",
+    "Right-click message context menu": "Menu contextuel du message avec clic-droit"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 3c4ddf1ff96..63679ba2654 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2196,7 +2196,7 @@
     "Takes the call in the current room off hold": "Acepta a chamada na sala actual",
     "%(creator)s created this DM.": "%(creator)s creou esta MD.",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensaxes desta sala están cifradas de extremo-a-extremo. Cando se unan, podes verificar as persoas no seu perfil, tocando no seu avatar.",
-    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Aquí as mensaxes están cifradas de extremo-a-extre. Verifica a %(displayName)s no seu perfil - toca no seu avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Aquí as mensaxes están cifradas de extremo-a-extremo. Verifica a %(displayName)s no seu perfil - toca no seu avatar.",
     "This is the start of <roomName/>.": "Este é o comezo de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Engade unha foto para que se poida identificar a sala facilmente.",
     "%(displayName)s created this room.": "%(displayName)s creou esta sala.",
@@ -2205,7 +2205,7 @@
     "Topic: %(topic)s ": "Asunto: %(topic)s ",
     "Topic: %(topic)s (<a>edit</a>)": "Asunto: %(topic)s (<a>editar</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "Este é o comezo do teu historial de conversa con <displayName/>.",
-    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Só vós as dúas estades nesta conversa, a non ser que convidedes a alguén máis.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Só vós estades nesta conversa, a non ser que convidedes a alguén máis.",
     "Zimbabwe": "Zimbabue",
     "Zambia": "Zambia",
     "Yemen": "Yemen",
@@ -3284,7 +3284,7 @@
     "The homeserver the user you're verifying is connected to": "O servidor ao que está conectado a persoa que estás verificando",
     "Can't see what you're looking for?": "Non atopas o que buscas?",
     "You do not have permission to start polls in this room.": "Non tes permiso para publicar enquisas nesta sala.",
-    "Reply in thread": "Responder na conversa",
+    "Reply in thread": "Responder nun fío",
     "Manage rooms in this space": "Xestionar salas neste espazo",
     "You won't get any notifications": "Non recibirás ningunha notificación",
     "Get notifications as set up in your <a>settings</a>": "Ter notificacións tal como se indica nos <a>axustes</a>",
@@ -3630,7 +3630,7 @@
     "<%(count)s spaces>|other": "<%(count)s espazos>",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s enviou unha mensaxe oculta",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s enviou %(count)s mensaxes ocultas",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s enviou %(count)s mensaxe oculta",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s enviou unha mensaxe oculta",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s enviaron %(count)s mensaxes ocultas",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s eliminou unha mensaxe",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s eliminou %(count)s mensaxes",
@@ -3649,5 +3649,209 @@
     "Open poll": "Abrir enquisa",
     "Poll type": "Tipo de enquisa",
     "Results will be visible when the poll is ended": "Os resultados serán visibles cando remate a enquisa",
-    "Show current avatar and name for users in message history": "Mostrar o avatar actual e nome para as usuarias no historial de mensaxes"
+    "Show current avatar and name for users in message history": "Mostrar o avatar actual e nome para as usuarias no historial de mensaxes",
+    "Open user settings": "Abrir axustes",
+    "Switch to space by number": "Cambia á sala polo número",
+    "Next recently visited room or community": "Seguinte sala ou comunidade visitadas",
+    "Previous recently visited room or community": "Sala ou comunidade visitada con anterioridade",
+    "Accessibility": "Accesibilidade",
+    "This is a beta feature. Click for more info": "Esta é unha característica en beta. Preme para máis info",
+    "Export Cancelled": "Exportación cancelada",
+    "What location type do you want to share?": "Que tipo de localización queres compartir?",
+    "Drop a Pin": "Fixa a posición",
+    "My live location": "Localización en direto",
+    "My current location": "Localización actual",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s non enviou a túa localización. Inténtao máis tarde.",
+    "We couldn't send your location": "Non puidemos enviar a túa localización",
+    "Pinned": "Fixado",
+    "Open thread": "Abrir fío",
+    "Remove messages sent by me": "Eliminar mensaxes que enviei",
+    "Match system": "Seguir o sistema",
+    "Location sharing - pin drop (under active development)": "Compartir localización - fixar (en desenvolvemento)",
+    "No virtual room for this room": "No hai sala virtual para esta sala",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Responde a unha conversa en curso ou usa \"%(replyInThread)s\" cando pasas por enriba dunha mensaxe co rato para iniciar unha nova.",
+    "We'll create rooms for each of them.": "Imos crear salas para cada un deles.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s cambiou as <a>mensaxes fixadas</a> da sala %(count)s veces",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s cambiaron as <a>mensaxes fixadas</a> da sala %(count)s veces",
+    "Click": "Premer",
+    "Expand quotes": "Despregar as citas",
+    "Collapse quotes": "Pregar as citas",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Espazos é o novo xeito de agrupar salas e persoas. Que tipo de Espazo queres crear? Pódelo cambiar máis tarde.",
+    "Insert a trailing colon after user mentions at the start of a message": "Inserir dous puntos tras mencionar a outra usuaria no inicio da mensaxe",
+    "Show polls button": "Mostrar botón de enquisas",
+    "Location sharing - share your current location with live updates (under active development)": "Compartir localización - comparte a túa localización actual con actualizacións en directo (en desenvolvemento)",
+    "Switches to this room's virtual room, if it has one": "Cambia á sala virtual desta sala, se é que existe",
+    "Toggle Link": "Activar Ligazón",
+    "Toggle Code Block": "Activar Bloque de Código",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Será unha transición dun só paso, xa que os fíos son agora unha parte da especificación de Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Mentras nos preparamos, temos que facer algúns cambios: os fíos creados antes deste punto van ser <strong>mostrados como respostas normais</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Estamos achegándonos á publicación da versión Beta para Fíos.",
+    "Threads Approaching Beta 🎉": "Fíos achégase á Beta 🎉",
+    "You are sharing your live location": "Vas compartir en directo a túa localización",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Desmarcar se tamén queres eliminar as mensaxes do sistema acerca da usuaria (ex. cambios na membresía, cambios no perfil...)",
+    "Preserve system messages": "Conservar mensaxes do sistema",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Vas eliminar %(count)s mensaxe de %(user)s. Esto eliminaraa de xeito permanente para todas na conversa. Tes a certeza de querer eliminala?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Vas a eliminar %(count)s mensaxes de %(user)s. Así eliminaralos de xeito permanente para todas na conversa. Tes a certeza de facelo?",
+    "%(displayName)s's live location": "Localización en directo de %(displayName)s",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Este servidor non está correctamente configurado para mostrar mapas, ou o servidor de mapas configurado non é accesible.",
+    "This homeserver is not configured to display maps.": "Este servidor non está configurado para mostrar mapas.",
+    "Click to drop a pin": "Click para soltar un marcador",
+    "Click to move the pin": "Click para mover marcador",
+    "Share for %(duration)s": "Compartida durante %(duration)s",
+    "Shared a location: ": "Compartiu unha localización: ",
+    "Shared their location: ": "Compartiron a súa localización: ",
+    "Unable to load map": "Non se cargou o mapa",
+    "Can't create a thread from an event with an existing relation": "Non se pode crear un tema con unha relación existente desde un evento",
+    "Currently removing messages in %(count)s rooms|one": "Eliminando agora mensaxes de %(count)s sala",
+    "Currently removing messages in %(count)s rooms|other": "Eliminando agora mensaxes de %(count)s salas",
+    "Busy": "Ocupado",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Se informaches do fallo en GitHub, os rexistros poden ser útiles para arranxar o problema. ",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "Command error: Unable to handle slash command.": "Erro no comando: non se puido xestionar o comando con barra.",
+    "Next recently visited room or space": "Seguinte sala ou espazo visitados recentemente",
+    "Previous recently visited room or space": "Anterior sala ou espazo visitados recentemente",
+    "Event ID: %(eventId)s": "ID do evento: %(eventId)s",
+    "Stop sharing": "Deixar de compartir",
+    "%(timeRemaining)s left": "%(timeRemaining)s restante",
+    "No verification requests found": "Non se atopan solicitudes de verificación",
+    "Observe only": "Só observar",
+    "Requester": "Solicitante",
+    "Methods": "Métodos",
+    "Timeout": "Caducidade",
+    "Phase": "Fase",
+    "Transaction": "Transacción",
+    "Cancelled": "Cancelado",
+    "Started": "Iniciado",
+    "Ready": "Preparado",
+    "Requested": "Solicitado",
+    "Unsent": "Sen enviar",
+    "Edit values": "Editar valores",
+    "Failed to save settings.": "Fallou o gardado dos axustes.",
+    "Number of users": "Número de usuarias",
+    "Server": "Servidor",
+    "Server Versions": "Versións do servidor",
+    "Client Versions": "Versións do cliente",
+    "Failed to load.": "Fallou a carga.",
+    "Capabilities": "Capacidades",
+    "Send custom state event": "Enviar evento de estado personalizado",
+    "Failed to send event!": "Fallou o envio do evento!",
+    "Doesn't look like valid JSON.": "Non semella un JSON válido.",
+    "Send custom room account data event": "Enviar evento de datos da sala personalizado",
+    "Send custom account data event": "Enviar evento de datos da conta personalizado",
+    "Room ID: %(roomId)s": "ID da sala: %(roomId)s",
+    "Server info": "Info do servidor",
+    "Settings explorer": "Explorar axustes",
+    "Explore account data": "Explorar datos da conta",
+    "Verification explorer": "Explorador da verificación",
+    "View servers in room": "Ver servidores na sala",
+    "Explore room account data": "Explorar datos da conta da sala",
+    "Explore room state": "Explorar estado da sala",
+    "Send custom timeline event": "Enviar evento personalizado da cronoloxía",
+    "Room details": "Detalles da sala",
+    "Voice & video room": "Sala de voz e vídeo",
+    "Text room": "Sala de texto",
+    "Room type": "Tipo de sala",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Axúdanos a atopar problemas e mellorar %(analyticsOwner)s compartindo datos anónimos de uso. Para comprender de que xeito as persoas usan varios dispositivos imos crear un identificador aleatorio compartido polos teus dispositivos.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Podes usar as opcións personalizadas do servidor para acceder a outros servidores Matrix indicando o URL do servidor de inicio. Así podes usar %(brand)s cunha conta Matrix rexistrada nun servidor diferente.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s non ten permiso para obter a túa localización. Concede acceso á localización nos axustes do navegador.",
+    "Connecting...": "Conectando...",
+    "Voice room": "Sala de voz",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Os rexistros de depuración conteñen datos de uso da aplicación incluíndo o teu nome de usuaria, os IDs ou alias das salas que visitaches, os elementos da IU cos que interactuaches así como os identificadores de outras usuarias.",
+    "Developer tools": "Ferramentas desenvolvemento",
+    "Mic": "Micro",
+    "Mic off": "Micro apagado",
+    "Video": "Vídeo",
+    "Video off": "Video apagado",
+    "Connected": "Conectado",
+    "Voice & video rooms (under active development)": "Salas de voz e vídeo (en desenvolvemento)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s é experimental no navegador web móbil. Para ter unha mellor experiencia e as últimas características usa a nosa app nativa.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Estás intentando acceder a unha comunidade (%(groupId)s).<br/>As Comunidades xa non teñen soporte e foron substituídas por Espazos.<br2/><a>Aprende máis acerca dos Espazos.</a>",
+    "That link is no longer supported": "Esa ligazón xa non está soportada",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable, como a sala, ID de usuaria, os datos serán eliminados antes de enviala ao servidor.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Se non atopas a sala que buscar, pide un convite ou <a>crea unha nova sala</a>.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Compartir localización en directo - comparte a localización (en desenvolvemento e, temporalmente, as localizacións permanecen no historial da sala)",
+    "User may or may not exist": "A usuaria podería non existir",
+    "User does not exist": "A usuaria non existe",
+    "User is already in the room": "A usuaria xa está na sala",
+    "User is already in the space": "A usuaria xa está no espazo",
+    "User is already invited to the room": "A usuaria xa está convidada á sala",
+    "User is already invited to the space": "A usuaria xa está convidada ao espazo",
+    "You do not have permission to invite people to this space.": "Non tes permiso para convidar persoas a este espazo.",
+    "Failed to invite users to %(roomName)s": "Fallou o convite das usuarias para %(roomName)s",
+    "<a>Give feedback</a>": "<a>Informar e dar opinión</a>",
+    "Threads are a beta feature": "Os fíos son unha ferramenta beta",
+    "Threads help keep your conversations on-topic and easy to track.": "Os fíos axúdanche a manter as conversas no tema e facilitan o seguimento.",
+    "Stop sharing and close": "Deter a compartición e pechar",
+    "An error occurred while stopping your live location, please try again": "Algo fallou ao deter a túa localización en directo, inténtao outra vez",
+    "An error occured whilst sharing your live location, please try again": "Algo fallou ao compartir a túa localización en directo, inténtao máis tarde",
+    "An error occured whilst sharing your live location": "Algo fallou ao compartir a túa localización en directo",
+    "Create room": "Crear sala",
+    "Create video room": "Crear sala de vídeo",
+    "Create a video room": "Crear sala de vídeo",
+    "%(featureName)s Beta feedback": "Informe sobre %(featureName)s Beta",
+    "Beta feature. Click to learn more.": "Característica beta. Preme para saber máis.",
+    "Beta feature": "Característica Beta",
+    "%(count)s participants|one": "1 participante",
+    "%(count)s participants|other": "%(count)s participantes",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Obtívose o erro %(errcode)s ao intentar acceder á sala ou espazo. Se cres que esta mensaxe é un erro, por favor <issueLink>envía un informe do fallo</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Inténtao máis tarde, ou solicita a admin da sala ou espazo que mire se tes acceso.",
+    "This room or space is not accessible at this time.": "Esta sala ou espazo non é accesible neste intre.",
+    "Are you sure you're at the right place?": "Tes a certeza de que é o lugar correcto?",
+    "This room or space does not exist.": "Esta sala ou espazo no existe.",
+    "There's no preview, would you like to join?": "Non hai vista previa, queres unirte?",
+    "This invite was sent to %(email)s": "Este convite enviouse a %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "O convite enviouselle a %(email)s que non está asociado coa túa conta",
+    "You can still join here.": "Podes entrar aquí igualmente.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Houbo un erro (%(errcode)s) ao intentar validar o teu convite. Podes intentar enviarlle esta información á persoa que te convidou.",
+    "Something went wrong with your invite.": "Algo foi mal co teu convite.",
+    "You were banned by %(memberName)s": "%(memberName)s vetoute",
+    "Forget this space": "Esquecer este espazo",
+    "You were removed by %(memberName)s": "%(memberName)s eliminoute de aquí",
+    "Loading preview": "Cargando vista previa",
+    "Joining …": "Entrando…",
+    "New video room": "Nova sala de vídeo",
+    "New room": "Nova sala",
+    "View older version of %(spaceName)s.": "Ver versión anterior de %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Actualiza este espazo á última versión recomendada da sala",
+    "Video rooms (under active development)": "Salas de vídeo (en desenvolvemento activo)",
+    "To leave, return to this page and use the “Leave the beta” button.": "Para saír, volve a esta páxina e usa o botón \"Saír da beta\".",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Truco:</b> Us \"Responder nun fío\" ao situarte sobre unha mensaxe.",
+    "Use \"Reply in thread\" when hovering over a message.": "Usa \"Responder nun fío\" cando te sitúes nunha mensaxe.",
+    "How can I start a thread?": "Como abrir un fío?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Os fíos axudan a centrar a conversa nun tema e facilitan o seguimento. <a>Coñece máis</a>.",
+    "Keep discussions organised with threads.": "Marter as conversas organizadas en fíos.",
+    "Failed to join": "Non puideches entrar",
+    "The person who invited you has already left, or their server is offline.": "A persoa que te convidou xa saíu, ou o seu servidor non está conectado.",
+    "The person who invited you has already left.": "A persoa que te convidou xa deixou o lugar.",
+    "Sorry, your homeserver is too old to participate here.": "Lamentámolo, o teu servidor de inicio é demasiado antigo para poder participar.",
+    "There was an error joining.": "Houbo un erro ao unirte.",
+    "The user's homeserver does not support the version of the space.": "O servidor de inicio da usuaria non soporta a versión do Espazo.",
+    "sends hearts": "envía corazóns",
+    "Sends the given message with hearts": "Engádelle moitos corazóns á mensaxe",
+    "Confirm signing out these devices|one": "Confirma a desconexión deste dispositivo",
+    "Confirm signing out these devices|other": "Confirma a desconexión destos dispositivos",
+    "Live location ended": "Rematou a localización en directo",
+    "Loading live location...": "Obtendo localización en directo...",
+    "View live location": "Ver localización en directo",
+    "Live location enabled": "Activada a localización en directo",
+    "Live location error": "Erro na localización en directo",
+    "Live until %(expiryTime)s": "En directo ata %(expiryTime)s",
+    "Ban from room": "Vetar na sala",
+    "Unban from room": "Retirar veto á sala",
+    "Ban from space": "Vetar ao espazo",
+    "Unban from space": "Retirar veto ao espazo",
+    "Disinvite from room": "Retirar convite á sala",
+    "Remove from space": "Retirar do espazo",
+    "Disinvite from space": "Retirar convite ao espazo",
+    "Yes, enable": "Si, activádeos",
+    "Do you want to enable threads anyway?": "Queres activar os fíos igualmente?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "O teu servidor actualmente non ten soporte para fíos, polo que podería non ser totalmente fiable. Algún dos comentarios fiados poderían non estar dispoñibles. <a>Saber máis</a>.",
+    "Partial Support for Threads": "Soporte parcial para Fíos",
+    "Right-click message context menu": "Botón dereito para menú contextual",
+    "Jump to the given date in the timeline": "Ir á seguinte data dada na cronoloxía"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index c7729531fc6..323828fc614 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -40,7 +40,7 @@
     "Submit debug logs": "הזן יומני ניפוי שגיאה (דבאג)",
     "Edit": "ערוך",
     "Online": "מקוון",
-    "Register": "רשום",
+    "Register": "צור חשבון",
     "Rooms": "חדרים",
     "Add rooms to this community": "הוסף חדר שיחוח לקהילה זו",
     "OK": "בסדר",
@@ -54,7 +54,7 @@
     "Cancel": "ביטול",
     "Send": "שלח",
     "Continue": "המשך",
-    "Failed to change password. Is your password correct?": "נכשל בשינוי סיסמא, האם הסיסמא נכונה?",
+    "Failed to change password. Is your password correct?": "שינוי הסיסמה נכשל. האם הסיסמה שלך נכונה?",
     "unknown error code": "קוד שגיאה לא מוכר",
     "Failed to forget room %(errCode)s": "נכשל בעת בקשה לשכוח חדר %(errCode)s",
     "Mute": "השתק",
@@ -254,7 +254,7 @@
     "e.g. <CurrentPageURL>": "למשל <קישור נוכחי של הדף>",
     "Failure to create room": "כשלון ביצירת חדר",
     "The server does not support the room version specified.": "השרת אינו תומך בגירסת החדר הזו.",
-    "Server may be unavailable, overloaded, or you hit a bug.": "השרת יכול להיות סגור או עמוס או יתכן ויש לכם תקלה.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "יתכן והשרת לא זמין, עמוס, או שקיימת תקלה.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "הקובץ %(fileName)s עולה בגודלו על הגודל המותר להעלאה",
     "The file '%(fileName)s' failed to upload.": "נכשלה העלאת הקובץ %(fileName)s.",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "לא ניתן כעת להשיב עם קובץ. האם תרצו להעלות את הקובץ ללא תגובה?",
@@ -297,7 +297,7 @@
     "Failed to add the following rooms to %(groupId)s:": "הוספת החדרים אל %(groupId)s נכשלה:",
     "Failed to invite users to %(groupId)s": "הזמנת משתמשים אל %(groupId)s נכשלה",
     "Failed to invite users to community": "הזמנת משתמשים אל הקהילה נכשלה",
-    "Failed to invite the following users to %(groupId)s:": "הזמנת החברים אל %(groupId)s נכשלה:",
+    "Failed to invite the following users to %(groupId)s:": "הזמנת המשתמשים הבאים אל %(groupId)s נכשלה:",
     "Add to community": "הוסף אל קהילה",
     "Room name or address": "שם חדר או כתובת",
     "Name or Matrix ID": "שם או שם משתמש",
@@ -311,7 +311,7 @@
     "United Kingdom": "אנגליה",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "המייל שלכם לא משוייך לחשבון בשרת הזה.",
     "This email address was not found": "המייל הזה לא נמצא",
-    "Unable to enable Notifications": "לא מצליח להחיל התרעות",
+    "Unable to enable Notifications": "לא ניתן להפעיל התראות",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s לא נתנו הרשאות לשלוח התרעות - אנא נסו שוב",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s אין אישור לשלוח אליכם הודעות - אנא בדקו את הרשאות הדפדפן",
     "%(name)s is requesting verification": "%(name)s מבקש אימות",
@@ -549,7 +549,7 @@
     "Vanuatu": "ונואטו",
     "Default": "ברירת מחדל",
     "Sign In": "התחברות",
-    "Create Account": "יצירת חשבון",
+    "Create Account": "משתמש חדש",
     "Use your account or create a new one to continue.": "השתמשו בחשבונכם או צרו חשבון חדש.",
     "Sign In or Create Account": "התחברו או צרו חשבון",
     "Zimbabwe": "זימבבואה",
@@ -574,7 +574,7 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "החדר הזה משמש להודעות חשובות מהשרת ולכן אינכם יכולים לעזוב אותו.",
     "Can't leave Server Notices room": "לא יכול לעזוב את חדר ההודעות של השרת",
     "Unexpected server error trying to leave the room": "שגיאת שרת לא צפויה בנסיון לעזוב את החדר",
-    "Authentication check failed: incorrect password?": "האימות שלכם נכשל: סיסמא שגוייה?",
+    "Authentication check failed: incorrect password?": "האימות שלכם נכשל: סיסמא שגויה?",
     "Not a valid %(brand)s keyfile": "קובץ מפתח של %(brand)s אינו תקין",
     "Your browser does not support the required cryptography extensions": "הדפדפן שלכם אינו תומך בהצפנה הדרושה",
     "%(name)s (%(userId)s)": "%(userId)s %(name)s",
@@ -705,7 +705,7 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s הגדיר את הסטוריית החדר פתוחה עבור (%(visibility)s) לא ידועים.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s הגדיר את הסטוריית החדר פתוחה עבור כולם.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s הגדיר את הסטוריית החדר כפתוחה לכל משתמשי החדר.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s הגדיר את תצוגת ההסטוריה של החדר כפתוחה עבור כל משתמשי החדר, מהרגע שבו הם הצתרפו.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s הגדיר/ה את תצוגת ההיסטוריה של החדר כפתוחה עבור כל משתמשי החדר, מהרגע שבו הם הצטרפו.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s הגדיר את תצוגת ההסטוריה של החדר כפתוחה עבור כל משתמשי החדר, מהרגע שבו הם הוזמנו.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s שלח הזמנה ל%(targetDisplayName)s להצטרף אל החדר.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s דחה את ההזמנה של %(targetDisplayName)s להצטרף אל החדר.",
@@ -773,11 +773,11 @@
     "Delete Backup": "מחק גיבוי",
     "Save": "שמירה",
     "Profile picture": "תמונת פרופיל",
-    "Display Name": "הצג שם",
+    "Display Name": "שם לתצוגה",
     "Profile": "פרופיל",
     "<a>Upgrade</a> to your own domain": "<a>שדרגו</a> לדומיין משלכם",
     "The operation could not be completed": "לא ניתן היה להשלים את הפעולה",
-    "Failed to save your profile": "שמירת הפרופיל שלכם נכשלה",
+    "Failed to save your profile": "שמירת הפרופיל שלך נכשלה",
     "Enable audible notifications for this session": "אפשר התראות נשמעות עבור התחברות זו",
     "Enable desktop notifications for this session": "החל התראות עבור התחברות זו",
     "Clear notifications": "נקה התראות",
@@ -792,7 +792,7 @@
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s.",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "אמת בנפרד כל מושב שמשתמש בו כדי לסמן אותו כאמצעי מהימן, ולא אמון על מכשירים חתומים צולבים.",
     "Encryption": "הצפנה",
-    "Failed to set display name": "תצוגת שם נכשלה",
+    "Failed to set display name": "עדכון שם תצוגה נכשל",
     "Last seen": "שם משפחה",
     "Public Name": "שם ציבורי",
     "ID": "קוד זיהוי",
@@ -836,7 +836,7 @@
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "שינוי הסיסמה יאפס כרגע את כל מפתחות ההצפנה מקצה לקצה בכל ההפעלות, מה שהופך את היסטוריית הצ'אט המוצפנת לבלתי קריאה, אלא אם כן אתה מייצא תחילה את מפתחות החדר שלך ומייבא אותם מחדש לאחר מכן. בעתיד זה ישופר.",
     "Passwords can't be empty": "ססמאות לא יכולות להיות ריקות",
     "New passwords don't match": "הססמאות החדשות לא תואמות",
-    "No display name": "אין תצוגת שם",
+    "No display name": "אין שם לתצוגה",
     "Upload new:": "העלאה חדשה:",
     "Failed to upload profile picture!": "העלאת תמונת פרופיל נכשלה!",
     "Show more": "הצג יותר",
@@ -1248,21 +1248,21 @@
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s דחה את ההזמנה %(count)s פעמים",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s דחו את ההזמנה שלהם",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s דחו את ההזמנה שלהם%(count)s פעמים",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s עזב וחזר",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s עזב וחזר %(count)s פעמים",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s עזב/ה וחזר/ה",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s עזב/ה וחזר/ה %(count)s פעמים",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s עזבו וחזרו",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s עזבו וחזרו %(count)s פעמים",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s הצטרפ/ה ועזב/ה",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s הצטרף ועזב/ה %(count)s פעמים",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s הצתרפו ועזבו",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s הצתרפו ועזבו %(count)s פעמים",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s עזב\\ה",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s עזב %(count)s פעמים",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s הצטרף/ה ועזב/ה",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s הצטרף/ה ועזב/ה %(count)s פעמים",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s הצטרפו ועזבו",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s הצטרפו ועזבו %(count)s פעמים",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s עזב/ה",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s עזב/ה %(count)s פעמים",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s עזבו",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s עזבו %(count)s פעמים",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s הצתרפו",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s הצתרפו %(count)s פעמים",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s הצתרפו %(count)s פעמים",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s הצטרף/ה",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s הצטרפו %(count)s פעמים",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s הצטרף/ה %(count)s פעמים",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s הצטרפ/ה",
     "%(nameList)s %(transitionList)s": "%(nameList)s-%(transitionList)s",
     "Language Dropdown": "תפריט שפות",
@@ -1617,7 +1617,7 @@
     "Once enabled, encryption cannot be disabled.": "לאחר הפעלתו, לא ניתן לבטל את ההצפנה.",
     "Security & Privacy": "אבטחה ופרטיות",
     "Who can read history?": "למי מותר לקרוא הסטוריה?",
-    "Members only (since they joined)": "חברים בלבד (מאז שהצתרפו)",
+    "Members only (since they joined)": "חברים בלבד (מאז שהצטרפו)",
     "Members only (since they were invited)": "חברים בלבד (מאז שהוזמנו)",
     "Members only (since the point in time of selecting this option)": "חברים בלבד (מאז נקודת הזמן לבחירת אפשרות זו)",
     "Anyone": "כולם",
@@ -1664,7 +1664,7 @@
     "Your theme": "ערכת הנושא שלכם",
     "Your user ID": "קוד זהות המשתמש שלכם",
     "Your avatar URL": "כתובת הקישור לאווטאר שלכם",
-    "Your display name": "שם התצוגה שלכם",
+    "Your display name": "שם התצוגה שלך",
     "Any of the following data may be shared:": "ניתן לשתף כל אחד מהנתונים הבאים:",
     "Unknown Address": "כתובת לא ידועה",
     "Cancel search": "בטל חיפוש",
@@ -2019,7 +2019,7 @@
     "Use an email address to recover your account": "השתמש בכתובת דוא\"ל לשחזור חשבונך",
     "Sign in": "כניסה",
     "Sign in with": "כניסה עם",
-    "Forgot password?": "שכחנו סיסמה?",
+    "Forgot password?": "שכחת את הסיסמה?",
     "Phone": "טלפון",
     "Username": "שם משתמש",
     "Email": "דוא\"ל",
@@ -2068,10 +2068,10 @@
     "Reject invitation": "דחה הזמנה",
     "Hold": "החזק",
     "Resume": "תקציר",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>אזהרה</b>: עליך להגדיר גיבוי מפתחות הצפנה רק ממחשב מהימן.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>אזהרה</b>: עליך להגדיר גיבוי מפתחות הצפנה רק ממחשב מהימן.",
     "Successfully restored %(sessionCount)s keys": "שוחזר בהצלחה %(sessionCount)s מפתחות",
-    "Failed to decrypt %(failedCount)s sessions!": "הפענוח של %(failedCount)s שניות נכשל!",
+    "Failed to decrypt %(failedCount)s sessions!": "הפענוח של %(failedCount)s חיבורים נכשל!",
     "Keys restored": "מפתחות משוחזרים",
     "No backup found!": "לא נמצא גיבוי!",
     "Unable to restore backup": "לא ניתן לשחזר את הגיבוי",
@@ -2182,7 +2182,7 @@
     "Report Content to Your Homeserver Administrator": "דווח על תוכן למנהל שרת הבית שלך",
     "Please fill why you're reporting.": "אנא מלאו מדוע אתם מדווחים.",
     "Email (optional)": "דוא\"ל (לא חובה)",
-    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "רק קדימה, אם לא תוסיף דוא\"ל ושכחת את הסיסמה שלך, אתה יכול <b> לאבד לצמיתות את הגישה לחשבונך </b>.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "שים לב, אם לא תשייך כתובת דואר אלקטרוני ותשכח את הסיסמה שלך, אתה תאבד <b>לצמיתות</b> את הגישה לחשבונך.",
     "Continuing without email": "ממשיך ללא דוא\"ל",
     "Doesn't look like a valid email address": "לא נראה כמו כתובת דוא\"ל תקפה",
     "Data on this screen is shared with %(widgetDomain)s": "הנתונים על המסך הזה משותפים עם %(widgetDomain)s",
@@ -2404,7 +2404,7 @@
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "ההפעלה החדשה שלך אומתה. יש לו גישה להודעות המוצפנות שלך, ומשתמשים אחרים יראו בכך אמינים.",
     "Decide where your account is hosted": "החלט היכן מתארח חשבונך",
     "Host account on": "חשבון מארח ב",
-    "Create account": "צור חשבון",
+    "Create account": "חשבון משתמש חדש",
     "Registration Successful": "ההרשמה בוצעה בהצלחה",
     "You can now close this window or <a>log in</a> to your new account.": "כעת תוכלו לסגור חלון זה או <a> להיכנס </a> לחשבונכם החדש.",
     "<a>Log in</a> to your new account.": "<a> היכנס </a> לחשבונך החדש.",
@@ -2417,7 +2417,7 @@
     "This server does not support authentication with a phone number.": "שרת זה אינו תומך באימות עם מספר טלפון.",
     "Registration has been disabled on this homeserver.": "ההרשמה הושבתה בשרת הבית הזה.",
     "Unable to query for supported registration methods.": "לא ניתן לשאול לשיטות רישום נתמכות.",
-    "New? <a>Create account</a>": "חָדָשׁ? <a> צור חשבון </a>",
+    "New? <a>Create account</a>": "<a>משתמש חדש</a>",
     "If you've joined lots of rooms, this might take a while": "אם הצטרפת להרבה חדרים, זה עשוי לקחת זמן מה",
     "Signing In...": "מתחבר...",
     "Syncing...": "מסנכרן...",
@@ -2601,5 +2601,179 @@
     "You cannot place calls in this browser.": "לא ניתן לבצע שיחות בדפדפן זה.",
     "Calls are unsupported": "שיחות לא נתמכות",
     "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "השרת דחה את ניסיון ההזדהות שלך, או שהפעולה ארכה יותר מדיי זמן. אנא נסה שוב. פנה למנהל השרת במידה והתקלה חוזרת על עצמה.",
-    "%(date)s at %(time)s": "%(date)s בשעה %(time)s"
+    "%(date)s at %(time)s": "%(date)s בשעה %(time)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s בחר/ה שם תצוגה חדש - %(displayName)s",
+    "Verified devices": "מכשירים מאומתים",
+    "Unverified devices": "מכשירים לא מאומתים",
+    "Your new device is now verified. Other users will see it as trusted.": "המכשיר שלך מוגדר כעת כמאומת. משתמשים אחרים יראו אותו כמכשיר מהימן.",
+    "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "המכשיר שלך מוגדר כעת כמאומת. יש לו גישה להודעות המוצפנות שלך ומשתמשים אחרים יראו אותו כמכשיר מהימן.",
+    "Device verified": "המכשיר אומת",
+    "Failed to load list of rooms.": "טעינת רשימת החדרים נכשלה.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "תקלת התחברות לשרת הבית. אנא סגור חלון זה ונסה שוב.",
+    "Failed to save settings": "שמירת ההגדרות נכשלה",
+    "Failed to migrate community": "העברת הקהילה נכשלה",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "אתחול חיפוש ההודעות נכשל. בדוק את <a>ההגדרות שלך</a> למידע נוסף",
+    "Failed to fetch your location. Please try again later.": "איתור המיקום שלך נכשל. אנא נסה שוב מאוחר יותר.",
+    "Failed to load map": "תקלה בטעינת מפה",
+    "Connection failed": "החיבור נכשל",
+    "Failed to remove user": "הסרת המשתמש נכשלה",
+    "Failed to send": "השליחה נכשלה",
+    "Message search initialisation failed": "אתחול חיפוש הודעות נכשל",
+    "Specify a number of messages": "ציין מספר הודעות",
+    "From the beginning": "מההתחלה",
+    "Plain Text": "טקסט רגיל",
+    "Are you sure you want to exit during this export?": "האם אתה בטוח שברצונך לצאת במהלך הייצוא הזה?",
+    "Share your public space": "שתף את המרחב הציבורי שלך",
+    "Jump to the given date in the timeline (YYYY-MM-DD)": "קפוץ לתאריך הנתון בציר הזמן (YYYY-MM-DD)",
+    "Command error: Unable to find rendering type (%(renderingType)s)": "שגיאת פקודה: לא ניתן למצוא את סוג העיבוד (%(renderingType)s)",
+    "Command error: Unable to handle slash command.": "שגיאת פקודה: לא ניתן לטפל בפקודת לוכסן.",
+    "You cannot place calls without a connection to the server.": "אינך יכול לבצע שיחות ללא חיבור לשרת.",
+    "Developer mode": "מצב מפתח",
+    "Show all rooms in Home": "הצג את כל החדרים בבית",
+    "Autoplay videos": "הפעלה אוטומטית של סרטונים",
+    "Don't send read receipts": "אל תשלחו אישורי קריאה",
+    "How can I give feedback?": "איך אני יכול לתת משוב?",
+    "New search experience": "ניסיון חיפוש חדש",
+    "Developer": "מפתח",
+    "Experimental": "נִסיוֹנִי",
+    "Spaces": "רווחים",
+    "Messaging": "הודעות",
+    "Moderation": "מְתִינוּת",
+    "Back to thread": "חזרה לשרשור",
+    "Room members": "חברי החדר",
+    "Back to chat": "חזרה לצ'אט",
+    "Threads": "חוטים",
+    "Check your devices": "בדוק את המכשירים שלך",
+    "Sound on": "צליל דולק",
+    "You have unverified logins": "יש לך כניסות לא מאומתות",
+    "Stop": "עצור",
+    "That's fine": "זה בסדר",
+    "Creating output...": "יוצר פלט...",
+    "Starting export process...": "מתחיל בתהליך הייצוא...",
+    "File Attached": "מצורף קובץ",
+    "Export successful!": "הייצוא הצליח!",
+    "Starting export...": "מתחיל לייצא...",
+    "Error fetching file": "שגיאה באחזור הקובץ",
+    "Current Timeline": "ציר הזמן הנוכחי",
+    "Voice Message": "הודעה קולית",
+    "Sticker": "מַדבֵּקָה",
+    "Send voice message": "שלח הודעה קולית",
+    "Reply to thread…": "תשובה לשרשור…",
+    "Send message": "לשלוח הודעה",
+    "Your message was sent": "ההודעה שלך נשלחה",
+    "Sending your message...": "שולח את הודעתך...",
+    "Copy link to thread": "העתק קישור לשרשור",
+    "Unknown failure": "כשל לא ידוע",
+    "Remove users": "הסר משתמשים",
+    "Send reactions": "שלח תגובות",
+    "Where you're signed in": "איפה אתה מחובר",
+    "Okay": "בסדר",
+    "You have no ignored users.": "אין לך משתמשים שהתעלמו מהם.",
+    "Displaying time": "מציג זמן",
+    "Show my Communities": "הצג את הקהילות שלי",
+    "Open Space": "שטח פתוח",
+    "Keyboard": "מקלדת",
+    "Global": "גלוֹבָּלִי",
+    "Enable for this account": "הפעל עבור חשבון זה",
+    "Loading new room": "טוען חדר חדש",
+    "Sending invites... (%(progress)s out of %(count)s)|one": "שולח הזמנה...",
+    "Upgrade required": "נדרש שדרוג",
+    "Anyone can find and join.": "כל אחד יכול למצוא ולהנות.",
+    "Large": "גדול",
+    "Rename": "שנה שם",
+    "Sign Out": "התנתק",
+    "This device": "המכשיר הזה",
+    "Devices without encryption support": "מכשירים ללא תמיכה בהצפנה",
+    "Select all": "בחר הכל",
+    "Deselect all": "הסר סימון מהכל",
+    "Sign out devices|one": "צא מהמכשיר",
+    "Sign out devices|other": "צא ממכשירים",
+    "Visibility": "רְאוּת",
+    "Saving...": "שומר...",
+    "Share invite link": "שתף קישור להזמנה",
+    "Creating...": "יוצר...",
+    "Invite people": "הזמן אנשים",
+    "Leave Space": "השאר רווח",
+    "Access": "גישה",
+    "Save Changes": "שמור שינוייים",
+    "Click to copy": "לחץ להעתקה",
+    "Show all rooms": "הצג את כל החדרים",
+    "Collapse": "הִתמוֹטְטוּת",
+    "Expand": "להרחיב",
+    "Private": "פרטי",
+    "Public": "ציבורי",
+    "Create a space": "צור מרחב",
+    "Address": "כתובת",
+    "Give feedback.": "תן משוב.",
+    "Delete": "מחק",
+    "Pin to sidebar": "הצמד לסרגל הצד",
+    "More options": "אופציות נוספות",
+    "Quick settings": "הגדרות מהירות",
+    "More": "יותר",
+    "Show sidebar": "הצג סרגל צד",
+    "Hide sidebar": "הסתר סרגל צד",
+    "Start sharing your screen": "התחל לשתף את המסך שלך",
+    "Stop sharing your screen": "הפסק לשתף את המסך שלך",
+    "Start the camera": "הפעל את המצלמה",
+    "Stop the camera": "עצור את המצלמה",
+    "Unmute the microphone": "בטל את השתקת המיקרופון",
+    "Mute the microphone": "השתקת המיקרופון",
+    "Dialpad": "משטח חיוג",
+    "Dial": "לחייג",
+    "Your camera is still enabled": "המצלמה שלך עדיין מופעלת",
+    "Your camera is turned off": "המצלמה שלך כבויה",
+    "You are presenting": "אתה מציג",
+    "Connecting": "מקשר",
+    "unknown person": "אדם לא ידוע",
+    "Sends the given message with rainfall": "שלח הודעה זו עם גשם נופל",
+    "sends rainfall": "שלח גשם נופל",
+    "Waiting for you to verify on your other device…": "ממתין לאישור שלך במכשיר השני…",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "ודא ואשר שהסמלים הבאים מופיעים בשני המכשירים ובאותו הסדר:",
+    "Mic": "מיקרופון",
+    "Mic off": "מיקרופון מושתק",
+    "Video": "וידאו",
+    "Video off": "וידאו כבוי",
+    "Connected": "מחובר",
+    "Show chat effects (animations when receiving e.g. confetti)": "הצג אפקטים בצ'אט (אנימציות, למשל קונפטי)",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "אפשר חיבור ישיר (Peer-to-Peer) בשיחות 1:1 עם משתמש אחר. (הפעלת אפשרות זו עשויה לחשוף את כתובת ה-IP שלך בפני הצד השני)",
+    "Use Ctrl + F to search timeline": "השתמש ב Ctrl + F כדי לחפש הודעות",
+    "Jump to the bottom of the timeline when you send a message": "קפוץ לתחתית השיחה בעת שליחת הודעה",
+    "Show line numbers in code blocks": "הצג מספרי שורות במקטעי קוד",
+    "Autoplay GIFs": "הפעלה אוטומטית של אנימציות GIF",
+    "Show current avatar and name for users in message history": "הצג שם ותמונה נוכחיים של משתמשים בהיסטוריית ההודעות",
+    "Other rooms": "חדרים אחרים",
+    "This homeserver has been blocked by it's administrator.": "שרת זה נחסם על ידי מנהלו.",
+    "Silence call": "השתקת שיחה",
+    "You previously consented to share anonymous usage data with us. We're updating how that works.": "הסכמת בעבר לשתף איתנו מידע אנונימי לגבי השימוש שלך. אנחנו מעדכנים איך זה מתבצע.",
+    "Fetching events...": "טוען אירועים...",
+    "Creating HTML...": "מייצר HTML...",
+    "Topic: %(topic)s": "נושא: %(topic)s",
+    "%(creatorName)s created this room.": "%(creatorName)s יצר/ה חדר זה.",
+    "Fetched %(count)s events so far|other": "נטענו %(count)s אירועים עד כה",
+    "Fetched %(count)s events out of %(total)s|other": "טוען %(count)s אירועים מתוך %(total)s",
+    "Generating a ZIP": "מייצר קובץ ZIP",
+    "User %(userId)s is already invited to the room": "המשתמש %(userId)s כבר הוזמן לחדר",
+    "This homeserver has been blocked by its administrator.": "שרת זה נחסם על ידי מנהלו.",
+    "%(senderName)s has shared their location": "%(senderName)s שיתף/ה מיקום",
+    "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s שינה את הגדרת המורשים להצטרף לחדר.",
+    "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s שינה את הגדרת המורשים להצטרף לחדר. <a>הגדרות</a>",
+    "%(senderDisplayName)s changed the room avatar.": "%(senderDisplayName)s שינה את תמונת החדר.",
+    "That link is no longer supported": "הקישור לא נתמך יותר",
+    "%(value)ss": "%(value)s שניות",
+    "%(value)sm": "%(value)s דקות",
+    "%(value)sh": "%(value)s שעות",
+    "%(value)sd": "%(value)s ימים",
+    "The user you called is busy.": "המשתמש עסוק כרגע.",
+    "User Busy": "המשתמש עסוק",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "מפתח האבטחה שלך <b>הועתק אל הלוח שלך</b>, הדבק אותו ל:",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "מפתח האבטחה שלך הוא רשת ביטחון - אתה יכול להשתמש בו כדי להחזיר את הגישה להודעות המוצפנות שלך אם תשכח את ביטוי האבטחה שלך.",
+    "Great! This Security Phrase looks strong enough.": "מצוין! ביטוי אבטחה זה נראה מספיק חזק.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "נאחסן עותק מוצפן של המפתחות שלך בשרת שלנו. אבטח את הגיבוי שלך עם ביטוי אבטחה.",
+    "Not a valid Security Key": "מפתח האבטחה לא חוקי",
+    "Failed to end poll": "תקלה בסגירת הסקר",
+    "Failed to post poll": "תקלה בפרסום הסקר",
+    "You can't see earlier messages": "לא ניתן לצפות בהודעות קודמות",
+    "Your Security Key is in your <b>Downloads</b> folder.": "מפתח האבטחה שלך נמצא ב<b>תיקיית ההורדות</b> שלך.",
+    "Confirm your Security Phrase": "אשר את ביטוי האבטחה שלך",
+    "Secure your backup with a Security Phrase": "אבטח את הגיבוי שלך עם ביטוי אבטחה"
 }
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index d5826983c89..e67a10b15ee 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -498,5 +498,223 @@
     "Explore rooms": "रूम का अन्वेषण करें",
     "Sign In": "साइन करना",
     "Create Account": "खाता बनाएं",
-    "Identity server is": "आइडेंटिटी सर्वर हैं"
+    "Identity server is": "आइडेंटिटी सर्वर हैं",
+    "Mongolia": "मंगोलिया",
+    "Monaco": "मोनाको",
+    "Moldova": "मोलदोवा",
+    "Micronesia": "माइक्रोनेशिया",
+    "Mexico": "मेक्सिको",
+    "Mayotte": "मैयट",
+    "Mauritius": "मॉरीशस",
+    "Mauritania": "मॉरिटानिया",
+    "Martinique": "मार्टीनिक",
+    "Marshall Islands": "मार्शल द्वीप समूह",
+    "Malta": "माल्टा",
+    "Mali": "माली",
+    "Maldives": "मालदीव",
+    "Malaysia": "मलेशिया",
+    "Malawi": "मलावी",
+    "Madagascar": "मेडागास्कर",
+    "Macedonia": "मैसेडोनिया",
+    "Macau": "मकाउ",
+    "Luxembourg": "लक्समबर्ग",
+    "Lithuania": "लिथुआनिया",
+    "Liechtenstein": "लिकटेंस्टाइन",
+    "Libya": "लीबिया",
+    "Liberia": "लाइबेरिया",
+    "Lesotho": "लिसोटो",
+    "Lebanon": "लेबनान",
+    "Latvia": "लातविया",
+    "Laos": "लाओस",
+    "Kyrgyzstan": "किर्गिज़स्तान",
+    "Kuwait": "कुवैट",
+    "Kosovo": "कोसोवो",
+    "Kiribati": "किरिबाती",
+    "Kenya": "केन्या",
+    "Kazakhstan": "कजाखस्तान",
+    "Jordan": "जॉर्डन",
+    "Jersey": "जर्सी",
+    "Japan": "जापान",
+    "Jamaica": "जमैका",
+    "Italy": "इटली",
+    "Israel": "इजराइल",
+    "Isle of Man": "मैन द्वीप",
+    "Ireland": "आयरलैंड",
+    "Iraq": "इराक",
+    "Iran": "ईरान",
+    "Indonesia": "इंडोनेशिया",
+    "India": "इंडिया",
+    "Iceland": "आइसलैंड",
+    "Hungary": "हंगरी",
+    "Hong Kong": "हांगकांग",
+    "Honduras": "होंडुरस",
+    "Heard & McDonald Islands": "हर्ड एंड मैकडॉनल्ड आइलैंड्स",
+    "Haiti": "हैती",
+    "Guyana": "गुयाना",
+    "Guinea-Bissau": "गिनी-बिसाऊ",
+    "Guinea": "गिन्नी",
+    "Guernsey": "ग्वेर्नसे",
+    "Guatemala": "ग्वाटेमाला",
+    "Guam": "गुआम",
+    "Guadeloupe": "ग्वाडेलोप",
+    "Grenada": "ग्रेनेडा",
+    "Greenland": "ग्रीनलैंड",
+    "Greece": "यूनान",
+    "Gibraltar": "जिब्राल्टर",
+    "Ghana": "घाना",
+    "Germany": "जर्मनी",
+    "Georgia": "जॉर्जिया",
+    "Gambia": "गाम्बिया",
+    "Gabon": "गैबॉन",
+    "French Southern Territories": "दक्षिणी फ्राँसिसी क्षेत्र",
+    "French Polynesia": "फ़्रेंच पोलिनेशिया",
+    "French Guiana": "फ्रेंच गयाना",
+    "France": "फ्रांस",
+    "Finland": "फिनलैंड",
+    "Fiji": "फ़िजी",
+    "Faroe Islands": "फ़ैरो द्वीप",
+    "Falkland Islands": "फ़ॉकलैंड आइलैंड",
+    "Ethiopia": "इथियोपिया",
+    "Estonia": "एस्तोनिया",
+    "Eritrea": "इरिट्रिया",
+    "Equatorial Guinea": "इक्वेटोरियल गिनी",
+    "El Salvador": "एल साल्वाडोर",
+    "Egypt": "मिस्र",
+    "Ecuador": "इक्वेडोर",
+    "Dominican Republic": "डोमिनिकन गणराज्य",
+    "Dominica": "डोमिनिका",
+    "Djibouti": "जिबूती",
+    "Denmark": "डेनमार्क",
+    "Côte d’Ivoire": "कोटे डी आइवर",
+    "Czech Republic": "चेक गणतंत्र",
+    "Cyprus": "साइप्रस",
+    "Curaçao": "कुराकाओ",
+    "Cuba": "क्यूबा",
+    "Croatia": "क्रोएशिया",
+    "Costa Rica": "कोस्टा रिका",
+    "Cook Islands": "कुक द्वीपसमूह",
+    "Congo - Kinshasa": "कांगो - ब्रेज़ाविल",
+    "Congo - Brazzaville": "कांगो - ब्रेज़ाविल",
+    "Comoros": "कोमोरोस",
+    "Colombia": "कोलंबिया",
+    "Cocos (Keeling) Islands": "कोकोस (कीलिंग) द्वीप समूह",
+    "Christmas Island": "क्रिसमस द्वीप",
+    "China": "चीन",
+    "Chile": "चिली",
+    "Chad": "चाड",
+    "Central African Republic": "केन्द्रीय अफ़्रीकी गणराज्य",
+    "Cayman Islands": "केमैन टापू",
+    "Caribbean Netherlands": "कैरेबियन नीदरलैंड्स",
+    "Cape Verde": "केप वर्दे",
+    "Canada": "कनाडा",
+    "Cameroon": "कैमरून",
+    "Cambodia": "कंबोडिया",
+    "Burundi": "बुस्र्न्दी",
+    "Burkina Faso": "बुर्किना फासो",
+    "Bulgaria": "बुल्गारिया",
+    "Brunei": "ब्रुनेई",
+    "British Virgin Islands": "ब्रिटिश वर्जिन आइसलैण्ड्स",
+    "British Indian Ocean Territory": "ब्रिटेन और भारतीय समुद्री क्षेत्र",
+    "Brazil": "ब्राज़िल",
+    "Bouvet Island": "बौवेट द्वीप",
+    "Botswana": "बोत्सवाना",
+    "Bosnia": "बोस्निया",
+    "Bolivia": "बोलीविया",
+    "Bhutan": "भूटान",
+    "Bermuda": "बरमूडा",
+    "Benin": "बेनिन",
+    "Belize": "बेलीज़",
+    "Belgium": "बेल्जियम",
+    "Belarus": "बेलोरूस",
+    "Barbados": "बारबाडोस",
+    "Bangladesh": "बांग्लादेश",
+    "Bahrain": "बहरीन",
+    "Bahamas": "बहामा",
+    "Azerbaijan": "आज़रबाइजान",
+    "Austria": "ऑस्ट्रिया",
+    "Australia": "ऑस्ट्रेलिया",
+    "Aruba": "अरूबा",
+    "Armenia": "आर्मीनिया",
+    "Argentina": "अर्जेंटीना",
+    "Antigua & Barbuda": "एंटीगुआ और बारबुडा",
+    "Antarctica": "अंटार्कटिका",
+    "Anguilla": "एंगुइला",
+    "Angola": "अंगोला",
+    "Andorra": "एंडोरा",
+    "American Samoa": "अमेरिकी समोआ",
+    "Algeria": "एलजीरिया",
+    "Albania": "अल्बानिया",
+    "Åland Islands": "एलैंड द्वीप समूह",
+    "Afghanistan": "अफ़ग़ानिस्तान",
+    "United States": "संयुक्त राज्य अमेरिका",
+    "United Kingdom": "यूनाइटेड किंगडम",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s को सूचनाएं भेजने की अनुमति नहीं दी गई थी - कृपया पुनः प्रयास करें",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s को आपको सूचनाएं भेजने की अनुमति नहीं है - कृपया अपनी ब्राउज़र सेटिंग जांचें",
+    "%(name)s is requesting verification": "%(name)s सत्यापन का अनुरोध कर रहा है",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "आपके होमसर्वर ने आपके लॉग इन प्रयास को अस्वीकार कर दिया। यह बहुत अधिक समय लेने वाली चीजों के कारण हो सकता है। कृपया पुन: प्रयास करें। यदि यह जारी रहता है, तो कृपया अपने होमसर्वर व्यवस्थापक से संपर्क करें।",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "आपका होमसर्वर पहुंच से बाहर था और आपको लॉग इन करने में सक्षम नहीं था। कृपया पुन: प्रयास करें। यदि यह जारी रहता है, तो कृपया अपने होमसर्वर व्यवस्थापक से संपर्क करें।",
+    "Try again": "पुनः प्रयास करे",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "हमने ब्राउज़र से यह याद रखने के लिए कहा कि आप किस होमसर्वर का उपयोग आपको साइन इन करने के लिए करते हैं, लेकिन दुर्भाग्य से आपका ब्राउज़र इसे भूल गया है। साइन इन पेज पर जाएं और फिर से कोशिश करें.",
+    "We couldn't log you in": "हम आपको लॉग इन नहीं कर सके",
+    "Trust": "विश्वास",
+    "Only continue if you trust the owner of the server.": "केवल तभी जारी रखें जब आप सर्वर के स्वामी पर भरोसा करते हैं।",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "इस क्रिया के लिए ईमेल पते या फ़ोन नंबर को मान्य करने के लिए डिफ़ॉल्ट पहचान सर्वर <server /> तक पहुँचने की आवश्यकता है, लेकिन सर्वर के पास सेवा की कोई शर्तें नहीं हैं।",
+    "Identity server has no terms of service": "पहचान सर्वर की सेवा की कोई शर्तें नहीं हैं",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "आप एक समुदाय लिंक (%(groupId)s) तक पहुंचने का प्रयास कर रहे हैं।<br/>समुदाय अब समर्थित नहीं हैं और उन्हें रिक्त स्थान से बदल दिया गया है।<br2/><a>यहां रिक्त स्थान के बारे में अधिक जानें।</a>",
+    "That link is no longer supported": "वह लिंक अब समर्थित नहीं है",
+    "%(value)ss": "%(value)s एस",
+    "%(value)sm": "%(value)sएम",
+    "%(value)sh": "%(value)s",
+    "%(value)sd": "%(value)s",
+    "%(date)s at %(time)s": "%(date)s %(time)s पर",
+    "The server does not support the room version specified.": "सर्वर निर्दिष्ट कक्ष संस्करण का समर्थन नहीं करता है।",
+    "This will end the conference for everyone. Continue?": "इससे सभी के लिए सम्मेलन समाप्त हो जाएगा। जारी रखना?",
+    "End conference": "अंत सम्मेलन",
+    "Failed to transfer call": "कॉल स्थानांतरित करने में विफल",
+    "Transfer Failed": "स्थानांतरण विफल",
+    "Unable to transfer call": "कॉल ट्रांसफर करने में असमर्थ",
+    "There was an error looking up the phone number": "फ़ोन नंबर खोजने में त्रुटि हुई",
+    "Unable to look up phone number": "फ़ोन नंबर देखने में असमर्थ",
+    "You've reached the maximum number of simultaneous calls.": "आप एक साथ कॉल की अधिकतम संख्या तक पहुंच गए हैं।",
+    "Too Many Calls": "बहुत अधिक कॉल",
+    "You cannot place calls without a connection to the server.": "आप सर्वर से कनेक्शन के बिना कॉल नहीं कर सकते।",
+    "Connectivity to the server has been lost": "सर्वर से कनेक्टिविटी खो गई है",
+    "You cannot place calls in this browser.": "आप इस ब्राउज़र में कॉल नहीं कर सकते।",
+    "Calls are unsupported": "कॉल असमर्थित हैं",
+    "You're already in a call with this person.": "आप पहले से ही इस व्यक्ति के साथ कॉल में हैं।",
+    "Already in call": "पहले से ही कॉल में है",
+    "No other application is using the webcam": "कोई अन्य एप्लिकेशन वेबकैम का उपयोग नहीं कर रहा है",
+    "Permission is granted to use the webcam": "वेबकैम का उपयोग करने की अनुमति दी गई है",
+    "A microphone and webcam are plugged in and set up correctly": "एक माइक्रोफ़ोन और वेब कैमरा प्लग इन किया गया है और सही तरीके से सेट किया गया है",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "कॉल विफल हुआ क्योंकि वेबकैम या माइक्रोफ़ोन तक नहीं पहुंचा जा सका। जांच करे:",
+    "Unable to access webcam / microphone": "वेबकैम / माइक्रोफ़ोन तक पहुँचने में असमर्थ",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "कॉल विफल हुआ क्योंकि माइक्रोफ़ोन तक नहीं पहुँचा जा सका। जांचें कि एक माइक्रोफ़ोन प्लग इन है और सही तरीके से सेट है।",
+    "Unable to access microphone": "माइक्रोफ़ोन एक्सेस करने में असमर्थ",
+    "Try using turn.matrix.org": "Turn.matrix.org का उपयोग करके देखें",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "वैकल्पिक रूप से, आप <code>turn.matrix.org</code> पर सार्वजनिक सर्वर का उपयोग करने का प्रयास कर सकते हैं, लेकिन यह उतना विश्वसनीय नहीं होगा, और यह आपके आईपी पते को उस सर्वर के साथ साझा करेगा। आप इसे सेटिंग में जाकर भी मैनेज कर सकते हैं।",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "कृपया अपने होमसर्वर (<code>%(homeserverDomain)s</code>) के व्यवस्थापक से एक TURN सर्वर कॉन्फ़िगर करने के लिए कहें ताकि कॉल विश्वसनीय रूप से काम करें।",
+    "Call failed due to misconfigured server": "गलत कॉन्फ़िगर किए गए सर्वर के कारण कॉल विफल रहा",
+    "The call was answered on another device.": "किसी अन्य डिवाइस पर कॉल का उत्तर दिया गया था।",
+    "Answered Elsewhere": "कहीं और उत्तर दिया गया",
+    "The call could not be established": "कॉल स्थापित नहीं किया जा सका",
+    "The user you called is busy.": "आपके द्वारा कॉल किया गया उपयोगकर्ता व्यस्त है।",
+    "User Busy": "उपयोगकर्ता व्यस्त है",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "जहां इस पृष्ठ में पहचान योग्य जानकारी शामिल है, जैसे कि कमरा, उपयोगकर्ता आईडी, उस डेटा को सर्वर पर भेजे जाने से पहले हटा दिया जाता है।",
+    "Some examples of the information being sent to us to help make %(brand)s better includes:": "%(brand)s को बेहतर बनाने में मदद के लिए हमें भेजी जा रही जानकारी के कुछ उदाहरणों में शामिल हैं:",
+    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "हमारी पूरी कुकी नीति <CookiePolicyLink>यहां</CookiePolicyLink> देखी जा सकती है।",
+    "Your user agent": "आपका उपयोगकर्ता एजेंट",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "क्या आप %(brand)s को एक स्थापित प्रोग्रेसिव वेब ऐप के रूप में उपयोग कर रहे हैं",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "चाहे आप %(brand)s का उपयोग किसी ऐसे उपकरण पर कर रहे हों जहां स्पर्श प्राथमिक इनपुट तंत्र है",
+    "The version of %(brand)s": "%(brand)s का संस्करण",
+    "Add Phone Number": "फोन नंबर डालें",
+    "Click the button below to confirm adding this phone number.": "इस फ़ोन नंबर को जोड़ने की पुष्टि करने के लिए नीचे दिए गए बटन पर क्लिक करें।",
+    "Confirm adding phone number": "फ़ोन नंबर जोड़ने की पुष्टि करें",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "अपनी पहचान साबित करने के लिए सिंगल साइन ऑन का उपयोग करके इस फ़ोन नंबर को जोड़ने की पुष्टि करें।",
+    "Add Email Address": "ईमेल पता जोड़ें",
+    "Confirm": "पुष्टि",
+    "Click the button below to confirm adding this email address.": "इस ईमेल पते को जोड़ने की पुष्टि करने के लिए नीचे दिए गए बटन पर क्लिक करें।",
+    "Confirm adding email": "ईमेल जोड़ने की पुष्टि करें",
+    "Single Sign On": "केवल हस्ताक्षर के ऊपर",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "अपनी पहचान साबित करने के लिए सिंगल साइन ऑन का उपयोग करके इस ईमेल पते को जोड़ने की पुष्टि करें।",
+    "Use Single Sign On to continue": "जारी रखने के लिए सिंगल साइन ऑन का उपयोग करें"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7c43f145a15..1de7484732d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -5,7 +5,7 @@
     "Dismiss": "Eltüntetés",
     "Error": "Hiba",
     "Failed to forget room %(errCode)s": "A szobát nem sikerült elfelejtetni: %(errCode)s",
-    "Favourite": "Kedvenc",
+    "Favourite": "Kedvencnek jelölés",
     "Mute": "Elnémít",
     "Notifications": "Értesítések",
     "Operation failed": "Sikertelen művelet",
@@ -330,7 +330,7 @@
     "Banned by %(displayName)s": "Kitiltotta: %(displayName)s",
     "Description": "Leírás",
     "Unable to accept invite": "A meghívót nem lehet elfogadni",
-    "Leave": "Elhagy",
+    "Leave": "Elhagyás",
     "Failed to invite the following users to %(groupId)s:": "A következő felhasználókat nem sikerült meghívni a(z) %(groupId)s csoportba:",
     "Failed to invite users to %(groupId)s": "A felhasználók meghívása a(z) %(groupId)s csoportba sikertelen",
     "Unable to reject invite": "Nem sikerül elutasítani a meghívót",
@@ -405,7 +405,7 @@
     "And %(count)s more...|other": "És még %(count)s...",
     "Something went wrong whilst creating your community": "Valami nem sikerült a közösség létrehozásánál",
     "Mention": "Megemlítés",
-    "Invite": "Meghív",
+    "Invite": "Meghívás",
     "Delete Widget": "Kisalkalmazás törlése",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "A kisalkalmazás törlése minden felhasználót érint a szobában. Biztos, hogy törölni akarja?",
     "Mirror local video feed": "Helyi videó folyam tükrözése",
@@ -1955,7 +1955,7 @@
     "Use default": "Alapértelmezett használata",
     "Mentions & Keywords": "Megemlítések és kulcsszavak",
     "Notification options": "Értesítési beállítások",
-    "Favourited": "Kedvencek",
+    "Favourited": "Kedvencnek jelölt",
     "Forget Room": "Szoba elfelejtése",
     "User menu": "Felhasználói menü",
     "This room is public": "Ez egy nyilvános szoba",
@@ -2674,7 +2674,7 @@
     "Leave space": "Tér elhagyása",
     "Invite people": "Személyek meghívása",
     "Share your public space": "Nyilvános tér megosztása",
-    "Share invite link": "Meghívó linkjének megosztása",
+    "Share invite link": "Meghívási link megosztása",
     "Click to copy": "Másolás kattintással",
     "Collapse space panel": "Tér panel összezárása",
     "Expand space panel": "Tér panel kiterjesztése",
@@ -2720,7 +2720,7 @@
     "Invite to %(roomName)s": "Meghívás ide: %(roomName)s",
     "Edit devices": "Eszközök szerkesztése",
     "Invite People": "Személyek meghívása",
-    "Invite with email or username": "Meghívás e-mail címmel vagy felhasználói névvel",
+    "Invite with email or username": "Meghívás e-mail-címmel vagy felhasználónévvel",
     "You can change these anytime.": "Bármikor megváltoztatható.",
     "Add some details to help people recognise it.": "Információ hozzáadása, hogy könnyebben felismerhető legyen.",
     "Check your devices": "Ellenőrizze az eszközeit",
@@ -3226,7 +3226,7 @@
     "Sending invites... (%(progress)s out of %(count)s)|other": "Meghívók küldése… (%(progress)s / %(count)s)",
     "Loading new room": "Új szoba betöltése",
     "Upgrading room": "Szoba fejlesztése",
-    "Show:": "Mutat:",
+    "Show:": "Megjelenítés:",
     "Shows all threads from current room": "A szobában lévő összes szál mutatása",
     "All threads": "Minden üzenetszál",
     "Shows all threads you’ve participated in": "Minden üzenetszál megjelenítése ahol szerepel",
@@ -3291,7 +3291,7 @@
     "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Az eszközből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával.",
     "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Az eszközökből való kijelentkezéshez erősítse meg a személyazonosságát az egyszeri bejelentkezés használatával.",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "A Biztonsági Kulcsot tárolja biztonságos helyen, mint pl. a jelszókezelő vagy széf, mivel ez tartja biztonságban a titkosított adatait.",
-    "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "Olyan biztonsági jelmondatot adjon meg amit csak ön ismer, mert ez fogja az adatait őrizni. Hogy biztonságos legyen ne használja a fiók jelszavát.",
+    "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "Olyan biztonsági jelmondatot adjon meg amit csak ön ismer, mert ez fogja az adatait őrizni. Hogy biztonságos legyen, ne használja a fiók jelszavát.",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "A Biztonsági Kulcsodat elkészítjük amit tároljon valamilyen biztonságos helyen mint pl. a jelszókezelő vagy széf.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "Szerezze vissza a hozzáférést a fiókjához és állítsa vissza az elmentett titkosítási kulcsokat ebben a munkamenetben. Ezek nélkül egyetlen munkamenetben sem tudja elolvasni a titkosított üzeneteit.",
     "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "Az ellenőrzés nélkül nem fér hozzá az összes üzenetéhez és mások számára megbízhatatlannak fog látszani.",
@@ -3315,8 +3315,8 @@
     "Yours, or the other users' session": "Az ön vagy a másik felhasználó munkamenete",
     "Yours, or the other users' internet connection": "Az ön vagy a másik felhasználó Internet kapcsolata",
     "The homeserver the user you're verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix kiszolgálóhoz kapcsolódik:",
-    "Someone already has that username, please try another.": "Ezt a felhasználói nevet másvalaki használja, próbáljon ki másikat.",
-    "Someone already has that username. Try another or if it is you, sign in below.": "Valaki már használja ezt a felhasználói nevet. Próbáljon ki másikat, illetve ha ön az jelentkezzen be alább.",
+    "Someone already has that username, please try another.": "Ez a felhasználónév már foglalt, próbáljon ki másikat.",
+    "Someone already has that username. Try another or if it is you, sign in below.": "Valaki már használja ezt a felhasználói nevet. Próbáljon ki másikat, illetve ha ön az, jelentkezzen be alább.",
     "Maximised widgets": "Maximalizált kisalkalmazás",
     "Own your conversations.": "Az ön beszélgetései csak az öné.",
     "Minimise dialog": "Dialógus ablak kicsinyítés",
@@ -3460,7 +3460,7 @@
     "To search messages, look for this icon at the top of a room <icon/>": "Üzenetek kereséséhez keresse a szoba tetején ezt az ikont: <icon/>",
     "Other searches": "Más keresések",
     "Public rooms": "Nyilvános szobák",
-    "Use \"%(query)s\" to search": "A kereséshez használja ezt: „%(query)s”",
+    "Use \"%(query)s\" to search": "Keresés erre a kifejezésre: „%(query)s”",
     "Other rooms in %(spaceName)s": "Más szobák itt: %(spaceName)s",
     "Spaces you're in": "Terek amiben tag",
     "Sections to show": "Megjelenítendő részek",
@@ -3472,7 +3472,7 @@
     "%(count)s members including you, %(commaSeparatedMembers)s|zero": "Ön",
     "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s tag Önt is beleértve, %(commaSeparatedMembers)s",
     "Including you, %(commaSeparatedMembers)s": "Önt is beleértve, %(commaSeparatedMembers)s",
-    "Copy room link": "Szoba hivatkozás másolása",
+    "Copy room link": "Szoba hivatkozásának másolása",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Anonimizált adatok megosztása a problémák feltárásához. Semmi személyes. Nincs harmadik fél.",
     "Jump to date (adds /jumptodate)": "Dátumra ugrás (/jumptodate hozzáadása)",
     "New spotlight search experience": "Új reflektorfény-keresés",
@@ -3555,9 +3555,9 @@
     "%(senderName)s has ended a poll": "%(senderName)s lezárta a szavazást",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s szavazást indított - %(pollQuestion)s",
     "%(senderName)s has shared their location": "%(senderName)s megosztotta a földrajzi helyzetét",
-    "You can't see earlier messages": "Régebbi üzeneteket nem tekinthet meg",
-    "Encrypted messages before this point are unavailable.": "Ez előtti titkosított üzenetek elérhetetlenek.",
-    "You don't have permission to view messages from before you joined.": "A belépés előtti üzenetek megtekintéséhez nincs engedélye.",
+    "You can't see earlier messages": "Nem tekintheted meg a régebbi üzeneteket",
+    "Encrypted messages before this point are unavailable.": "A régebbi titkosított üzenetek elérhetetlenek.",
+    "You don't have permission to view messages from before you joined.": "A belépés előtti üzenetek megtekintése nincs engedélyezve számodra.",
     "You don't have permission to view messages from before you were invited.": "A meghívás előtti üzenetek megtekintéséhez nincs engedélye.",
     "Navigate down in the room list": "A szoba listában navigálás lefelé",
     "Navigate up in the room list": "A szoba listában navigálás felfelé",
@@ -3623,11 +3623,11 @@
     "Click for more info": "Kattintson a további információkhoz",
     "This is a beta feature": "Ez egy beta állapotú funkció",
     "Results not as expected? Please <a>give feedback</a>.": "Nem a várt találatok? Kérjük <a>adjon visszajelzést</a>.",
-    "Use <arrows/> to scroll": "Görgetéshez használja ezt: <arrows/>",
+    "Use <arrows/> to scroll": "Görgetés ezekkel: <arrows/>",
     "Feedback sent! Thanks, we appreciate it!": "Visszajelzés elküldve! Köszönjük, ezt nagyra értékeljük!",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s rejtett üzenetet küldött",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s %(count)s rejtett üzenetet küldött",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s %(count)s rejtett üzenetet küldött",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s rejtett üzenetet küldött",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s %(count)s rejtett üzenetet küldött",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s üzenetet törölt",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s %(count)s üzenetet törölt",
@@ -3642,15 +3642,141 @@
     "<%(count)s spaces>|other": "<%(count)s szóköz>",
     "<%(count)s spaces>|one": "<szóköz>",
     "Edit poll": "Szavazás szerkesztése",
-    "Sorry, you can't edit a poll after votes have been cast.": "Sajnálom, a szavazás nem szerkeszthető miután szavazatok érkeztek.",
+    "Sorry, you can't edit a poll after votes have been cast.": "Sajnos a szavazás nem szerkeszthető miután szavazatok érkeztek.",
     "Can't edit poll": "A szavazás nem szerkeszthető",
     "Join %(roomAddress)s": "Belépés ide: %(roomAddress)s",
     "Show current avatar and name for users in message history": "A felhasználó jelenlegi nevének és profilképének megjelenítése a régi üzenetekben",
-    "Search Dialog": "Keresés ablak",
+    "Search Dialog": "Keresés párbeszédablak",
     "Results are only revealed when you end the poll": "Az eredmény csak a szavazás végeztével válik láthatóvá",
     "Voters see results as soon as they have voted": "A szavazók a szavazásuk után látják a szavazatokat",
-    "Closed poll": "Lezárt szavazás",
-    "Open poll": "Szavazás megnyitása",
+    "Closed poll": "Zárt szavazás",
+    "Open poll": "Nyitott szavazás",
     "Poll type": "Szavazás típusa",
-    "Results will be visible when the poll is ended": "Az eredmény a szavazás végeztével válik láthatóvá"
+    "Results will be visible when the poll is ended": "Az eredmény a szavazás végeztével válik láthatóvá",
+    "Open user settings": "Felhasználói beállítások megnyitása",
+    "Switch to space by number": "Tér váltás szám alapján",
+    "Next recently visited room or community": "Következő, nemrég meglátogatott szoba vagy közösség",
+    "Previous recently visited room or community": "Előző, nemrég meglátogatott szoba vagy közösség",
+    "Accessibility": "Akadálymentesség",
+    "Pinned": "Kitűzött",
+    "Open thread": "Üzenetszál megnyitása",
+    "Remove messages sent by me": "Általam küldött üzenetek törlése",
+    "Location sharing - pin drop (under active development)": "Tartózkodási hely megosztása - hely kiválasztása térképen (aktív fejlesztés alatt)",
+    "No virtual room for this room": "Ehhez a szobához nincs virtuális szoba",
+    "Switches to this room's virtual room, if it has one": "Átváltás a szoba virtuális szobájába, ha létezik",
+    "Export Cancelled": "Exportálás megszakítva",
+    "Match system": "Rendszer beállításával megegyező",
+    "This is a beta feature. Click for more info": "Ez egy béta funkció. Kattintson a további információkért",
+    "What location type do you want to share?": "Milyen jellegű a földrajzi helyzetet szeretne megosztani?",
+    "Drop a Pin": "Hely kijelölése",
+    "My live location": "Folyamatos földrajzi helyzetem",
+    "My current location": "Jelenlegi földrajzi helyzetem",
+    "%(brand)s could not send your location. Please try again later.": "Az %(brand)s nem tudja elküldeni a földrajzi helyzetét. Kérjük, próbálja meg később.",
+    "We couldn't send your location": "A földrajzi helyzetet nem sikerült elküldeni",
+    "Insert a trailing colon after user mentions at the start of a message": "Elválasztó vessző elhelyezése egy felhasználó üzenet elején való megemlítésekor",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Válaszoljon egy meglévő szálban, vagy új szál indításához használja a „%(replyInThread)s” lehetőséget az üzenet sarkában megjelenő menüben.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s módosította a szoba <a>kitűzött üzeneteit</a>",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s módosította a szoba <a>kitűzött üzeneteit</a>",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s %(count)s alkalommal módosította a szoba <a>kitűzött üzeneteit</a>",
+    "Show polls button": "Szavazások gomb megjelenítése",
+    "Location sharing - share your current location with live updates (under active development)": "Helyzetmegosztás – a jelenlegi helyzetének megosztása, állandó frissítéssel (aktív fejlesztés alatt)",
+    "We'll create rooms for each of them.": "Mindenhez készítünk egy szobát.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Ez a Matrix szerver nincs megfelelően beállítva a térképek megjelenítéséhez, vagy a beállított térkép szerver elérhetetlen.",
+    "This homeserver is not configured to display maps.": "Ezen a Matrix szerveren nincs beállítva a térképek megjelenítése.",
+    "Click to move the pin": "Kattintson a jelölő mozgatásához",
+    "Click to drop a pin": "Kattintson a hely megjelöléséhez",
+    "Shared a location: ": "Megosztott egy földrajzi helyzetet: ",
+    "Shared their location: ": "Megosztották a földrajzi helyzetüket: ",
+    "Unable to load map": "A térkép betöltése sikertelen",
+    "Click": "Kattintson",
+    "Expand quotes": "Idézetek megjelenítése",
+    "Collapse quotes": "Idézetek összecsukása",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "A Terek egy új lehetőség a szobák és emberek csoportosítására. Milyen teret szeretne létrehozni? Később megváltoztathatja.",
+    "Can't create a thread from an event with an existing relation": "Nem lehet üzenetszálat indítani olyan eseményről ami már rendelkezik kapcsolattal",
+    "Busy": "Foglalt",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Ha a GitHubon keresztül küldött be hibajegyet, a hibakereső napló segít nekünk felderíteni a problémát. ",
+    "Toggle Link": "Hivatkozás átkapcsolása",
+    "Toggle Code Block": "Kód blokk átkapcsolása",
+    "Thank you for helping us testing Threads!": "Köszönjük, hogy segített az üzenetszálak tesztelésében!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "A kísérleti időszakban létrehozott üzenetszálak a fő idővonalra kerülnek, és válaszként fognak megjelenni. Ez egy egyszeri változtatás. Az üzenetszálak mostantól bekerültek a Matrix specifikációba.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Kulcsfontosságú stabilizációs fejlesztéseket hajtottunk végre az üzenetszálakban nemrég, ez azt is jelenti, hogy a kísérleti üzenetszál kezelést megszüntetjük.",
+    "Threads are no longer experimental! 🎉": "Az üzenetszálak többé már nem kísérleti funkció! 🎉",
+    "You are sharing your live location": "Ön folyamatosan megosztja az aktuális földrajzi pozícióját",
+    "%(displayName)s's live location": "%(displayName)s élő földrajzi pozíciója",
+    "Preserve system messages": "Rendszerüzenetek megtartása",
+    "Currently removing messages in %(count)s rooms|one": "Üzenet törlése %(count)s szobából",
+    "Currently removing messages in %(count)s rooms|other": "Üzenet törlése %(count)s szobából",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Ahogy előkészülünk, változtatásokat kell tennünk: az eddig készített üzenetszálak <strong>hagyományos válaszokként fognak megjelenni</strong>.",
+    "Verification explorer": "Ellenőrzések böngésző",
+    "Next recently visited room or space": "Következő, nemrég meglátogatott szoba vagy tér",
+    "Previous recently visited room or space": "Előző, nemrég meglátogatott szoba vagy tér",
+    "Event ID: %(eventId)s": "Esemény azon.: %(eventId)s",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Ez egy egyszeri átmenet lesz, ahogy az üzenetszálak a Matrix specifikációba kerülnek.",
+    "We're getting closer to releasing a public Beta for Threads.": "Egyre közelebb kerülünk ahhoz, hogy az üzenetszálak nyilvános béta állapotba kerüljenek.",
+    "Threads Approaching Beta 🎉": "Üzenetszálak lassan béta állapotba kerülnek 🎉",
+    "Stop sharing": "Megosztás megállítása",
+    "%(timeRemaining)s left": "Maradék idő: %(timeRemaining)s",
+    "No verification requests found": "Nem található ellenőrző kérés",
+    "Observe only": "Csak megfigyel",
+    "Requester": "Kérelmező",
+    "Methods": "Metódusok",
+    "Timeout": "Időtúllépés",
+    "Phase": "Fázis",
+    "Transaction": "Tranzakció",
+    "Cancelled": "Megszakítva",
+    "Started": "Elindult",
+    "Ready": "Kész",
+    "Requested": "Megkérve",
+    "Unsent": "Elküldetlen",
+    "Edit values": "Értékek szerkesztése",
+    "Failed to save settings.": "A beállítások elmentése nem sikerült.",
+    "Number of users": "Felhasználószám",
+    "Server": "Szerver",
+    "Server Versions": "Szerver verziók",
+    "Client Versions": "Kliens verziók",
+    "Failed to load.": "Betöltés sikertelen.",
+    "Capabilities": "Képességek",
+    "Send custom state event": "Egyedi állapot esemény küldése",
+    "Failed to send event!": "Az eseményt nem sikerült elküldeni!",
+    "Doesn't look like valid JSON.": "Nem tűnik érvényes JSON szövegnek.",
+    "Send custom room account data event": "Egyedi szoba fiókadat esemény küldése",
+    "Send custom account data event": "Egyedi fiókadat esemény küldése",
+    "Room ID: %(roomId)s": "Szoba azon.: %(roomId)s",
+    "Server info": "Szerver információ",
+    "Settings explorer": "Beállítás böngésző",
+    "Explore account data": "Fiókadatok felderítése",
+    "View servers in room": "Szerverek megjelenítése a szobában",
+    "Explore room account data": "Szoba fiók adatok felderítése",
+    "Explore room state": "Szoba állapot felderítése",
+    "Send custom timeline event": "Egyedi idővonal esemény küldése",
+    "Room details": "Szoba adatai",
+    "Voice & video room": "Hang és videó szoba",
+    "Text room": "Szöveges szoba",
+    "Room type": "Szoba típusa",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Törölje a kijelölést ha a rendszer üzeneteket is törölni szeretné ettől a felhasználótól (pl. tagság változás, profil változás…)",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "%(count)s üzenetet készül törölni az alábbi felhasználótól: %(user)s. A művelet mindenki számára visszavonhatatlanul eltávolítja ezeket a beszélgetésekből. Biztos, hogy folytatja?",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Segítsen észrevennünk a hibákat, és jobbá tenni a(z) %(analyticsOwner)s a névtelen használati adatok küldése által. Ahhoz, hogy megértsük, hogyan használnak a felhasználók egyszerre több eszközt, egy véletlenszerű azonosítót generálunk, ami az eszközei között meg lesz osztva.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Használhatja a más szerver opciót, hogy egy másik matrix szerverre jelentkezz be amihez megadod a szerver url címét. Ezzel használhatja a(z) %(brand)s klienst egy már létező Matrix fiókkal egy másik matrix szerveren.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s alkalmazásnak nincs jogosultsága a földrajzi helyzetének a lekérdezéséhez. Kérjük engedélyezze a hely hozzáférést a böngésző beállításokban.",
+    "Share for %(duration)s": "Megosztás eddig: %(duration)s",
+    "Connecting...": "Kapcsolás…",
+    "Voice room": "Hang szoba",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "A hibakereső napló alkalmazás használati adatokat tartalmaz beleértve a felhasználói nevedet, az általad meglátogatott szobák azonosítóit alternatív neveit, az utolsó felhasználói felület elemét amit használt és más felhasználói neveket. Csevegés üzenetek szövegét nem tartalmazza.",
+    "Developer tools": "Fejlesztői eszközök",
+    "Mic": "Mikrofon",
+    "Video off": "Videó ki",
+    "Mic off": "Mikrofon ki",
+    "Video": "Videó",
+    "Connected": "Kapcsolódva",
+    "Voice & video rooms (under active development)": "Hang és videó szobák (aktív fejlesztés alatt)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s kísérleti állapotban van mobiltelefon web böngészőjében. A jobb élmény és a legújabb funkciók használatához használja az alkalmazást.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Egy közösség hivatkozást próbál elérni (%(groupId)s). <br/>A közösségek a továbbiakban nem támogatottak, a helyüket a terek vették át.<br2/><a>Tudjon meg többet a terekről itt.</a>",
+    "That link is no longer supported": "A hivatkozás már nem támogatott",
+    "%(value)ss": "%(value)smp",
+    "%(value)sm": "%(value)sp",
+    "%(value)sh": "%(value)só",
+    "%(value)sd": "%(value)sn",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adat, mint a szoba, felhasználó eltávolításra kerülnek, mielőtt elküldenénk a kiszolgálónak."
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 7625887ef18..3038fd5ecc6 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -733,7 +733,7 @@
     "Widgets": "Widget",
     "Favourited": "Difavorit",
     "A-Z": "A-Z",
-    "Activity": "Aktifitas",
+    "Activity": "Aktivitas",
     "Unpin": "Lepaskan Pin",
     "Privacy": "Privasi",
     "ready": "siap",
@@ -773,7 +773,7 @@
     "Flags": "Bendera",
     "Symbols": "Simbol",
     "Objects": "Obyek",
-    "Activities": "Aktifitas",
+    "Activities": "Aktivitas",
     "React": "Bereaksi",
     "Reactions": "Reaksi",
     "or": "atau",
@@ -1116,7 +1116,7 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s membuat semua riwayat ruangan di masa mendatang dapat dilihat oleh orang yang tidak dikenal (%(visibility)s).",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s menghapus alamat alternatif %(addresses)s untuk ruangan ini.",
-    "Hey you. You're the best!": "Hey. Kamu yang terbaik!",
+    "Hey you. You're the best!": "Hei kamu. Kamu yang terbaik!",
     "See when a sticker is posted in this room": "Lihat saat sebuah stiker telah dikirim ke ruangan ini",
     "Send stickers to this room as you": "Kirim stiker ke ruangan ini sebagai Anda",
     "See when people join, leave, or are invited to your active room": "Lihat saat orang-orang bergabung, keluar, atau diundang ke ruangan aktif Anda",
@@ -1641,7 +1641,7 @@
     "Support adding custom themes": "Dukungan penambahan tema kustom",
     "Try out new ways to ignore people (experimental)": "Coba cara yang baru untuk mengabaikan pengguna (eksperimental)",
     "Multiple integration managers (requires manual setup)": "Beberapa manajer integrasi (membutuhkan penyiapan manual)",
-    "Render simple counters in room header": "Tampilkan penghitung simpel di tajukan ruangan",
+    "Render simple counters in room header": "Tampilkan penghitung sederhana di tajukan ruangan",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Kelompokkan & filter ruangan dengan tag kustom (muat ulang untuk menerapkan perubahan)",
     "Custom user status messages": "Pesan status pengguna kustom",
     "Threaded messaging": "Pesan utasan",
@@ -1693,7 +1693,7 @@
     "Don't miss a reply": "Jangan lewatkan sebuah balasan",
     "Review to ensure your account is safe": "Periksa untuk memastikan akun Anda aman",
     "You have unverified logins": "Anda punya login yang belum diverifikasi",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Mengirimkan <UsageDataLink>data penggunaan anonim</UsageDataLink> yang akan bantu kami untuk membuat %(brand)s lebih baik. Ini akan menggunakan sebuah <PolicyLink>cookie</PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Mengirimkan <UsageDataLink>data penggunaan anonim</UsageDataLink> yang akan bantu kami untuk membuat %(brand)s lebih baik. Ini akan menggunakan sebuah <PolicyLink>kuki</PolicyLink>.",
     "Help us improve %(brand)s": "Bantu kami membuat %(brand)s lebih baik",
     "File Attached": "File Dilampirkan",
     "Error fetching file": "Terjadi kesalahan saat mendapatkan file",
@@ -1751,7 +1751,7 @@
     "Spaces are ways to group rooms and people.": "Space adalah salah satu cara untuk mengelompokkan ruangan dan pengguna.",
     "Sidebar": "Bilah Samping",
     "Manage your signed-in devices below. A device's name is visible to people you communicate with.": "Kelola sesi Anda di bawah. Sebuah nama sesi dapat dilihat oleh siapa saja yang Anda berkomunikasi.",
-    "Where you're signed in": "Dimana Anda masuk",
+    "Where you're signed in": "Di mana Anda masuk",
     "Learn more about how we use analytics.": "Pelajari lebih lanjut tentang bagaimana kamu menggunakan analitik.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privasi itu penting bagi kami, jadi kami tidak mengumpulkan data personal atau data yang dapat diidentifikasi untuk analitik kami.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s mengumpulkan analitik anonim untuk membantu kami untuk membuat aplikasi ini lebih baik.",
@@ -1863,7 +1863,7 @@
     "Waiting for %(displayName)s to accept…": "Menunggu untuk %(displayName)s untuk menerima…",
     "To proceed, please accept the verification request on your other login.": "Untuk melanjutkan, mohon terima permintaan verifikasi di login Anda yang lain.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ketika seseorang menambahkan URL di pesannya, sebuah tampilan URL dapat ditampilkan untuk memberikan informasi lainnya tentang tautan itu seperti judul, deskripsi, dan sebuah gambar dari website.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Di ruangan terenkripsi, seperti ruangan ini, tampilan URL dinonaktifkan untuk memastikan homeserver Anda (dimana tampilannya dibuat) tidak mendapatkan informasi tentang tautan yang Anda lihat di ruangan ini.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Di ruangan terenkripsi, seperti ruangan ini, tampilan URL dinonaktifkan untuk memastikan homeserver Anda (di mana tampilannya dibuat) tidak mendapatkan informasi tentang tautan yang Anda lihat di ruangan ini.",
     "URL previews are disabled by default for participants in this room.": "Tampilan URL dinonaktifkan secara default untuk anggota di ruangan ini.",
     "URL previews are enabled by default for participants in this room.": "Tampilan URL diaktifkan secara default untuk anggota di ruangan ini.",
     "You have <a>disabled</a> URL previews by default.": "Anda telah <a>menonaktifkan</a> tampilan URL secara default.",
@@ -2142,7 +2142,7 @@
     "%(senderName)s has updated the room layout": "%(senderName)s telah memperbarui tata letak ruangan",
     "Automatically group all your favourite rooms and people together in one place.": "Kelompokkan semua ruangan dan orang favorit Anda di satu tempat secara otomatis.",
     "Quick Reactions": "Reaksi Cepat",
-    "Travel & Places": "Aktifitas & Tempat",
+    "Travel & Places": "Aktivitas & Tempat",
     "Food & Drink": "Makanan & Minuman",
     "Animals & Nature": "Hewan & Alam",
     "Smileys & People": "Senyuman & Orang",
@@ -2554,7 +2554,7 @@
     "Message search initialisation failed, check <a>your settings</a> for more information": "Initialisasi pencarian pesan gagal, periksa <a>pengaturan Anda</a> untuk informasi lanjut",
     "Error - Mixed content": "Terjadi kesalahan — Konten tercampur",
     "Error loading Widget": "Terjadi kesalahan saat memuat Widget",
-    "This widget may use cookies.": "Widget ini mungkin menggunakan cookie.",
+    "This widget may use cookies.": "Widget ini mungkin menggunakan kuki.",
     "Widget added by": "Widget ditambahkan oleh",
     "Widgets do not use message encryption.": "Widget tidak menggunakan enkripsi pesan.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Menggunakan widget ini mungkin membagikan data <helpIcon /> dengan %(widgetDomain)s.",
@@ -2631,7 +2631,7 @@
     "You should know": "Anda seharusnya tahu",
     "Terms of Service": "Persyaratan Layanan",
     "Privacy Policy": "Kebijakan Privasi",
-    "Cookie Policy": "Kebijakan Cookie",
+    "Cookie Policy": "Kebijakan Kuki",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Pelajari lebih lanjut di <privacyPolicyLink />, <termsOfServiceLink />, dan <cookiePolicyLink />.",
     "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Melanjutkan untuk sementara mengizinkan proses pengaturan %(hostSignupBrand)s untuk mengakses akun Anda untuk mendapatkan alamat-alamat email yang terverifikasi. Data ini tidak disimpan.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Gagal menghubungkan ke homeserver Anda. Mohon tutup dialog ini dan coba lagi.",
@@ -3080,7 +3080,7 @@
     "Verify with Security Key or Phrase": "Verifikasi dengan Kunci Keamanan atau Frasa",
     "Proceed with reset": "Lanjutkan dengan mengatur ulang",
     "It looks like you don't have a Security 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.": "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.",
-    "Decide where your account is hosted": "Putuskan dimana untuk menghost akun Anda",
+    "Decide where your account is hosted": "Putuskan di mana untuk menghost akun Anda",
     "Host account on": "Host akun di",
     "You can now close this window or <a>log in</a> to your new account.": "Anda dapat menutup jendela ini atau <a>masuk</a> ke akun yang baru.",
     "<a>Log in</a> to your new account.": "<a>Masuk</a> ke akun yang baru.",
@@ -3126,7 +3126,7 @@
     "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Jika Anda mau, dicatat bahwa pesan-pesan Anda tidak dihapus, tetapi pengalaman pencarian mungkin terdegradasi untuk beberapa saat indeksnya sedang dibuat ulang",
     "You most likely do not want to reset your event index store": "Kemungkinan besar Anda tidak ingin mengatur ulang penyimpanan indeks peristiwa Anda",
     "Reset event store?": "Atur ulang penyimanan peristiwa?",
-    "About homeservers": "Tentang homeserver-homeserver",
+    "About homeservers": "Tentang homeserver",
     "Continuing without email": "Melanjutkan tanpa email",
     "Data on this screen is shared with %(widgetDomain)s": "Data di layar ini dibagikan dengan %(widgetDomain)s",
     "Modal Widget": "Widget Modal",
@@ -3347,7 +3347,7 @@
     "Help improve %(analyticsOwner)s": "Bantu membuat %(analyticsOwner)s lebih baik",
     "That's fine": "Saya tidak keberatan",
     "Some examples of the information being sent to us to help make %(brand)s better includes:": "Beberapa contoh informasi yang akan dikirim ke kami untuk membuat %(brand)s lebih baik termasuk:",
-    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Kebijakan cookie kami yang lengkap dapat ditemukan <CookiePolicyLink>di sini</CookiePolicyLink>.",
+    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Kebijakan kuki kami yang lengkap dapat ditemukan <CookiePolicyLink>di sini</CookiePolicyLink>.",
     "Type of location share": "Ketik deskripsi",
     "My location": "Lokasi saya",
     "Share my current location as a once off": "Bagikan lokasi saya saat ini (sekali saja)",
@@ -3566,7 +3566,7 @@
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s menghapus %(count)s pesan",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s menghapus sebuah pesan",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s mengirim %(count)s pesan tersembunyi",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s mengirim %(count)s sebuah pesan tersembunyi",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s mengirim sebuah pesan tersembunyi",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s sent %(count)s hidden messages",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s mengirim sebuah pesan tersembunyi",
     "Automatically send debug logs when key backup is not functioning": "Kirim catat pengawakutu secara otomatis ketika pencadangan kunci tidak berfungsi",
@@ -3583,5 +3583,215 @@
     "Closed poll": "Pemungutan suara tertutup",
     "Open poll": "Pemungutan suara terbuka",
     "Poll type": "Tipe pemungutan suara",
-    "Results will be visible when the poll is ended": "Hasil akan tersedia setelah pemungutan suara berakhir"
+    "Results will be visible when the poll is ended": "Hasil akan tersedia setelah pemungutan suara berakhir",
+    "Switches to this room's virtual room, if it has one": "Mengganti ke ruangan virtual ruangan ini, jika tersedia",
+    "Open user settings": "Buka pengaturan pengguna",
+    "Switch to space by number": "Ganti ke space oleh nomor",
+    "Next recently visited room or community": "Ruangan atau komunitas yang dikunjungi terkini berikutnya",
+    "Previous recently visited room or community": "Ruangan atau komunitas yang dikunjungi terkini sebelumnya",
+    "Accessibility": "Aksesibilitas",
+    "Search Dialog": "Dialog Pencarian",
+    "Pinned": "Disematkan",
+    "Open thread": "Buka utasan",
+    "No virtual room for this room": "Tidak ada ruangan virtual untuk ruangan ini",
+    "Remove messages sent by me": "Hapus pesan yang terkirim oleh saya",
+    "Location sharing - pin drop (under active development)": "Pembagian lokasi — drop pin (dalam pengembangan aktif)",
+    "Export Cancelled": "Ekspor Dibatalkan",
+    "What location type do you want to share?": "Tipe lokasi apa yang Anda ingin bagikan?",
+    "Drop a Pin": "Drop sebuah Pin",
+    "My live location": "Lokasi langsung saya",
+    "My current location": "Lokasi saya saat ini",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s tidak dapat mengirimkan lokasi Anda. Silakan coba lagi nanti.",
+    "We couldn't send your location": "Kami tidak dapat mengirimkan lokasi Anda",
+    "This is a beta feature. Click for more info": "Ini adalah fitur beta. Klik untuk info lanjut",
+    "Match system": "Cocokkan dengan sistem",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Balas ke utasan yang sedang terjadi atau gunakan “%(replyInThread)s” ketika kursor diletakkan pada pesan untuk memulai yang baru.",
+    "Insert a trailing colon after user mentions at the start of a message": "Tambahkan sebuah karakter titik dua sesudah sebutan pengguna dari awal pesan",
+    "Show polls button": "Tampilkan tombol pemungutan suara",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s mengubah <a>pesan-pesan yang disematkan</a> di ruangan ini",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)smengubah <a>pesan-pesan yang dipasangi pin</a> untuk ruangan ini %(count)s kali",
+    "Location sharing - share your current location with live updates (under active development)": "Pembagian lokasi — bagikan lokasi Anda saat ini dengan pembaruan langsung (dalam pengembangan aktif)",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Space adalah cara yang baru untuk mengelompokkan ruangan dan orang. Space apa yang Anda ingin buat? Ini dapat diubah nanti.",
+    "Click": "Klik",
+    "Expand quotes": "Buka kutip",
+    "Collapse quotes": "Tutup kutip",
+    "We'll create rooms for each of them.": "Kami akan membuat ruangan untuk masing-masing.",
+    "Click to drop a pin": "Klik untuk menaruh pin",
+    "Click to move the pin": "Klik untuk memindahkan pin",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Homeserver ini tidak diatur dengan benar untuk memuat peta, atau server peta yang diatur mungkin tidak tersedia.",
+    "This homeserver is not configured to display maps.": "Homeserver ini tidak diatur untuk menampilkan peta.",
+    "Shared a location: ": "Membagikan sebuah lokasi: ",
+    "Shared their location: ": "Membagikan lokasinya: ",
+    "Unable to load map": "Tidak dapat memuat peta",
+    "Can't create a thread from an event with an existing relation": "Tidak dapat membuat utasan dari sebuah peristiwa dengan relasi yang sudah ada",
+    "Busy": "Sibuk",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Jika Anda mengirim sebuah kutu via GitHub, catat pengawakutu dapat membantu kami melacak masalahnya. ",
+    "Toggle Link": "Alih Tautan",
+    "Toggle Code Block": "Alih Blok Kode",
+    "Thank you for helping us testing Threads!": "Terima kasih untuk mencoba Utasan!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Semua peristiwa utasan dibuat saat masa eksperimental akan ditampilkan di linimasa ruangan sebagai balasan. Ini adalah transisi sekali saja. Utasan sekarang masuk dalam spesifikasi Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Kami baru saja perbaikan stabilitas untuk Utasan, yang berarti mengakhiri dukungan untuk Utasan bereksperimental.",
+    "Threads are no longer experimental! 🎉": "Utasan sudah tidak bereksperimental lagi! 🎉",
+    "You are sharing your live location": "Anda membagikan lokasi langsung Anda",
+    "%(displayName)s's live location": "Lokasi langsung %(displayName)s",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Jangan centang jika Anda juga ingin menghapus pesan-pesan sistem pada pengguna ini (mis. perubahan keanggotaan, perubahan profil…)",
+    "Preserve system messages": "Simpan pesan-pesan sistem",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Anda akan menghapus %(count)s pesan dari %(user)s. Ini akan dihapus secara permanen untuk semua dalam obrolan. Apakah Anda ingin lanjut?",
+    "Currently removing messages in %(count)s rooms|one": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
+    "Currently removing messages in %(count)s rooms|other": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
+    "Share for %(duration)s": "Bagikan selama %(duration)s",
+    "%(value)ss": "%(value)sd",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sj",
+    "%(value)sd": "%(value)sh",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Ini hanya transisi sekali, utasan sekarang sebagai bagian dari spesifikasi Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Saat kami mempersiapkan, kami harus membuat beberapa perubahan: utasan dibuat sebelum titik ini akan <strong>ditampilkan sebagai balasan biasa</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Kami hampir dekat untuk meriliskan sebuah Beta publik untuk Utasan.",
+    "Threads Approaching Beta 🎉": "Utasan Mencapai Beta 🎉",
+    "Stop sharing": "Berhenti membagikan",
+    "You are sharing %(count)s live locations|one": "Anda membagikan lokasi langsung Anda",
+    "You are sharing %(count)s live locations|other": "Anda membagikan %(count)s lokasi langsung",
+    "%(timeRemaining)s left": "%(timeRemaining)sd lagi",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Anda mencoba mengakses sebuah tautan komunitas (%(groupId)s).<br/>Komunitas tidak didukung lagi dan telah digantikan oleh space.<br2/><a>Pelajari lebih lanjut tentang space di sini.</a>",
+    "Next recently visited room or space": "Ruangan atau space berikut yang dikunjungi",
+    "Previous recently visited room or space": "Ruangan atau space yang dikunjungi sebelumnya",
+    "Room details": "Detail ruangan",
+    "Voice & video room": "Ruangan suara & video",
+    "Text room": "Ruangan teks",
+    "Room type": "Tipe ruangan",
+    "Connecting...": "Menghubungkan...",
+    "Voice room": "Ruangan suara",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Catat pengawakutu berisi data penggunaan aplikasi termasuk nama pengguna Anda, ID atau alias ruangan yang telah Anda kunjungi, elemen UI apa saja yang Anda terakhir berinteraksi, dan nama pengguna lain. Mereka tidak berisi pesan.",
+    "Mic": "Mikrofon",
+    "Mic off": "Mikrofon mati",
+    "Video": "Video",
+    "Video off": "Video mati",
+    "Connected": "Terhubung",
+    "Voice & video rooms (under active development)": "Ruangan suara & video (dalam pengembangan aktif)",
+    "That link is no longer supported": "Tautan itu tidak didukung lagi",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Di mana laman ini berisi informasi yang dapat dikenal, seperti sebuah ruangan, ID pengguna, data itu dihilangkan sebelum dikirimkan ke server.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Anda dapat menggunakan opsi server khusus untuk masuk ke server Matrix lain dengan menentukan URL homeserver yang berbeda. Ini memungkinkan Anda untuk menggunakan %(brand)s dengan akun Matrix yang ada di homeserver yang berbeda.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "Izin %(brand)s ditolak untuk mengakses lokasi Anda. Mohon izinkan akses lokasi di pengaturan peramban Anda.",
+    "Developer tools": "Alat pengembang",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s bersifat eksperimental pada peramban web ponsel. Untuk pengalaman yang lebih baik dan fitur-fitur terkini, gunakan aplikasi natif gratis kami.",
+    "Event ID: %(eventId)s": "ID peristiwa: %(eventId)s",
+    "No verification requests found": "Tidak ada permintaan verifikasi yang ditemukan",
+    "Observe only": "Lihat saja",
+    "Requester": "Peminta",
+    "Methods": "Metode",
+    "Timeout": "Waktu habis",
+    "Phase": "Masa",
+    "Transaction": "Transaksi",
+    "Cancelled": "Dibatalkan",
+    "Started": "Dimulai",
+    "Ready": "Siap",
+    "Requested": "Diminta",
+    "Unsent": "Belum dikirim",
+    "Edit values": "Edit nilai",
+    "Failed to save settings.": "Gagal menyimpan pengaturan.",
+    "Number of users": "Jumlah pengguna",
+    "Server": "Server",
+    "Server Versions": "Versi Server",
+    "Client Versions": "Versi Klien",
+    "Failed to load.": "Gagal untuk dimuat.",
+    "Capabilities": "Kemampuan",
+    "Send custom state event": "Kirim peristiwa status kustom",
+    "Failed to send event!": "Gagal mengirimkan pertistiwa!",
+    "Doesn't look like valid JSON.": "Tidak terlihat seperti JSON yang valid.",
+    "Send custom room account data event": "Kirim peristiwa data akun ruangan kustom",
+    "Send custom account data event": "Kirim peristiwa data akun kustom",
+    "Room ID: %(roomId)s": "ID ruangan: %(roomId)s",
+    "Server info": "Info server",
+    "Settings explorer": "Penelusur pengaturan",
+    "Explore account data": "Jelajahi data akun",
+    "Verification explorer": "Penelusur verifikasi",
+    "View servers in room": "Tampilkan server-server di ruangan",
+    "Explore room account data": "Jelajahi data akun ruangan",
+    "Explore room state": "Jelajahi status ruangan",
+    "Send custom timeline event": "Kirim peristiwa linimasa kustom",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Bantu kami mengidentifikasi masalah-masalah dan membuat %(analyticsOwner)s lebih baik dengan membagikan data penggunaan anonim. Untuk memahami bagaimana orang-orang menggunakan beberapa perangkat-perangkat, kami akan membuat pengenal acak, yang dibagikan oleh perangkat Anda.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Jika Anda tidak dapat menemukan ruangan yang Anda cari, minta sebuah undangan atau <a>buat sebuah ruangan baru</a>.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Pembagian lokasi langsung — bagikan lokasi saat ini (pengembangan aktif, dan sementara, lokasi tetap di riwayat ruangan)",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s didapatkan saat mencoba mengakses ruangan atau space. Jika Anda pikir Anda melihat pesan ini secara tidak benar, silakan <issueLink>kirim sebuah laporan kutu</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Coba ulang nanti, atau tanya kepada admin ruangan atau space untuk memeriksa jika Anda memiliki akses.",
+    "This room or space is not accessible at this time.": "Ruangan atau space ini tidak dapat diakses pada saat ini.",
+    "Are you sure you're at the right place?": "Apakah Anda yakin Anda berada di tempat yang benar?",
+    "This room or space does not exist.": "Ruangan atau space ini tidak ada.",
+    "There's no preview, would you like to join?": "Tidak ada tampilan, apakah Anda ingin bergabung?",
+    "This invite was sent to %(email)s": "Undangan ini telah dikirim ke %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Undangan ini telah dikirim ke %(email)s yang tidak ditautkan dengan akun Anda",
+    "You can still join here.": "Anda masih dapat bergabung di sini.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Sebuah kesalahan (%(errcode)s) telah diberikan saat mencoba untuk memvalidasikan undangan. Anda bisa saja dapat memberikan informasi ini ke orang yang mengundang Anda.",
+    "Something went wrong with your invite.": "Terjadi kesalahan dengan undangan Anda.",
+    "You were banned by %(memberName)s": "Anda telah dicekal oleh %(memberName)s",
+    "Forget this space": "Lupakan space ini",
+    "You were removed by %(memberName)s": "Anda telah dikeluarkan oleh %(memberName)s",
+    "Loading preview": "Memuat tampilan",
+    "Joining …": "Bergabung…",
+    "View older version of %(spaceName)s.": "Lihat versi %(spaceName)s yang lama.",
+    "Upgrade this space to the recommended room version": "Tingkatkan space ini ke versi ruangan yang disarankan",
+    "Failed to join": "Gagal untuk bergabung",
+    "The person who invited you has already left, or their server is offline.": "Orang yang mengundang Anda telah keluar, atau servernya sedang luring.",
+    "The person who invited you has already left.": "Orang yang mengundang Anda telah keluar.",
+    "Sorry, your homeserver is too old to participate here.": "Maaf, homeserver Anda terlalu usang untuk berpartisipasi di sini.",
+    "There was an error joining.": "Terjadi sebuah kesalahan bergabung.",
+    "The user's homeserver does not support the version of the space.": "Homeserver pengguna tidak mendukung versi space.",
+    "User may or may not exist": "Pengguna mungkin atau mungkin tidak ada",
+    "User does not exist": "Pengguna tidak ada",
+    "User is already in the room": "Pengguna sudah ada di ruangan",
+    "User is already in the space": "Pengguna sudah ada di space",
+    "User is already invited to the room": "Pengguna sudah diundang ke ruangan",
+    "User is already invited to the space": "Pengguna sudah diundang ke space",
+    "You do not have permission to invite people to this space.": "Anda tidak memiliki izin untuk mengundang seseorang ke space ini.",
+    "Failed to invite users to %(roomName)s": "Gagal mengundang pengguna ke %(roomName)s",
+    "An error occurred while stopping your live location, please try again": "Sebuah kesalahan terjadi saat menghentikan lokasi langsung Anda, mohon coba lagi",
+    "Stop sharing and close": "Hentikan pembagian dan tutup",
+    "An error occured whilst sharing your live location, please try again": "Sebuah kesalahan terjadi saat membagikan lokasi langsung Anda, mohon coba lagi",
+    "An error occured whilst sharing your live location": "Sebuah kesalahan terjadi saat membagikan lokasi langsung Anda",
+    "Create room": "Buat ruangan",
+    "Create video room": "Buat ruangan video",
+    "Create a video room": "Buat sebuah ruangan video",
+    "%(count)s participants|one": "1 perserta",
+    "%(count)s participants|other": "%(count)s perserta",
+    "New video room": "Ruangan video baru",
+    "New room": "Ruangan baru",
+    "Video rooms (under active development)": "Ruangan video (dalam pengembangan aktif)",
+    "Threads help keep your conversations on-topic and easy to track.": "Utasan membantu membuat obrolan sesuai topik dan mudah untuk dilacak.",
+    "%(featureName)s Beta feedback": "Masukan %(featureName)s Beta",
+    "Beta feature. Click to learn more.": "Fitur beta. Klik untuk mempelajari lebih lanjut.",
+    "Beta feature": "Fitur beta",
+    "To leave, return to this page and use the “Leave the beta” button.": "Untuk keluar, kembali ke laman ini dan gunakan tombol “Tinggalkan beta”.",
+    "Use \"Reply in thread\" when hovering over a message.": "Gunakan \"Balas dalam utasan\" ketika kursor berada di atas pesan.",
+    "How can I start a thread?": "Bagaimana saya dapat memulai sebuah utasan?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Utasan membantu membuat percakapan sesuai topik dan mudah untuk dilacak. <a>Pelajari lebih lanjut</a>.",
+    "Keep discussions organised with threads.": "Buat diskusi tetap teratur dengan utasan.",
+    "<a>Give feedback</a>": "<a>Berikan masukan</a>",
+    "Threads are a beta feature": "Utasan adalah fitur beta",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Tip:</b> Gunakan \"Balas dalam utasan\" ketika kursor ada di atas pesan.",
+    "sends hearts": "mengirim hati",
+    "Sends the given message with hearts": "Kirim pesan dengan hati",
+    "Confirm signing out these devices|one": "Konfirmasi mengeluarkan perangkat ini",
+    "Confirm signing out these devices|other": "Konfirmasi mengeluarkan perangkat ini",
+    "Live location ended": "Lokasi langsung berakhir",
+    "Loading live location...": "Memuat lokasi langsung…",
+    "View live location": "Tampilkan lokasi langsung",
+    "Live location enabled": "Lokasi langsung diaktifkan",
+    "Live location error": "Kesalahan lokasi langsung",
+    "Live until %(expiryTime)s": "Langsung sampai %(expiryTime)s",
+    "Ban from room": "Cekal dari ruangan",
+    "Unban from room": "Batalkan cekalan dari ruangan",
+    "Ban from space": "Cekal dari space",
+    "Unban from space": "Batalkan cekalan dari space",
+    "Yes, enable": "Iya, aktifkan",
+    "Do you want to enable threads anyway?": "Apakah Anda ingin mengaktifkan utasan?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Homeserver Anda saat ini tidak mendukung utasan, jadi fitur ini mungkin tidak andal. Beberapa pesan yang diutas mungkin tidak tersedia. <a>Pelajari lebih lanjut</a>.",
+    "Partial Support for Threads": "Sebagian Dukungan untuk Utasan",
+    "Jump to the given date in the timeline": "Pergi ke tanggal yang diberikan di linimasa",
+    "Right-click message context menu": "Klik kanan menu konteks pesan",
+    "Disinvite from room": "Batalkan undangan dari ruangan",
+    "Remove from space": "Keluarkan dari space",
+    "Disinvite from space": "Batalkan undangan dari space"
 }
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index b94925647af..2be58851752 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -18,7 +18,7 @@
     "Sat": "lau",
     "Jan": "jan",
     "Feb": "feb",
-    "Mar": "mar",
+    "Mar": "Mar",
     "Apr": "apr",
     "May": "maí",
     "Jun": "jún",
@@ -64,7 +64,7 @@
     "Messages in one-to-one chats": "Skilaboð í maður-á-mann spjalli",
     "Messages in group chats": "Skilaboð í hópaspjalli",
     "When I'm invited to a room": "Þegar mér er boðið á spjallrás",
-    "Call invitation": "Boð um þátttöku",
+    "Call invitation": "Boð um þátttöku í símtali",
     "Messages sent by bot": "Skilaboð send af vélmennum",
     "Decline": "Hafna",
     "Accept": "Samþykkja",
@@ -95,18 +95,18 @@
     "Unban this user?": "Taka þennan notanda úr banni?",
     "Ban this user?": "Banna þennan notanda?",
     "Are you sure?": "Ertu viss?",
-    "Unignore": "Byrja að fylgjast með á ný",
+    "Unignore": "Hætta að hunsa",
     "Ignore": "Hunsa",
     "Mention": "Minnst á",
     "Invite": "Bjóða",
-    "Unmute": "Kveikja á hljóði",
-    "Mute": "Þagga hljóð",
+    "Unmute": "Ekki þagga",
+    "Mute": "Þagga niður",
     "Admin Tools": "Kerfisstjóratól",
     "Invited": "Boðið",
     "Filter room members": "Sía meðlimi spjallrásar",
     "Attachment": "Viðhengi",
     "Hangup": "Leggja á",
-    "Voice call": "Raddsamtal",
+    "Voice call": "Raddsímtal",
     "Video call": "Myndsímtal",
     "Upload file": "Hlaða inn skrá",
     "Send an encrypted message…": "Senda dulrituð skilaboð…",
@@ -150,7 +150,7 @@
     "This Room": "Þessi spjallrás",
     "All Rooms": "Allar spjallrásir",
     "Cancel": "Hætta við",
-    "Jump to first unread message.": "Fara í fyrstu ólesin skilaboð.",
+    "Jump to first unread message.": "Fara í fyrstu ólesnu skilaboðin.",
     "Close": "Loka",
     "not specified": "ekki tilgreint",
     "Invalid community ID": "Ógilt auðkenni samfélags",
@@ -198,7 +198,7 @@
     "Logs sent": "Sendi atvikaskrár",
     "Thank you!": "Takk fyrir!",
     "Failed to send logs: ": "Mistókst að senda atvikaskrár: ",
-    "Submit debug logs": "Senda inn aflúsunarannála",
+    "Submit debug logs": "Senda inn villuleitarskrár",
     "Send logs": "Senda atvikaskrá",
     "Unavailable": "Ekki tiltækt",
     "Changelog": "Breytingaskrá",
@@ -239,7 +239,7 @@
     "Reject": "Hafna",
     "Low Priority": "Lítill forgangur",
     "View Community": "Skoða samfélag",
-    "Name": "Nafn",
+    "Name": "Heiti",
     "Failed to upload image": "Gat ekki sent inn mynd",
     "Add rooms to this community": "Bæta spjallrásum í þetta samfélag",
     "Featured Users:": "Notendur í sviðsljósinu:",
@@ -318,8 +318,8 @@
     "And %(count)s more...|other": "Og %(count)s til viðbótar...",
     "Matrix ID": "Matrix-auðkenni",
     "Matrix Room ID": "Matrix-auðkenni spjallrásar",
-    "Send Custom Event": "Senda sérsniðið atvik",
-    "Event sent!": "Atvik sent!",
+    "Send Custom Event": "Senda sérsniðinn atburð",
+    "Event sent!": "Atburður sendur!",
     "State Key": "Stöðulykill",
     "Explore Room State": "Skoða stöðu spjallrásar",
     "Explore Account Data": "Skoða aðgangsgögn",
@@ -359,7 +359,7 @@
     "<not supported>": "<ekki stutt>",
     "No Microphones detected": "Engir hljóðnemar fundust",
     "No Webcams detected": "Engar vefmyndavélar fundust",
-    "Homeserver is": "Heimanetþjónn er",
+    "Homeserver is": "Heimaþjónn er",
     "Displays action": "Birtir aðgerð",
     "Changes your display nickname": "Breytir birtu gælunafni þínu",
     "Emoji": "Tjáningartáknmynd",
@@ -379,8 +379,8 @@
     "Leave Room": "Fara af Spjallrás",
     "Add room": "Bæta við spjallrás",
     "Use a more compact ‘Modern’ layout": "Nota þéttara ‘nútímalegt’ skipulag",
-    "Switch to dark mode": "Skiptu yfir í dökkstillingu",
-    "Switch to light mode": "Skiptu yfir í ljósstillingu",
+    "Switch to dark mode": "Skiptu yfir í dökkan ham",
+    "Switch to light mode": "Skiptu yfir í ljósan ham",
     "Modify widgets": "Breyta viðmótshluta",
     "Room Info": "Upplýsingar um spjallrás",
     "Room information": "Upplýsingar um spjallrás",
@@ -402,22 +402,22 @@
     "Food & Drink": "Mat og drykkur",
     "Animals & Nature": "Dýr og náttúra",
     "Smileys & People": "Broskarlar og fólk",
-    "Voice & Video": "Rödd og myndband",
+    "Voice & Video": "Tal og myndmerki",
     "Roles & Permissions": "Hlutverk og heimildir",
-    "Help & About": "Hjálp og um",
+    "Help & About": "Hjálp og um hugbúnaðinn",
     "Reject & Ignore user": "Hafna og hunsa notanda",
     "Security & privacy": "Öryggi og einkalíf",
-    "Security & Privacy": "Öryggi & Einkalíf",
-    "Feedback sent": "Endurgjöf sent",
-    "Send feedback": "Senda endurgjöf",
-    "Feedback": "Endurgjöf",
-    "%(featureName)s beta feedback": "%(featureName)s beta endurgjöf",
+    "Security & Privacy": "Öryggi og gagnaleynd",
+    "Feedback sent": "Umsögn send",
+    "Send feedback": "Senda umsögn",
+    "Feedback": "Umsagnir",
+    "%(featureName)s beta feedback": "Umsögn um %(featureName)s beta-prófunarútgáfu",
     "Thank you for your feedback, we really appreciate it.": "Þakka þér fyrir athugasemdir þínar.",
     "All settings": "Allar stillingar",
     "Notification settings": "Tilkynningarstillingar",
     "Change notification settings": "Breytta tilkynningastillingum",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Þú getur ekki sent nein skilaboð fyrr en þú hefur farið yfir og samþykkir <consentLink>skilmála okkar</consentLink>.",
-    "Send a Direct Message": "Senda beinskilaboð",
+    "Send a Direct Message": "Senda bein skilaboð",
     "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.": "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.",
     "Send a message…": "Senda skilaboð…",
     "Send message": "Senda skilaboð",
@@ -425,9 +425,9 @@
     "Send as message": "Senda sem skilaboð",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Þú getur notað <code>/help</code> til að lista tilteknar skipanir. Ætlaðir þú að senda þetta sem skilaboð?",
     "Send messages": "Senda skilaboð",
-    "Sends the given message with snowfall": "Sendir skilaboðið með snjókomu",
-    "Sends the given message with fireworks": "Sendir skilaboðið með flugeldum",
-    "Sends the given message with confetti": "Sendir skilaboðið með skrauti",
+    "Sends the given message with snowfall": "Sendir skilaboðin með snjókomu",
+    "Sends the given message with fireworks": "Sendir skilaboðin með flugeldum",
+    "Sends the given message with confetti": "Sendir skilaboðin með skrauti",
     "Never send encrypted messages to unverified sessions in this room from this session": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja á þessari spjallrás úr þessari setu",
     "Never send encrypted messages to unverified sessions from this session": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja",
     "Use Ctrl + Enter to send a message": "Notaðu Ctrl + Enter til að senda skilaboð",
@@ -442,7 +442,7 @@
     "Send messages as you in this room": "Senda skilaboð sem þú í þessari spjallrás",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s breytti föstum skilaboðum fyrir spjallrásina.",
     "Sends a message to the given user": "Sendir skilaboð til viðkomandi notanda",
-    "Sends the given message coloured as a rainbow": "Sendir gefið skilaboð litað sem regnbogi",
+    "Sends the given message coloured as a rainbow": "Sendir uppgefin skilaboð lituð sem regnboga",
     "Sends a message as html, without interpreting it as markdown": "Sendir skilaboð sem html, án þess að túlka það sem markdown",
     "Sends a message as plain text, without interpreting it as markdown": "Sendir skilaboð sem óbreyttur texti án þess að túlka það sem markdown",
     "Sends the given message as a spoiler": "Sendir skilaboðin sem stríðni",
@@ -480,7 +480,7 @@
     "Send an encrypted reply…": "Senda dulritað svar…",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Þegar hún er gerð virk er ekki hægt að gera dulritun óvirka. Skilaboð á dulritaðri spjallrás getur netþjónninn ekki séð, aðeins þátttakendur á spjallrásinni. Virkjun dulritunar gæti komið í veg fyrir að vélmenni og brýr virki rétt. <a>Lærðu meira um dulritun.</a>",
     "Once enabled, encryption cannot be disabled.": "Eftir að kveikt er á dulritun er ekki hægt að slökkva á henni.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Í dulrituðum spjallrásum, eins og þessari, er sjálfgefið slökkt á forskoðun vefslóða  til að tryggja að heimaþjónn þinn (þar sem forskoðunin myndast) geti ekki safnað upplýsingum um tengla sem þú sérð í þessari spjallrás.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Í dulrituðum spjallrásum, eins og þessari, er sjálfgefið slökkt á forskoðun vefslóða til að tryggja að heimaþjónn þinn (þar sem forskoðunin myndast) geti ekki safnað upplýsingum um tengla sem þú sérð í þessari spjallrás.",
     "URL Previews": "Forskoðun vefslóða",
     "URL previews are disabled by default for participants in this room.": "Forskoðun vefslóða er sjálfgefið óvirk fyrir þátttakendur í þessari spjallrás.",
     "URL previews are enabled by default for participants in this room.": "Forskoðun vefslóða er sjálfgefið virk fyrir þátttakendur í þessari spjallrás.",
@@ -490,8 +490,8 @@
     "Enable URL previews for this room (only affects you)": "Virkja forskoðun vefslóða fyrir þessa spjallrás (einungis fyrir þig)",
     "Room settings": "Stillingar spjallrásar",
     "Room Settings - %(roomName)s": "Stillingar spjallrásar - %(roomName)s",
-    "This is the beginning of your direct message history with <displayName/>.": "Þetta er upphaf beinna skilaboðasögu með <displayName/>.",
-    "Recently Direct Messaged": "Sendi nýlega bein skilaboð",
+    "This is the beginning of your direct message history with <displayName/>.": "Þetta er upphaf ferils beinna skilaboða með <displayName/>.",
+    "Recently Direct Messaged": "Nýsend bein skilaboð",
     "Direct Messages": "Bein skilaboð",
     "Frequently Used": "Oft notað",
     "Filter all spaces": "Sía öll rými",
@@ -510,9 +510,9 @@
     "This user has not verified all of their sessions.": "Þessi notandi hefur ekki sannreynt öll tæki þeirra.",
     "%(count)s verified sessions|one": "1 sannreynt tæki",
     "%(count)s verified sessions|other": "%(count)s sannreyn tæki",
-    "Hide verified sessions": "Fela sannreyn tæki",
+    "Hide verified sessions": "Fela sannreynd tæki",
     "Remove recent messages": "Fjarlægja nýleg skilaboð",
-    "Remove recent messages by %(user)s": "Fjarlægja nýleg skilaboð af %(user)s",
+    "Remove recent messages by %(user)s": "Fjarlægja nýleg skilaboð frá %(user)s",
     "Messages in this room are not end-to-end encrypted.": "Skilaboð í þessari spjallrás eru ekki enda-í-enda dulrituð.",
     "Who would you like to add to this community?": "Hverjum viltu bæta við í þetta samfélag?",
     "You cannot place a call with yourself.": "Þú getur ekki byrjað símtal með sjálfum þér.",
@@ -530,7 +530,7 @@
     "Upgrade": "Uppfæra",
     "Verify": "Sannreyna",
     "Security": "Öryggi",
-    "Trusted": "Traustað",
+    "Trusted": "Treyst",
     "Subscribe": "Skrá",
     "Unsubscribe": "Afskrá",
     "None": "Ekkert",
@@ -541,14 +541,14 @@
     "Objects": "Hlutir",
     "Activities": "Starfsemi",
     "Document": "Skjal",
-    "Complete": "Búið",
+    "Complete": "Fullklára",
     "View": "Skoða",
     "Preview": "Forskoðun",
     "Strikethrough": "Yfirstrikletrað",
     "Italics": "Skáletrað",
     "Bold": "Feitletrað",
     "ID": "Auðkenni (ID)",
-    "Disconnect": "Aftengja",
+    "Disconnect": "Aftengjast",
     "Share": "Deila",
     "Revoke": "Afturkalla",
     "Discovery": "Uppgötvun",
@@ -560,13 +560,13 @@
     "Browse": "Skoða",
     "Reset": "Endursetja",
     "Sounds": "Hljóð",
-    "edited": "breytt",
+    "edited": "breytti",
     "Re-join": "Taka þátt aftur",
     "Banana": "Banani",
     "Fire": "Eldur",
     "Cloud": "Ský",
     "Moon": "Tungl",
-    "Globe": "Heiminn",
+    "Globe": "Hnöttur",
     "Mushroom": "Sveppur",
     "Cactus": "Kaktus",
     "Tree": "Tré",
@@ -594,7 +594,7 @@
     "Encrypted": "Dulritað",
     "Encryption": "Dulritun",
     "Timeline": "Tímalína",
-    "Composer": "Ritari",
+    "Composer": "Skrifreitur",
     "Preferences": "Stillingar",
     "Versions": "Útgáfur",
     "FAQ": "Algengar spurningar",
@@ -606,12 +606,12 @@
     "Retry": "Reyna aftur",
     "Download": "Niðurhal",
     "Next": "Næsta",
-    "Legal": "Löglegt",
+    "Legal": "Lagalegir fyrirvarar",
     "Demote": "Leggja til baka",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sfór",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sfóru",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sskráðist",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sskráðust",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sfór út",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sfóru út",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sskráði sig",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sskráðu sig",
     "Stickerpack": "Límmerkjapakki",
     "Replying": "Svara",
     "%(duration)sd": "%(duration)sd",
@@ -623,15 +623,15 @@
     "%(count)s messages deleted.|one": "%(count)s skilaboð eytt.",
     "%(count)s messages deleted.|other": "%(count)s skilaboðum eytt.",
     "Message deleted on %(date)s": "Skilaboð eytt á %(date)s",
-    "Message edits": "Skilaboðs breytingar",
+    "Message edits": "Breytingar á skilaboðum",
     "List options": "Lista valkosti",
     "Create a Group Chat": "Búa til hópspjall",
     "Explore Public Rooms": "Kanna almenningsspjallrásir",
     "Explore public rooms": "Kanna almenningsspjallrásir",
     "Explore all public rooms": "Kanna allar almenningsspjallrásir",
     "Liberate your communication": "Frelsaðu samskipti þín",
-    "Welcome to <name/>": "Velkomin til <name/>",
-    "Welcome to %(appName)s": "Velkomin til %(appName)s",
+    "Welcome to <name/>": "Velkomin í <name/>",
+    "Welcome to %(appName)s": "Velkomin í %(appName)s",
     "Identity server is": "Auðkennisþjónn er",
     "Identity server": "Auðkennisþjónn",
     "%(date)s at %(time)s": "%(date)s kl. %(time)s",
@@ -647,7 +647,7 @@
     "Loading room preview": "Hleð inn forskoðun á spjallrás",
     "Joining room …": "Geng til liðs við spjallrás …",
     "Open Space": "Opna svæði",
-    "Spaces": "Svæði (Spaces)",
+    "Spaces": "Svæði",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Setur ( ͡° ͜ʖ ͡°) framan við hrein textaskilaboð",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Setur ┬──┬ ノ( ゜-゜ノ) framan við hrein textaskilaboð",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Setur (╯°□°）╯︵ ┻━┻ framan við hrein textaskilaboð",
@@ -914,7 +914,7 @@
     "Moderation": "Umsjón",
     "Widgets": "Viðmótshlutar",
     "Room members": "Meðlimir spjallrásar",
-    "Threads": "Þræðir",
+    "Threads": "Spjallþræðir",
     "All rooms": "Allar spjallrásir",
     "Ok": "Í lagi",
     "Use app": "Nota smáforrit",
@@ -947,20 +947,20 @@
     "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s bannaði %(targetName)s: %(reason)s",
     "%(senderName)s invited %(targetName)s": "%(senderName)s bauð %(targetName)s",
     "%(targetName)s accepted an invitation": "%(targetName)s samþykkti boð",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hringdi myndsamtal. (Ekki stutt af þessum vafra)",
-    "%(senderName)s placed a video call.": "%(senderName)s hringdi myndsamtal.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hringdi raddsamtal. (Ekki stutt af þessum vafra)",
-    "%(senderName)s placed a voice call.": "%(senderName)s hringdi raddsamtal.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hringdi myndsímtal. (Ekki stutt af þessum vafra)",
+    "%(senderName)s placed a video call.": "%(senderName)s hringdi myndsímtal.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hringdi raddsímtal. (Ekki stutt af þessum vafra)",
+    "%(senderName)s placed a voice call.": "%(senderName)s hringdi raddsímtal.",
     "Use an identity server": "Nota auðkennisþjón",
     "Sets the room name": "Stillir heiti spjallrásar",
-    "Effects": "Sjónhverfingar",
+    "Effects": "Brellur",
     "Setting up keys": "Set upp dulritunarlykla",
     "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s og %(count)s til viðbótar",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s og %(space2Name)s",
     "Custom (%(level)s)": "Sérsniðið (%(level)s)",
     "Sign In or Create Account": "Skráðu þig inn eða búðu til aðgang",
-    "Try again": "Reyndu aftur",
+    "Try again": "Reyna aftur",
     "Name or Matrix ID": "Nafn eða Matrix-auðkenni",
     "Failure to create room": "Mistókst að búa til spjallrás",
     "End conference": "Ljúka fjarfundi",
@@ -1020,7 +1020,7 @@
     "Esc": "Esc",
     "Page Down": "Síða niður",
     "Page Up": "Síða upp",
-    "Space used:": "Gagnamagn notað:",
+    "Space used:": "Notað geymslupláss:",
     "Disable": "Gera óvirkt",
     "Go to Settings": "Fara í stillingar",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Útflutta skráin verður varin með lykilfrasa. Settu inn lykilfrasann hér til að afkóða skrána.",
@@ -1032,7 +1032,7 @@
     "Syncing...": "Samstilli...",
     "Your password has been reset.": "Lykilorðið þitt hefur verið endursett.",
     "Set status": "Setja stöðu",
-    "Thread": "Þráður",
+    "Thread": "Spjallþráður",
     "Show:": "Sýna:",
     "Skip for now": "Sleppa í bili",
     "Support": "Aðstoð",
@@ -1075,7 +1075,7 @@
     "Looks good!": "Lítur vel út!",
     "Remember this": "Muna þetta",
     "Approve": "Samþykkja",
-    "Upload Error": "Villa í innsendingu",
+    "Upload Error": "Villa við innsendingu",
     "Cancel All": "Hætta við allt",
     "Upload all": "Senda allt inn",
     "Upload files": "Hlaða inn skrám",
@@ -1086,10 +1086,10 @@
     "Link to room": "Tengill á spjallrás",
     "Share Room Message": "Deila skilaboðum spjallrásar",
     "Share Room": "Deila spjallrás",
-    "About homeservers": "Um heimanetþjóna",
-    "Specify a homeserver": "Tilgreindu heimanetþjón",
+    "About homeservers": "Um heimaþjóna",
+    "Specify a homeserver": "Tilgreindu heimaþjón",
     "Invalid URL": "Ógild slóð",
-    "Send report": "Senda skýrslu",
+    "Send report": "Senda kæru",
     "Email (optional)": "Tölvupóstfang (valfrjálst)",
     "Session name": "Nafn á setu",
     "%(count)s rooms|one": "%(count)s spjallrás",
@@ -1099,11 +1099,11 @@
     "Leave %(spaceName)s": "Yfirgefa %(spaceName)s",
     "Upload completed": "Innsendingu er lokið",
     "User Directory": "Mappa notanda",
-    "Transfer": "Millifærsla",
+    "Transfer": "Flutningur",
     "Unnamed Space": "Nafnlaust svæði",
     "Suggestions": "Tillögur",
     "Terms of Service": "Þjónustuskilmálar",
-    "Privacy Policy": "Meðferð persónuupplýsinga",
+    "Privacy Policy": "Persónuverndarstefna",
     "Abort": "Hætta",
     "Message preview": "Forskoðun skilaboða",
     "Forward message": "Áframsenda skilaboð",
@@ -1143,11 +1143,11 @@
     "Notes": "Minnispunktar",
     "Want to add a new room instead?": "Viltu frekar bæta við nýrri spjallrás?",
     "Add existing rooms": "Bæta við fyrirliggjandi spjallrásum",
-    "Server name": "Nafn miðlara",
+    "Server name": "Heiti þjóns",
     "Matrix": "Matrix",
     "Looks good": "Lítur vel út",
     "QR Code": "QR-kóði",
-    "Create options": "Valkostir frágangs",
+    "Create options": "Búa til valkosti",
     "Done": "Lokið",
     "Information": "Upplýsingar",
     "Rotate Right": "Snúa til hægri",
@@ -1187,7 +1187,7 @@
     "Files": "Skrár",
     "About": "Um hugbúnaðinn",
     "Chat": "Spjall",
-    "Show more": "Birta meira",
+    "Show more": "Sýna meira",
     "Local Addresses": "Staðvær vistföng",
     "Local address": "Staðvært vistfang",
     "Stop recording": "Stöðva upptöku",
@@ -1216,7 +1216,7 @@
     "Unpin": "Losa",
     "Topic: %(topic)s ": "Umfjöllunarefni: %(topic)s ",
     "Insert link": "Setja inn tengil",
-    "Code block": "Kóða reitur",
+    "Code block": "Kóðablokk",
     "Poll": "Athuga",
     "Voice Message": "Talskilaboð",
     "Sticker": "Límmerki",
@@ -1237,7 +1237,7 @@
     "@mentions & keywords": "@minnst á og stikkorð",
     "Bridges": "Brýr",
     "Space information": "Upplýsingar um svæði",
-    "this room": "þessi spjallrás",
+    "this room": "þessari spjallrás",
     "Audio Output": "Hljóðúttak",
     "Rooms outside of a space": "Spjallrásir utan svæðis",
     "Sidebar": "Hliðarspjald",
@@ -1249,12 +1249,12 @@
     "Keyboard Shortcuts": "Flýtilyklar",
     "Bug reporting": "Tilkynningar um villur",
     "Credits": "Framlög",
-    "Deactivate account": "Gera notandaaðgang óvirkan",
+    "Deactivate account": "Gera notandaaðgang óvirkann",
     "Phone numbers": "Símanúmer",
     "Email addresses": "Tölvupóstföng",
     "Add theme": "Bæta við þema",
-    "Change": "Skipta um",
-    "not ready": "Ekki tilbúið",
+    "Change": "Breyta",
+    "not ready": "ekki tilbúið",
     "ready": "tilbúið",
     "Algorithm:": "Reiknirit:",
     "Restore from Backup": "Endurheimta úr öryggisafriti",
@@ -1275,7 +1275,7 @@
     "Select all": "Velja allt",
     "Deselect all": "Afvelja allt",
     "Session ID:": "Auðkenni setu:",
-    "exists": "er til",
+    "exists": "er til staðar",
     "not found": "fannst ekki",
     "Passwords don't match": "Lykilorðin samsvara ekki",
     "Channel: <channelLink/>": "Rás: <channelLink/>",
@@ -1303,8 +1303,8 @@
     "Pin": "Pinni",
     "Folder": "Mappa",
     "Headphones": "Heyrnartól",
-    "Anchor": "Festipunktur",
-    "Bell": "Gulur",
+    "Anchor": "Akkeri",
+    "Bell": "Bjalla",
     "Trumpet": "Trompet",
     "Bicycle": "Reiðhjól",
     "Train": "Lest",
@@ -1324,9 +1324,9 @@
     "Got It": "Náði því",
     "Show sidebar": "Sýna hliðarspjald",
     "Hide sidebar": "Fela hliðarspjald",
-    "Dial": "Skífa",
+    "Dial": "Hringja",
     "Unknown Command": "Óþekkt skipun",
-    "All rooms you're in will appear in Home.": "Sllar spjallrásir sem þú ert í munu birtast á forsíðu.",
+    "All rooms you're in will appear in Home.": "Allar spjallrásir sem þú ert í munu birtast á forsíðu.",
     "Show all rooms in Home": "Sýna allar spjallrásir á forsíðu",
     "Match system theme": "Samsvara þema kerfis",
     "Show stickers button": "Birta límmerkjahnapp",
@@ -1359,7 +1359,7 @@
     "Avoid recent years": "Forðastu nýleg ártöl",
     "Avoid sequences": "Forðastu runur",
     "Avoid repeated words and characters": "Forðastu endurtekin orð og stafi",
-    "Send stickers to this room as you": "Senda límmerki á þessa spjallrás um leið og þú",
+    "Send stickers to this room as you": "Senda límmerki sem þú á þessa spjallrás",
     "Send stickers into your active room": "Senda límmerki á virku spjallrásina þína",
     "Send stickers into this room": "Senda límmerki á þessa spjallrás",
     "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s breytti <a>föstum skilaboðum</a> fyrir spjallrásina.",
@@ -1370,7 +1370,7 @@
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s og %(count)s til viðbótar",
     "Connectivity to the server has been lost": "Tenging við vefþjón hefur rofnað",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s eru að skrifa…… …",
-    "%(names)s and %(count)s others are typing …|one": "(names)s og einn til viðbótar eru að skrifa……",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s og einn til viðbótar eru að skrifa……",
     "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s til viðbótar eru að skrifa……",
     "%(senderName)s has ended a poll": "%(senderName)s hefur lokið könnun",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s hefur sett í gang könnun - %(pollQuestion)s",
@@ -1384,10 +1384,10 @@
     "%(senderName)s removed %(targetName)s: %(reason)s": "%(senderName)s fjarlægði %(targetName)s: %(reason)s",
     "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s tók til baka boð til %(targetName)s",
     "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s": "%(senderName)s tók til baka boð til %(targetName)s: %(reason)s",
-    "%(senderName)s unbanned %(targetName)s": "(senderName)s tók bann af %(targetName)s",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s tók bann af %(targetName)s",
     "%(senderName)s set a profile picture": "%(senderName)s stillti notandamynd",
     "%(senderName)s changed their profile picture": "%(senderName)s breytti notandamyndinni sinni",
-    "%(senderName)s removed their profile picture": "%(senderName)s fjarlægði notandamyndina sína (%(oldDisplayName)s",
+    "%(senderName)s removed their profile picture": "%(senderName)s fjarlægði notandamyndina sína",
     "You are no longer ignoring %(userId)s": "Þú ert ekki lengur að hunsa %(userId)s",
     "Unignored user": "Ekki-hunsaður notandi",
     "Ignores a user, hiding their messages from you": "Hunsar notanda, felur skilaboð viðkomandi fyrir þér",
@@ -1499,7 +1499,7 @@
     "Approve widget permissions": "Samþykkja heimildir viðmótshluta",
     "Clear cache and resync": "Hreinsa skyndiminni og endursamstilla",
     "Incompatible local cache": "Ósamhæft staðvært skyndiminni",
-    "Feedback sent! Thanks, we appreciate it!": "Umsögn send! Takk, við kunnum að meta þetta.",
+    "Feedback sent! Thanks, we appreciate it!": "Umsögn send! Takk, við kunnum að meta þetta!",
     "Continue With Encryption Disabled": "Halda áfram með dulritun óvirka",
     "Enable end-to-end encryption": "Virkja enda-í-enda dulritun",
     "Encryption not enabled": "Dulritun ekki virk",
@@ -1594,9 +1594,1630 @@
     "about a minute ago": "fyrir um það bil mínútu síðan",
     "a few seconds ago": "fyrir örfáum sekúndum síðan",
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
-    "%(items)s and %(count)s others|one": "%(items)s og til viðbótar",
+    "%(items)s and %(count)s others|one": "%(items)s og einn til viðbótar",
     "%(items)s and %(count)s others|other": "%(items)s og %(count)s til viðbótar",
     "Unable to connect to Homeserver. Retrying...": "Ekki tókst að tengjast heimaþjóni. Reyni aftur...",
     "No homeserver URL provided": "Engin slóð heimaþjóns tilgreind",
-    "Cannot reach identity server": "Næ ekki sambandi við auðkennisþjón"
+    "Cannot reach identity server": "Næ ekki sambandi við auðkennisþjón",
+    "Send a sticker": "Senda límmerki",
+    "Just me": "Bara ég",
+    "Room name": "Heiti spjallrásar",
+    "Private space": "Einkasvæði",
+    "Doesn't look like a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
+    "Mentions only": "Aðeins minnst á",
+    "Reset everything": "Frumstilla allt",
+    "Not Trusted": "Ekki treyst",
+    "Report Content": "Kæra efni",
+    "Session key": "Dulritunarlykill setu",
+    "Other spaces or rooms you might not know": "Önnur svæði sem þú gætir ekki vitað um",
+    "Select spaces": "Veldu svæði",
+    "Dial pad": "Talnaborð",
+    "Enter the name of a new server you want to explore.": "Sláðu inn nafn nýja netþjónsins sem þú vilt skoða.",
+    "Add a new server": "Bæta við nýjum þjóni",
+    "Your server": "Netþjónninn þinn",
+    "Can't find this server or its room list": "Fann ekki þennan netþjón eða spjallrásalista hans",
+    "Sign in with single sign-on": "Skrá inn með einfaldri innskráningu (single sign-on)",
+    "Homeserver": "Heimaþjónn",
+    "This address is already in use": "Þetta vistfang er nú þegar í notkun",
+    "Open poll": "Opna könnun",
+    "Poll type": "Tegund könnunar",
+    "Edit poll": "Breyta könnun",
+    "Create Poll": "Búa til könnun",
+    "Create poll": "Búa til könnun",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sbreytti auðkennismynd sinni",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sbreytti auðkennismynd sinni %(count)s sinnum",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sbreyttu auðkennismynd sinni",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sbreyttu auðkennismynd sinni %(count)s sinnum",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sbreytti nafni sínu",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sbreytti nafni sínu %(count)s sinnum",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sbreyttu nafni sínu",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sbreyttu nafni sínu %(count)s sinnum",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "Share content": "Deila efni",
+    "Share entire screen": "Deila öllum skjánum",
+    "Widget ID": "Auðkenni viðmótshluta",
+    "Room ID": "Auðkenni spjallrásar",
+    "Your theme": "Þemað þitt",
+    "Your user ID": "Notandaauðkennið þitt",
+    "Your avatar URL": "Vefslóð á auðkennismyndina þína",
+    "Your display name": "Birtingarnafnið þitt",
+    "Reactions": "Viðbrögð",
+    "No answer": "Ekkert svar",
+    "Call back": "Hringja til baka",
+    "Remove from chat": "Fjarlægja úr spjalli",
+    "Demote yourself?": "Lækka þig sjálfa/n í tign?",
+    "New published address (e.g. #alias:server)": "Nýtt birt vistfangs (t.d. #samnefni:netþjónn)",
+    "Other published addresses:": "Önnur birt vistföng:",
+    "Published Addresses": "Birt vistföng",
+    "This room has no local addresses": "Þessi spjallrás er ekki með nein staðvær vistföng",
+    "Empty room": "Tóm spjallrás",
+    "Suggested Rooms": "Tillögur að spjallrásum",
+    "Add people": "Bæta við fólki",
+    "You do not have permissions to invite people to this space": "Þú hefur ekki heimild til að bjóða fólk á þetta svæði",
+    "Invite to space": "Bjóða inn á svæði",
+    "Start new chat": "Hefja nýtt spjall",
+    "Show Widgets": "Sýna viðmótshluta",
+    "Hide Widgets": "Fela viðmótshluta",
+    "(~%(count)s results)|one": "(~%(count)s niðurstaða)",
+    "(~%(count)s results)|other": "(~%(count)s niðurstöður)",
+    "No recently visited rooms": "Engar nýlega skoðaðar spjallrásir",
+    "Recently visited rooms": "Nýlega skoðaðar spjallrásir",
+    "Room %(name)s": "Spjallrás %(name)s",
+    "Invite to just this room": "Bjóða inn á aðeins þessa spjallrás",
+    "%(displayName)s created this room.": "%(displayName)s bjó til þessa spjallrás.",
+    "You created this room.": "Þú bjóst til þessa spjallrás.",
+    "Topic: %(topic)s (<a>edit</a>)": "Umfjöllunarefni: %(topic)s (<a>edit</a>)",
+    "You do not have permission to start polls in this room.": "Þú hefur ekki aðgangsheimildir til að hefja kannanir á þessari spjallrás.",
+    "Send voice message": "Senda talskilaboð",
+    "%(seconds)ss left": "%(seconds)ssek eftir",
+    "Invite to this space": "Bjóða inn á þetta svæði",
+    "and %(count)s others...|one": "og einn í viðbót...",
+    "and %(count)s others...|other": "og %(count)s til viðbótar...",
+    "Close preview": "Loka forskoðun",
+    "View in room": "Skoða á spjallrás",
+    "Notify everyone": "Tilkynna öllum",
+    "Remove messages sent by others": "Fjarlægja skilaboð send af öðrum",
+    "Ban users": "Banna notendur",
+    "Remove users": "Fjarlægja notendur",
+    "Default role": "Sjálfgefið hlutverk",
+    "Change topic": "Breyta umfjöllunarefni",
+    "Change history visibility": "Breyta sýnileika ferils",
+    "Change main address for the space": "Skipta um aðalvistfang svæðisins",
+    "Change space name": "Breyta nafni svæðis",
+    "Change space avatar": "Skipta um táknmynd svæðis",
+    "Set up": "Setja upp",
+    "Your private space": "Einkasvæðið þitt",
+    "Your public space": "Opinbera svæðið þitt",
+    "Return to call": "Fara til baka í símtal",
+    "Start the camera": "Ræsa myndavélina",
+    "Stop the camera": "Stöðva myndavélina",
+    "Unmute the microphone": "Kveikja á hljóðnema",
+    "Mute the microphone": "Þagga niður í hljóðnema",
+    "sends confetti": "sendir skraut",
+    "The new search": "Nýja leitin",
+    "Back to chat": "Til baka í spjall",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s er að hringja",
+    "%(senderName)s started a call": "%(senderName)s hóf símtal",
+    "You started a call": "Þú hófst símtal",
+    "Call ended": "Símtali lokið",
+    "%(senderName)s ended the call": "%(senderName)s lauk símtalinu",
+    "You ended the call": "Þú laukst símtalinu",
+    "Call in progress": "Símtal í gangi",
+    "%(senderName)s joined the call": "%(senderName)s kom inn í símtalið",
+    "You joined the call": "Þú komst inn í símtalið",
+    "Update %(brand)s": "Uppfæra %(brand)s",
+    "Check your devices": "Athugaðu tækin þín",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s frá %(ip)s",
+    "New login. Was this you?": "Ný innskráning. Varst þetta þú?",
+    "Other users may not trust it": "Aðrir notendur gætu ekki treyst því",
+    "Converts the DM to a room": "Umbreytir beinum skilaboðum yfir í spjallrás",
+    "Converts the room to a DM": "Umbreytir spjallrás yfir í bein skilaboð",
+    "Displays information about a user": "Birtir upplýsingar um notanda",
+    "Define the power level of a user": "Skilgreindu völd notanda",
+    "Last seen %(date)s at %(ip)s": "Sást síðast %(date)s kl. %(ip)s",
+    "Failed to set display name": "Mistókst að stilla birtingarnafn",
+    "This device": "Þetta tæki",
+    "Unverified devices": "Óstaðfest tæki",
+    "Verified devices": "Sannvottuð tæki",
+    "Sign out devices|one": "Skrá út tæki",
+    "Sign out devices|other": "Skrá út tæki",
+    "Unable to load device list": "Ekki tókst að ná lista yfir tæki",
+    "Show advanced": "Birta ítarlegt",
+    "Hide advanced": "Fela ítarlegt",
+    "Edit settings relating to your space.": "Breyta stillingum viðkomandi svæðinu þínu.",
+    "Failed to save space settings.": "Mistókst að vista stillingar svæðis.",
+    "Share invite link": "Deila boðstengli",
+    "Failed to copy": "Mistókst að afrita",
+    "Invite only, best for yourself or teams": "Einungis gegn boði, best fyrir þig og lítinn hóp",
+    "Open space for anyone, best for communities": "Opið öllum, best fyrir dreifða hópa",
+    "System Alerts": "Aðvaranir kerfis",
+    "Copy link to thread": "Afrita tengil á spjallþráð",
+    "You can change these anytime.": "Þú getur breytt þessu hvenær sem er.",
+    "Create a space": "Búa til svæði",
+    "e.g. my-space": "t.d. mitt-svæði",
+    "Spaces feedback": "Umsagnir um svæði",
+    "Spaces are a new feature.": "Svæði eru nýr eiginleiki.",
+    "Please enter a name for the space": "Settu inn eitthvað nafn fyrir svæðið",
+    "Search %(spaceName)s": "Leita í %(spaceName)s",
+    "Upload avatar": "Senda inn auðkennismynd",
+    "Match system": "Samsvara kerfinu",
+    "Pin to sidebar": "Festa á hliðarspjald",
+    "Quick settings": "Flýtistillingar",
+    "Accept <policyLink /> to continue:": "Samþykktu <policyLink /> til að halda áfram:",
+    "Decline (%(counter)s)": "Hafna (%(counter)s)",
+    "Your server isn't responding to some <a>requests</a>.": "Netþjónninn þinn er ekki að svara sumum <a>beiðnum</a>.",
+    "Guitar": "Gítar",
+    "Ball": "Bolti",
+    "Trophy": "Verðlaun",
+    "Rocket": "Eldflaug",
+    "Aeroplane": "Flugvél",
+    "Hammer": "Hamar",
+    "Scissors": "Skæri",
+    "Paperclip": "Bréfaklemma",
+    "Light bulb": "Ljósapera",
+    "Hourglass": "Stundaglas",
+    "Umbrella": "Regnhlíf",
+    "Thumbs up": "Þumlar upp",
+    "Santa": "Jólasveinn",
+    "Glasses": "Gleraugu",
+    "Robot": "Vélmenni",
+    "Smiley": "Broskall",
+    "Heart": "Hjarta",
+    "Corn": "Maís",
+    "Strawberry": "Jarðarber",
+    "They match": "Þau samsvara",
+    "They don't match": "Þau samsvara ekki",
+    "%(name)s on hold": "%(name)s er í bið",
+    "Fill Screen": "Fylla skjá",
+    "Start sharing your screen": "Byrjaðu að deila skjánum þínum",
+    "Stop sharing your screen": "Hætta að deila skjánum þínum",
+    "unknown person": "óþekktur einstaklingur",
+    "Unrecognised command: %(commandText)s": "Óþekkt skipun: %(commandText)s",
+    "Server unavailable, overloaded, or something else went wrong.": "Netþjónninn gæti verið undir miklu álagi eða ekki til taks, nú eða að eitthvað hafi farið úrskeiðis.",
+    "sends space invaders": "sendir geimverur til árásar",
+    "Sends the given message with a space themed effect": "Sendir skilaboðin með geimveruþema",
+    "sends snowfall": "sendir snjókomu",
+    "sends rainfall": "sendir rigningu",
+    "Sends the given message with rainfall": "Sendir skilaboðin með rigningu",
+    "sends fireworks": "sendir flugelda",
+    "My Ban List": "Bannlistinn minn",
+    "Encrypted messages in group chats": "Dulrituð skilaboð í hópaspjalli",
+    "Encrypted messages in one-to-one chats": "Dulrituð skilaboð í maður-á-mann spjalli",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Öllum netþjónum er núna bannað að taka þátt! Þessa spjallrás er ekki lengur hægt að nota.",
+    "Takes the call in the current room off hold": "Tekur símtalið í fyrirliggjandi spjallrás úr bið",
+    "No active call in this room": "Ekkert virkt símtal á þessari spjallrás",
+    "Places the call in the current room on hold": "Setur símtalið í fyrirliggjandi spjallrás í bið",
+    "Keep discussions organised with threads": "Haltu umræðum skipulögðum með spjallþráðum",
+    "Shows all threads from current room": "Birtir alla spjallþræði úr fyrirliggjandi spjallrás",
+    "This room is not public. You will not be able to rejoin without an invite.": "Þessi spjallrás er ekki opinber. Þú munt ekki geta tekið aftur þátt nema að vera boðið.",
+    "If they don't match, the security of your communication may be compromised.": "Ef þetta samsvarar ekki, getur verið að samskiptin þín séu berskjölduð.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Staðfestu með því að bera eftirfarandi saman við 'Stillingar notanda' í hinni setunni þinni:",
+    "Start using Key Backup": "Byrja að nota öryggisafrit dulritunarlykla",
+    "Closed poll": "Lokuð könnun",
+    "No votes cast": "Engin atkvæði greidd",
+    "Failed to load map": "Mistókst að hlaða inn landakorti",
+    "This room has been replaced and is no longer active.": "Þessari spjallrás hefur verið skipt út og er hún ekki lengur virk.",
+    "Secure Backup": "Varið öryggisafrit",
+    "Delete Backup": "Eyða öryggisafriti",
+    "Message bubbles": "Skilaboðablöðrur",
+    "IRC (Experimental)": "IRC (á tilraunastigi)",
+    "Message layout": "Framsetning skilaboða",
+    "Sending invites... (%(progress)s out of %(count)s)|one": "Sendi boð...",
+    "Sending invites... (%(progress)s out of %(count)s)|other": "Sendi boð... (%(progress)s af %(count)s)",
+    "Spaces with access": "Svæði með aðgang",
+    "& %(count)s more|one": "og %(count)s til viðbótar",
+    "& %(count)s more|other": "og %(count)s til viðbótar",
+    "Anyone can find and join.": "Hver sem er getur fundið og tekið þátt.",
+    "Only invited people can join.": "Aðeins fólk sem er boðið getur tekið þátt.",
+    "Private (invite only)": "Einka (einungis gegn boði)",
+    "Session key:": "Setulykill:",
+    "Master private key:": "Aðal-einkalykill:",
+    "in memory": "í minni",
+    "Passwords can't be empty": "Lykilorð mega ekki vera auð",
+    "New passwords don't match": "Nýju lykilorðin eru ekki eins",
+    "No display name": "Ekkert birtingarnafn",
+    "Upload new:": "Senda inn nýtt:",
+    "Access": "Aðgangur",
+    "Send typing notifications": "Senda skriftilkynningar",
+    "Message Previews": "Forskoðanir skilaboða",
+    "Back to thread": "Til baka í spjallþráð",
+    "Waiting for answer": "Bíð eftir svari",
+    "Verify this session": "Sannprófa þessa setu",
+    "This homeserver has exceeded one of its resource limits.": "Þessi heimaþjónn er kominn fram yfir takmörk á tilföngum sínum.",
+    "This homeserver has hit its Monthly Active User limit.": "Þessi heimaþjónn er kominn fram yfir takmörk á mánaðarlega virkum notendum.",
+    "Cannot reach homeserver": "Næ ekki að tengjast heimaþjóni",
+    "Could not find user in room": "Gat ekki fundið notanda á spjallrás",
+    "Favourited": "Í eftirlætum",
+    "Notification options": "Valkostir tilkynninga",
+    "Show %(count)s more|one": "Birta %(count)s til viðbótar",
+    "Show %(count)s more|other": "Birta %(count)s til viðbótar",
+    "Show previews of messages": "Sýna forskoðun skilaboða",
+    "Show rooms with unread messages first": "Birta spjallrásir með ólesnum skilaboðum fyrst",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Svæði eru ný leið til að hópa fólk og spjallrásir. Hverskyns svæði langar þig til að útbúa? Þessu má breyta síðar.",
+    "Spanner": "Skrúflykill",
+    "To be secure, do this in person or use a trusted way to communicate.": "Til öryggis, gerðu þetta í eigin persónu eða notaðu einhverja samskiptaleið sem þú treystir.",
+    "Waiting for %(displayName)s to verify…": "Bíð eftir að %(displayName)s sannreyni…",
+    "Invalid base_url for m.homeserver": "Ógilt base_url fyrir m.homeserver",
+    "The homeserver may be unavailable or overloaded.": "Heimaþjónninn gæti verið undir miklu álagi eða ekki til taks.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Til að halda áfram að nota %(homeserverDomain)s heimaþjóninn þarftu að yfirfara og samþykkja skilmála okkar og kvaðir.",
+    "This homeserver does not support communities": "Þessi heimaþjónn styður ekki samfélög (communities)",
+    "Enter phone number (required on this homeserver)": "Settu inn símanúmer (nauðsynlegt á þessum heimaþjóni)",
+    "Enter email address (required on this homeserver)": "Settu inn tölvupóstfang (nauðsynlegt á þessum heimaþjóni)",
+    "This homeserver would like to make sure you are not a robot.": "Þessi heimaþjónn vill ganga úr skugga um að þú sért ekki vélmenni.",
+    "Other homeserver": "Annar heimaþjónn",
+    "Sign into your homeserver": "Skráðu þig inn á heimaþjóninn þinn",
+    "Unable to validate homeserver": "Ekki tókst að sannreyna heimaþjón",
+    "Report Content to Your Homeserver Administrator": "Kæra efni til kerfisstjóra heimaþjónsins þíns",
+    "Your homeserver": "Heimaþjónninn þinn",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stilltu vistföng fyrir þessa spjallrás svo notendur geti fundið hana í gegnum heimaþjóninn þinn (%(localDomain)s)",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "Stilltu vistföng fyrir þetta svæði svo notendur geti fundið það í gegnum heimaþjóninn þinn (%(localDomain)s)",
+    "Show all your rooms in Home, even if they're in a space.": "Birtu allar spjallrásirnar þínar á forsíðunni, jafnvel þótt þær tilheyri svæði.",
+    "Home is useful for getting an overview of everything.": "Forsíðan nýtist til að hafa yfirsýn yfir allt.",
+    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "Svæði eru leið til að hópa fólk og spjallrásir. Auk svæðanna sem þú ert á, geturðu líka notað nokkur forútbúin svæði.",
+    "Spaces to show": "Svæði sem á að birta",
+    "Your homeserver does not support device management.": "Heimaþjónninn þinn styður ekki umsýslu tækja.",
+    "Please contact your homeserver administrator.": "Hafðu samband við kerfisstjóra heimaþjónsins þíns.",
+    "Cookie Policy": "Stefna varðandi vefkökur",
+    "Quick Reactions": "Flýtiviðbrögð",
+    "Remove %(email)s?": "Fjarlægja %(email)s?",
+    "Discovery options will appear once you have added a phone number above.": "Valkostir fyrir uppgötvun munu birtast um leið og þú hefur bætt inn símanúmeri hér fyrir ofan.",
+    "Discovery options will appear once you have added an email above.": "Valkostir fyrir uppgötvun munu birtast um leið og þú hefur bætt inn tölvupóstfangi hér fyrir ofan.",
+    "Group all your rooms that aren't part of a space in one place.": "Hópaðu allar spjallrásir sem ekki eru hluti af svæðum á einum stað.",
+    "Group all your people in one place.": "Hópaðu allt fólk á einum stað.",
+    "Group all your favourite rooms and people in one place.": "Hópaðu allar eftirlætisspjallrásir og fólk á einum stað.",
+    "Access Token": "Aðgangsteikn",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Til að tilkynna Matrix-tengd öryggisvandamál, skaltu lesa <a>Security Disclosure Policy</a> á matrix.org.",
+    "Chat with %(brand)s Bot": "Spjalla við %(brand)s vélmenni",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Til að fá aðstoð við að nota %(brand)s, smelltu <a>hér</a> eða byrjaðu að spjalla við vélmennið okkar með hnappnum hér fyrir neðan.",
+    "For help with using %(brand)s, click <a>here</a>.": "Til að fá aðstoð við að nota %(brand)s, smelltu <a>hér</a>.",
+    "Olm version:": "Útgáfa olm:",
+    "Account management": "Umsýsla notandaaðgangs",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Samþykktu þjónustuskilmála auðkennisþjónsins (%(serverName)s) svo hægt sé að finna þig með tölvupóstfangi eða símanúmeri.",
+    "Spell check dictionaries": "Stafsetningarorðasöfn",
+    "Language and region": "Tungumál og landsvæði",
+    "Set a new account password...": "Setja upp nýtt lykilorð notandaaðgangs...",
+    "New version available. <a>Update now.</a>": "Ný útgáfa tiltæk. <a>Uppfæra núna.</a>",
+    "Custom theme URL": "Slóð á sérsniðið þema",
+    "Use high contrast": "Nota mikil birtuskil",
+    "Theme added!": "Þema bætt við!",
+    "Enter a new identity server": "Settu inn nýjan auðkennisþjón",
+    "Do not use an identity server": "Ekki nota auðkennisþjón",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Að nota auðkennisþjón er valkvætt. Ef þú velur að nota ekki auðkennisþjón, munu aðrir notendur ekki geta fundið þig og þú munt ekki geta boðið öðrum með símanúmeri eða tölvupósti.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ef þú aftengist frá auðkennisþjóninum þínum, munu aðrir notendur ekki geta fundið þig og þú munt ekki geta boðið öðrum með símanúmeri eða tölvupósti.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Þú ert núna ekki að nota neinn auðkennisþjón. Til að uppgötva og vera finnanleg/ur fyrir þá tengiliði sem þú þekkir, skaltu bæta við auðkennisþjóni hér fyrir neðan.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ef þú vilt ekki nota <server /> til að uppgötva og vera finnanleg/ur fyrir þá tengiliði sem þú þekkir, skaltu setja inn annan auðkennisþjón hér fyrir neðan.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Þú ert núna að nota <server></server> til að uppgötva og vera finnanleg/ur fyrir þá tengiliði sem þú þekkir. Þú getur breytt auðkennisþjóninum hér fyrir neðan.",
+    "Identity server (%(server)s)": "Auðkennisþjónn (%(server)s)",
+    "Disconnect anyway": "Aftengja samt",
+    "You should:": "Þú ættir:",
+    "Disconnect from the identity server <idserver />?": "Aftengjast frá auðkennisþjóni <idserver />?",
+    "Disconnect identity server": "Aftengja auðkennisþjón",
+    "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Leyfa jafningi-á-jafningja fyrir maður-á-mann samtöl (ef þetta er virkjað, getur viðkomandi mögulega séð IP-vistfangið þitt)",
+    "Mirror local video feed": "Spegla staðværu myndmerki",
+    "Show typing notifications": "Sýna skriftilkynningar",
+    "Jump to last message": "Fara í síðustu skilaboðin",
+    "Jump to first message": "Fara í fyrstu skilaboðin",
+    "Jump to end of the composer": "Hoppa á enda skrifreits",
+    "Jump to start of the composer": "Hoppa á byrjun skrifreits",
+    "Navigate to previous message to edit": "Fara í fyrri skilaboð sem á að breyta",
+    "Navigate to next message to edit": "Fara í næstu skilaboð sem á að breyta",
+    "Your Communities": "Samfélögin þín",
+    "Communities can now be made into Spaces": "Samfélögum er núna hægt að breyta í svæði",
+    "Spaces you know that contain this room": "Svæði sem þú veist að innihalda þetta svæði",
+    "Spaces you know that contain this space": "Svæði sem þú veist að innihalda þetta svæði",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Að gera aðganginn þinn óvirkan <b>lætur okkur ekki sjálfgefið hreinsa út skilaboð sem þú hefur sent.</b> Ef þú vilt að við gleymum skilaboðunum þínum, skaltu merkja við í reitinn hér fyrir neðan.",
+    "Pick a date to jump to": "Veldu dagsetningu til að hoppa á",
+    "Message pending moderation": "Efni sem bíður yfirferðar",
+    "Message pending moderation: %(reason)s": "Efni sem bíður yfirferðar: %(reason)s",
+    "Jump to date": "Hoppa á dagsetningu",
+    "Jump to read receipt": "Fara í fyrstu leskvittun",
+    "Incorrect verification code": "Rangur sannvottunarkóði",
+    "Images, GIFs and videos": "Myndir, GIF-hreyfimyndir og myndskeið",
+    "Code blocks": "Kóðablokkir",
+    "Displaying time": "Birting tíma",
+    "To view all keyboard shortcuts, <a>click here</a>.": "Til að sjá allar flýtileiðir á lyklaborði, skaltu <a>smella hér</a>.",
+    "Show my Communities": "Birta samfélögin mín",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Samfélög-flokkuninni hefur verið skipt út fyrir Svæði, en þú getur umbreytt samfélögunum þínum yfir í svæði hér fyrir neðan. Þessi umbreyting tryggir að samtölin þín fái nýjustu eiginleika.",
+    "Deactivating your account is a permanent action - be careful!": "Að gera aðganginn þinn óvirkan er endanleg aðgerð - farðu varlega!",
+    "Appearance Settings only affect this %(brand)s session.": "Stillingar útlits hafa einungis áhrif á þessa %(brand)s setu.",
+    "Enable audible notifications for this session": "Virkja tilkynningar með hljóði fyrir þessa setu",
+    "Enable desktop notifications for this session": "Virkja tilkynningar á skjáborði fyrir þessa setu",
+    "Enable for this account": "Virkja fyrir þennan notandaaðgang",
+    "Messages containing keywords": "Skilaboð sem innihalda stikkorð",
+    "Hey you. You're the best!": "Hæ þú. Þú ert algjört æði!",
+    "Jump to first invite.": "Fara í fyrsta boð.",
+    "Jump to first unread room.": "Fara í fyrstu ólesnu spjallrásIna.",
+    "You can also make Spaces from <a>communities</a>.": "Þú getur líka útbúið svæði úr <a>samfélögum</a>.",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "Tímabundið birta samfélög í stað svæða í þessari setu. Stuðningur við þetta mun hverfa í framtíðinni. Þetta mun hlaða Element inn aftur.",
+    "Display Communities instead of Spaces": "Birta Samfélög í staðinn fyrir Svæði",
+    "Show shortcuts to recently viewed rooms above the room list": "Sýna flýtileiðir í nýskoðaðar spjallrásir fyrir ofan listann yfir spjallrásir",
+    "Enable big emoji in chat": "Virkja stór tákn í spjalli",
+    "Show line numbers in code blocks": "Sýna línunúmer í kóðablokkum",
+    "Expand code blocks by default": "Fletta sjálfgefið út textablokkum með kóða",
+    "Enable automatic language detection for syntax highlighting": "Virkja greiningu á forritunarmálum fyrir málskipunarlitun",
+    "Show read receipts sent by other users": "Birta leskvittanir frá öðrum notendum",
+    "Show display name changes": "Sýna breytingar á birtingarnafni",
+    "Show avatar changes": "Sýna breytingar á auðkennismynd",
+    "Show a placeholder for removed messages": "Birta frátökutákn fyrir fjarlægð skilaboð",
+    "Use a more compact 'Modern' layout": "Nota þjappaðri 'nútímalegri' framsetningu",
+    "Show polls button": "Birta hnapp fyrir kannanir",
+    "Don't send read receipts": "Ekki senda leskvittanir",
+    "Jump to date (adds /jumptodate and jump to date headers)": "Hoppa á dagsetningu (bætir við /jumptodate og jump to date hausum)",
+    "Force complete": "Þvinga klárun",
+    "Open user settings": "Opna notandastillingar",
+    "Switch to space by number": "Skipta yfir í spjallrás með númeri",
+    "Next recently visited room or community": "Næsta nýlega heimsótt spjallrás eða samfélag",
+    "Previous recently visited room or community": "Fyrra nýlega heimsótt spjallrás eða samfélag",
+    "Previous room or DM": "Fyrri spjallrás eða bein skilaboð",
+    "Next room or DM": "Næsta spjallrás eða bein skilaboð",
+    "Previous unread room or DM": "Fyrri ólesna spjallrás eða bein skilaboð",
+    "Next unread room or DM": "Næsta ólesna spjallrás eða bein skilaboð",
+    "Navigate to previous message in composer history": "Fara í næstu skilaboð í ferli skrifreits",
+    "Navigate to next message in composer history": "Fara í næstu skilaboð í ferli skrifreits",
+    "Generate a Security Key": "Útbúa öryggislykil",
+    "Make a copy of your Security Key": "Gerðu afrit af öryggislyklinum þínum",
+    "Your Security Key": "Öryggislykillinn þinn",
+    "User Autocomplete": "Orðaklárun notanda",
+    "Space Autocomplete": "Orðaklárun svæða",
+    "Room Autocomplete": "Orðaklárun spjallrása",
+    "Notification Autocomplete": "Orðaklárun tilkynninga",
+    "Emoji Autocomplete": "Orðaklárun Emoji-tákna",
+    "Community Autocomplete": "Orðaklárun samfélags",
+    "Command Autocomplete": "Orðaklárun skipana",
+    "Not a valid Security Key": "Ekki gildur öryggislykill",
+    "This looks like a valid Security Key!": "Þetta lítur út eins og gildur öryggislykill!",
+    "Enter Security Key": "Settu inn öryggislykil",
+    "Security Key mismatch": "Misræmi í öryggislyklum",
+    "Use your Security Key to continue.": "Notaðu öryggislykilinn þinn til að halda áfram.",
+    "Security Key": "Öryggislykill",
+    "Invalid Security Key": "Ógildur öryggislykill",
+    "Wrong Security Key": "Rangur öryggislykill",
+    "Manually Verify by Text": "Sannreyna handvirkt með textaskilaboðum",
+    "Ask this user to verify their session, or manually verify it below.": "Biddu þennan notanda að sannreyna setuna sína, eða sannreyndu hana handvirkt hér fyrir neðan.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) skráði sig inn í nýja setu án þess að sannvotta hana:",
+    "You signed in to a new session without verifying it:": "Þú skráðir inn í nýja setu án þess að sannvotta hana:",
+    "Your messages are not secure": "Skilaboðin þín eru ekki örugg",
+    "Manage your signed-in devices below. A device's name is visible to people you communicate with.": "Haltu utan um innskráðu tækin þín hér fyrir neðan. Heiti tækis er sýnilegt þeim sem þú átt samskipti við.",
+    "Where you're signed in": "Hvar þú ert skráð/ur inn",
+    "Share anonymous data to help us identify issues. Nothing personal. No third parties.": "Deildu nafnlausum gögnum til að hjálpa okkur við að greina vandamál. Ekkert persónulegt. Engir utanaðkomandi.",
+    "Could not connect to identity server": "Gat ekki tengst við auðkennisþjón",
+    "Secret storage:": "Leynigeymsla:",
+    "in account data": "í gögnum notandaaðgangs",
+    "Secret storage public key:": "Dreifilykill leynigeymslu:",
+    "Backup key cached:": "Öryggisafritunarlykill í skyndiminni:",
+    "not stored": "ekki geymt",
+    "Backup key stored:": "Geymdur öryggisafritunarlykill:",
+    "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 Security Key.": "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.",
+    "unexpected type": "óvænt tegund",
+    "well formed": "rétt sniðið",
+    "Back up your keys before signing out to avoid losing them.": "Taktu öryggisafrit af dulritunarlyklunum áður en þú skráir þig út svo þeir tapist ekki.",
+    "Your keys are <b>not being backed up from this session</b>.": "Dulritunarlyklarnir þínir eru <b>ekki öryggisafritaðir úr þessari setu</b>.",
+    "Backup version:": "Útgáfa öryggisafrits:",
+    "All keys backed up": "Allir lyklar öryggisafritaðir",
+    "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.": "Þ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.",
+    "This session is backing up your keys. ": "Þessi seta öryggisafritar dulritunarlyklana þína. ",
+    "Unable to load key backup status": "Tókst ekki að hlaða inn stöðu öryggisafritunar dulritunarlykla",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ertu viss? Þú munt tapa dulrituðu skilaboðunum þínum ef dulritunarlyklarnir þínir eru ekki rétt öryggisafritaðir.",
+    "You aren't signed into any other devices.": "Þú ert ekki skráð/ur inn í nein önnur tæki.",
+    "in secret storage": "í leynigeymslu",
+    "Manually verify all remote sessions": "Sannreyna handvirkt allar fjartengdar setur",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Leyfa turn.matrix.org sem varaleið fyrir símtalaþjónustu þegar heimaþjónninn þinn býður ekki upp á slíkt (IP-vistfanginu þínu yrði deilt á meðan símtali stendur)",
+    "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Deildu nafnlausum gögnum til að hjálpa okkur við að greina vandamál. Ekkert persónulegt. Engir utanaðkomandi. <LearnMoreLink>Kanna nánar</LearnMoreLink>",
+    "User menu": "Valmynd notandans",
+    "Switch theme": "Skipta um þema",
+    "Do not disturb": "Ekki ónáða",
+    "Got an account? <a>Sign in</a>": "Ertu með aðgang? <a>Skráðu þig inn</a>",
+    "Set a new status": "Setja nýja stöðu",
+    "Clear status": "Hreinsa stöðu",
+    "Shows all threads you've participated in": "Birtir alla spjallþræði sem þú hefur tekið þátt í",
+    "My threads": "Spjallþræðirnir mínir",
+    "All threads": "Allir spjallþræðir",
+    "Make sure the right people have access. You can invite more later.": "Gakktu úr skugga um að rétta fólkið hafi aðgang. Þú getur boðið fleira fólki síðar.",
+    "Invite your teammates": "Bjóddu félögum þínum",
+    "Inviting...": "Er að bjóða...",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Mistókst að bjóða eftirfarandi notendum á svæðið þitt: %(csvUsers)s",
+    "A private space for you and your teammates": "Einkasvæði fyrir þig og félaga í teyminu þínu",
+    "Me and my teammates": "Ég og félagar í teyminu mínu",
+    "A private space to organise your rooms": "Einkasvæði til að skipuleggja spjallrásirnar þínar",
+    "Make sure the right people have access to %(name)s": "Gakktu úr skugga um að rétta fólkið hafi aðgang að %(name)s",
+    "Who are you working with?": "Hverjum ertu að vinna með?",
+    "Go to my space": "Fara í svæðið mitt",
+    "Toggle hidden event visibility": "Víxla sýnileika falins atburðar",
+    "Previous autocomplete suggestion": "Fyrri tillaga sjálfvirkrar orðaklárunar",
+    "Next autocomplete suggestion": "Næsta tillaga sjálfvirkrar orðaklárunar",
+    "Cancel autocomplete": "Hætta orðaklárun",
+    "Clear room list filter field": "Hreinsa síureit spjallrásalistans",
+    "Expand room list section": "Fletta út hluta spjallrásalista",
+    "Collapse room list section": "Fella saman hluta spjallrásalista",
+    "Select room from the room list": "Veldu spjallrás úr spjallrásalistanum",
+    "Dismiss read marker and jump to bottom": "Hunsa lesmerki og hoppa neðst",
+    "Accessibility": "Auðveldað aðgengi",
+    "Indexed rooms:": "Spjallrásir í efnisyfirliti:",
+    "Indexed messages:": "Skilaboð í efnisyfirliti:",
+    "Currently indexing: %(currentRoom)s": "Set í efnisyfirlit: %(currentRoom)s",
+    "Not currently indexing messages for any room.": "Ekki að setja nein skilaboð í efnisyfirlit neinnar spjallrásar.",
+    "Unable to create key backup": "Tókst ekki að gera öryggisafrit af dulritunarlykli",
+    "Create key backup": "Gera öryggisafrit af dulritunarlykli",
+    "New? <a>Create account</a>": "Nýr hérna? <a>Stofnaðu aðgang</a>",
+    "If you've joined lots of rooms, this might take a while": "Þetta getur tekið dálítinn tíma ef þú tekur þátt í mörgum spjallrásum",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Þú hefur verið skráður út úr öllum setum og munt ekki lengur fá ýti-tilkynningar. Til að endurvirkja tilkynningar, þarf að skrá sig aftur inn á hverju tæki fyrir sig.",
+    "New here? <a>Create an account</a>": "Nýr hérna? <a>Stofnaðu aðgang</a>",
+    "Show all threads": "Birta alla spjallþræði",
+    "Go to my first room": "Fara í fyrstu spjallrásIna mína",
+    "Search for rooms or spaces": "Leita að spjallrásum eða svæðum",
+    "Creating rooms...": "Bý til spjallrásir...",
+    "Rooms and spaces": "Spjallrásir og svæði",
+    "Failed to load list of rooms.": "Mistókst að hlaða inn lista yfir spjallrásir.",
+    "Select a room below first": "Veldu fyrst spjallrás hér fyrir neðan",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ef þú finnur ekki spjallrásina sem þú leitar að, skaltu biðja um boð eða <a>útbúa nýja spjallrás</a>.",
+    "Find a room… (e.g. %(exampleRoom)s)": "Finndu spjallrás… (t.d. %(exampleRoom)s)",
+    "Find a room…": "Finndu spjallrás…",
+    "Couldn't find a matching Matrix room": "Fann ekki samsvarand Matrix-spjallrás",
+    "%(brand)s failed to get the public room list.": "%(brand)s tókst ekki að sækja opinbera spjallrásalistann.",
+    "Create a new community": "Búa til nýtt samfélag",
+    "%(creator)s created and configured the room.": "%(creator)s bjó til og stillti spjallrásina.",
+    "Unable to copy a link to the room to the clipboard.": "Tókst ekki að afrita tengil á spjallrás á klippispjaldið.",
+    "Unable to copy room link": "Tókst ekki að afrita tengil spjallrásar",
+    "You do not have permission to create rooms in this community.": "Þú hefur ekki heimild til að búa til spjallrásir í þessu samfélagi.",
+    "Cannot create rooms in this community": "Get ekki útbúið spjallrásir í þessu samfélagi",
+    "Own your conversations.": "Eigðu samtölin þín.",
+    "You can create a Space from this community <a>here</a>.": "Þú getur búið til svæði út frá þessusamfélagi <a>hér</a>.",
+    "No files visible in this room": "Engar skrár sýnilegar á þessari spjallrás",
+    "You must join the room to see its files": "Þú verður að taka þátt í spjallrás til að sjá skrárnar á henni",
+    "Join %(roomAddress)s": "Taka þátt í %(roomAddress)s",
+    "Decide which spaces can access this room. If a space is selected, its members can find and join <RoomName/>.": "Veldu hvaða svæði hafa aðgang að þessari spjallrás. Ef svæði er valið geta meðlimir þess fundið og tekið þátt í spjallrásinni<RoomName/>.",
+    "Failed to find the following users": "Mistókst að finna eftirfarandi notendur",
+    "We couldn't create your DM.": "Það tókst ekki að útbúa beinu skilaboðin þin.",
+    "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Ertu viss um að þú viljir ljúka þessari könnun? Þetta mun birta lokaniðurstöður könnunarinnar og koma í veg fyrir að fólk geti kosið.",
+    "Only people invited will be able to find and join this space.": "Aðeins fólk sem hefur verið boðið getur fundið og tekið þátt í þessu svæði.",
+    "Anyone will be able to find and join this space, not just members of <SpaceName/>.": "Hver sem er getur fundið og tekið þátt í þessu svæði, ekki bara meðlimir í <SpaceName/>.",
+    "Anyone in <SpaceName/> will be able to find and join.": "Hver sem er í <SpaceName/> getur fundið og tekið þátt.",
+    "Space visibility": "Sýnileiki svæðis",
+    "Fetching data...": "Sæki gögn...",
+    "Visible to space members": "Sýnilegt meðlimum svæðis",
+    "Topic (optional)": "Umfjöllunarefni (valkvætt)",
+    "Only people invited will be able to find and join this room.": "Aðeins fólk sem hefur verið boðið getur fundið og tekið þátt í þessari spjallrás.",
+    "Anyone will be able to find and join this room.": "Hver sem er getur fundið og tekið þátt í þessari spjallrás.",
+    "Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Hver sem er getur fundið og tekið þátt í þessari spjallrás, ekki bara meðlimir í <SpaceName/>.",
+    "Everyone in <SpaceName/> will be able to find and join this room.": "Hver sem er í <SpaceName/> getur fundið og tekið þátt í þessari spjallrás.",
+    "Please enter a name for the room": "Settu inn eitthvað nafn fyrir spjallrásina",
+    "An image will help people identify your community.": "Mynd mun hjálpa fólki að auðkenna samfélagið þitt.",
+    "Add image (optional)": "Bæta við mynd (valkvætt)",
+    "What's the name of your community or team?": "Hvert er nafnið á samfélaginu þínu eða teymi?",
+    "You can change this later if needed.": "Þú getur breytt þessu síðar ef þarf.",
+    "Clear all data": "Hreinsa öll gögn",
+    "Reason (optional)": "Ástæða (valkvætt)",
+    "Invite people to join %(communityName)s": "Bjóddu fólki að taka þátt í %(communityName)s",
+    "Send %(count)s invites|one": "Senda %(count)s boð",
+    "Send %(count)s invites|other": "Senda %(count)s boð",
+    "People you know on %(brand)s": "Fólk sem þú þekkir á %(brand)s",
+    "Add another email": "Bæta við öðru tölvupóstfangi",
+    "GitHub issue": "Villutilkynning á GitHub",
+    "Close dialog": "Loka glugga",
+    "Invite anyway": "Bjóða samt",
+    "Invite anyway and never warn me again": "Bjóða samt og ekki vara mig við aftur",
+    "The following users may not exist": "Eftirfarandi notendur eru mögulega ekki til",
+    "You can turn this off anytime in settings": "Þú getur slökkt á þessu hvenær sem er í stillingunum",
+    "You have entered an invalid address.": "Þú hefur sett inn ógilt tölvupóstfang.",
+    "That doesn't look like a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
+    "Create a new space": "Búa til nýtt svæði",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Þú hefur hunsað þennan notanda, þannig að skilaboð frá honum eru falin. <a>Birta samts.</a>",
+    "Failed to find the general chat for this community": "Mistókst að finna almennt spjall fyrir þetta samfélag",
+    "Show %(count)s other previews|one": "Sýna %(count)s forskoðun til viðbótar",
+    "Show %(count)s other previews|other": "Sýna %(count)s forskoðanir til viðbótar",
+    "You have no ignored users.": "Þú ert ekki með neina hunsaða notendur.",
+    "Read Marker off-screen lifetime (ms)": "Líftími lesmerkis utan skjás (ms)",
+    "Read Marker lifetime (ms)": "Líftími lesmerkis (ms)",
+    "Autocomplete delay (ms)": "Töf við sjálfvirka klárun (ms)",
+    "Show tray icon and minimise window to it on close": "Sýna táknmynd í kerfisbakka og lágmarka forritið niður í hana þegar því er lokað",
+    "Always show the window menu bar": "Alltaf að sýna valmyndastiku glugga",
+    "Warn before quitting": "Aðvara áður en hætt er",
+    "Start automatically after system login": "Ræsa sjálfvirkt við innskráningu í kerfi",
+    "Enable email notifications for %(email)s": "Virkja tilkynningar í tölvupósti fyrir %(email)s",
+    "Anyone in a space can find and join. You can select multiple spaces.": "Hver sem er í svæði getur fundið og tekið þátt. Þú getur valið mörg svæði.",
+    "Anyone in <spaceName/> can find and join. You can select other spaces too.": "Hver sem er í <spaceName/> getur fundið og tekið þátt. Þú getur einnig valið önnur svæði.",
+    "Anyone in a space can find and join. <a>Edit which spaces can access here.</a>": "Hver sem er í svæði getur fundið og tekið þátt. <a>Breyttu hér því hvaða svæði hafa aðgang.</a>",
+    "Enable guest access": "Leyfa aðgang gesta",
+    "Show chat effects (animations when receiving e.g. confetti)": "Sýna hreyfingar í spjalli (t.d. þegar tekið er við skrauti)",
+    "Show previews/thumbnails for images": "Birta forskoðun/smámyndir fyrir myndir",
+    "Low bandwidth mode (requires compatible homeserver)": "Hamur fyrir litla bandbreidd (krefst samhæfðs heimaþjóns)",
+    "Show developer tools": "Sýna forritunartól",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Spyrja áður en boð eru send á mögulega ógild matrix-auðkenni",
+    "Enable widget screenshots on supported widgets": "Virkja skjámyndir viðmótshluta í studdum viðmótshlutum",
+    "Enable Community Filter Panel": "Virkja spjald fyrir síun samfélaga",
+    "Automatically replace plain text Emoji": "Skipta sjálfkrafa út Emoji-táknum á hreinum texta",
+    "Surround selected text when typing special characters": "Umlykja valinn texta þegar sértákn eru skrifuð",
+    "Show avatars in user and room mentions": "Sýna auðkennismyndir þegar minnst er á notendur og spjallrásir",
+    "Show join/leave messages (invites/removes/bans unaffected)": "Birta taka-þátt/hætta skilaboð (hefur ekki áhrif á boð/fjarlægingu/bönn)",
+    "Enable Emoji suggestions while typing": "Virkja uppástungur tákna á meðan skrifað er",
+    "Show info about bridges in room settings": "Sýna upplýsingar um brýr í stillingum spjallrása",
+    "Show current avatar and name for users in message history": "Birta núgildandi auðkennismynd og nafn fyrir notendur í ferilskrá",
+    "Show message previews for reactions in all rooms": "Sýna forskoðanir skilaboða vegna viðbragða í öllum spjallrásum",
+    "Show message previews for reactions in DMs": "Sýna forskoðanir skilaboða vegna viðbragða við beinum skilaboðum",
+    "Show options to enable 'Do not disturb' mode": "Sýna valkosti til að virkja 'Ekki ónáða'-ham",
+    "Integrations are disabled": "Samþættingar eru óvirkar",
+    "Integration manager": "Samþættingarstýring",
+    "%(creator)s created this DM.": "%(creator)s bjó til oþessi beinu skilaboð.",
+    "Your homeserver doesn't seem to support this feature.": "Heimaþjóninn þinn virðist ekki styðja þennan eiginleika.",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s þátttakendur að meðtöldum %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s þátttakendur að þér meðtöldum og %(commaSeparatedMembers)s",
+    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s þátttakendur að þér meðtöldum, %(commaSeparatedMembers)s",
+    "Including %(commaSeparatedMembers)s": "Þar með taldir %(commaSeparatedMembers)s",
+    "Including you, %(commaSeparatedMembers)s": "Að þér meðtöldum, %(commaSeparatedMembers)s",
+    "Only room administrators will see this warning": "Aðeins stjórnendur spjallrásar munu sjá þessa aðvörun",
+    "Bulk options": "Valkostir magnvinnslu",
+    "Server or user ID to ignore": "Netþjónn eða auðkenni notanda sem á að hunsa",
+    "Please verify the room ID or address and try again.": "Yfirfarðu auðkenni spjallrásar og vistfang hennar og reyndu aftur.",
+    "Error subscribing to list": "Villa við að gerast áskrifandi að lista",
+    "Error adding ignored user/server": "Villa við að bæta við hunsuðum notanda/netþjóni",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ef þú hefur sent inn villutilkynningu í gegnum GitHub, geta atvikaskrár hjálpað okkur að finna hvar vandamálið liggur. Atvikaskrár innihalda gögn varðandi virkni hugbúnaðarins en líka notandanafn þitt, auðkenni eða samnefni spjallrása eða hópa sem þú hefur skoðað, hvaða viðmótshluta þú hefur átt við, auk notendanafna annarra notenda. Atvikaskrár innihalda ekki skilaboð.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Það tókst að breyta lykilorðinu þínu. Þú munt ekki fá ýti-tilkynningar á öðrum setum fyrr en þú skráir þig aftur inn á þeim",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Settu inn heiti á letri sem er uppsett á kerfinu þínu og %(brand)s mun reyna að nota það.",
+    "Invalid theme schema.": "Ógilt þemaskema.",
+    "Clear cross-signing keys": "Hreinsa kross-undirritunarlykla",
+    "Destroy cross-signing keys?": "Eyða kross-undirritunarlyklum?",
+    "a device cross-signing signature": "kross-undirritun undirritunarlykils tækis",
+    "a new cross-signing key signature": "ný kross-undirritun undirritunarlykils",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)s leyfir þér ekki að nota samþættingarstýringu til að gera þetta. Hafðu samband við kerfisstjóra.",
+    "Integrations not allowed": "Samþættingar eru ekki leyfðar",
+    "Enable 'Manage Integrations' in Settings to do this.": "Virkjaðu 'Sýsla með samþættingar' í stillingunum til að gera þetta.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "Að nota þennan viðmótshluta gæti deilt gögnum <helpIcon /> með %(widgetDomain)s og samþættingarstýringunni þinni.",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Verið er að beina þér á utanaðkomandi vefsvæði til að auðkenna aðganginn þinn til notkunar með %(integrationsUrl)s. Viltu halda áfram?",
+    "Add an Integration": "Bæta við samþættingu",
+    "Failed to connect to integration manager": "Mistókst að tengjast samþættingarstýringu",
+    "Cross-signing": "Kross-undirritun",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Samþættingarstýringar taka við stillingagögnum og geta breytt viðmótshlutum, sent boð í spjallrásir, auk þess að geta úthlutað völdum fyrir þína hönd.",
+    "Manage integrations": "Sýsla með samþættingar",
+    "Use an integration manager to manage bots, widgets, and sticker packs.": "Notaðu samþættingarstýringu til að stýra vélmennum, viðmótshlutum og límmerkjapökkum.",
+    "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Notaðu samþættingarstýringu <b>(%(serverName)s)</b> til að stýra vélmennum, viðmótshlutum og límmerkjapökkum.",
+    "An error occurred whilst saving your notification preferences.": "Villa kom upp við að vista valkosti þína fyrir tilkynningar.",
+    "Error saving notification preferences": "Villa við að vista valkosti tilkynninga",
+    "Updating spaces... (%(progress)s out of %(count)s)|other": "Uppfæri svæði... (%(progress)s af %(count)s)",
+    "Currently, %(count)s spaces have access|one": "Núna er svæði með aðgang",
+    "Currently, %(count)s spaces have access|other": "Núna eru %(count)s svæði með aðgang",
+    "The integration manager is offline or it cannot reach your homeserver.": "Samþættingarstýringin er ekki nettengd og nær ekki að tengjast heimaþjóninum þínum.",
+    "Cannot connect to integration manager": "Get ekki tengst samþættingarstýringu",
+    "Connecting to integration manager...": "Tengist við samþættingarstýringu...",
+    "Use between %(min)s pt and %(max)s pt": "Nota á milli %(min)s pt og %(max)s pt",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Sérsniðin stærð á letri getur aðeins verið á milli %(min)s pt og %(max)s pt",
+    "Size must be a number": "Stærð verður að vera tala",
+    "%(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.": "%(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.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum, notar %(size)s til að geyma skilaboð frá %(rooms)s spjallrásum.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Sannreyndu hverja setu sem notandinn notar til að merkja hana sem treysta, án þess að treyta kross-undirrituðum tækjum.",
+    "Sign out %(count)s selected devices|one": "Skrá út af %(count)s völdum tæki",
+    "Sign out %(count)s selected devices|other": "Skrá út af %(count)s völdum tækjum",
+    "Devices without encryption support": "Tæki án stuðnings við dulritun",
+    "Cross-signing private keys:": "Kross-undirritun einkalykla:",
+    "Cross-signing public keys:": "Kross-undirritun dreifilykla:",
+    "Cross-signing is not set up.": "Kross-undirritun er ekki uppsett.",
+    "Cross-signing is ready but keys are not backed up.": "Kross-undirritun er tilbúin en ekki er búið að öryggisafrita dulritunarlykla.",
+    "Cross-signing is ready for use.": "Kross-undirritun er tilbúin til notkunar.",
+    "Your homeserver does not support cross-signing.": "Heimaþjónninn þinn styður ekki kross-undirritun.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Örugg skilaboð við þennan notanda eru enda-í-enda dulrituð þannig að enginn annar getur lesið þau.",
+    "You've successfully verified this user.": "Þér hefur tekist að sannreyna þennan notanda.",
+    "The other party cancelled the verification.": "Hinn aðilinn hætti við sannvottunina.",
+    "Your camera is still enabled": "Enn er kveikt á myndavélinni þinni",
+    "Your camera is turned off": "Slökkt er á myndavélinni þinni",
+    "%(sharerName)s is presenting": "%(sharerName)s er að kynna",
+    "You are presenting": "Þú ert að kynna",
+    "%(peerName)s held the call": "%(peerName)s setti símtalið í bið",
+    "You held the call <a>Resume</a>": "Þú settir símtalið í bið <a>Halda áfram</a>",
+    "You held the call <a>Switch</a>": "Þú settir símtalið í bið <a>Skipta</a>",
+    "Uploading logs": "Sendi inn atvikaskrár",
+    "Automatically send debug logs when key backup is not functioning": "Senda atvikaskrár sjálfkrafa þegar öryggisafrit dulritunarlykla virkar ekki",
+    "Automatically send debug logs on decryption errors": "Senda atvikaskrár sjálfkrafa við afkóðunarvillur",
+    "Automatically send debug logs on any error": "Senda atvikaskrár sjálfkrafa við allar villur",
+    "Developer mode": "Forritarahamur",
+    "IRC display name width": "Breidd IRC-birtingarnafns",
+    "Insert a trailing colon after user mentions at the start of a message": "Setja tvípunkt á eftir þar sem minnst er á notanda í upphafi skilaboða",
+    "Location sharing - share your current location with live updates (under active development)": "Deiling staðsetninga - deildu staðsetningunni þinni í rauntíma (í virkri þróun)",
+    "Location sharing - pin drop (under active development)": "Deiling staðsetninga - festipinni (í virkri þróun)",
+    "Right panel stays open (defaults to room member list)": "Hægra spjaldið helst opið (er sjálfgefið listi yfir meðlimi spjallrásar)",
+    "To leave, just return to this page or click on the beta badge when you search.": "Til að hætta kemurðu einfaldlega aftur á þessa síðu eða smellir á skjaldmerki prófunarútgáfunnar þegar þú leitar.",
+    "How can I leave the beta?": "Hvernig get ég hætt í Beta-prófunum?",
+    "To feedback, join the beta, start a search and click on feedback.": "Til að gefa umsögn skaltu skrá þig í prófunarútgáfu, byrjar að leita og smellir á Umsögn.",
+    "How can I give feedback?": "Hvernig get ég gefið umsögn?",
+    "This feature is a work in progress, we'd love to hear your feedback.": "Þetta er í vinnslu, það væri gaman að heyra hvað þér finnst.",
+    "A new, quick way to search spaces and rooms you're in.": "Ný og fljótleg leið til að leita í svæðum og spjallrásum sem þú tekur þátt í.",
+    "New search experience": "Ný upplifun við að leita",
+    "Support adding custom themes": "Stuðningur við að bæta við sérsniðnum þemum",
+    "Try out new ways to ignore people (experimental)": "Prófaðu nýjar leiðir til að hunsa fólk (á tilraunastigi)",
+    "Multiple integration managers (requires manual setup)": "Margar samþættingarstýringar (krefst handvirkrar uppsetningar)",
+    "Render simple counters in room header": "Myndgera einfalda teljara í haus spjallrása",
+    "Custom user status messages": "Sérsniðin stöðuskilaboð",
+    "Threaded messaging": "Skilaboð í spjallþráðum",
+    "Message Pinning": "Festing skilaboða",
+    "Render LaTeX maths in messages": "Myndgera LaTeX-stærðfræðitákn í skilaboðum",
+    "Let moderators hide messages pending moderation.": "Láta umsjónarmenn fela skilaboð sem bíða yfirferðar.",
+    "%(brand)s URL": "%(brand)s URL",
+    "Cancel search": "Hætta við leitina",
+    "Only visible to community members": "Aðeins sýnilegt meðlimum samfélags",
+    "Visible to everyone": "Sýnilegt öllum",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Mistókst að uppfæra sýnileika '%(roomName)s' í %(groupId)s.",
+    "Drop a Pin": "Sleppa pinna",
+    "My live location": "Staðsetning mín í rauntíma",
+    "My current location": "Núverandi staðsetning mín",
+    "Click to drop a pin": "Smelltu til að sleppa pinna",
+    "Click to move the pin": "Smelltu til að færa pinnann",
+    "Could not fetch location": "Gat ekki náð í staðsetningu",
+    "Can't load this message": "Gat ekki hlaðið inn þessum skilaboðum",
+    "Click to view edits": "Smelltu hér til að skoða breytingar",
+    "Edited at %(date)s": "Breytt þann %(date)s",
+    "This room is a continuation of another conversation.": "Þessi spjallrás er framhald af öðru samtali.",
+    "Click here to see older messages.": "Smelltu hér til að sjá eldri skilaboð.",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s fjarlægði auðkennismynd spjallrásarinnar.",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>brást við %(shortName)s</reactedWith>",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s brást við með %(content)s",
+    "Add reaction": "Bæta við viðbrögðum",
+    "Error processing voice message": "Villa við meðhöndlun talskilaboða",
+    "Error decrypting video": "Villa við afkóðun myndskeiðs",
+    "Based on %(count)s votes|one": "Byggt á %(count)s atkvæði",
+    "Based on %(count)s votes|other": "Byggt á %(count)s atkvæðum",
+    "%(count)s votes cast. Vote to see the results|one": "%(count)s atkvæði greitt. Greiddu atkvæði til að sjá útkomuna",
+    "%(count)s votes cast. Vote to see the results|other": "%(count)s atkvæði greidd. Greiddu atkvæði til að sjá útkomuna",
+    "Results will be visible when the poll is ended": "Niðurstöður birtast einungis eftir að könnuninni hefur lokið",
+    "Final result based on %(count)s votes|one": "Lokaniðurstöður byggðar á %(count)s atkvæði",
+    "Final result based on %(count)s votes|other": "Lokaniðurstöður byggðar á %(count)s atkvæðum",
+    "Sorry, your vote was not registered. Please try again.": "Því miður, atkvæðið þitt var ekki skráð. Prófaðu aftur.",
+    "Vote not registered": "Atkvæði ekki skráð",
+    "Sorry, you can't edit a poll after votes have been cast.": "Því miður, þú getur ekki breytt könnun eftir að atkvæði hafa verið greidd.",
+    "Can't edit poll": "Get ekki breytt könnun",
+    "Expand map": "Stækka landakort",
+    "Declining …": "Hafna …",
+    "Accepting …": "Samþykki…",
+    "Error decrypting image": "Villa við afkóðun myndar",
+    "Invalid file%(extra)s": "Ógild skrá%(extra)s",
+    "Decrypt %(text)s": "Afkóða %(text)s",
+    "Click": "Smelltu",
+    "Expand quotes": "Fletta út tilvitnunum",
+    "Collapse quotes": "Fella saman tilvitnanir",
+    "Reply in thread": "Svara í spjallþræði",
+    "React": "Bregðast við",
+    "Error processing audio message": "Villa við meðhöndlun hljóðskilaboða",
+    "The encryption used by this room isn't supported.": "Dulritunin sem notuð er í þessari spjallrás er ekki studd.",
+    "The beginning of the room": "Upphaf spjallrásarinnar",
+    "Unable to find event at that date. (%(code)s)": "Gat ekki fundið atburð á þeirri dagsetningu. (%(code)s)",
+    "The call is in an unknown state!": "Símtalið er í óþekktu ástandi!",
+    "Unknown failure: %(reason)s": "Óþekkt bilun: %(reason)s",
+    "Failed to deactivate user": "Mistókst að gera þennan notanda óvirkan",
+    "Deactivate user": "Gera notanda óvirkan",
+    "Deactivate user?": "Gera notanda óvirkan?",
+    "Remove from community": "Fjarlægja úr samfélaginu",
+    "Failed to mute user": "Mistókst að þagga niður í notanda",
+    "Failed to ban user": "Mistókst að banna notanda",
+    "Remove %(count)s messages|one": "Fjarlægja 1 skilaboð",
+    "Remove %(count)s messages|other": "Fjarlægja %(count)s skilaboð",
+    "Failed to remove user": "Mistókst að fjarlægja notanda",
+    "Hide sessions": "Fela setur",
+    "%(count)s sessions|one": "%(count)s seta",
+    "%(count)s sessions|other": "%(count)s setur",
+    "Unable to load session list": "Ekki tókst að ná lista yfir setur",
+    "Not trusted": "Ekki treyst",
+    "Export chat": "Flytja út spjall",
+    "Pinned": "Fest",
+    "Maximise": "Hámarka",
+    "Share Community": "Deila samfélagi",
+    "Share User": "Deila notanda",
+    "Server isn't responding": "Netþjónninn er ekki að svara",
+    "You're all caught up.": "Þú hefur klárað að lesa allt.",
+    "Upgrade public room": "Uppfæra almenningsspjallrás",
+    "Upgrade private room": "Uppfæra einkaspjallrás",
+    "Report the entire room": "Kæra alla spjallrásina",
+    "Spam or propaganda": "Ruslpóstur eða áróður",
+    "Illegal Content": "Ólöglegt efni",
+    "Toxic Behaviour": "Eitruð hegðun",
+    "Disagree": "Ósammála",
+    "Verify session": "Sannprófa setu",
+    "Search spaces": "Leita að svæðum",
+    "%(count)s members|one": "%(count)s þátttakandi",
+    "%(count)s members|other": "%(count)s þátttakendur",
+    "You'll lose access to your encrypted messages": "Þú munt tapa dulrituðu skilaboðunum þínum",
+    "Leave some rooms": "Yfirgefa sumar spjallrásir",
+    "Leave all rooms": "Yfirgefa allar spjallrásir",
+    "Don't leave any rooms": "Ekki yfirgefa neinar spjallrásir",
+    "Updating %(brand)s": "Uppfæri %(brand)s",
+    "Invite to %(roomName)s": "Bjóða í %(roomName)s",
+    "Recent Conversations": "Nýleg samtöl",
+    "Invite by email": "Bjóða með tölvupósti",
+    "Minimise dialog": "Lágmarka glugga",
+    "Maximise dialog": "Hámarka glugga",
+    "You should know": "Þú ættir að vita",
+    "Search for rooms or people": "Leita að spjallrásum eða fólki",
+    "You don't have permission to do this": "Þú hefur ekki heimildir til að gera þetta",
+    "Include Attachments": "Hafa með viðhengi",
+    "Size Limit": "Stærðarmörk",
+    "Export Cancelled": "Hætt við útflutning",
+    "Number of messages": "Fjöldi skilaboða",
+    "Enter a number between %(min)s and %(max)s": "Settu inn tölu á milli %(min)s og %(max)s",
+    "End Poll": "Ljúka könnun",
+    "Sorry, the poll did not end. Please try again.": "Því miður, könnuninni lauk ekki. Prófaðu aftur.",
+    "Failed to end poll": "Mistókst að ljúka könnun",
+    "The poll has ended. No votes were cast.": "Könnuninni er lokið. Engin atkvæði voru greidd.",
+    "Edit Values": "Breyta gildum",
+    "Value in this room:": "Gildi á þessari spjallrás:",
+    "Setting definition:": "Skilgreining stillingar:",
+    "Value in this room": "Gildi á þessari spjallrás",
+    "Setting ID": "Auðkenni stillingar",
+    "Failed to save settings": "Mistókst að vista stillingar",
+    "There was an error finding this widget.": "Það kom upp villa við að finna þennan viðmótshluta.",
+    "Active Widgets": "Virkir viðmótshlutar",
+    "Verification Requests": "Beiðnir um sannvottun",
+    "Event Content": "Efni atburðar",
+    "Failed to send custom event.": "Mistókst að senda sérsniðinn atburð.",
+    "You must specify an event type!": "Þú verður að skilgreina tegund atburðar!",
+    "Space created": "Svæði búið til",
+    "Search for spaces": "Leita að svæðum",
+    "Want to add a new space instead?": "Viltu frekar bæta við nýju svæði?",
+    "Add existing space": "Bæta við fyrirliggjandi svæði",
+    "%(networkName)s rooms": "%(networkName)s spjallrásir",
+    "Add a new server...": "Bæta við nýjum þjóni...",
+    "Join millions for free on the largest public server": "Taktu þátt ókeypis ásamt milljónum annarra á stærsta almenningsþjóninum",
+    "Server Options": "Valkostir vefþjóns",
+    "This address had invalid server or is already in use": "Þetta vistfang er með ógildan netþjón eða er nú þegar í notkun",
+    "This address is available to use": "Þetta vistfang er tiltækt til notkunar",
+    "This address does not point at this room": "Vistfangið beinir ekki á þessa spjallrás",
+    "Please provide an address": "Gefðu upp vistfang",
+    "Some characters not allowed": "Sumir stafir eru óleyfilegir",
+    "Results are only revealed when you end the poll": "Niðurstöður birtast einungis eftir að þú hefur lokað könnuninni",
+    "Voters see results as soon as they have voted": "Kjósendur sjá niðurstöðurnar þegar þeir hafa kosið",
+    "Sorry, the poll you tried to create was not posted.": "Því miður, könnunin sem þú varst að reyna að útbúa birtist ekki.",
+    "Joined": "Gekk í hópinn",
+    "Remove server": "Fjarlægja þjón",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ertu viss um að þú viljir fjarlægja <b>%(serverName)s</b>",
+    "Enter a server name": "Settu inn nafn á þjóni",
+    "Continue with %(provider)s": "Halda áfram með %(provider)s",
+    "e.g. my-room": "t.d. mín-spjallrás",
+    "Room address": "Vistfang spjallrásar",
+    "In reply to <a>this message</a>": "Sem svar við <a>þessum skilaboðum</a>",
+    "Custom level": "Sérsniðið stig",
+    "Power level": "Stig valda",
+    "Add option": "Bæta við valkosti",
+    "Write an option": "Skrifaðu valmöguleika",
+    "Option %(number)s": "Valkostur %(number)s",
+    "Write something...": "Skrifaðu eitthvað...",
+    "Question or topic": "Spurning eða viðfangsefni",
+    "What is your poll question or topic?": "Hver er spurning eða viðfangsefni könnunarinnar?",
+    "Failed to post poll": "Mistókst að birta könnun",
+    "Language Dropdown": "Fellilisti tungumála",
+    "%(count)s people you know have already joined|one": "%(count)s aðili sem þú þekkir hefur þegar tekið þátt",
+    "%(count)s people you know have already joined|other": "%(count)s aðilar sem þú þekkir hafa þegar tekið þátt",
+    "View all %(count)s members|one": "Sjá 1 meðlim",
+    "View all %(count)s members|other": "Sjá alla %(count)s meðlimina",
+    "was removed %(count)s times|one": "var fjarlægð/ur",
+    "was removed %(count)s times|other": "var fjarlægður %(count)s sinnum",
+    "were removed %(count)s times|one": "voru fjarlægð",
+    "were removed %(count)s times|other": "voru fjarlægð %(count)s sinnum",
+    "was unbanned %(count)s times|one": "var tekin/n úr banni",
+    "was unbanned %(count)s times|other": "var tekin/n úr banni %(count)s sinnum",
+    "were unbanned %(count)s times|one": "voru tekin úr banni",
+    "were unbanned %(count)s times|other": "voru tekin úr banni %(count)s sinnum",
+    "was banned %(count)s times|one": "var bannaður",
+    "was banned %(count)s times|other": "var bannaður %(count)s sinnum",
+    "were banned %(count)s times|one": "voru bönnuð",
+    "were banned %(count)s times|other": "voru bönnuð %(count)s sinnum",
+    "was invited %(count)s times|other": "var boðið %(count)s sinnum",
+    "were invited %(count)s times|other": "var boðið %(count)s sinnum",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sfór og skráði sig aftur",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sfór og skráði sig aftur %(count)s sinnum",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sfóru og skráðu sig aftur",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)shafa skráð sig aftur %(count)s sinnum",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sskráði sig og fór",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)shefur skráð sig og farið %(count)s sinnum",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sskráðu sig og fóru",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sskráðu sig og fóru %(count)s sinnum",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sfór út %(count)s sinnum",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sfóru út %(count)s sinnum",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)shefur skráð sig %(count)s sinnum",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)shafa skráð sig %(count)s sinnum",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s breytti auðkennismynd spjallrásarinnar í <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s breytti auðkennismyndinni fyrir %(roomName)s",
+    "You don't have permission to view messages from before you joined.": "Þú hefur ekki heimildir til að skoða skilaboð frá því áður en þú fórst að taka þátt.",
+    "Identity server URL must be HTTPS": "Slóð á auðkennisþjón verður að vera HTTPS",
+    "<a>Upgrade</a> to your own domain": "<a>Uppfærðu</a> í þitt eigið lén",
+    "The operation could not be completed": "Ekki tókst að ljúka aðgerðinni",
+    "Failed to save your profile": "Mistókst að vista sniðið þitt",
+    "There was an error loading your notification settings.": "Það kom upp villa við að hlaða inn stillingum fyrir tilkynningar.",
+    "New keyword": "Nýtt stikkorð",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s breytti völdum %(powerLevelDiffText)s.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s breytti vistföngunum fyrir þessa spjallrás.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s breytti aðal- og varavistföngunum fyrir þessa spjallrás.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s breytti varavistfanginu fyrir þessa spjallrás.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Sendu okkur <UsageDataLink>nafnlaus greiningargögn</UsageDataLink> til að gera okkur kleift að bæta %(brand)s. Við þetta mun þurfa að setja <PolicyLink>vefköku</PolicyLink>.",
+    "Key request sent.": "Beiðni um lykil send.",
+    "This event could not be displayed": "Ekki tókst að birta þennan atburð",
+    "Edit message": "Breyta skilaboðum",
+    "Everyone in this room is verified": "Allir á þessari spjallrás eru staðfestir",
+    "Your email address hasn't been verified yet": "Tölvupóstfangið þitt hefur ekki ennþá verið staðfest",
+    "Unable to share email address": "Get ekki deilt tölvupóstfangi",
+    "Unable to revoke sharing for email address": "Ekki er hægt að afturkalla að deila tölvupóstfangi",
+    "Send %(eventType)s events": "Senda %(eventType)s atburði",
+    "Privileged Users": "Notendur með auknar heimildir",
+    "No users have specific privileges in this room": "Engir notendur eru með neinar sérheimildir á þessari spjallrás",
+    "Manage pinned events": "Sýsla með festa atburði",
+    "Remove messages sent by me": "Fjarlægja skilaboð send af mér",
+    "Send reactions": "Senda viðbrögð",
+    "Change server ACLs": "Breyta ACL á netþjóni",
+    "Change description": "Breyta lýsingu",
+    "Error changing power level": "Villa við að breyta valdastigi",
+    "Error changing power level requirement": "Villa við að breyta kröfum um valdastig",
+    "Banned by %(displayName)s": "Bannaður af %(displayName)s",
+    "Failed to unban": "Tókst ekki að taka úr banni",
+    "Set a new custom sound": "Stilla nýtt sérsniðið hljóð",
+    "You won't get any notifications": "Þú munt ekki fá neinar tilkynningar",
+    "Get notified for every message": "Fáðu tilkynningu fyrir öll skilaboð",
+    "Uploaded sound": "Innsent hljóð",
+    "Internal room ID": "Innra auðkenni spjallrásar",
+    "No Audio Outputs detected": "Engir hljóðútgangar fundust",
+    "Message search": "Leita í skilaboðum",
+    "Open in OpenStreetMap": "Opna í OpenStreetMap",
+    "I don't want my encrypted messages": "Ég vil ekki dulrituðu skilaboðin mín",
+    "Call declined": "Símtali hafnað",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Aðeins þið tveir/tvö eruð í þessu samtali, nema annar hvor bjóði einhverjum að taka þátt.",
+    "The conversation continues here.": "Samtalið heldur áfram hér.",
+    "Send a reply…": "Senda svar…",
+    "Reply to thread…": "Svara spjallþræði…",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (með völd sem %(powerLevelNumber)s)",
+    "You can't see earlier messages": "Þú getur ekki séð eldri skilaboð",
+    "Message Actions": "Aðgerðir skilaboða",
+    "From a thread": "Úr spjallþræði",
+    "Someone is using an unknown session": "Einhver er að nota óþekkta setu",
+    "You have not verified this user.": "Þér hefur ekki sannreynt þennan notanda.",
+    "Remove %(phone)s?": "Fjarlægja %(phone)s?",
+    "Please enter verification code sent via text.": "Settu inn staðfestingarkóða sem sendur var með SMS.",
+    "Unable to verify phone number.": "Ekki var hægt að sannreyna símanúmer.",
+    "Unable to share phone number": "Ekki er hægt að deila símanúmeri",
+    "Unable to revoke sharing for phone number": "Ekki er hægt að afturkalla að deila símanúmeri",
+    "Verify the link in your inbox": "Athugaðu tengilinn í pósthólfinu þínu",
+    "The person who invited you already left the room, or their server is offline.": "Aðilinn sem bauð þér hefur yfirgefið spjallrásina, eða að netþjónninn hans/hennar er ekki tengdur.",
+    "The person who invited you already left the room.": "Aðilinn sem bauð þér hefur yfirgefið spjallrásina.",
+    "Sorry, your homeserver is too old to participate in this room.": "Því miður, heimaþjónninn þinn er of gamall til að taka þátt í þessari spjallrás.",
+    "There was an error joining the room": "Það kom upp villa við að ganga til liðs við spjallrásina",
+    "New version of %(brand)s is available": "Ný útgáfa %(brand)s er tiltæk",
+    "Set up Secure Backup": "Setja upp varið öryggisafrit",
+    "You previously consented to share anonymous usage data with us. We're updating how that works.": "Þú hefur áður samþykkt að deila nafnlausum upplýsingum um notkun forritsins með okkur. Við erum að uppfæra hvernig það virkar.",
+    "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Þetta er upphaf útflutning á <roomName/>. Var flutt út af <exporterDetails/> þann %(exportDate)s.",
+    "Authentication check failed: incorrect password?": "Sannvottun auðkenningar mistókst: er lykilorðið rangt?",
+    "Your browser does not support the required cryptography extensions": "Vafrinn þinn styður ekki nauðsynlegar dulritunarviðbætur",
+    "Please <a>contact your service administrator</a> to continue using the service.": "<a>Hafðu samband við kerfisstjóra þjónustunnar þinnar</a> til að halda áfram að nota þjónustuna.",
+    "This homeserver has been blocked by its administrator.": "Þessi heimaþjónn hefur verið útilokaður af kerfisstjóra hans.",
+    "Unexpected error resolving identity server configuration": "Óvænt villa kom upp við að lesa uppsetningu auðkenningarþjóns",
+    "Unexpected error resolving homeserver configuration": "Óvænt villa kom upp við að lesa uppsetningu heimaþjóns",
+    "Your %(brand)s is misconfigured": "%(brand)s-uppsetningin þín er rangt stillt",
+    "The <b>%(capability)s</b> capability": "Geta <b>%(capability)s</b>-þjónsins",
+    "Message didn't send. Click for info.": "Mistókst að senda skilaboð. Smelltu til að fá nánari upplýsingar.",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Einkaskilaboðin þín eru venjulega dulrituð, en þessi spjallrás er það hinsvegar ekki. Venjulega kemur þetta til vegna tækis sem ekki sé stutt, eða aðferðarinnar sem sé notuð, eins og t.d. boðum í tölvupósti.",
+    "This is the start of <roomName/>.": "Þetta er upphafið á <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Bættu við mynd, svo fólk eigi auðveldara með að finna spjallið þitt.",
+    "Open Devtools": "Opna forritaratól",
+    "Developer options": "Valkostir forritara",
+    "View older messages in %(roomName)s.": "Skoða eldri skilaboð í %(roomName)s.",
+    "This room is not accessible by remote Matrix servers": "Þessi spjallrás er ekki aðgengileg fjartengdum Matrix-netþjónum",
+    "No media permissions": "Engar heimildir fyrir myndefni",
+    "That doesn't match.": "Þetta stemmir ekki.",
+    "That matches!": "Þetta passar!",
+    "Clear personal data": "Hreinsa persónuleg gögn",
+    "You're signed out": "Þú ert skráð/ur út",
+    "General failure": "Almenn bilun",
+    "Share %(name)s": "Deila %(name)s",
+    "You don't have permission": "Þú hefur ekki heimild",
+    "Retry all": "Prófa aftur allt",
+    "Private community": "Einkasamfélag",
+    "Public community": "Opinbert samfélag",
+    "Open dial pad": "Opna talnaborð",
+    "You cancelled": "Þú hættir við",
+    "You accepted": "Þú samþykktir",
+    "Unable to find Matrix ID for phone number": "Gat ekki fundið Matrix-auðkenni fyrir símanúmer",
+    "Opens chat with the given user": "Opnar spjall við viðkomandi notanda",
+    "Send a bug report with logs": "Senda villuskýrslu með atvikaskrám",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "AÐVÖRUN: Setan er þegar sannreynd, en lyklarnir SAMSVARA EKKI!",
+    "Session already verified!": "Seta er þegar sannreynd!",
+    "You cannot modify widgets in this room.": "Þú getur ekki sýslað með viðmótshluta á þessari spjallrás.",
+    "Please supply a https:// or http:// widget URL": "Gefðu upp https:// eða http:// slóð á viðmótshluta",
+    "Deops user with given id": "Tekur stjórnunarréttindi af notanda með uppgefið auðkenni",
+    "Command failed: Unable to find room (%(roomId)s": "Skipun mistókst: Gat ekki fundið spjallrásina (%(roomId)s",
+    "Stops ignoring a user, showing their messages going forward": "Hættir að hunsa notanda, birtir skilaboð viðkomandi héðan í frá",
+    "Use an identity server to invite by email. Manage in Settings.": "Notaðu auðkennisþjón til að geta boðið með tölvupósti. Sýslaðu með þetta í stillingunum.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Notaðu auðkennisþjón til að geta boðið með tölvupósti. Smelltu á að halda áfram til að nota sjálfgefinn auðkennisþjón (%(defaultIdentityServerName)s) eða sýslaðu með þetta í stillingunum.",
+    "Failed to get room topic: Unable to find room (%(roomId)s": "Mistókst að ná í umfjöllunarefni spjallrásar: Gat ekki fundið spjallrásina (%(roomId)s",
+    "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Okkur tókst ekki að túlka uppgefna dagsetningu (%(inputDate)s). Prófaðu að nota YYYY-MM-DD sniðið.",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s voru ekki gefnar heimildir til að senda þér tilkynningar - reyndu aftur",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s hefur ekki heimildir til að senda þér tilkynningar - yfirfarðu stillingar vafrans þíns",
+    "%(name)s is requesting verification": "%(name)s biður um sannvottun",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sklst",
+    "%(value)sd": "%(value)sd",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s er að setja dulrituð skilaboð leynilega í skyndiminni á tækinu svo þau birtist í leitarniðurstöðum:",
+    "Confirm Security Phrase": "Staðfestu öryggisfrasa",
+    "Confirm your Security Phrase": "Staðfestu öryggisfrasann þinn",
+    "Enter a Security Phrase": "Settu inn öryggisfrasa",
+    "Continue with previous account": "Halda áfram með fyrri aðgangi",
+    "Continue with %(ssoButtons)s": "Halda áfram með %(ssoButtons)s",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Tölvupóstur hefur verið sendur á %(emailAddress)s. Þegar þú ert búin/n að fylgja tenglinum sem sá póstur inniheldur, smelltu þá hér fyrir neðan.",
+    "Device verified": "Tæki er sannreynt",
+    "Could not load user profile": "Gat ekki hlaðið inn notandasniði",
+    "<inviter/> invites you": "<inviter/> býður þér",
+    "Add a photo so people know it's you.": "Bættu við mynd, svo fólk viti að þetta sért þú.",
+    "Confirm your identity by entering your account password below.": "Staðfestu auðkennin þín með því að setja inn hér fyrir neðan lykilorðið á aðganginn þinn.",
+    "Country Dropdown": "Fellilisti með löndum",
+    "Click for more info": "Smelltu til að sjá frekari upplýsingar",
+    "Collapse reply thread": "Fella saman svarþráð",
+    "Enter Security Phrase": "Settu inn öryggisfrasa",
+    "Click the button below to confirm setting up encryption.": "Smelltu á hnappinn hér að neðan til að staðfesta uppsetningu á dulritun.",
+    "Confirm encryption setup": "Staðfestu uppsetningu dulritunar",
+    "Decline All": "Hafna öllu",
+    "Command Help": "Hjálp við skipun",
+    "Continuing without email": "Halda áfram án tölvupósts",
+    "Click the button below to confirm your identity.": "Smelltu á hnappinn hér að neðan til að staðfesta auðkennið þitt.",
+    "Confirm to continue": "Staðfestu til að halda áfram",
+    "%(hostSignupBrand)s Setup": "Uppsetning %(hostSignupBrand)s",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Staðfestu að aðgangurinn þinn sé gerður óvirkur með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+    "Clear all data in this session?": "Hreinsa öll gögn í þessari setu?",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)ssendi falin skilaboð",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)ssendi %(count)s falin skilaboð",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sfjarlægði skilaboð",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sbreytti <a>föstum skilaboðum</a> fyrir spjallrásina %(count)s sinnum",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgerði engar breytingar",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgerði engar breytingar %(count)s sinnum",
+    "%(displayName)s's live location": "Staðsetning fyrir %(displayName)s í rauntíma",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s gat ekki sent staðsetninguna þína. Reyndu aftur síðar.",
+    "Edited at %(date)s. Click to view edits.": "Breytt þann %(date)s. Smelltu hér til að skoða breytingar.",
+    "%(name)s wants to verify": "%(name)s vill sannreyna",
+    "%(name)s cancelled": "%(name)s hætti við",
+    "%(name)s declined": "%(name)s hafnaði",
+    "%(name)s accepted": "%(name)s samþykkti",
+    "%(name)s cancelled verifying": "%(name)s hætti við sannvottun",
+    "%(displayName)s cancelled verification.": "%(displayName)s hætti við sannvottun.",
+    "Ask %(displayName)s to scan your code:": "Biddu %(displayName)s um að skanna kóðann þinn:",
+    "Compare unique emoji": "Bera saman einstakar táknmyndir",
+    "Accepting…": "Samþykki…",
+    "%(count)s reply|one": "%(count)s svar",
+    "%(count)s reply|other": "%(count)s svör",
+    "Add some now": "Bæta við núna",
+    "%(count)s unread messages.|other": "%(count)s ólesin skilaboð.",
+    "%(count)s unread messages including mentions.|one": "1 ólesin tilvísun í þig.",
+    "%(count)s unread messages including mentions.|other": "%(count)s ólesin skilaboð að meðtöldum þar sem minnst er á þig.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s er ekki aðgengileg í augnablikinu.",
+    "Do you want to chat with %(user)s?": "Viltu spjalla við %(user)s?",
+    "Add space": "Bæta við svæði",
+    "Can't see what you're looking for?": "Finnurðu ekki það sem þú leitar að?",
+    "Add existing room": "Bæta við fyrirliggjandi spjallrás",
+    "Busy": "Upptekinn",
+    "Decide who can join %(roomName)s.": "Veldu hverjir geta tekið þátt í %(roomName)s.",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Aftengjast frá auðkennisþjóninum <current /> og tengjast í staðinn við <new />?",
+    "Checking server": "Athuga með þjón",
+    "Backing up %(sessionsRemaining)s keys...": "Öryggisafrita dulritunarlykla %(sessionsRemaining)s...",
+    "Click the button below to confirm signing out these devices.|one": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessa tækis.",
+    "Click the button below to confirm signing out these devices.|other": "Smelltu á hnappinn hér að neðan til að staðfesta útskráningu þessara tækja.",
+    "Confirm signing out these devices": "Staðfestu útskráningu þessara tækja",
+    "Do you want to set an email address?": "Viltu skrá tölvupóstfang?",
+    "Decide who can view and join %(spaceName)s.": "Veldu hverjir geta skoðað og tekið þátt í %(spaceName)s.",
+    "Change the avatar of your active room": "Breyta auðkennismynd virku spjallrásarinnar þinnar",
+    "Change the avatar of this room": "Breyta auðkennismynd þessarar spjallrásar",
+    "Change the name of your active room": "Breyta heiti virku spjallrásarinnar þinnar",
+    "Change the name of this room": "Breyta heiti þessarar spjallrásar",
+    "Change the topic of your active room": "Breyta umfjöllunarefni virku spjallrásarinnar þinnar",
+    "Change the topic of this room": "Breyta heiti þessarar spjallrásar",
+    "Change which room, message, or user you're viewing": "Breyttu hvaða spjallrás, skilaboð eða notanda þú ert að skoða",
+    "Change which room you're viewing": "Breyttu hvaða spjallrás þú ert að skoða",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s breytti ACL á netþjóni fyrir þessa spjallrás.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s breytti þátttökureglu í %(rule)s",
+    "Video": "Myndskeið",
+    "Verification Request": "Beiðni um sannvottun",
+    "Save your Security Key": "Vista öryggislykilinn þinn",
+    "Set a Security Phrase": "Setja öryggisfrasa",
+    "Secure your backup with a Security Phrase": "Verðu öryggisafritið þitt með öryggisfrasa",
+    "Mark as suggested": "Merkja sem tillögu",
+    "Mark as not suggested": "Merkja sem ekki-tillögu",
+    "Remove for everyone": "Fjarlægja fyrir alla",
+    "Security Phrase": "Öryggisfrasi",
+    "Manually export keys": "Flytja út dulritunarlykla handvirkt",
+    "Incoming Verification Request": "Innkomin beiðni um sannvottun",
+    "Revoke invite": "Afturkalla boð",
+    "Change identity server": "Skipta um auðkennisþjón",
+    "Enter your account password to confirm the upgrade:": "Sláðu inn lykilorðið þitt til að staðfesta uppfærsluna:",
+    "Enter your Security Phrase a second time to confirm it.": "Settu aftur inn öryggisfrasann þinn til að staðfesta hann.",
+    "Forgotten your password?": "Gleymdirðu lykilorðinu þínu?",
+    "Failed to re-authenticate": "Tókst ekki að endurauðkenna",
+    "Host account on": "Hýsa notandaaðgang á",
+    "Failed to remove some rooms. Try again later": "Mistókst að fjarlægja sumar spjallrásir. Reyndu aftur síðar",
+    "Error downloading audio": "Villa við að sækja hljóð",
+    "Failed to start livestream": "Tókst ekki að ræsa beint streymi",
+    "Failed to decrypt %(failedCount)s sessions!": "Mistókst að afkóða %(failedCount)s setur!",
+    "Fetching keys from server...": "Sæki lykla frá þjóni...",
+    "Find others by phone or email": "Finndu aðra með símanúmeri eða tölvupóstfangi",
+    "Failed to upgrade room": "Mistókst að uppfæra spjallrás",
+    "Export Chat": "Flytja út spjall",
+    "Exporting your data": "Útflutningur gagnanna þinna",
+    "Event Type": "Tegund atburðar",
+    "Error - Mixed content": "Villa - blandað efni",
+    "Error loading Widget": "Villa við að hlaða inn viðmótshluta",
+    "Failed to fetch your location. Please try again later.": "Mistókst að sækja staðsetninguna þína. Reyndu aftur síðar.",
+    "Error removing address": "Villa við að fjarlægja vistfang",
+    "Error creating address": "Villa við að búa til vistfang",
+    "Error updating main address": "Villa við uppfærslu á aðalvistfangi",
+    "Failed to revoke invite": "Mistókst að afturkalla boð",
+    "Forget this room": "Gleyma þessari spjallrás",
+    "Recovery Method Removed": "Endurheimtuaðferð fjarlægð",
+    "Starting backup...": "Byrja öryggisafritun...",
+    "Registration Successful": "Nýskráning tókst",
+    "<a>Log in</a> to your new account.": "<a>Skráðu þig inn</a> í nýja notandaaðganginn þinn.",
+    "Set a new password": "Stilla nýtt lykilorð",
+    "Sign in instead": "Skrá inn í staðinn",
+    "Skip verification for now": "Sleppa sannvottun í bili",
+    "Verify this device": "Sannreyna þetta tæki",
+    "Search names and descriptions": "Leita í nöfnum og lýsingum",
+    "Fetching third party location failed": "Mistókst að ná í staðsetningu annars aðila",
+    "delete the address.": "eyða vistfanginu.",
+    "toggle event": "víxla atburði af/á",
+    "remove %(name)s from the directory.": "fjarlægja %(name)s úr skránni.",
+    "Remove from Directory": "Fjarlægja úr skrá",
+    "Remove %(name)s from the directory?": "Fjarlægja %(name)s úr skránni?",
+    "You have no visible notifications.": "Þú átt engar sýnilegar tilkynningar.",
+    "You're all caught up": "Þú hefur klárað að lesa allt",
+    "Verification requested": "Beðið um sannvottun",
+    "Review terms and conditions": "Yfirfara skilmála og kvaðir",
+    "Now, let's help you get started": "Hefjumst handa við að koma þér í gang",
+    "Welcome %(name)s": "Velkomin/n %(name)s",
+    "Great, that'll help people know it's you": "Frábært, það mun hjálpa fólki að vita að þetta sért þú",
+    "Sign in with SSO": "Skrá inn með einfaldri innskráningu (SSO)",
+    "Token incorrect": "Rangt teikn",
+    "Stop sharing": "Hætta deilingu",
+    "%(timeRemaining)s left": "%(timeRemaining)s eftir",
+    "You are sharing your live location": "Þú ert að deila staðsetninu þinni í rauntíma",
+    "This is a beta feature": "Þetta er beta-prófunareiginleiki",
+    "This is a beta feature. Click for more info": "Þetta er beta-prófunareiginleiki. Smelltu til að sjá frekari upplýsingar",
+    "Revoke permissions": "Afturkalla heimildir",
+    "Take a picture": "Taktu mynd",
+    "Start audio stream": "Hefja hljóðstreymi",
+    "Unable to start audio streaming.": "Get ekki ræst hljóðstreymi.",
+    "Resend %(unsentCount)s reaction(s)": "Endursenda %(unsentCount)s reaction(s)",
+    "Requester": "Beiðandi",
+    "Methods": "Aðferðir",
+    "Timeout": "Tímamörk",
+    "Phase": "Fasi",
+    "Transaction": "Færsluaðgerð",
+    "Cancelled": "Hætt við",
+    "Started": "Hafið",
+    "Ready": "Tilbúið",
+    "Requested": "Umbeðið",
+    "Unsent": "Ósent",
+    "Edit values": "Breyta gildum",
+    "Failed to save settings.": "Mistókst að vista stillingar.",
+    "Number of users": "Fjöldi notenda",
+    "Server": "Netþjónn",
+    "Server Versions": "Útgáfur þjóna",
+    "Client Versions": "Útgáfur biðlaraforrita",
+    "Failed to load.": "Mistókst að hlaða inn.",
+    "Capabilities": "Geta",
+    "Send custom state event": "Senda sérsniðinn stöðuatburð",
+    "Failed to send event!": "Mistókst að senda atburð!",
+    "Doesn't look like valid JSON.": "Þetta lítur ekki út eins og gilt JSON.",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Gleymdirðu eða týndir öllum aðferðum til endurheimtu? <a>Endurstilla allt</a>",
+    "Wrong file type": "Röng skráartegund",
+    "This widget would like to:": "Þessi viðmótshluti vill:",
+    "Verify other device": "Sannreyndu hitt tækið",
+    "To continue you need to accept the terms of this service.": "Þú verður að samþykkja þjónustuskilmálana til að geta haldið áfram.",
+    "Use bots, bridges, widgets and sticker packs": "Notaðu vélmenni, viðmótshluta og límmerkjapakka",
+    "Be found by phone or email": "Láttu finna þig með símanúmeri eða tölvupóstfangi",
+    "Search Dialog": "Leitargluggi",
+    "Use <arrows/> to scroll": "Notaðu <arrows/> til að skruna",
+    "Spaces you're in": "Svæði sem þú tilheyrir",
+    "Settings - %(spaceName)s": "Stillingar - %(spaceName)s",
+    "Space settings": "Stillingar svæðis",
+    "Unable to upload": "Ekki tókst að senda inn",
+    "Room ID: %(roomId)s": "Auðkenni spjallrásar: %(roomId)s",
+    "Server info": "Upplýsingar um þjón",
+    "View servers in room": "Skoða netþjóna á spjallrás",
+    "Explore room account data": "Skoða aðgangsgögn spjallrásar",
+    "Explore room state": "Skoða stöðu spjallrásar",
+    "Room details": "Nánar um spjallrás",
+    "Voice & video room": "Tal- og myndmerkisspjallrás",
+    "Text room": "Textaspjallrás",
+    "Room type": "Tegund spjallrásar",
+    "This widget may use cookies.": "Þessi viðmótshluti gæti notað vefkökur.",
+    "Widget added by": "Viðmótshluta bætt við af",
+    "Share for %(duration)s": "Deila í %(duration)s",
+    "Submit logs": "Senda inn atvikaskrár",
+    "Shared a location: ": "Deildi staðsetningu: ",
+    "Shared their location: ": "Deildi staðsetningu sinni: ",
+    "Unable to load map": "Gat ekki hlaðið inn landakorti",
+    "You sent a verification request": "Þú sendir beiðni um sannvottun",
+    "You declined": "Þú hafnaðir",
+    "You cancelled verifying %(name)s": "Þú hættir við sannvottun á %(name)s",
+    "You verified %(name)s": "Þú sannreyndir %(name)s",
+    "Verification cancelled": "Hætt við sannprófun",
+    "You cancelled verification.": "Þú hættir við sannvottun.",
+    "Verification timed out.": "Sannvottun rann út á tíma.",
+    "Verify User": "Sannreyna notanda",
+    "Start Verification": "Hefja sannvottun",
+    "This space has no local addresses": "Þetta svæði er ekki með nein staðvær vistföng",
+    "Connecting...": "Tengist...",
+    "Voice room": "Talspjallrás",
+    "You were banned from %(roomName)s by %(memberName)s": "Þú hefur verið settur í bann á %(roomName)s af %(memberName)s",
+    "Reason: %(reason)s": "Ástæða: %(reason)s",
+    "Rejecting invite …": "Hafna boði …",
+    "%(spaceName)s menu": "Valmynd %(spaceName)s",
+    "Start a new chat": "Hefja nýtt spjall",
+    "wait and try again later": "bíða og reyna aftur síðar",
+    "User signing private key:": "Notanda-undirritaður einkalykill:",
+    "Self signing private key:": "Sjálf-undirritaður einkalykill:",
+    "not found locally": "fannst ekki á tækinu",
+    "not found in storage": "fannst ekki í geymslu",
+    "Developer tools": "Forritunartól",
+    "Video off": "Slökkt á myndmerki",
+    "Connected": "Tengt",
+    "Next recently visited room or space": "Næsta nýlega heimsótt spjallrás eða svæði",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Ef þetta er óvirkt, munu skilaboð frá dulrituðum spjallrásum ekki birtast í leitarniðurstöðum.",
+    "New Recovery Method": "Ný endurheimtuaðferð",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Geymdu afrit af þessu á öruggum stað, eins og í lykilorðastýringu eða jafnvel í peningaskáp.",
+    "I'll verify later": "Ég mun sannreyna síðar",
+    "Please <a>contact your service administrator</a> to continue using this service.": "<a>Hafðu samband við kerfisstjóra þjónustunnar þinnar</a> til að halda áfram að nota þessa þjónustu.",
+    "Identity server URL does not appear to be a valid identity server": "Slóð á auðkennisþjón virðist ekki vera á gildan auðkennisþjón",
+    "Invalid base_url for m.identity_server": "Ógilt base_url fyrir m.identity_server",
+    "Let's create a room for each of them.": "Búum til spjallrás fyrir hvern og einn þeirra.",
+    "Joining": "Geng í hópinn",
+    "No results for \"%(query)s\"": "Engar niðurstöður fyrir \"%(query)s\"",
+    "Old cryptography data detected": "Gömul dulritunargögn fundust",
+    "New search beta available": "Ný beta-prófunarleit tiltæk",
+    "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "Ef einhver sagði þér að afrita/líma eitthvað hér, eru miklar líkur á að það sé verið að gabba þig!",
+    "Phone (optional)": "Sími (valfrjálst)",
+    "Keep going...": "Höldum áfram...",
+    "Password is allowed, but unsafe": "Lykilorð er leyfilegt, en óöruggt",
+    "Nice, strong password!": "Fínt, sterkt lykilorð!",
+    "Open the link in the email to continue registration.": "Opnaðu tengilinn í tölvupóstinum þínum til að halda áfram með skráningu.",
+    "Leave the beta": "Fara út úr Beta-prófunarútgáfu",
+    "Keys restored": "Dulritunarlyklar endurheimtir",
+    "No backup found!": "Ekkert öryggisafrit fannst!",
+    "Incorrect Security Phrase": "Rangur öryggisfrasi",
+    "Interactively verify by Emoji": "Sannprófa gagnvirkt með táknmyndum",
+    "Missing session data": "Vantar setugögn",
+    "Other searches": "Aðrar leitir",
+    "Link to selected message": "Tengill í valin skilaboð",
+    "Link to most recent message": "Tengill í nýjustu skilaboðin",
+    "Matrix.org is the biggest public homeserver in the world, so it's a good place for many.": "Matrix.org is er heimsins stærsti opinberi heimaþjónninn, þannig að þar er góður staður fyrir marga.",
+    "Invited people will be able to read old messages.": "Fólk sem er boðið mun geta lesið eldri skilaboð.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Bjóddu einhverjum með því að nota nafn, notandanafn (eins og <userId/>) eða <a>deildu þessari spjallrás</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Bjóddu einhverjum með því að nota nafn, tölvupóstfang, notandanafn (eins og <userId/>) eða <a>deildu þessari spjallrás</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Bjóddu einhverjum með því að nota nafn, notandanafn (eins og <userId/>) eða <a>deildu þessu svæði</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Bjóddu einhverjum með því að nota nafn, tölvupóstfang, notandanafn (eins og <userId/>) eða <a>deildu þessu svæði</a>.",
+    "Or send invite link": "Eða senda boðstengil",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Skoðaðu nánari upplýsingar í <privacyPolicyLink />, <termsOfServiceLink /> og <cookiePolicyLink />.",
+    "Number of messages can only be a number between %(min)s and %(max)s": "Fjöldi skilaboða getur aðeins verið tala á milli %(min)s og %(max)s",
+    "Incompatible Database": "Ósamhæfður gagnagrunnur",
+    "No recent messages by %(user)s found": "Engin nýleg skilaboð frá %(user)s fundust",
+    "Not all selected were added": "Ekki var öllu völdu bætt við",
+    "Missing room name or separator e.g. (my-room:domain.org)": "Vantar heiti spjallrásar eða aðgreini, t.d. (spjallrásin-mín:lén.org)",
+    "Missing domain separator e.g. (:domain.org)": "Vantar aðgreini léns, t.d. (:lén.org)",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "Frumstilling leitar í skilaboðum mistókst, skoðaðu <a>stillingarnar þínar</a> til að fá nánari upplýsingar",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Skilaboð hér eru enda-í-enda dulrituð. Þegar fólk gengur í hópinn, geturðu sannreynt það á persónusniðinu þeirra, ýttu einfaldlega á auðkennismyndina þeirra.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Skilaboð hér eru enda-í-enda dulrituð. Sannreyndu %(displayName)s á persónusniðinu þeirra - ýttu á auðkennismyndina þeirra.",
+    "Pinned messages": "Föst skilaboð",
+    "Nothing pinned, yet": "Ekkert fest, ennþá",
+    "One of the following may be compromised:": "Eitt af eftirfarandi gæti verið berskjaldað:",
+    "No other published addresses yet, add one below": "Engin önnur birt vistföng ennþá, bættu einu við hér fyrir neðan",
+    "Main address": "Aðalvistfang",
+    "Open thread": "Opna spjallþráð",
+    "Invited by %(sender)s": "Boðið af %(sender)s",
+    "Join the discussion": "Taktu þátt í umræðunni",
+    "Joining space …": "Geng til liðs við svæði …",
+    "Offline for %(duration)s": "Ekki á netinu í %(duration)s",
+    "Idle for %(duration)s": "Aðgerðalaust í %(duration)s",
+    "Online for %(duration)s": "Á netinu í %(duration)s",
+    "Missing media permissions, click the button below to request.": "Vantar heimildir fyrir margmiðlunarefni, smelltu á hnappinn hér fyrir neðan til að biðja um þær.",
+    "Not a valid identity server (status code %(code)s)": "Ekki gildur auðkennisþjónn (stöðukóði %(code)s)",
+    "Message search initialisation failed": "Frumstilling leitar í skilaboðum mistókst",
+    "Mic": "Hljóðnemi",
+    "Mic off": "Slökkt á hljóðnema",
+    "This invite to %(roomName)s was sent to %(email)s": "Þetta boð í %(roomName)s var sent til %(email)s",
+    "You can still join it because this is a public room.": "Þú getur samt tekið þátt þar sem þetta er almenningsspjallrás.",
+    "Try to join anyway": "Reyna samt að taka þátt",
+    "You were removed from %(roomName)s by %(memberName)s": "Þú hefur verið fjarlægð/ur á %(roomName)s af %(memberName)s",
+    "Join the conversation with an account": "Taktu þátt í samtalinu með notandaaðgangi",
+    "Currently removing messages in %(count)s rooms|one": "Er núna að fjarlægja skilaboð í %(count)s spjallrás",
+    "Currently removing messages in %(count)s rooms|other": "Er núna að fjarlægja skilaboð í %(count)s spjallrásum",
+    "Currently joining %(count)s rooms|one": "Er núna að ganga til liðs við %(count)s spjallrás",
+    "Currently joining %(count)s rooms|other": "Er núna að ganga til liðs við %(count)s spjallrásir",
+    "You do not have permissions to add spaces to this space": "Þú hefur ekki heimild til að bæta svæðum í þetta svæði",
+    "You do not have permissions to add rooms to this space": "Þú hefur ekki heimild til að bæta spjallrásum í þetta svæði",
+    "You do not have permissions to create new rooms in this space": "Þú hefur ekki heimild til að búa til nýjar spjallrásir í þessu svæði",
+    "Unknown for %(duration)s": "Óþekkt í %(duration)s",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Bættu við umfjöllunarefni</a> svo fólk viti að um hvað málin snúist.",
+    "That link is no longer supported": "Þessi tengill er ekki lengur studdur",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Þar sem þessi síða inniheldur persónugreinanlegar upplýsingar, eins og um spjallrás eða auðkenni notanda, þá eru þau gögn fjarlægð áður en upplýsingar eru sendar til netþjónsins.",
+    "Unable to verify this device": "Tókst ekki að sannreyna þetta tæki",
+    "Event ID: %(eventId)s": "Auðkenni atburðar: %(eventId)s",
+    "Scroll to most recent messages": "Skruna að nýjustu skilaboðunum",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Þetta boð í %(roomName)s var sent til %(email)s sem er ekki tengt notandaaðgangnum þínum",
+    "You must <a>register</a> to use this functionality": "Þú verður að <a>skrá þig</a> til að geta notað þennan eiginleika",
+    "Unnamed audio": "Nafnlaust hljóð",
+    "Someone already has that username. Try another or if it is you, sign in below.": "Einhver annar er að nota þetta notandanafn. Prófaðu eitthvað annað, eða ef þetta ert þú, skaltu skrá þig inn hér fyrir neðan.",
+    "Unable to check if username has been taken. Try again later.": "Ekki er hægt að athuga hvort notandanafnið sé frátekið. Prófaðu aftur síðar.",
+    "Use lowercase letters, numbers, dashes and underscores only": "Notaðu einungis bókstafi, tölur, skástrik og undirstrik",
+    "Use an email address to recover your account": "Notaðu tölvupóstfang til að endurheimta aðganginn þinn",
+    "Start authentication": "Hefja auðkenningu",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Eitthvað fór úrskeiðis við að staðfesta auðkennin þín. Hættu við og prófaðu aftur.",
+    "Please enter the code it contains:": "Settu inn kóðann sem þau innihalda:",
+    "A text message has been sent to %(msisdn)s": "Textaskilaboð hafa verið send á %(msisdn)s",
+    "A confirmation email has been sent to %(emailAddress)s": "Staðfestingartölvupóstur var sendur á %(emailAddress)s",
+    "Please review and accept the policies of this homeserver:": "Yfirfarðu og samþykktu reglur þessa heimaþjóns:",
+    "Please review and accept all of the homeserver's policies": "Yfirfarðu og samþykktu allar reglur þessa heimaþjóns",
+    "To continue, use Single Sign On to prove your identity.": "Til að halda áfram skaltu nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Staðfestu útskráningu af þessu tæki með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Staðfestu útskráningu af þessum tækjum með því að nota einfalda innskráningu (single-sign-on) til að sanna auðkennið þitt.",
+    "Homeserver feature support:": "Heimaþjónninn styður eftirfarandi eiginleika:",
+    "Failed to upload profile picture!": "Gat ekki sent inn notandamynd!",
+    "Thank you for trying Spaces. Your feedback will help inform the next versions.": "Takk fyrir að prófa Svæðin. Umsögn þín mun hjálpa okkur að betrumbæta næstu útgáfur.",
+    "Waiting for you to verify on your other device…": "Bíð eftir að þú staðfestir á hinu tækinu…",
+    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "Bíð eftir að þú staðfestir á hinu tækinu, %(deviceName)s (%(deviceId)s)…",
+    "Unable to find a supported verification method.": "Fann ekki neina studda sannvottunaraðferð.",
+    "Verify this user by confirming the following number appears on their screen.": "Sannreyndu þennan notanda með því að staðfesta eftirfarandi númer sem birtist á skjánum hans.",
+    "Verify this device by confirming the following number appears on its screen.": "Sannreyndu þetta tæki með því að staðfesta eftirfarandi númer sem birtist á skjá þess.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Sannreyndu þennan notanda með því að staðfesta eftirfarandi táknmynd sem birtist á skjánum hans.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Staðfestu að táknmyndirnar hér fyrir neðan séu birtar á báðum tækjunum og í sömu röð:",
+    "Recommended for public spaces.": "Mælt með fyrir opinber almenningssvæði.",
+    "Allow people to preview your space before they join.": "Bjóddu fólki að forskoða svæðið þitt áður en þau geta tekið þátt.",
+    "Failed to update the visibility of this space": "Mistókst að uppfæra sýnileika þessa svæðis",
+    "This may be useful for public spaces.": "Þetta getur hentað fyrir opinber almenningssvæði.",
+    "Guests can join a space without having an account.": "Gestir geta tekið þátt í svæði án þess að vera með notandaaðgang.",
+    "Failed to update the history visibility of this space": "Mistókst að uppfæra sýnileika atvikaferils þessa svæðis",
+    "Failed to update the guest access of this space": "Mistókst að uppfæra gestaaðgang þessa svæðis",
+    "Add some details to help people recognise it.": "Bættu við nánari atriðum svo fólk eigi auðveldara með að þekkja þetta.",
+    "To join a space you'll need an invite.": "Til að ganga til liðs við svæði þarftu boð.",
+    "Previous recently visited room or space": "Fyrra nýlega heimsótt spjallrás eða svæði",
+    "Toggle Link": "Víxla tengli af/á",
+    "Toggle Code Block": "Víxla kóðablokk af/á",
+    "Unable to set up secret storage": "Tókst ekki að setja upp leynigeymslu",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Tryggðu þig gegn því að missa aðgang að dulrituðum skilaboðum og gögnum með því að taka öryggisafrit af dulritunarlyklunum á netþjóninum þinum.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Notaðu leynilegan frasa eða setningu sem aðeins þú þekkir, og útbúðu öryggislykil fyrir öryggisafrit.",
+    "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Við munum útbúa öryggislykil fyrir þig til að geyma á öruggum stað, eins og í lykilorðastýringu eða jafnvel í peningaskáp.",
+    "Set up Secure Message Recovery": "Setja upp örugga endurheimtu skilaboða",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Án þess að setja upp örugga endurheimtu skilaboða, muntu ekki geta endurheimt feril dulritaðra skilaboða ef þú skráir þig út eða notar aðra setu.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Verið er að öryggisafrita dulritunarlyklana þína (öryggisafritun getur tekið dálítinn tíma í fyrsta skiptið).",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Afritaðu hann</b> á einkageymslu sem þú átt í tölvuskýi",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Vistaðu hann</b> á USB-lykil eða öryggisdisk",
+    "<b>Print it</b> and store it somewhere safe": "<b>Prentaðu hann</b> og geymdu á öruggum stað",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Öryggislykillinn þinn hefur verið <b>afritaður á klippispjaldið þitt</b>, límdu hann á:",
+    "Repeat your Security Phrase...": "Endurtaktu öryggisfrasann þinn...",
+    "Go back to set it again.": "Farðu til baka til að setja hann aftur.",
+    "Set up with a Security Key": "Setja upp með öryggislykli",
+    "Great! This Security Phrase looks strong enough.": "Frábært! Þessi öryggisfrasi virðist vera nógu sterkur.",
+    "Failed to re-authenticate due to a homeserver problem": "Tókst ekki að endurauðkenna vegna vandamála með heimaþjón",
+    "Verify with another device": "Sannreyna með öðru tæki",
+    "Verify with Security Key": "Sannreyna með öryggislykli",
+    "Verify with Security Key or Phrase": "Sannreyna með öryggisfrasa",
+    "Proceed with reset": "Halda áfram með endurstillingu",
+    "Decide where your account is hosted": "Ákveddu hvar aðgangurinn þinn er hýstur",
+    "You can now close this window or <a>log in</a> to your new account.": "Þú mátt núna loka þessum glugga eða <a>skráð þig inn</a> í nýja notandaaðganginn þinn.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Nýi aðgangurinn þinn (%(newAccountId)s) er skráður, eð þú ert þegar skráð/ur inn á öðrum notandaaðgangi (%(loggedInUserId)s).",
+    "Already have an account? <a>Sign in here</a>": "Ert þú með aðgang? <a>Skráðu þig inn hér</a>",
+    "That e-mail address is already in use.": "Þetta tölvupóstfang er nú þegar í notkun.",
+    "This server does not support authentication with a phone number.": "Þessi netþjónn styður ekki auðkenningu með símanúmeri.",
+    "Registration has been disabled on this homeserver.": "Nýskráning hefur verið gerð óvirk á þessum heimaþjóni.",
+    "There was a problem communicating with the homeserver, please try again later.": "Vandamál kom upp í samskiptunum við heimaþjóninn, reyndu aftur síðar.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Athugaðu að þú ert að skrá þig inn á %(hs)s þjóninn, ekki inn á matrix.org.",
+    "This account has been deactivated.": "Þessi notandaaðgangur hefur verið gerður óvirkur.",
+    "This homeserver does not support login using email address.": "Þessi heimaþjónn styður ekki innskráningu með tölvupóstfangi.",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Slóð heimaþjóns virðist ekki beina á gildan heimaþjón",
+    "Really reset verification keys?": "Viltu í alvörunni endurstilla sannvottunarlyklana?",
+    "Use email to optionally be discoverable by existing contacts.": "Notaðu tölvupóstfang til að geta verið finnanleg/ur fyrir tengiliðina þína.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Notaðu tölvupóstfang eða símanúmer til að geta verið finnanleg/ur fyrir tengiliðina þína.",
+    "For security, this session has been signed out. Please sign in again.": "Í öryggisskyni hefur verið skráð út þessari setu. Skráðu þig aftur inn.",
+    "We're getting closer to releasing a public Beta for Threads.": "Við erum að nálgast útgáfu á opinberri Beta-prófunarútgáfu með spjallþráðum.",
+    "Threads Approaching Beta 🎉": "Spjallþræðir í bráðlegri Beta-útgáfu 🎉",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ertu viss um að þú viljir yfirgefa spjallrásina '%(roomName)s'?",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Ertu viss um að þú viljir yfirgefa svæðið '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Þetta svæði er ekki opinbert. Þú munt ekki geta tekið aftur þátt nema að vera boðið.",
+    "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Þú ert eini eintaklingurinn hérna. Ef þú ferð út, mun enginn framar geta tekið þátt, að þér meðtöldum.",
+    "Add an email to be able to reset your password.": "Bættu við tölvupóstfangi til að geta endurstillt lykilorðið þitt.",
+    "Thread options": "Valkostir spjallþráðar",
+    "No verification requests found": "Engar staðfestingarbeiðnir fundust",
+    "Observe only": "Aðeins fylgjast með",
+    "Values at explicit levels in this room:": "Gildi á skilgreindum stigum í þessari spjallrás:",
+    "Values at explicit levels:": "Gildi á skilgreindum stigum:",
+    "Values at explicit levels in this room": "Gildi á skilgreindum stigum í þessari spjallrás",
+    "Values at explicit levels": "Gildi á skilgreindum stigum",
+    "Settable at room": "Stillanlegt fyrir hverja spjallrás",
+    "Settable at global": "Stillanlegt víðvært",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Þetta viðmót athugar EKKI tegundir gildanna. Notist á eigin ábyrgð.",
+    "Save setting values": "Vista gildi valkosta",
+    "Unable to load backup status": "Tókst ekki að hlaða inn stöðu öryggisafritunar dulritunarlykla",
+    "%(completed)s of %(total)s keys restored": "%(completed)s af %(total)s lyklum endurheimtir",
+    "Restoring keys from backup": "Endurheimti lykla úr öryggisafriti",
+    "Unable to set up keys": "Tókst ekki að setja upp lykla",
+    "Allow this widget to verify your identity": "Leyfa þessum viðmótshluta að sannreyna auðkennin þín",
+    "Remember my selection for this widget": "Muna val mitt fyrir þennan viðmótshluta",
+    "Upload files (%(current)s of %(total)s)": "Senda inn skrár (%(current)s oaf %(total)s)",
+    "We encountered an error trying to restore your previous session.": "Villa kom upp þegar reynt var að endurheimta fyrri setuna þína.",
+    "A connection error occurred while trying to contact the server.": "Villa kom upp þegar reynt var að tengjast þjóninum.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Öryggi dulritaðra skilaboða er tryggt með enda-í-enda dulritun. Einungis þú og viðtakendurnir hafa dulritunarlyklana til að lesa slík skilaboð.",
+    "%(brand)s encountered an error during upload of:": "%(brand)s rakst á villu við innsendingu á:",
+    "Unknown error fetching location. Please try again later.": "Óþekkt villa kom upp við að sækja staðsetningu. Reyndu aftur síðar.",
+    "You cancelled verification on your other device.": "Þú hættir við sannvottun á hinu tækinu þínu.",
+    "Start verification again from their profile.": "Hefja sannvottun aftur úr notandasniði viðkomandi.",
+    "Start verification again from the notification.": "Hefja sannvottun aftur úr tilkynningunni.",
+    "You've successfully verified %(displayName)s!": "Þér hefur tekist að sannreyna %(displayName)s!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Þér hefur tekist að sannreyna %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified your device!": "Þér hefur tekist að sannreyna tækið þitt!",
+    "In encrypted rooms, verify all users to ensure it's secure.": "Í dulrituðum spjallrásum skaltu sannreyna alla notendur til að tryggja að hún sé örugg.",
+    "Verify all users in a room to ensure it's secure.": "Sannreyndu alla notendur á spjallrás til að tryggja að hún sé örugg.",
+    "Verify by emoji": "Sannprófa með táknmyndum",
+    "Verify by comparing unique emoji.": "Sannprófaðu með því að bera saman einstakar táknmyndir.",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ef þú getur ekki skannað kóðann hér fyrir ofan, skaltu sannprófa með því að bera saman einstakar táknmyndir.",
+    "Verify by scanning": "Sannprófa með skönnun",
+    "Verify this device by completing one of the following:": "Sannreyndu þetta tæki með því að ljúka einu af eftirtöldu:",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Berðu saman einstakar táknmyndir ef ekki er myndavél á tækjunum",
+    "Scan this unique code": "Skanna þennan einstaka kóða",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Villa kom upp við að breyta valdastigi notandans. Athugaðu hvort þú hafir nægilegar heimildir og prófaðu aftur.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Villa kom upp við að breyta kröfum spjallrásarinnar um valdastig. Athugaðu hvort þú hafir nægilegar heimildir og prófaðu aftur.",
+    "Unexpected server error trying to leave the room": "Óvænt villa kom upp við að reyna að yfirgefa spjallrásina",
+    "It's just you at the moment, it will be even better with others.": "Í augnablikinu ert þetta bara þú, þetta verður enn betra með fleirum.",
+    "What do you want to organise?": "Hvað viltu skipuleggja?",
+    "To view %(spaceName)s, you need an invite": "Til að skoða %(spaceName)s þarftu boð",
+    "Some of your messages have not been sent": "Sum skilaboðin þín hafa ekki verið send",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Skilaboðin þín voru ekki send vegna þess að þessi heimaþjónn er kominn fram yfir takmörk á notuðum tilföngum. Hafðu <a>samband við kerfisstjóra þjónustunnar þinnar</a> til að halda áfram að nota þjónustuna.",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Skilaboðin þín voru ekki send vegna þess að lokað hefur verið á þennan heimaþjón af kerfisstjóra þjónsins. Hafðu <a>samband við kerfisstjóra þjónustunnar þinnar</a> til að halda áfram að nota þjónustuna.",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Skilaboðin þín voru ekki send vegna þess að þessi heimaþjónn er kominn fram yfir takmörk á mánaðarlega virkum notendum. Hafðu <a>samband við kerfisstjóra þjónustunnar þinnar</a> til að halda áfram að nota þjónustuna.",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s kann ekki að ganga til liðs við spjallrásir á þessu netkerfi",
+    "Unable to join network": "Mistókst að ganga til liðs við netkerfi",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s tókst ekki að sækja listann yfir samskiptamáta frá heimaþjóninum. Heimaþjónninn gæti verið of gömul útgáfa til að styðja við utanaðkomandi netkerfi.",
+    "We're testing a new search to make finding what you want quicker.\n": "Við erum að prófa nýja leit svo þú finnir fyrr það sem þú vilt.\n",
+    "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "Ef þú veist hvað þú átt að gera, þá er Element með opinn grunnkóða; þú getur alltaf skoðað kóðann á GitHub (https://github.com/vector-im/element-web/) og lagt þitt af mörkum!",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Hengdu við skrár úr spjalli eða bara dragðu þær og slepptu einhversstaðar á spjallrásina.",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Vantar captcha fyrir dreifilykil í uppsetningu heimaþjónsins. Tilkynntu þetta til kerfisstjóra heimaþjónsins þíns.",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Sé viðmótshluta eytt hverfur hann hjá öllum notendum í þessari spjallrás. Ertu viss um að þú viljir eyða þessum viðmótshluta?",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Þú getur líka sett upp varið öryggisafrit og sýslað með dulritunarlykla í stillingunum.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "Geymdu öryggislykilinn þinn á öruggum stað, eins og í lykilorðastýringu eða jafnvel í peningaskáp, þar sem hann er notaður til að verja gögnin þín.",
+    "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "Settu inn öryggisfrasa sem aðeins þú þekkir, þetta er notað til að verja gögnin þín. Til að gæta fyllsta öryggis ættirðu ekki að endurnýta lykilorð notandaaðgangsins þíns.",
+    "For maximum security, this should be different from your account password.": "Til að gæta fyllsta öryggis ætti þetta að vera eitthvað annað enm lykilorð notandaaðgangsins þíns.",
+    "You seem to be in a call, are you sure you want to quit?": "Það lítur út eins og þú sért í símtali, ertu viss um að þú viljir hætta?",
+    "You seem to be uploading files, are you sure you want to quit?": "Það lítur út eins og þú sért að senda inn skrár, ertu viss um að þú viljir hætta?",
+    "Other users can invite you to rooms using your contact details": "Aðrir notendur geta boðið þér á spjallrásir með því að nota nánari tengiliðaupplýsingar þínar",
+    "That phone number doesn't look quite right, please check and try again": "Þetta símanúmer lítur ekki rétt út, yfirfarðu það og prófaðu svo aftur",
+    "We <Bold>don't</Bold> share information with third parties": "Við deilum <Bold>ekki</Bold> upplýsingum með utanaðkomandi aðilum",
+    "We <Bold>don't</Bold> record or profile any account data": "Við skráum <Bold>ekki</Bold> eða búum til snið með gögnum notendaaðganga",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Hjálpaðu okkur við að greina vandamál og bæta %(analyticsOwner)s með því að deila nafnlausum gögnum varðandi notkun. Til að skilja hvernig fólk notar saman mörg tæki, munum við útbúa tilviljanakennt auðkenni, sem tækin þín deila.",
+    "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "Þú getur lesið skilmálana okkar <PrivacyPolicyUrl>hér</PrivacyPolicyUrl>",
+    "Adding spaces has moved.": "Aðgerðin til að bæta við svæðum hefur verið flutt.",
+    "You are not allowed to view this server's rooms list": "Þú hefur ekki heimild til að skoða spjallrásalistann á þessum netþjóni",
+    "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Ertu til í eitthvað spennandi? Að taka þátt í tilraunum gefur færi á að sjá nýja hluti fyrr, prófa nýja eiginleika og vera með í að móta þá áður en þeir fara í almenna notkun. <a>Kannaðu þetta nánar</a>.",
+    "Your access token gives full access to your account. Do not share it with anyone.": "Aðgangsteiknið þitt gefur fullan aðgang að notandaaðgangnum þínum. Ekki deila því með neinum.",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Atvikaskrár innihalda gögn varðandi virkni hugbúnaðarins en líka notandanafn þitt, auðkenni eða samnefni spjallrása sem þú hefur skoðað, hvaða viðmótshluta þú hefur átt við, auk notendanafna annarra notenda. Atvikaskrár innihalda ekki skilaboð.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Ef þú hefur tilkynnt vandamál í gegnum GitHub, þá geta atvikaskrár hjálpað okkur við að finna ástæður vandamálanna. ",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Aðgangurinn þinn er með auðkenni kross-undirritunar í leynigeymslu, en þessu er ekki ennþá treyst í þessari setu.",
+    "Safeguard against losing access to encrypted messages & data": "Tryggðu þig gegn því að missa aðgang að dulrituðum skilaboðum og gögnum",
+    "Unable to query secret storage status": "Tókst ekki að finna stöðu á leynigeymslu",
+    "Unable to restore backup": "Tekst ekki að endurheimta öryggisafrit",
+    "Upload %(count)s other files|one": "Senda inn %(count)s skrá til viðbótar",
+    "Upload %(count)s other files|other": "Senda inn %(count)s skrár til viðbótar",
+    "Use \"%(query)s\" to search": "Notaðu \"%(query)s\" til að leita",
+    "Sections to show": "Hlutar sem á að sýna",
+    "The server has denied your request.": "Þjóninum hefur hafnað beiðninni þinni.",
+    "The server is offline.": "Netþjónninn er ekki tengdur.",
+    "A browser extension is preventing the request.": "Vafraviðbót kemur í veg fyrir beiðnina.",
+    "Your firewall or anti-virus is blocking the request.": "Eldveggur eða vírusvarnarforrit kemur í veg fyrir beiðnina.",
+    "The server (%(serverName)s) took too long to respond.": "Þjónninn (%(serverName)s) var of lengi að svara.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Netþjónninn þinn er ekki að svara sumum beiðnum frá þér. Hér fyrir neðan eru sumar líklegustu ástæðurnar.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Þú munt uppfæra þessa spjallrás úr <oldVersion /> upp í <newVersion />.",
+    "Their device couldn't start the camera or microphone": "Hitt tækið gat ekki ræst myndavélina eða hljóðnemann",
+    "Could not connect media": "Gat ekki tengt gagnamiðil",
+    "Almost there! Is %(displayName)s showing the same shield?": "Næstum því búið! Sýnir %(displayName)s sama skjöldinn?",
+    "Almost there! Is your other device showing the same shield?": "Næstum því búið! Sýnir hitt tækið þitt sama skjöldinn?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að gefa notandanum jafn mikil völd og þú hefur sjálf/ur.",
+    "Failed to change power level": "Mistókst að breyta valdastigi",
+    "You can only pin up to %(count)s widgets|other": "Þú getur bara fest allt að %(count)s viðmótshluta",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Öryggi skilaboðanna þinna er tryggt og einungis þú og viðtakendurnir hafa dulritunarlyklana til að opna skilaboðin.",
+    "Waiting for %(displayName)s to accept…": "Bíð eftir að %(displayName)s samþykki…",
+    "Your area is experiencing difficulties connecting to the internet.": "Landssvæðið þar sem þú ert á í vandræðum með að tengjast við internetið.",
+    "Upgrade Room Version": "Uppfæra útgáfu spjallrásar",
+    "Upgrade this room to version %(version)s": "Uppfæra þessa spjallrás í útgáfu %(version)s",
+    "The room upgrade could not be completed": "Ekki tókst að ljúka uppfærslu spjallrásarinnar",
+    "Data on this screen is shared with %(widgetDomain)s": "Gögnum á þessum skjá er deilt með %(widgetDomain)s",
+    "You are about to leave <spaceName/>.": "Þú ert í þann mund að yfirgefa <spaceName/>.",
+    "Automatically invite members from this room to the new one": "Bjóða meðlimum á þessari spjallrás sjálfvirkt yfir í þá nýju",
+    "Create a new room with the same name, description and avatar": "Búa til nýja spjallrás með sama heiti, lýsingu og auðkennismynd",
+    "Please pick a nature and describe what makes this message abusive.": "Veldu ástæðu og lýstu því hvað gerir þessi skilaboð ótæk.",
+    "Any other reason. Please describe the problem.\nThis will be reported to the room moderators.": "Einhver önnur ástæða. Lýstu vandamálinu.\nÞetta verður tilkynnt til umsjónarmanna spjallrásarinnar.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Þessi spjallrás er tileinkuð ólöglegu eða eitruðu efni eða skorti á viðbrögðum umsjónarmanna gagnvart ólöglegu eða eitruðu efni.\nÞetta verður tilkynnt til stjórnenda %(homeserver)s.",
+    "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\nThis will be reported to the administrators of %(homeserver)s. The administrators will NOT be able to read the encrypted content of this room.": "Þessi spjallrás er tileinkuð ólöglegu eða eitruðu efni eða skorti á viðbrögðum umsjónarmanna gagnvart ólöglegu eða eitruðu efni.\nÞetta verður tilkynnt til stjórnenda %(homeserver)s. Kerfisstjórarnir geta EKKI LESIÐ dulritað efni þessarar spjallrásar.",
+    "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Þessi notandi er að dreifa auglýsingum inn á spjallrásina, tenglum á auglýsingar eða áróður.\nÞetta verður tilkynnt til umsjónarmanna spjallrásarinnar.",
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Þessi notandi er að sýna ólöglega hegðun, til dæmis með því að hrella aðra notendur eða hóta ofbeldi.\nÞetta verður tilkynnt til umsjónarmanna spjallrásarinnar, sem gætu þurft að tilkynna þetta til viðeigandi yfirvalda.",
+    "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Þessi notandi er að sýna eitraða hegðun, til dæmis með því að móðga aðra notendur eða birta óviðeigandi efni á fjölskylduvænni spjallrás eða á annan hátt að brjóta reglur spjallrásarinnar.\nÞetta verður tilkynnt til umsjónarmanna spjallrásarinnar.",
+    "What this user is writing is wrong.\nThis will be reported to the room moderators.": "Það sem notandinn er að skrifa sem er rangt.\nÞetta verður tilkynnt til umsjónarmanna spjallrásarinnar.",
+    "Please fill why you're reporting.": "Fylltu út skýringu á því hvers vegna þú ert að kæra.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Bara til að minna á; ef þú gleymir lykilorðinu þínu, <b>þá er engin leið til að endurheimta aðganginn þinn</b>.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s fjarlægði aðalvistfang spjallrásarinnar.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s stillti aðalvistfang spjallrásarinnar sem %(address)s.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s stillti ACL á netþjóni fyrir þessa spjallrás.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s hefur bannað gestum að koma inn á spjallrásina.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s hefur leyft gestum að koma inn á spjallrásina.",
+    "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s breytti því hverjir geta tekið þátt í þessari spjallrás.",
+    "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s breytti því hverjir geta tekið þátt í þessari spjallrás. <a>Skoða stillingar</a>.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s gerði spjallrás einungis aðgengilega gegn boði.",
+    "Displays list of commands with usages and descriptions": "Birtir lista yfir skipanir með notkunarleiðbeiningum og lýsingum",
+    "Sends the given emote coloured as a rainbow": "Sendir uppgefna tjáningu litaða sem regnboga",
+    "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "Óþekkt pörun (notandi, seta): (%(userId)s, %(deviceId)s)",
+    "See when the avatar changes in your active room": "Sjá þegar auðkennismynd virku spjallrásarinnar þinnar breytist",
+    "See when the avatar changes in this room": "Sjá þegar auðkennismynd þessarar spjallrásar breytist",
+    "See when the name changes in your active room": "Sjá þegar heiti virku spjallrásarinnar þinnar breytist",
+    "See when the name changes in this room": "Sjá þegar heiti þessarar spjallrásar breytist",
+    "See when the topic changes in your active room": "Sjá þegar umfjöllunarefni virku spjallrásarinnar þinnar breytist",
+    "See when the topic changes in this room": "Sjá þegar umfjöllunarefni þessarar spjallrásar breytist",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s úr %(fromPowerLevel)s til %(toPowerLevel)s",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir óþekkta (%(visibility)s).",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir alla.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir alla meðlimi spjallrásarinnar.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir alla meðlimi spjallrásarinnar síðan þeir skráðu sig.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir alla meðlimi spjallrásarinnar síðan þeim var boðið.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendi boð til %(targetDisplayName)s um þátttöku í spjallrásinni.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s afturkallaði boð til %(targetDisplayName)s um þátttöku í spjallrásinni.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjarlægði varavistfangið %(addresses)s af þessari spjallrás.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s fjarlægði varavistföngin %(addresses)s af þessari spjallrás.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bætti við varavistfanginu %(addresses)s fyrir þessa spjallrás.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bætti við varavistföngunum %(addresses)s fyrir þessa spjallrás.",
+    "Failed to join": "Mistókst að taka þátt",
+    "The person who invited you has already left, or their server is offline.": "Aðilinn sem bauð þér er þegar farinn eða að netþjónninn hans/hennar er ekki tengdur.",
+    "The person who invited you has already left.": "Aðilinn sem bauð þér er þegar farinn.",
+    "Sorry, your homeserver is too old to participate here.": "Því miður, heimaþjónninn þinn er of gamall til að taka þátt í þessu.",
+    "There was an error joining.": "Það kom upp villa við að taka þátt.",
+    "The user's homeserver does not support the version of the space.": "Heimaþjónn notandans styður ekki útgáfu svæðisins.",
+    "User may or may not exist": "Notandinn gæti verið til eða ekki",
+    "User does not exist": "Notandinn er ekki til",
+    "User is already in the room": "Notandinn er nú þegar á spjallrásinni",
+    "User is already in the space": "Notandinn er nú þegar á svæðinu",
+    "User is already invited to the room": "Notandanum hefur nú þegar verið boðið á spjallrásina",
+    "User is already invited to the space": "Notandanum hefur nú þegar verið boðið á svæðið",
+    "You do not have permission to invite people to this space.": "Þú hefur ekki heimild til að bjóða fólk á þetta svæði.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Biddu kerfisstjórann á %(brand)s að athuga hvort <a>uppsetningin þín</a> innihaldi rangar eða tvíteknar færslur.",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Gakktu úr skugga um að þú hafir stöðuga nettengingu, eða hafðu samband við kerfisstjóra netþjónsins þíns",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Sjá <b>%(msgtype)s</b> skilaboð sem birtast í virku spjallrásina þinni",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Sjá <b>%(msgtype)s</b> skilaboð sem birtast í þessari spjallrás",
+    "See general files posted to your active room": "Sjá almennar skrár sem birtast í virku spjallrásina þinni",
+    "See general files posted to this room": "Sjá almennar skrár sem birtast í þessari spjallrás",
+    "Send general files as you in your active room": "Senda almennar skrár sem þú á virku spjallrásina þína",
+    "Send general files as you in this room": "Senda almennar skrár sem þú í þessari spjallrás",
+    "See videos posted to your active room": "Sjá myndskeið sem birtast í virku spjallrásina þinni",
+    "See videos posted to this room": "Sjá myndskeið sem birtast í þessari spjallrás",
+    "Send videos as you in your active room": "Senda myndskeið sem þú á virku spjallrásina þína",
+    "Send videos as you in this room": "Senda myndskeið sem þú í þessari spjallrás",
+    "See images posted to your active room": "Sjá myndir sem birtast í virku spjallrásina þinni",
+    "See images posted to this room": "Sjá myndir sem birtast í þessari spjallrás",
+    "Send images as you in your active room": "Senda myndir sem þú á virku spjallrásina þína",
+    "Send images as you in this room": "Senda myndir sem þú í þessari spjallrás",
+    "See emotes posted to your active room": "Sjá tjáningar sem birtast í virku spjallrásina þinni",
+    "See emotes posted to this room": "Sjá tjáningar sem birtast í þessari spjallrás",
+    "Send emotes as you in your active room": "Senda tjáningu sem þú á virku spjallrásina þína",
+    "Send emotes as you in this room": "Senda tjáningu sem þú í þessari spjallrás",
+    "See text messages posted to your active room": "Sjá textaskilaboð sem birtast í virku spjallrásina þinni",
+    "See text messages posted to this room": "Sjá textaskilaboð sem birtast í þessari spjallrás",
+    "See messages posted to your active room": "Sjá skilaboð sem birtast í virku spjallrásina þinni",
+    "See messages posted to this room": "Sjá skilaboð sem birtast í þessari spjallrás",
+    "See when anyone posts a sticker to your active room": "Sjá þegar límmerki er birt í virku spjallrásinni þinni",
+    "See when a sticker is posted in this room": "Sjá þegar límmerki er birt í þessari spjallrás",
+    "See when people join, leave, or are invited to your active room": "Sjá þegar fólk tekur þátt, yfirgefur eða er boðið á virku spjallrásina þína",
+    "See when people join, leave, or are invited to this room": "Sjá þegar fólk tekur þátt, yfirgefur eða er boðið á þessa spjallrás",
+    "View older version of %(spaceName)s.": "Skoða eldri útgáfu af %(spaceName)s.",
+    "Upgrade this room to the recommended room version": "Uppfæra þessa spjallrás í þá útgáfu spjallrásar sem mælt er með",
+    "Upgrade this space to the recommended room version": "Uppfæra þetta svæði í þá útgáfu spjallrásar sem mælt er með",
+    "Request media permissions": "Biðja um heimildir fyrir myndefni",
+    "Voice & video rooms (under active development)": "Tal- og myndspjallrásir (í virkri þróun)",
+    "Stop sharing and close": "Hætta deilingu og loka",
+    "Sign out and remove encryption keys?": "Skrá út og fjarlægja dulritunarlykla?",
+    "Want to add an existing space instead?": "Viltu frekar bæta við fyrirliggjandi svæði?",
+    "Add a space to a space you manage.": "Bættu svæði við eitthvað svæði sem þú stýrir.",
+    "Preserve system messages": "Geyma kerfisskilaboð",
+    "To leave the beta, visit your settings.": "Til að hætta í beta-prófunarútgáfunni, skaltu fara í stillingarnar þínar.",
+    "Widgets do not use message encryption.": "Viðmótshlutar nota ekki dulritun skilaboða.",
+    "What location type do you want to share?": "Hvaða gerð staðsetningar vilt þú deila?",
+    "We couldn't send your location": "Við gátum ekki sent staðsetninguna þína",
+    "Timed out trying to fetch your location. Please try again later.": "Rann út á tíma við að sækja staðsetninguna þína. Reyndu aftur síðar.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s hefur ekki heimildir til að ná í staðsetninguna þína. Leyfðu aðgang að staðsetningum í stillingum vafrans þíns.",
+    "They won't be able to access whatever you're not an admin of.": "Viðkomandi munu ekki hafa aðgang að því sem þú ert ekki stjórnandi fyrir.",
+    "They'll still be able to access whatever you're not an admin of.": "Viðkomandi munu eftir sem áður hafa aðgang að hverju því sem þú ert ekki stjórnandi fyrir.",
+    "No virtual room for this room": "Engin sýndarspjallrás fyrir þessa spjallrás",
+    "Switches to this room's virtual room, if it has one": "Skiptir yfir í sýndarspjallrás þessarar spjallrásar, ef hún er til staðar",
+    "Please supply a widget URL or embed code": "Gefðu upp slóð á viðmótshluta eða ívefðu kóða",
+    "Adds a custom widget by URL to the room": "Bætir sérsniðnum viðmótshluta við með slóð í spjallrásina",
+    "Opens the Developer Tools dialog": "Opnar valmyndina fyrir forritunartól",
+    "Ban them from specific things I'm able to": "Banna viðkomandi frá því að gera tiltekna hluti sem ég get gert",
+    "Unban them from specific things I'm able to": "Afturkalla bann viðkomandi frá því að gera tiltekna hluti sem ég get gert",
+    "Ban them from everything I'm able to": "Banna viðkomandi frá því að gera allt það sem ég get gert",
+    "Unban them from everything I'm able to": "Afturkalla bann viðkomandi frá því að gera allt það sem ég get gert",
+    "Remove them from specific things I'm able to": "Fjarlægja viðkomandi úr tilteknum hlutum sem ég get gert",
+    "Remove them from everything I'm able to": "Fjarlægja viðkomandi úr öllu því sem ég get gert",
+    "Remove from %(roomName)s": "Fjarlægja úr %(roomName)s",
+    "Disinvite from %(roomName)s": "Afturkalla boð á %(roomName)s",
+    "You don't have permission to delete the address.": "Þú hefur ekki heimild til að eyða vistfanginu.",
+    "Unable to access your microphone": "Mistókst að ná aðgangi að hljóðnema",
+    "You don't currently have any stickerpacks enabled": "Í augnablikinu ertu ekki með neina límmerkjapakka virkjaða",
+    "This room has already been upgraded.": "Þessi spjallrás hefur þegar verið uppfærð.",
+    "This room or space is not accessible at this time.": "Þessi spjallrás eða svæði er ekki aðgengilegt í augnablikinu.",
+    "Are you sure you're at the right place?": "Ertu viss um að þú sért á réttum stað?",
+    "This room or space does not exist.": "Þessi spjallrás eða svæði er ekki til.",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Ekki er hægt að forskoða %(roomName)s. Viltu taka þátt í henni?",
+    "You're previewing %(roomName)s. Want to join it?": "Þú ert að forskoða %(roomName)s. Viltu taka þátt í henni?",
+    "This invite was sent to %(email)s": "Þetta boð var sent til %(email)s",
+    "Something went wrong with your invite.": "Eitthvað fór úrskeiðis varðandi boðið þitt.",
+    "Something went wrong with your invite to %(roomName)s": "Eitthvað fór úrskeiðis varðandi boðið þitt á %(roomName)s",
+    "You were banned by %(memberName)s": "Þú hefur verið settur í bann af %(memberName)s",
+    "Forget this space": "Gleyma þessu svæði",
+    "You were removed by %(memberName)s": "Þú hefur verið fjarlægð/ur af %(memberName)s",
+    "Loading preview": "Hleð inn forskoðun",
+    "Joining …": "Geng í hópinn …",
+    "This message cannot be decrypted": "Þessi skilaboð er ekki hægt að afkóða",
+    "To link to this room, please add an address.": "Til að tengja við þessa spjallrás skaltu bæta við vistfangi.",
+    "Send stickers to your active room as you": "Senda límmerki sem þú á virku spjallrásina þína",
+    "Failed to invite users to %(roomName)s": "Mistókst að bjóða notendum í %(roomName)s",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s losaði <a>skilaboð</a> af þessari spjallrás. Skoða öll <b>fest skilaboð</b>.",
+    "See <b>%(eventType)s</b> events posted to your active room": "Sjá <b>%(eventType)s</b> atburði sem birtast í virku spjallrásina þinni",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Senda <b>%(eventType)s</b> atburði sem þú á virku spjallrásina þína",
+    "See <b>%(eventType)s</b> events posted to this room": "Sjá <b>%(eventType)s</b> atburði sem birtast í þessari spjallrás",
+    "Send <b>%(eventType)s</b> events as you in this room": "Senda <b>%(eventType)s</b> atburði sem þú á þessa spjallrás",
+    "The above, but in <Room /> as well": "Ofangreint, en einnig í <Room />",
+    "The above, but in any room you are joined or invited to as well": "Ofangreint, en einnig í hverri þeirri spjallrás sem þú tekur þátt í eða hefur verið boðið að taka þátt í",
+    "with state key %(stateKey)s": "með stöðulykli %(stateKey)s",
+    "with an empty state key": "með tómum stöðulykli",
+    "Remove, ban, or invite people to your active room, and make you leave": "Fjarlægðu, bannaðu eða bjóddu fólki í virku spjallrásina þína auk þess að þú getur yfirgefið hana",
+    "Remove, ban, or invite people to this room, and make you leave": "Fjarlægðu, bannaðu eða bjóddu fólki í þessa spjallrás auk þess að þú getur yfirgefið hana",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s bjó til bannreglu samsvarar %(glob)s, vegna %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s bjó til reglu sem bannar netþjóna sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s bjó til reglu sem bannar spjallrásir sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s bjó til reglu sem bannar notendur sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s uppfærði bannreglu sem samsvarar %(glob)s, vegna %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s uppfærði regluna sem bannar netþjóna sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s uppfærði regluna sem bannar spjallrásir sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s uppfærði regluna sem bannar notendur sem samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s fjarlægði ógilda bannreglu",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s fjarlægði bannreglu sem samsvarar %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s fjarlægði regluna sem bannar netþjóna sem samsvara %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s fjarlægði regluna sem bannar spjallrásir sem samsvara %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s fjarlægði regluna sem bannar notendur sem samsvara %(glob)s",
+    "%(senderName)s has updated the room layout": "%(senderName)s hefur uppfært framsetningu spjallrásarinnar",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s viðmótshluti var fjarlægður af %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s viðmótshluta var bætt við af %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s viðmótshluta var breytt af %(senderName)s",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)s losaði skilaboð af þessari spjallrás. Skoðaðu öll fest skilaboð.",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)s festi skilaboð í þessari spjallrás. Skoðaðu öll fest skilaboð.",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)s festi <a>skilaboð</a> í þessari spjallrás. Skoða öll <b>fest skilaboð</b>.",
+    "Consult first": "Ráðfæra fyrst",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Þú ert áfram að <b>deila persónulegum gögnum</b> á auðkenningarþjóninum <idserver />.",
+    "contact the administrators of identity server <idserver />": "að hafa samband við stjórnendur auðkennisþjónsins <idserver />",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "að yfirfara vafraviðbæturnar þínar ef vera kynni að einhverjar þeirra loki á auðkenningarþjóninn (eins og t.d. Privacy Badger)",
+    "The identity server you have chosen does not have any terms of service.": "Auðkennisþjónninn sem þú valdir er ekki með neina þjónustuskilmála.",
+    "Terms of service not accepted or the identity server is invalid.": "Þjónustuskilmálar eru ekki samþykktir eða að auðkennisþjónn er ógildur.",
+    "Connect this session to Key Backup": "Tengja þessa setu við öryggisafrit af lykli",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Ráðfæri við %(transferTarget)s. <a>Flytja á %(transferee)s</a>",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Þetta er listinn þinn yfir notendur/netþjóna sem þú hefur lokað á - ekki fara af spjallsvæðinu!",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Deiling staðsetninga í rautíma - deildu staðsetningunni þinni í rauntíma (í virkri þróun, tímabundið haldast staðsetningar í ferli spjallrása)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s í farsímavafra er á tilraunastigi. Til að fá eðlilegri hegðun og nýjustu eiginleikana, ættirðu að nota til þess gerða smáforritið okkar.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Heimaþjónninn er ekki rétt stilltur til að geta birt landakort, eða að uppsettur kortaþjónn er ekki aðgengilegur.",
+    "This homeserver is not configured to display maps.": "Heimaþjónninn er ekki stilltur til að birta landakort.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Þessi spjallrás er notuð fyrir mikilvæg skilaboð frá heimaþjóninum, þannig að þú getur ekki yfirgefið hana.",
+    "Can't leave Server Notices room": "Getur ekki yfirgefið spjallrásina fyrir tilkynningar frá netþjóni",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Þú getur ekki skráð þig inn á notandaaðganginn þinn. Hafðu samband við stjórnanda heimaþjónsins þíns til að fá frekari upplýsingar.",
+    "Sign in and regain access to your account.": "Skráðu þig inn og fáðu aftur aðgang að notandaaðgangnum þínum.",
+    "Enter your password to sign in and regain access to your account.": "Settu inn lykilorðið þitt til að skrá þig inn og fáðu aftur aðgang að notandaaðgangnum þínum.",
+    "Verifies a user, session, and pubkey tuple": "Sannreynir auðkenni notanda, setu og dreifilykils",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Heimaþjónninn þinn hafnaði því að skrá þig inn. Mögulega getur þetta stafað af því að hlutirnir taki of langan tíma. Prófaðu aftur. Ef þetta vandamál er viðvarandi, ættirðu að hafa samband við kerfisstjóra heimaþjónsins þíns.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Heimaþjónninn þinn er ekki til taks og var því ekki hægt að skrá þig inn. Prófaðu aftur. Ef þetta vandamál er viðvarandi, ættirðu að hafa samband við kerfisstjóra heimaþjónsins þíns.",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Við báðum vafrann þinn að muna hvaða heimaþjón þú notar til að skrá þig inn, en því miður virðist það hafa gleymst. Farðu á innskráningarsíðuna og reyndu aftur.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Þú ert að reyna að fylgja tengli á samfélagið (%(groupId)s).<br/>Samfélög eru ekki lengur studd og hafa svæði komið í staðinn.<br2/><a>Hér geturðu fræðst meira um svæði.</a>",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Við mælum með því að þú fjarlægir tölvupóstföngin þín og símanúmer af auðkennisþjóninum áður en þú aftengist.",
+    "This bridge is managed by <user />.": "Þessari brú er stýrt af <user />.",
+    "This bridge was provisioned by <user />.": "Brúin var veitt af <user />.",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Takk fyrir að prófa beta-forútgáfuna, settu inn eins mikið af smáatriðum og þú getur, þannig að við eigum auðveldara með að bæta þetta.",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "Frumgerð á kærum til umsjónarmanna. Í spjallrásum sem styðja eftirlit umsjónarmanna, mun 'Kæra'-hnappurinn gefa þér færi á að tilkynna misnotkun til umsjónarmanna spjallrása",
+    "Double check that your server supports the room version chosen and try again.": "Athugaðu vandlega hvort netþjónninn styðji ekki valda útgáfu spjallrása og reyndu aftur.",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s uppfærði bannreglu sem samsvarar %(oldGlob)s yfir í að samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s breytti reglu sem bannar netþjóna sem samsvara %(oldGlob)s yfir í að samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s breytti reglu sem bannar spjallrásir sem samsvara %(oldGlob)s yfir í að samsvara %(glob)s, vegna %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s breytti reglu sem bannar notendur sem samsvara %(oldGlob)s yfir í að samsvara %(glob)s, vegna %(reason)s",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Undirritunarlykillinn sem þú gafst upp samsvarar lyklinum sem þú fékkst frá %(userId)s og setunni %(deviceId)s. Setan er því merkt sem sannreynd.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AÐVÖRUN: SANNVOTTUN LYKILS MISTÓKST! Undirritunarlykillinn fyrir %(userId)s og setuna %(deviceId)s er \"%(fprint)s\" sem samsvarar ekki uppgefna lyklinum \"%(fingerprint)s\". Þetta gæti þýtt að einhver hafi komist inn í samskiptin þín!"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 315528ad6f8..fee5111aa60 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -3632,7 +3632,7 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sha inviato un messaggio nascosto",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sha inviato %(count)s messaggi nascosti",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)shanno inviato %(count)s un messaggio nascosto",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)shanno inviato un messaggio nascosto",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)shanno inviato %(count)s messaggi nascosti",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sha rimosso un messaggio",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sha rimosso %(count)s messaggi",
@@ -3654,5 +3654,192 @@
     "Open poll": "Apri sondaggio",
     "Poll type": "Tipo sondaggio",
     "Results will be visible when the poll is ended": "I risultati saranno visibili quando il sondaggio è terminato",
-    "Show current avatar and name for users in message history": "Mostra avatar e nome attuali degli utenti nella cronologia dei messaggi"
+    "Show current avatar and name for users in message history": "Mostra avatar e nome attuali degli utenti nella cronologia dei messaggi",
+    "Open thread": "Apri conversazione",
+    "Open user settings": "Apri impostazioni utente",
+    "Switch to space by number": "Passa allo spazio per numero",
+    "Next recently visited room or community": "Successiva stanza o comunità visitata di recente",
+    "Previous recently visited room or community": "Precedente stanza o comunità visitata di recente",
+    "Accessibility": "Accessibilità",
+    "Search Dialog": "Finestra di ricerca",
+    "Export Cancelled": "Esportazione annullata",
+    "What location type do you want to share?": "Che tipo di posizione vuoi condividere?",
+    "Drop a Pin": "Lascia una puntina",
+    "My live location": "La mia posizione in tempo reale",
+    "My current location": "La mia posizione attuale",
+    "Pinned": "Fissato",
+    "Remove messages sent by me": "Rimuovi i messaggi che ho inviato",
+    "Location sharing - pin drop (under active development)": "Condivisione posizione - puntina (in sviluppo attivo)",
+    "No virtual room for this room": "Nessuna stanza virtuale per questa stanza",
+    "Switches to this room's virtual room, if it has one": "Passa alla stanza virtuale di questa stanza, se ne ha una",
+    "Match system": "Sistema di corrispondenza",
+    "This is a beta feature. Click for more info": "Questa è una funzionalità beta. Clicca per maggiori info",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s non ha potuto inviare la tua posizione. Riprova più tardi.",
+    "We couldn't send your location": "Non siamo riusciti ad inviare la tua posizione",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Rispondi ad una conversazione in corso o usa \"%(replyInThread)s\" passando sopra ad un messaggio per iniziarne una nuova.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)shanno cambiato i <a>messaggi ancorati</a> della stanza",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sha cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)shanno cambiato i <a>messaggi ancorati</a> della stanza %(count)s volte",
+    "Insert a trailing colon after user mentions at the start of a message": "Inserisci dei due punti dopo le citazioni degli utenti all'inizio di un messaggio",
+    "Show polls button": "Mostra pulsante sondaggi",
+    "Location sharing - share your current location with live updates (under active development)": "Condivisione posizione - condividi la tua attuale posizione con aggiornamenti in tempo reale (in sviluppo attivo)",
+    "We'll create rooms for each of them.": "Creeremo stanze per ognuno di essi.",
+    "Click to drop a pin": "Clicca per lasciare una puntina",
+    "Click to move the pin": "Clicca per spostare la puntina",
+    "Click": "Click",
+    "Expand quotes": "Espandi le citazioni",
+    "Collapse quotes": "Riduci le citazioni",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Gli spazi sono un nuovo modo di raggruppare stanze e persone. Che tipo di spazio vuoi creare? Puoi cambiarlo in seguito.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Questo homeserver non è configurato correttamente per mostrare mappe, o il server di mappe configurato non è raggiungibile.",
+    "This homeserver is not configured to display maps.": "Questo homeserver non è configurato per mostrare mappe.",
+    "Shared a location: ": "Ha condiviso una posizione: ",
+    "Shared their location: ": "Ha condiviso la sua posizione: ",
+    "Unable to load map": "Impossibile caricare la mappa",
+    "Can't create a thread from an event with an existing relation": "Impossibile creare una conversazione da un evento con una relazione esistente",
+    "Busy": "Occupato",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Se hai inviato un errore via GitHub, i log di debug possono aiutarci ad individuare il problema. ",
+    "Toggle Link": "Attiva/disattiva collegamento",
+    "Toggle Code Block": "Attiva/disattiva blocco di codice",
+    "Thank you for helping us testing Threads!": "Grazie per averci aiutati a testare le conversazioni!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Tutti i messaggi in conversazioni creati durante il periodo sperimentale, ora verranno elencati nella linea temporale della stanza e mostrati come risposte. È una transizione una-tantum. Le conversazioni ora fanno parte delle specifiche di Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Di recente abbiamo introdotto miglioramenti importanti di stabilità per le conversazioni, perciò non sono più sperimentali.",
+    "Threads are no longer experimental! 🎉": "I messaggi in conversazioni non sono più sperimentali! 🎉",
+    "You are sharing your live location": "Stai condividendo la tua posizione in tempo reale",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Deseleziona se vuoi rimuovere anche i messaggi di sistema per questo utente (es. cambiamenti di sottoscrizione, modifiche al profilo…)",
+    "Preserve system messages": "Conserva i messaggi di sistema",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Stai per rimuovere %(count)s messaggio di %(user)s. Verrà rimosso permanentemente per chiunque nella conversazione. Vuoi continuare?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Stai per rimuovere %(count)s messaggi di %(user)s. Verranno rimossi permanentemente per chiunque nella conversazione. Vuoi continuare?",
+    "%(displayName)s's live location": "Posizione in tempo reale di %(displayName)s",
+    "Share for %(duration)s": "Condividi per %(duration)s",
+    "Currently removing messages in %(count)s rooms|one": "Rimozione di messaggi in corso in %(count)s stanza",
+    "Currently removing messages in %(count)s rooms|other": "Rimozione di messaggi in corso in %(count)s stanze",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)so",
+    "%(value)sd": "%(value)sg",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Sarà una transizione una-tantum, dato che le conversazioni ora sono parte delle specifiche di Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Mentre ci prepariamo, dobbiamo fare alcune modifiche: le conversazioni create prima di questo momento saranno <strong>mostrate come normali risposte</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Siamo vicini ad iniziare una beta pubblica delle conversazioni.",
+    "Threads Approaching Beta 🎉": "I messaggi in conversazioni entrano in beta 🎉",
+    "Stop sharing": "Non condividere più",
+    "You are sharing %(count)s live locations|one": "Stai condividendo la tua posizione in tempo reale",
+    "You are sharing %(count)s live locations|other": "Stai condividendo %(count)s posizioni in tempo reale",
+    "%(timeRemaining)s left": "%(timeRemaining)s rimasti",
+    "Next recently visited room or space": "Successiva stanza o spazio visitati di recente",
+    "Previous recently visited room or space": "Precedente stanza o spazio visitati di recente",
+    "Room details": "Dettagli stanza",
+    "Voice & video room": "Stanza vocale & video",
+    "Text room": "Stanza testuale",
+    "Room type": "Tipo stanza",
+    "Connecting...": "Connessione...",
+    "Voice room": "Stanza vocale",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati, gli ultimi elementi dell'interfaccia con cui hai interagito e i nomi degli altri utenti. Non contengono messaggi.",
+    "Mic": "Microfono",
+    "Mic off": "Microfono spento",
+    "Video off": "Video spento",
+    "Video": "Video",
+    "Connected": "Connesso",
+    "Voice & video rooms (under active development)": "Stanze vocali & video (in sviluppo attivo)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Stai cercando di accedere a un collegamento di una comunità (%(groupId)s).<br/>Le comunità non sono più supportate e sono state sostituite dagli spazi.<br2/><a>Maggiori informazioni sugli spazi qui.</a>",
+    "That link is no longer supported": "Quel collegamento non è più supportato",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, un ID utente, tali dati saranno rimossi prima di essere inviati al server.",
+    "Event ID: %(eventId)s": "ID evento: %(eventId)s",
+    "No verification requests found": "Nessuna richiesta di verifica trovata",
+    "Observe only": "Osserva solo",
+    "Requester": "Richiedente",
+    "Methods": "Metodi",
+    "Timeout": "Scadenza",
+    "Phase": "Fase",
+    "Transaction": "Transazione",
+    "Cancelled": "Annullato",
+    "Started": "Iniziato",
+    "Ready": "Pronto",
+    "Requested": "Richiesto",
+    "Unsent": "Non inviato",
+    "Edit values": "Modifica valori",
+    "Failed to save settings.": "Salvataggio impostazioni fallito.",
+    "Number of users": "Numero di utenti",
+    "Server": "Server",
+    "Server Versions": "Versioni server",
+    "Client Versions": "Versioni client",
+    "Failed to load.": "Caricamento fallito.",
+    "Capabilities": "Capacità",
+    "Send custom state event": "Invia evento di stato personalizzato",
+    "Failed to send event!": "Invio dell'evento fallito!",
+    "Doesn't look like valid JSON.": "Non sembra essere un JSON valido.",
+    "Send custom room account data event": "Invia evento dati di account della stanza personalizzato",
+    "Send custom account data event": "Invia evento dati di account personalizzato",
+    "Room ID: %(roomId)s": "ID stanza: %(roomId)s",
+    "Server info": "Info server",
+    "Settings explorer": "Esploratore di impostazioni",
+    "Verification explorer": "Esploratore di verifiche",
+    "Explore account data": "Esplora dati account",
+    "View servers in room": "Vedi i server nella stanza",
+    "Explore room account data": "Esplora i dati di account della stanza",
+    "Explore room state": "Esplora lo stato della stanza",
+    "Send custom timeline event": "Invia evento della linea temporale personalizzato",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Aiutaci a identificare problemi e a migliorare %(analyticsOwner)s condividendo dati di utilizzo anonimi. Per capire come le persone usano diversi dispositivi, genereremo un identificativo casuale, condiviso dai tuoi dispositivi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando un URL homeserver diverso. Ciò ti permette di usare %(brand)s con un account Matrix esistente su un homeserver differente.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s non ha l'autorizzazione per rilevare la tua posizione. Consenti l'accesso alla posizione nelle impostazioni del browser.",
+    "Developer tools": "Strumenti per sviluppatori",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s è sperimentale su un browser web mobile. Per un'esperienza migliore e le ultime funzionalità, usa la nostra app nativa gratuita.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Se non trovi la stanza che stai cercando, chiedi un invito o <a>crea una stanza nuova</a>.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Condivisione posizione in tempo reale - condividi la posizione attuale (in sviluppo attivo e, per ora, le posizioni restano nella cronologia della stanza)",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s si è verificato tentando di accedere alla stanza o spazio. Se pensi che tu stia vedendo questo messaggio per errore, <issueLink>invia una segnalazione</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Riprova più tardi, o chiedi ad un admin della stanza o spazio di controllare se hai l'accesso.",
+    "This room or space is not accessible at this time.": "Questa stanza o spazio non è al momento accessibile.",
+    "Are you sure you're at the right place?": "Sei sicuro di essere nel posto giusto?",
+    "This room or space does not exist.": "Questa stanza o spazio non esiste.",
+    "There's no preview, would you like to join?": "Non c'è un'anteprima, vuoi entrare?",
+    "This invite was sent to %(email)s": "Questo invito è stato inviato a %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Questo invito è stato inviato a %(email)s , la quale non è associata al tuo account",
+    "You can still join here.": "Puoi comunque entrare qui.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Si è verificato un errore (%(errcode)s) tentando di validare il tuo invito. Puoi provare a passare questa informazione alla persona che ti ha invitato.",
+    "Something went wrong with your invite.": "Qualcosa è andato storto con il tuo invito.",
+    "You were banned by %(memberName)s": "Sei stato bandito da %(memberName)s",
+    "Forget this space": "Dimentica questo spazio",
+    "You were removed by %(memberName)s": "Sei stato rimosso da %(memberName)s",
+    "Loading preview": "Caricamento anteprima",
+    "Joining …": "Entrata …",
+    "View older version of %(spaceName)s.": "Vedi versione più vecchia di %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Aggiorna questo spazio alla versione di stanza consigliata",
+    "Failed to join": "Entrata fallita",
+    "The person who invited you has already left, or their server is offline.": "La persona che ti ha invitato è già uscita, o il suo server è offline.",
+    "The person who invited you has already left.": "La persona che ti ha invitato è già uscita.",
+    "Sorry, your homeserver is too old to participate here.": "Spiacenti, il tuo homeserver è troppo vecchio per partecipare qui.",
+    "There was an error joining.": "Si è verificato un errore entrando.",
+    "The user's homeserver does not support the version of the space.": "L'homeserver dell'utente non supporta la versione dello spazio.",
+    "User may or may not exist": "L'utente forse non esiste",
+    "User does not exist": "L'utente non esiste",
+    "User is already in the room": "L'utente è già nella stanza",
+    "User is already in the space": "L'utente è già nello spazio",
+    "User is already invited to the room": "L'utente è già stato invitato nella stanza",
+    "User is already invited to the space": "L'utente è già stato invitato nello spazio",
+    "You do not have permission to invite people to this space.": "Non hai l'autorizzazione di invitare persone in questo spazio.",
+    "Failed to invite users to %(roomName)s": "Impossibile invitare gli utenti in %(roomName)s",
+    "Stop sharing and close": "Ferma la condivisione e chiudi",
+    "An error occurred while stopping your live location, please try again": "Si è verificato un errore fermando la tua posizione in tempo reale, riprova",
+    "An error occured whilst sharing your live location, please try again": "Si è verificato un errore condividendo la tua posizione in tempo reale, riprova",
+    "An error occured whilst sharing your live location": "Si è verificato un errore condividendo la tua posizione in tempo reale",
+    "Create room": "Crea stanza",
+    "Create video room": "Crea stanza video",
+    "Create a video room": "Crea una stanza video",
+    "%(count)s participants|one": "1 partecipante",
+    "%(count)s participants|other": "%(count)s partecipanti",
+    "New video room": "Nuova stanza video",
+    "New room": "Nuova stanza",
+    "Video rooms (under active development)": "Stanze video (in sviluppo attivo)",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Le conversazioni aiutano a tenere le discussioni in tema e rintracciabili. <a>Maggiori info</a>.",
+    "<a>Give feedback</a>": "<a>Lascia feedback</a>",
+    "Threads are a beta feature": "Le conversazioni sono una funzionalità beta",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Consiglio:</b> usa \"Rispondi nella conversazione\" passando sopra un messaggio.",
+    "Threads help keep your conversations on-topic and easy to track.": "Le conversazioni ti aiutano a tenere le tue discussioni in tema e rintracciabili.",
+    "%(featureName)s Beta feedback": "Feedback %(featureName)s beta",
+    "Beta feature. Click to learn more.": "Funzionalità beta. Clicca per maggiori informazioni.",
+    "Beta feature": "Funzionalità beta",
+    "To leave, return to this page and use the “Leave the beta” button.": "Per uscire, torna in questa pagina e usa il pulsante \"Abbandona la beta\".",
+    "Use \"Reply in thread\" when hovering over a message.": "Usa \"Rispondi nella conversazione\" passando sopra un messaggio.",
+    "How can I start a thread?": "Come inizio una conversazione?",
+    "Keep discussions organised with threads.": "Tieni le discussioni organizzate in conversazioni."
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 6ade4106d9d..85c40c682a6 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -8,7 +8,7 @@
     "Favourites": "お気に入り",
     "Invited": "招待中",
     "Low priority": "低優先度",
-    "Mute": "通知しない",
+    "Mute": "ミュート",
     "Notifications": "通知",
     "Cancel": "キャンセル",
     "Create new room": "新しいルームを作成",
@@ -41,7 +41,7 @@
     "Continue": "続行する",
     "Online": "オンライン",
     "unknown error code": "不明なエラーコード",
-    "Failed to forget room %(errCode)s": "ルームの履歴を消すのに失敗しました %(errCode)s",
+    "Failed to forget room %(errCode)s": "ルームの履歴を消去するのに失敗しました %(errCode)s",
     "Register": "登録",
     "Rooms": "ルーム",
     "Add rooms to this community": "このコミュニティーにルームを追加",
@@ -49,8 +49,8 @@
     "World readable": "誰でも読むことができます",
     "Guests can join": "ゲストが参加できます",
     "No rooms to show": "表示するルームがありません",
-    "This email address is already in use": "このメールアドレスは既に使われています",
-    "This phone number is already in use": "この電話番号は既に使われています",
+    "This email address is already in use": "このメールアドレスは既に使用されています",
+    "This phone number is already in use": "この電話番号は既に使用されています",
     "Failed to verify email address: make sure you clicked the link in the email": "メールアドレスの認証に失敗しました。メール中のリンクをクリックしたか、確認してください",
     "The platform you're on": "利用中のプラットフォーム",
     "The version of %(brand)s": "%(brand)sのバージョン",
@@ -63,7 +63,7 @@
     "Thursday": "木曜日",
     "Messages in one-to-one chats": "1対1のチャットでのメッセージ",
     "All Rooms": "全てのルーム",
-    "You cannot delete this message. (%(code)s)": "あなたはこの発言を削除できません。(%(code)s）",
+    "You cannot delete this message. (%(code)s)": "この発言を削除できません。(%(code)s）",
     "Send": "送信",
     "All messages": "全ての発言",
     "Sunday": "日曜日",
@@ -111,7 +111,7 @@
     "Event sent!": "イベントが送信されました！",
     "Preparing to send logs": "ログを送信する準備をしています",
     "Explore Account Data": "アカウントのデータを調査",
-    "The server may be unavailable or overloaded": "サーバーは使用できないか、オーバーロードされています",
+    "The server may be unavailable or overloaded": "サーバーは使用できないか、オーバーロードしている可能性があります",
     "Reject": "拒否",
     "Remove from Directory": "ディレクトリから消去",
     "Toolbox": "ツールボックス",
@@ -173,7 +173,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s年%(monthName)s%(day)s日（%(weekDayName)s）",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s年%(monthName)s%(day)s日 %(weekDayName)s曜日 %(time)s",
     "Who would you like to add to this community?": "このコミュニティーに誰を追加しますか？",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：あなたがコミュニティーに追加する人は誰でも、コミュニティーIDを知っている人には公開されます",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：あなたがコミュニティーに追加する人は、コミュニティーIDを知っている全員に対して公開されます",
     "Invite new community members": "新しいコミュニティーメンバーを招待",
     "Invite to Community": "コミュニティーに招待",
     "Which rooms would you like to add to this community?": "このコミュニティーに追加したいルームはどれですか？",
@@ -184,7 +184,7 @@
     "Failed to invite users to community": "ユーザーをコミュニティーに招待できませんでした",
     "Failed to invite users to %(groupId)s": "ユーザーを%(groupId)sに招待できませんでした",
     "Failed to add the following rooms to %(groupId)s:": "次のルームを%(groupId)sに追加できませんでした：",
-    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)sに通知を送信する権限がありません - ブラウザーの設定を確認してください",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)sに通知を送信する権限がありません。ブラウザーの設定を確認してください",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)sに通知を送信する権限がありませんでした。もう一度お試しください",
     "Unable to enable Notifications": "通知を有効にできません",
     "This email address was not found": "このメールアドレスが見つかりませんでした",
@@ -202,14 +202,14 @@
     "This room is not recognised.": "このルームは認識されません。",
     "Power level must be positive integer.": "権限レベルは正の整数でなければなりません。",
     "You are not in this room.": "このルームのメンバーではありません。",
-    "You do not have permission to do that in this room.": "あなたはこのルームでそれを行う許可を持っていません。",
+    "You do not have permission to do that in this room.": "あなたはこのルームでそれを行う権限を持っていません。",
     "Missing room_id in request": "リクエストにroom_idがありません",
     "Room %(roomId)s not visible": "ルーム %(roomId)s は見えません",
     "Missing user_id in request": "リクエストにuser_idがありません",
     "Usage": "用法",
     "Changes your display nickname": "表示されるニックネームを変更",
     "Invites user with given id to current room": "指定されたIDを持つユーザーを現在のルームに招待",
-    "Leave room": "ルームを退出",
+    "Leave room": "ルームから退出",
     "Kicks user with given id": "与えられたIDを持つユーザーを追放する",
     "Bans user with given id": "指定されたIDでユーザーをブロック",
     "Ignores a user, hiding their messages from you": "ユーザーを無視し、自分からのメッセージを隠す",
@@ -217,11 +217,11 @@
     "You are now ignoring %(userId)s": "%(userId)sを無視しています",
     "Stops ignoring a user, showing their messages going forward": "ユーザーの無視を止めて、メッセージを表示",
     "Unignored user": "無視していないユーザー",
-    "You are no longer ignoring %(userId)s": "あなたはもはや%(userId)sを無視していません",
+    "You are no longer ignoring %(userId)s": "あなたは%(userId)sを無視していません",
     "Define the power level of a user": "ユーザーの権限レベルを規定",
     "Deops user with given id": "指定されたIDのユーザーを非表示",
     "Opens the Developer Tools dialog": "開発者ツールダイアログを開く",
-    "Verified key": "検証済の鍵",
+    "Verified key": "認証済の鍵",
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄",
     "Reason": "理由",
@@ -229,15 +229,15 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)sがルーム名を削除しました。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)sがルーム名を%(roomName)sに変更しました。",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)sが画像を送信しました。",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)sが、このルームのメインアドレスを%(address)sに設定しました。",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)sがこのルームのメインアドレスを%(address)sに設定しました。",
     "%(senderName)s removed the main address for this room.": "%(senderName)sがこのルームのメインアドレスを削除しました。",
     "Someone": "誰か",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)sが%(targetDisplayName)sをこのルームに招待しました。",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)sは、今後のルーム履歴を「メンバーのみ（招待された時点以降）」閲覧可能に設定しました。",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)sは、今後のルーム履歴を「メンバーのみ（参加した時点以降）」閲覧可能に設定しました。",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)sは、今後のルーム履歴を「メンバーのみ」閲覧可能に設定しました。",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)sは、今後のルーム履歴を「誰でも」閲覧可能に設定しました。",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)sは、今後のルーム履歴を「不明（%(visibility)s）」に閲覧可能に設定しました。",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)sが、%(targetDisplayName)sをこのルームに招待しました。",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)sが、今後のルームの履歴を「メンバーのみ（招待された時点以降）」閲覧可能に設定しました。",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)sが、今後のルームの履歴を「メンバーのみ（参加した時点以降）」閲覧可能に設定しました。",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)sが、今後のルームの履歴を「メンバーのみ」閲覧可能に設定しました。",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)sが、今後のルームの履歴を「誰でも」閲覧可能に設定しました。",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)sが、今後のルームの履歴を「不明（%(visibility)s）」に閲覧可能に設定しました。",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)sの権限レベルを%(fromPowerLevel)sから%(toPowerLevel)sに変更しました。",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)sが%(powerLevelDiffText)s",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)sが、ルームの固定メッセージを変更しました。",
@@ -245,7 +245,7 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)sウィジェットが%(senderName)sによって追加されました",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)sウィジェットが%(senderName)sによって削除されました",
     "Failure to create room": "ルームの作成に失敗しました",
-    "Server may be unavailable, overloaded, or you hit a bug.": "サーバーが使用できない、オーバーロードされている、または不具合が発生した可能性があります。",
+    "Server may be unavailable, overloaded, or you hit a bug.": "サーバーが使用できないか、オーバーロードしているか、または不具合が発生した可能性があります。",
     "Unnamed Room": "名前のないルーム",
     "This homeserver has hit its Monthly Active User limit.": "このホームサーバーは、月間アクティブユーザー制限を超えています。",
     "This homeserver has exceeded one of its resource limits.": "このホームサーバーは、リソース制限の1つを超えています。",
@@ -257,25 +257,25 @@
     "Sorry, your homeserver is too old to participate in this room.": "申し訳ありませんが、あなたのホームサーバーはこのルームに参加するには古すぎます。",
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
     "Failed to join room": "ルームに参加できませんでした",
-    "Message Pinning": "メッセージ留め",
+    "Message Pinning": "固定メッセージを有効にする",
     "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
     "Mirror local video feed": "ビデオ映像のミラー効果（反転）を有効にする",
     "Send analytics data": "分析データを送信",
     "Enable inline URL previews by default": "デフォルトでインラインURLプレビューを有効にする",
-    "Enable URL previews for this room (only affects you)": "このルームのURLプレビューを有効にする（あなたにのみ適用)",
+    "Enable URL previews for this room (only affects you)": "このルームのURLプレビューを有効にする（あなたにのみ適用）",
     "Enable URL previews by default for participants in this room": "このルームの参加者のためにデフォルトでURLプレビューを有効にする",
     "Enable widget screenshots on supported widgets": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
-    "Decline": "辞退",
+    "Decline": "拒否",
     "Accept": "同意",
     "Incorrect verification code": "認証コードが誤っています",
     "Submit": "提出",
     "Phone": "電話",
-    "Failed to upload profile picture!": "プロフィール画像をアップロードできませんでした!",
+    "Failed to upload profile picture!": "プロフィール画像をアップロードできませんでした！",
     "Upload new:": "新しいアップロード：",
     "No display name": "表示名なし",
     "New passwords don't match": "新しいパスワードが一致しません",
     "Passwords can't be empty": "パスワードを空にすることはできません",
-    "Warning!": "警告!",
+    "Warning!": "警告！",
     "Export E2E room keys": "ルームのエンドツーエンド暗号鍵をエクスポート",
     "Do you want to set an email address?": "メールアドレスを設定しますか？",
     "Password": "パスワード",
@@ -289,7 +289,7 @@
     "This event could not be displayed": "このイベントは表示できませんでした",
     "Options": "オプション",
     "Key request sent.": "鍵のリクエストが送信されました。",
-    "Disinvite": "招待拒否",
+    "Disinvite": "招待を取り消す",
     "Kick": "追放する",
     "Disinvite this user?": "このユーザーを招待拒否しますか?",
     "Kick this user?": "このユーザーを追放しますか?",
@@ -299,11 +299,11 @@
     "Call Failed": "呼び出しに失敗しました",
     "Automatically replace plain text Emoji": "自動的にプレーンテキスト絵文字を置き換える",
     "Demote yourself?": "自身を降格しますか？",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "自分自身を降格させるときにこの変更を元に戻すことはできません。あなたがルームの最後の特権ユーザーである場合、特権を回復することは不可能です。",
-    "Demote": "降格",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "自分自身を降格しようとしています。この変更を元に戻すことはできません。ルーム内の最後の特権ユーザーである場合、特権を取り戻すことはできません。",
+    "Demote": "降格する",
     "Failed to mute user": "ユーザーのミュートに失敗しました",
     "Failed to change power level": "権限レベルの変更に失敗しました",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "この変更を元に戻すことはできません。そのユーザーが自分と同じ権限レベルを持つように促します。",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "このユーザーにあなたと同じ権限レベルを与えようとしています。この変更を元に戻すことはできません。",
     "Ignore": "無視",
     "Jump to read receipt": "既読へジャンプ",
     "Invite": "招待",
@@ -313,17 +313,17 @@
     "and %(count)s others...|other": "他%(count)s人…",
     "and %(count)s others...|one": "他1人…",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（権限レベル：%(powerLevelNumber)s）",
-    "Attachment": "付属品",
+    "Attachment": "添付ファイル",
     "Hangup": "電話を切る",
     "Voice call": "音声通話",
     "Video call": "ビデオ通話",
     "Send an encrypted reply…": "暗号化された返信を送信…",
     "Send an encrypted message…": "暗号化されたメッセージを送信…",
-    "This room has been replaced and is no longer active.": "このルームは交換されており、使用されていません。",
+    "This room has been replaced and is no longer active.": "このルームは置き換えられており、アクティブではありません。",
     "The conversation continues here.": "こちらから継続中の会話を確認する。",
     "You do not have permission to post to this room": "このルームに投稿する権限がありません",
     "Server error": "サーバーエラー",
-    "Server unavailable, overloaded, or something else went wrong.": "サーバーが使用できない、オーバーロードされている、または何かが間違っていました。",
+    "Server unavailable, overloaded, or something else went wrong.": "サーバーが使用できないか、オーバーロードしているか、または問題が発生しました。",
     "Command error": "コマンドエラー",
     "Loading...": "読み込んでいます…",
     "%(duration)ss": "%(duration)s秒",
@@ -341,10 +341,10 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(dateTime)sに%(displayName)s（%(userName)s）が既読",
     "Replying": "以下に返信",
     "Save": "保存",
-    "(~%(count)s results)|other": "(〜%(count)s件)",
-    "(~%(count)s results)|one": "(〜%(count)s件)",
+    "(~%(count)s results)|other": "（〜%(count)s件）",
+    "(~%(count)s results)|one": "（〜%(count)s件）",
     "Join Room": "ルームに参加",
-    "Forget room": "ルームを忘れる",
+    "Forget room": "ルームを消去",
     "Share room": "ルームを共有",
     "Invites": "招待",
     "Unban": "ブロック解除",
@@ -370,7 +370,7 @@
     "Members only (since they joined)": "メンバーのみ（参加した時点から）",
     "Permissions": "アクセス許可",
     "Advanced": "詳細",
-    "Only room administrators will see this warning": "この警告はルーム管理者のみに表示されます",
+    "Only room administrators will see this warning": "この警告はルームの管理者にのみ表示されます",
     "You don't currently have any stickerpacks enabled": "現在、使用可能なステッカーパックはありません",
     "Add some now": "今すぐ追加",
     "Stickerpack": "ステッカーパック",
@@ -388,26 +388,26 @@
     "You have <a>disabled</a> URL previews by default.": "デフォルトでURLプレビューが<a>無効</a>です。",
     "URL previews are enabled by default for participants in this room.": "このルームの参加者には、デフォルトでURLプレビューが有効です。",
     "URL previews are disabled by default for participants in this room.": "このルームの参加者には、デフォルトでURLプレビューが無効です。",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "このルームのように暗号化されたルームでは、あなたのホームサーバー（これがプレビューを作成します）によるリンクの情報の収集を防ぐため、URLプレビューはデフォルトで無効になっています。",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "このルームを含めて、暗号化されたルームでは、あなたのホームサーバー（これがプレビューを作成します）によるリンクの情報の収集を防ぐため、URLプレビューはデフォルトで無効になっています。",
     "URL Previews": "URLプレビュー",
     "Historical": "履歴",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "メッセージにURLが含まれる場合、タイトル、説明、ウェブサイトの画像などがURLプレビューとして表示されます。",
-    "Error decrypting attachment": "添付ファイルの復号化エラー",
-    "Decrypt %(text)s": "%(text)sを復号",
+    "Error decrypting attachment": "添付ファイルを復号化する際のエラー",
+    "Decrypt %(text)s": "%(text)sを復号化",
     "Download %(text)s": "%(text)sをダウンロード",
     "Invalid file%(extra)s": "無効なファイル %(extra)s",
-    "Error decrypting image": "画像の復号中にエラーが発生しました",
-    "Error decrypting video": "動画の復号化エラー",
+    "Error decrypting image": "画像を復号化する際のエラー",
+    "Error decrypting video": "動画を復号化する際のエラー",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)sが%(roomName)sのアバターを変更しました",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)sがルームのアバターを削除しました。",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)sはルームのアバターを<img/>に変更しました",
     "This room is a continuation of another conversation.": "このルームは別の会話の続きです。",
-    "Click here to see older messages.": "以前のメッセージを見るには、ここをクリックしてください。",
+    "Click here to see older messages.": "以前のメッセージを表示するには、ここをクリックしてください。",
     "Copied!": "コピーしました！",
     "Failed to copy": "コピーに失敗しました",
     "Add an Integration": "統合を追加",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "サードパーティーのサイトに移動して、%(integrationsUrl)sで使用するためにアカウントを認証できるようになります。続行しますか？",
-    "Please review and accept the policies of this homeserver:": "このホームサーバーのポリシーを確認し、同意してください：",
+    "Please review and accept the policies of this homeserver:": "このホームサーバーの運営方針を確認し、同意してください：",
     "Token incorrect": "誤ったトークン",
     "A text message has been sent to %(msisdn)s": "テキストメッセージが%(msisdn)sに送信されました",
     "Please enter the code it contains:": "それに含まれるコードを入力してください：",
@@ -417,7 +417,7 @@
     "Email address": "メールアドレス",
     "Sign in": "サインイン",
     "Remove from community": "コミュニティーから削除",
-    "Disinvite this user from community?": "このユーザーをコミュニティーから拒否しますか？",
+    "Disinvite this user from community?": "このユーザーのコミュニティーへの招待を取り消しますか？",
     "Remove this user from community?": "コミュニティーからこのユーザーを削除しますか？",
     "Failed to withdraw invitation": "招待を撤回できませんでした",
     "Failed to remove user from community": "コミュニティーからユーザーを削除できませんでした",
@@ -426,19 +426,19 @@
     "Removing a room from the community will also remove it from the community page.": "コミュニティーからルームを削除すると、コミュニティーページからもそのルームが削除されます。",
     "Failed to remove room from community": "コミュニティーからのルームの削除に失敗しました",
     "Failed to remove '%(roomName)s' from %(groupId)s": "%(groupId)sから「%(roomName)s」を削除できませんでした",
-    "Something went wrong!": "何かがうまくいきませんでした！",
+    "Something went wrong!": "問題が発生しました！",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(groupId)sの「%(roomName)s」の表示を更新できませんでした。",
     "Visibility in Room List": "ルームリストの可視性",
-    "Visible to everyone": "みんなに見える",
-    "Only visible to community members": "コミュニティーのメンバーにのみ表示されます",
+    "Visible to everyone": "全員に表示",
+    "Only visible to community members": "コミュニティーのメンバーにのみ表示",
     "Filter community rooms": "コミュニティールームを絞り込む",
-    "Something went wrong when trying to get your communities.": "コミュニティーに参加しようとすると何かがうまくいかなかった。",
+    "Something went wrong when trying to get your communities.": "コミュニティーに参加する際に、問題が発生しました。",
     "Display your community flair in rooms configured to show it.": "表示するよう設定したルームであなたのコミュニティーバッジを表示します。",
     "Show developer tools": "開発者ツールを表示",
-    "You're not currently a member of any communities.": "あなたは現在、どのコミュニティーのメンバーでもありません。",
-    "Unknown Address": "不明な住所",
+    "You're not currently a member of any communities.": "現在、どのコミュニティーのメンバーでもありません。",
+    "Unknown Address": "不明なアドレス",
     "Delete Widget": "ウィジェットを削除",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "ウィジェットを削除すると、このルームの全てのユーザーのウィジェットが削除されます。このウィジェットを削除してもいいですか？",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "ウィジェットを削除すると、このルームの全てのユーザーから削除されます。削除してよろしいですか？",
     "Delete widget": "ウィジェットを削除",
     "Popout widget": "ウィジェットをポップアウト",
     "No results": "結果がありません",
@@ -449,12 +449,12 @@
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sが参加しました",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sが%(count)s回参加しました",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sが参加しました",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sは%(count)s回退出しました",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sは退出しました",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sは%(count)s回退出しました",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sは退出しました",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sが%(count)s回退出しました",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sが退出しました",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sが%(count)s回退出しました",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sが退出しました",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sが%(count)s回参加し、退出しました",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sは参加して退出しました",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sが参加して退出しました",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sが%(count)s回参加し退出しました",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sが参加し退出しました",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sが%(count)s回退出し再参加しました",
@@ -493,7 +493,7 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sがアバターを変更しました",
     "%(items)s and %(count)s others|other": "%(items)sと他%(count)s人",
     "%(items)s and %(count)s others|one": "%(items)sともう1人",
-    "%(items)s and %(lastItem)s": "%(items)s、また、同じ人たち%(lastItem)s",
+    "%(items)s and %(lastItem)s": "%(items)s, %(lastItem)s",
     "collapse": "折りたたむ",
     "expand": "展開",
     "Custom level": "カスタムレベル",
@@ -510,7 +510,7 @@
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "このイベントを削除してもよろしいですか？ルームの名前やトピックの変更を削除すると、変更が取り消される可能性があります。",
     "Community IDs cannot be empty.": "コミュニティーIDは空にできません。",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "コミュニティーIDには次の文字のみを含めることができます：a-z、0-9、または'=_-./'",
-    "Something went wrong whilst creating your community": "コミュニティーを作成する時に何かがうまくいかなかった",
+    "Something went wrong whilst creating your community": "コミュニティーを作成する際に、問題が発生しました",
     "Create Community": "コミュニティーを作成",
     "Community Name": "コミュニティー名",
     "Example": "例",
@@ -520,37 +520,37 @@
     "Unknown error": "不明なエラー",
     "Incorrect password": "間違ったパスワード",
     "Deactivate Account": "アカウントを無効にする",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "これにより、あなたのアカウントは永久に使用できなくなります。ログインできなくなり、誰も同じユーザーIDを再登録できなくなります。これにより、参加している全てのルームから退室し、IDサーバーからあなたのアカウントの詳細が削除されます。<b>この操作は元に戻すことができません。</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトでは忘れられません。</b>メッセージを忘れさせたい場合は、下のボックスにチェックを入れてください。",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrixのメッセージの見え方は、電子メールと同様のものです。メッセージの履歴を消去すると、あなたが送信したメッセージは、新規または未登録のユーザーに共有されることはありませんが、既にメッセージを取得している登録ユーザーは、今後もそのコピーにアクセスできます。",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "アカウントを無効する際、送信した全てのメッセージを削除(<b>警告:</b>これにより、今後のユーザーは会話履歴の全文を見ることができなくなります)",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "これにより、あなたのアカウントは永久に使用できなくなります。ログインできなくなり、誰も同じユーザーIDを再登録できなくなります。また、参加している全てのルームから退出し、あなたのアカウントの詳細がIDサーバーから削除されます。<b>この操作は元に戻すことができません。</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージの履歴はデフォルトでは消去されません。</b>メッセージの履歴を消去したい場合は、下のボックスにチェックを入れてください。",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrixのメッセージの見え方は、電子メールと同様です。メッセージの履歴を消去すると、あなたが送信したメッセージが新規または未登録のユーザーに共有されることはありませんが、既にメッセージを取得している登録ユーザーは、今後もそのコピーにアクセスできます。",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "アカウントを無効にする際、送信した全てのメッセージの履歴を消去（<b>警告：</b>今後のユーザーには会話の履歴の全文が表示されなくなります）",
     "To continue, please enter your password:": "続行するには、パスワードを入力してください：",
     "An error has occurred.": "エラーが発生しました。",
-    "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "以前%(host)sにて、メンバーの遅延ロードを有効にした%(brand)sを使用していました。このバージョンでは、遅延ロードは無効です。ローカルキャッシュはこれらの2つの設定の間で互換性がないため、%(brand)sはアカウントを再同期する必要があります。",
-    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "他のバージョンの%(brand)sがまだ別のタブで開いている場合は、同じホスト上で%(brand)sを使用するように閉じてください。遅延ロードが同時に有効と無効になっていると問題が発生します。",
+    "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "以前%(host)sにて、メンバーの遅延ロードを有効にした%(brand)sが使用されていました。このバージョンでは、遅延ロードは無効です。ローカルキャッシュはこれらの2つの設定の間で互換性がないので、%(brand)sはアカウントを再同期する必要があります。",
+    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "他のバージョンの%(brand)sが別のタブで開いている場合は、それを閉じてください。同じホスト上で、遅延ロードを有効と無効の両方に設定して%(brand)sを使用すると、問題が発生します。",
     "Incompatible local cache": "互換性のないローカルキャッシュ",
     "Clear cache and resync": "キャッシュをクリアして再同期",
-    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)sは、必要に応じて他のユーザーに関する情報をロードするだけで、メモリの使用量を3〜5倍減らしました。サーバーと再同期するのを待ってください!",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)sは、必要に応じて他のユーザーに関する情報をロードするだけで、メモリの使用量を3〜5倍減らしました。サーバーと再同期するのを待ってください！",
     "Updating %(brand)s": "%(brand)s更新中",
     "Failed to upgrade room": "ルームをアップグレードできませんでした",
     "The room upgrade could not be completed": "ルームのアップグレードを完了できませんでした",
     "Upgrade this room to version %(version)s": "このルームをバージョン%(version)sにアップグレード",
-    "Upgrade Room Version": "アップグレードルームバージョン",
+    "Upgrade Room Version": "ルームのバージョンをアップグレード",
     "Create a new room with the same name, description and avatar": "同じ名前、説明、アバターで新しいルームを作成",
     "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンのルームでのユーザーの発言を停止し、新しいルームに移動するようユーザーに通知するメッセージを投稿",
     "Mention": "メンション",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sが%(count)s回招待を取り消しました",
     "was unbanned %(count)s times|one": "がブロック解除されました",
-    "Put a link back to the old room at the start of the new room so people can see old messages": "新しいルームの始めに古いルームにリンクを張って、人々が古いメッセージを見ることができるように",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "以前のメッセージを表示できるように、新しいルームの先頭に古いルームへのリンクを張る",
     "Sign out": "サインアウト",
     "Clear Storage and Sign Out": "ストレージのクリアとサインアウト",
     "Send Logs": "ログを送信",
     "Refresh": "リフレッシュ",
     "Unable to restore session": "セッションを復元できません",
-    "We encountered an error trying to restore your previous session.": "以前のセッションを復元しようとしてエラーが発生しました。",
-    "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "以前に%(brand)sの最新バージョンを使用していた場合、セッションはこのバージョンと互換性がない可能性があります。このウィンドウを閉じて、最新のバージョンに戻ります。",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "ブラウザーのストレージをクリアすると問題は解決するかもしれませんが、ログアウトして暗号化されたチャット履歴を読むことができなくなります。",
+    "We encountered an error trying to restore your previous session.": "以前のセッションを復元する際にエラーが発生しました。",
+    "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "以前に%(brand)sの最新バージョンを使用していた場合、セッションはこのバージョンと互換性がない可能性があります。このウィンドウを閉じて、最新のバージョンに戻ってください。",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "ブラウザーのストレージを消去すると問題は解決するかもしれません。ただし、ログアウトを行い、暗号化されたチャット履歴を読むことができなくなります。",
     "Invalid Email Address": "無効なメールアドレス",
     "This doesn't appear to be a valid email address": "メールアドレスの形式が正しくありません",
     "Verification Pending": "認証の保留中",
@@ -570,16 +570,16 @@
     "Unable to reject invite": "招待を拒否できません",
     "Name": "名前",
     "You must <a>register</a> to use this functionality": "この機能を使用するには<a>登録</a>する必要があります",
-    "You must join the room to see its files": "そのファイルを見るためにルームに参加する必要があります",
+    "You must join the room to see its files": "ルームのファイルを表示するには、ルームに参加する必要があります",
     "Add rooms to the community summary": "コミュニティーサマリーにルームを追加",
     "Which rooms would you like to add to this summary?": "このサマリーにどのルームを追加したいですか？",
     "Add to summary": "サマリーに追加",
-    "Failed to add the following rooms to the summary of %(groupId)s:": "%(groupId)sの要約に次のルームを追加できませんでした：",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "%(groupId)sのサマリーに次のルームを追加できませんでした：",
     "Add a Room": "ルームを追加",
-    "Failed to remove the room from the summary of %(groupId)s": "%(groupId)sの要約からルームを削除できませんでした",
+    "Failed to remove the room from the summary of %(groupId)s": "%(groupId)sのサマリーからルームを削除できませんでした",
     "The room '%(roomName)s' could not be removed from the summary.": "'%(roomName)s' ルームをサマリーから削除できませんでした。",
     "Add users to the community summary": "コミュニティーサマリーにユーザーを追加",
-    "Who would you like to add to this summary?": "この要約に誰を追加しますか？",
+    "Who would you like to add to this summary?": "このサマリーに誰を追加しますか？",
     "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)sのサマリーに次のユーザーを追加できませんでした。",
     "Add a User": "ユーザーを追加",
     "Failed to remove a user from the summary of %(groupId)s": "%(groupId)sのサマリーからユーザーを削除できませんでした",
@@ -588,54 +588,54 @@
     "Failed to update community": "コミュニティーの更新に失敗しました",
     "Unable to accept invite": "招待を受け入れることができません",
     "Unable to join community": "コミュニティーに参加できません",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "あなたはこのコミュニティーの管理者です。 別の管理者からの招待なしには、再び参加することはできません。",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "あなたはこのコミュニティーの管理者です。別の管理者から招待されなければ、再び参加することはできません。",
     "Leave Community": "コミュニティーから退出",
-    "Leave %(groupName)s?": "%(groupName)sを退出しますか？",
-    "Unable to leave community": "コミュニティーを退出できません",
+    "Leave %(groupName)s?": "%(groupName)sから退出しますか？",
+    "Unable to leave community": "コミュニティーから退出できません",
     "Community Settings": "コミュニティーの設定",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "コミュニティー<bold1>名</bold1>と<bold2>アバター</bold2>に対する変更は、他のユーザーには最大30分間表示されないことがあります。",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "コミュニティーの<bold1>名称</bold1>と<bold2>アバター</bold2>に対する変更は、他のユーザーには最大30分間表示されないことがあります。",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "これらのルームは、コミュニティーページのコミュニティーメンバーに表示されます。メンバーは、それらをクリックしてルームに参加できます。",
     "Featured Rooms:": "ルームの特徴：",
     "Featured Users:": "ユーザーの特徴：",
     "%(inviter)s has invited you to join this community": "%(inviter)sがあなたをこのコミュニティーに招待しました",
     "Join this community": "このコミュニティーに参加",
-    "Leave this community": "このコミュニティーを退出",
+    "Leave this community": "このコミュニティーから退出",
     "You are an administrator of this community": "あなたはこのコミュニティーの管理者です",
     "You are a member of this community": "あなたはこのコミュニティーのメンバーです",
     "Who can join this community?": "誰がこのコミュニティーに参加できますか？",
     "Everyone": "全員",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "あなたのコミュニティーには、説明がありません。コミュニティーのメンバーに見せるHTMLページです。<br />ここをクリックして設定を開き、説明を加えてください!",
-    "Long Description (HTML)": "詳細説明（HTML)",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "あなたのコミュニティーには説明文がありません。コミュニティーのメンバーに見せるHTMLページです。<br />ここをクリックして設定を開き、説明を加えてください！",
+    "Long Description (HTML)": "詳細説明（HTML）",
     "Description": "説明",
     "Community %(groupId)s not found": "コミュニティー %(groupId)s が見つかりません",
     "Failed to load %(groupId)s": "%(groupId)sをロードできませんでした",
     "Failed to reject invitation": "招待を拒否できませんでした",
     "This room is not public. You will not be able to rejoin without an invite.": "このルームは公開されていません。再度参加するには、招待が必要です。",
     "Are you sure you want to leave the room '%(roomName)s'?": "このルーム「%(roomName)s」から退出してよろしいですか？",
-    "Can't leave Server Notices room": "サーバー通知ルームを退出することはできません",
+    "Can't leave Server Notices room": "サーバー通知ルームから退出することはできません",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "このルームはホームサーバーからの重要なメッセージに使用されるので、退出することはできません。",
     "Signed Out": "サインアウト",
-    "For security, this session has been signed out. Please sign in again.": "セキュリティー上、このセッションはログアウトされています。 もう一度サインインしてください。",
+    "For security, this session has been signed out. Please sign in again.": "セキュリティー上、このセッションはログアウトされています。もう一度サインインしてください。",
     "Terms and Conditions": "利用規約",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)sホームサーバーを引き続き使用するには、利用規約を確認して同意する必要があります。",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)sのホームサーバーを引き続き使用するには、利用規約を確認して同意する必要があります。",
     "Review terms and conditions": "利用規約を確認",
     "Old cryptography data detected": "古い暗号化データが検出されました",
-    "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "%(brand)sの古いバージョンのデータが検出されました。 これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。 古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。 これにより、このバージョンで交換されたメッセージが失敗することもあります。 問題が発生した場合は、ログアウトして再度ログインしてください。 メッセージ履歴を保持するには、鍵をエクスポートして再インポートしてください。",
+    "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "%(brand)sの古いバージョンのデータを検出しました。これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。また、このバージョンで交換されたメッセージが失敗することもあります。問題が発生した場合は、ログアウトして再度ログインしてください。メッセージ履歴を保持するには、鍵をエクスポートして再インポートしてください。",
     "Logout": "ログアウト",
     "Your Communities": "あなたのコミュニティー",
     "Did you know: you can use communities to filter your %(brand)s experience!": "知っていましたか：コミュニティーを使って%(brand)sの経験を絞り込むことができます！",
-    "Error whilst fetching joined communities": "参加したコミュニティーを取得中にエラーが発生しました",
+    "Error whilst fetching joined communities": "参加したコミュニティーを取得する際のエラー",
     "Create a new community": "新しいコミュニティーを作成",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "コミュニティーを作成して、ユーザーとルームをグループ化しましょう！独自のページを作り、Matrixの世界で空間を目立たせましょう。",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "<consentLink>利用規約</consentLink> を確認して同意するまでは、いかなるメッセージも送信できません。",
-    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが月間アクティブユーザー制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
-    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーがリソース制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが月間アクティブユーザー制限を超えたため、メッセージは送信されませんでした。サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーがリソース制限を超えたため、メッセージは送信されませんでした。サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
     "Connectivity to the server has been lost.": "サーバーとの接続が失われました。",
     "Sent messages will be stored until your connection has returned.": "送信されたメッセージは、接続が復旧するまで保存されます。",
     "You seem to be uploading files, are you sure you want to quit?": "ファイルをアップロードしているようですが、中止しますか？",
     "You seem to be in a call, are you sure you want to quit?": "通話中のようですが、本当にやめたいですか？",
     "Search failed": "検索に失敗しました",
-    "Server may be unavailable, overloaded, or search timed out :(": "サーバーが使用できない、オーバーロードされている、または検索がタイムアウトしているようです :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "サーバーが使用できないか、オーバーロードしているか、または検索がタイムアウトしました :(",
     "No more results": "結果がありません",
     "Room": "ルーム",
     "Failed to reject invite": "招待を拒否できませんでした",
@@ -647,7 +647,7 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)sをアップロードしています",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)sと他%(count)s件をアップロードしています",
     "Success": "成功",
-    "Unable to remove contact information": "連絡先情報を削除できません",
+    "Unable to remove contact information": "連絡先の情報を削除できません",
     "<not supported>": "<サポート対象外>",
     "Import E2E room keys": "ルームのエンドツーエンド暗号鍵をインポート",
     "Cryptography": "暗号",
@@ -672,7 +672,7 @@
     "The email address linked to your account must be entered.": "あなたのアカウントに登録されたメールアドレスの入力が必要です。",
     "A new password must be entered.": "新しいパスワードを入力する必要があります。",
     "New passwords must match each other.": "新しいパスワードは互いに一致する必要があります。",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "メールが %(emailAddress)s に送信されました。 リンクをたどったら、以下をクリックしてください。",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "メールが %(emailAddress)s に送信されました。リンクをたどったら、以下をクリックしてください。",
     "I have verified my email address": "メールアドレスを確認しました",
     "Return to login screen": "ログイン画面に戻る",
     "Send Reset Email": "リセットメールを送信",
@@ -692,13 +692,13 @@
     "Passphrases must match": "パスフレーズが一致していません",
     "Passphrase must not be empty": "パスフレーズには1文字以上が必要です",
     "Export room keys": "ルームの暗号鍵をエクスポート",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "このプロセスでは、暗号化されたルームで受信したメッセージの鍵をローカルファイルにエクスポートできます。 その後、クライアントがこれらのメッセージを復号化できるように、鍵のファイルを別のMatrixクライアントにインポートすることができます。",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "このプロセスでは、暗号化されたルームで受信したメッセージの鍵をローカルファイルにエクスポートできます。その後、クライアントがこれらのメッセージを復号化できるように、鍵のファイルを別のMatrixクライアントにインポートすることができます。",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "エクスポートしたファイルを使えば、誰でも暗号化されたメッセージを復号化できるので、ファイルを安全に保つように注意してください。ファイルのエクスポートには、任意のパスフレーズの入力が必要です。パスフレーズはファイルの暗号化に用いられます。ファイルをインポートする際には、同一のパスフレーズの入力が求められます。",
     "Enter passphrase": "パスフレーズを入力",
     "Confirm passphrase": "パスフレーズを確認",
     "Export": "エクスポート",
     "Import room keys": "ルームの暗号鍵をインポート",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "このプロセスでは、以前に別のMatrixクライアントからエクスポートした暗号鍵をインポートできます。 これにより、他のクライアントが解読できる全てのメッセージを解読することができます。",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "このプロセスでは、以前に別のMatrixクライアントからエクスポートした暗号鍵をインポートできます。これにより、他のクライアントが解読できる全てのメッセージを解読することができます。",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "エクスポートされたファイルはパスフレーズで保護されています。ファイルを復号化するには、パスフレーズを以下に入力してください。",
     "File to import": "インポートするファイル",
     "Import": "インポート",
@@ -708,7 +708,7 @@
     "Open Devtools": "開発ツールを開く",
     "Flair": "バッジ",
     "Unignore": "無視をやめる",
-    "Unable to load! Check your network connectivity and try again.": "ロードできません！ ネットワーク通信を確認の上もう一度お試しください。",
+    "Unable to load! Check your network connectivity and try again.": "ロードできません！ネットワーク通信を確認して、もう一度やり直してください。",
     "Failed to invite users to the room:": "ルームにユーザーを招待できませんでした：",
     "You do not have permission to invite people to this room.": "このルームにユーザーを招待する権限がありません。",
     "Unknown server error": "不明なサーバーエラー",
@@ -760,7 +760,7 @@
     "Unbans user with given ID": "与えられたIDを持つユーザーのブロックを解除",
     "Adds a custom widget by URL to the room": "URLで指定したカスタムウィジェットをルームに追加",
     "Please supply a https:// or http:// widget URL": "https:// または http:// で始まるウィジェットURLを指定してください",
-    "You cannot modify widgets in this room.": "あなたはこのルームのウィジェットを変更できません。",
+    "You cannot modify widgets in this room.": "このルームのウィジェットを変更できません。",
     "Sends the given message coloured as a rainbow": "与えられたメッセージを虹色にして送信",
     "Sends the given emote coloured as a rainbow": "与えられたエモートを虹色で送信",
     "Displays list of commands with usages and descriptions": "使い方と説明付きのコマンド一覧を表示",
@@ -783,10 +783,10 @@
     "Your %(brand)s is misconfigured": "あなたの%(brand)sは設定が間違っています",
     "Cannot reach identity server": "IDサーバーに接続できません",
     "No homeserver URL provided": "ホームサーバーのURLが与えられていません",
-    "User %(userId)s is already in the room": "ユーザー %(userId)s は既にそのルームにいます",
+    "User %(userId)s is already in the room": "ユーザー %(userId)s は既にそのルームに参加しています",
     "User %(user_id)s does not exist": "ユーザー %(user_id)s は存在しません",
     "The user's homeserver does not support the version of the room.": "そのユーザーのホームサーバーはそのルームのバージョンに対応していません。",
-    "Use a few words, avoid common phrases": "ありふれた語句を避けて、いくつかの単語を使ってください",
+    "Use a few words, avoid common phrases": "単語をいくつか組み合わせてください。ありきたりなフレーズは避けましょう。",
     "This is a top-10 common password": "これがよく使われるパスワードの上位10個です",
     "This is a top-100 common password": "これがよく使われるパスワードの上位100個です",
     "This is a very common password": "これはとてもよく使われるパスワードです",
@@ -794,7 +794,7 @@
     "A word by itself is easy to guess": "単語一つだけだと簡単に特定されます",
     "Custom user status messages": "ユーザーステータスのメッセージをカスタマイズ",
     "Render simple counters in room header": "ルームのヘッダーに簡単なカウンターを表示",
-    "Enable Emoji suggestions while typing": "入力中の絵文字提案機能を有効にする",
+    "Enable Emoji suggestions while typing": "入力中に絵文字を提案",
     "Show avatar changes": "アバターの変更を表示",
     "Show display name changes": "表示名の変更を表示",
     "Show read receipts sent by other users": "他の人の既読情報を表示",
@@ -814,7 +814,7 @@
     "Internal room ID:": "内部部屋 ID:",
     "Room version": "ルームのバージョン",
     "Room version:": "ルームのバージョン：",
-    "Developer options": "開発者オプション",
+    "Developer options": "開発者向けのオプション",
     "Room Addresses": "ルームのアドレス",
     "Sounds": "音",
     "Notification sound": "通知音",
@@ -846,8 +846,8 @@
     "Change topic": "トピックの変更",
     "Upgrade the room": "ルームのアップグレード",
     "Modify widgets": "ウィジェットの変更",
-    "Error changing power level requirement": "必要な権限レベルの変更中にエラーが発生しました",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "ルームで必要な権限レベルの変更中にエラーが発生しました。あなたが十分な権限を確認したうえで再度お試しください。",
+    "Error changing power level requirement": "必要な権限レベルを変更する際のエラー",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "ルームで必要な権限レベルを変更する際にエラーが発生しました。必要な権限があることを確認したうえで、もう一度やり直してください。",
     "Default role": "既定の役割",
     "Send messages": "メッセージの送信",
     "Invite users": "ユーザーの招待",
@@ -857,15 +857,15 @@
     "Notify everyone": "全員に通知",
     "Select the roles required to change various parts of the room": "ルームに関する変更を行うために必要な役割を選択",
     "Room Topic": "ルームのトピック",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>%(shortName)sとリアクションしました</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>%(shortName)sでリアクションしました</reactedWith>",
     "Next": "次へ",
     "Username": "ユーザー名",
     "Create account": "アカウントを作成",
-    "Error upgrading room": "ルームのアップグレード中にエラーが発生しました",
+    "Error upgrading room": "ルームをアップグレードする際のエラー",
     "%(senderName)s placed a voice call.": "%(senderName)sが音声通話を行いました。",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)sが音声通話を行いました。（このブラウザーではサポートされていません)",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)sが音声通話を行いました。（このブラウザーではサポートされていません）",
     "%(senderName)s placed a video call.": "%(senderName)sがビデオ通話を行いました。",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)sがビデオ通話を行いました。（このブラウザーではサポートされていません)",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)sがビデオ通話を行いました。（このブラウザーではサポートされていません）",
     "Match system theme": "システムテーマに合わせる",
     "Delete Backup": "バックアップを削除",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと受信者だけです。",
@@ -888,9 +888,9 @@
     "All keys backed up": "全ての鍵がバックアップされています",
     "Back up your keys before signing out to avoid losing them.": "鍵を失くさないよう、サインアウトする前にバックアップしてください。",
     "Start using Key Backup": "鍵のバックアップを使用開始",
-    "Error updating flair": "バッジの更新でエラーが発生しました",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "このルームのバッジの更新でエラーが発生しました。サーバーが許可していないか、一時的なエラーが発生しました。",
-    "Edited at %(date)s. Click to view edits.": "%(date)sに編集。クリックして変更履歴を表示。",
+    "Error updating flair": "バッジを更新する際のエラー",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "このルームのバッジを更新する際にエラーが発生しました。サーバーが許可していないか、一時的なエラーが発生しました。",
+    "Edited at %(date)s. Click to view edits.": "%(date)sに編集済。クリックして変更履歴を表示。",
     "edited": "編集済",
     "I don't want my encrypted messages": "暗号化されたメッセージは必要ありません",
     "Manually export keys": "手動で鍵をエクスポート",
@@ -898,11 +898,11 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "このルームを<oldVersion />から<newVersion />にアップグレードします。",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：信頼済のコンピューターからのみ鍵のバックアップを設定してください。",
     "For maximum security, this should be different from your account password.": "セキュリティーの効果を高めるために、アカウントのパスワードと別のものを設定するべきです。",
-    "That matches!": "同じです!",
+    "That matches!": "同じです！",
     "Download": "ダウンロード",
-    "<b>Print it</b> and store it somewhere safe": "<b>印刷して</b>安全な場所に保管しましょう",
-    "<b>Save it</b> on a USB key or backup drive": "USBメモリーやバックアップ用のドライブに<b>保存</b>しましょう",
-    "<b>Copy it</b> to your personal cloud storage": "個人のクラウドストレージに<b>コピー</b>しましょう",
+    "<b>Print it</b> and store it somewhere safe": "<b>印刷</b>して安全な場所に保管",
+    "<b>Save it</b> on a USB key or backup drive": "USBメモリーやバックアップ用のドライブに<b>保存</b>",
+    "<b>Copy it</b> to your personal cloud storage": "個人用クラウドストレージに<b>コピー</b>",
     "Display Name": "表示名",
     "Profile picture": "プロフィール画像",
     "Encryption enabled": "暗号化が有効です",
@@ -920,15 +920,15 @@
     "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます",
     "Session name": "セッション名",
     "Session key": "セッションキー",
-    "Never send encrypted messages to unverified sessions from this session": "このセッションでは、未検証のセッションに対して暗号化されたメッセージを送信しない",
-    "Never send encrypted messages to unverified sessions in this room from this session": "このセッションでは、このルームの未検証のセッションに対して暗号化されたメッセージを送信しない",
+    "Never send encrypted messages to unverified sessions from this session": "このセッションでは、未認証のセッションに対して暗号化されたメッセージを送信しない",
+    "Never send encrypted messages to unverified sessions in this room from this session": "このセッションでは、このルームの未認証のセッションに対して暗号化されたメッセージを送信しない",
     "Encrypted messages in one-to-one chats": "1対1のチャットでの暗号化されたメッセージ",
     "Encrypted messages in group chats": "グループチャットでの暗号化されたメッセージ",
     "Upload": "アップロード",
-    "Enable desktop notifications for this session": "このセッションでデスクトップ通知を行う",
+    "Enable desktop notifications for this session": "このセッションではデスクトップ通知を有効にする",
     "Email addresses": "メールアドレス",
     "This room is end-to-end encrypted": "このルームはエンドツーエンド暗号化されています",
-    "Encrypted by an unverified session": "未検証のセッションによる暗号化",
+    "Encrypted by an unverified session": "未認証のセッションによる暗号化",
     "Close preview": "プレビューを閉じる",
     "Direct Messages": "ダイレクトメッセージ",
     "Loading …": "読み込んでいます…",
@@ -939,10 +939,10 @@
     "Clear cross-signing keys": "クロス署名鍵を削除",
     "Clear all data in this session?": "このセッションの全てのデータを削除してよろしいですか？",
     "Clear all data": "全てのデータを削除",
-    "Create a public room": "公開されたルームを作成",
+    "Create a public room": "公開ルームを作成",
     "Message edits": "メッセージの編集履歴",
     "Report Content to Your Homeserver Administrator": "あなたのホームサーバーの管理者にコンテンツを報告",
-    "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.": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。このルーム内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示することはできません。",
+    "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.": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。このルーム内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示したりすることはできません。",
     "Send report": "報告を送信",
     "Sign out and remove encryption keys?": "ログアウトおよび暗号鍵の削除を実行してよろしいですか？",
     "Terms of Service": "利用規約",
@@ -975,43 +975,43 @@
     "Email (optional)": "メールアドレス（任意）",
     "Phone (optional)": "電話番号（任意）",
     "Sign in instead": "サインイン",
-    "Verify this session": "このセッションの検証",
+    "Verify this session": "このセッションの認証",
     "Encryption upgrade available": "暗号化のアップグレードが利用できます",
     "Not Trusted": "信頼されていません",
-    "Manually Verify by Text": "テキストを使って手動で検証",
-    "Interactively verify by Emoji": "絵文字を使って検証",
+    "Manually Verify by Text": "テキストを使って手動で認証",
+    "Interactively verify by Emoji": "絵文字を使って認証",
     "Done": "戻る",
     "Later": "後で",
-    "Review": "検証",
+    "Review": "認証",
     "Upgrade": "アップグレード",
-    "Verify": "検証",
+    "Verify": "認証",
     "Trusted": "信頼済",
     "Not trusted": "信頼されていません",
-    "%(count)s verified sessions|other": "%(count)s件の検証済のセッション",
-    "%(count)s verified sessions|one": "1件の検証済のセッション",
-    "Hide verified sessions": "検証済のセッションを隠す",
-    "%(count)s sessions|other": "%(count)s件のセッション",
-    "%(count)s sessions|one": "%(count)s件のセッション",
+    "%(count)s verified sessions|other": "%(count)s件の認証済のセッション",
+    "%(count)s verified sessions|one": "1件の認証済のセッション",
+    "Hide verified sessions": "認証済のセッションを隠す",
+    "%(count)s sessions|other": "%(count)s個のセッション",
+    "%(count)s sessions|one": "%(count)s個のセッション",
     "Hide sessions": "セッションを隠す",
     "Security": "セキュリティー",
     "Welcome to %(appName)s": "%(appName)sにようこそ",
     "Liberate your communication": "あなたのコミュニケーションを解放する",
     "Send a Direct Message": "ダイレクトメッセージを送信",
-    "Explore Public Rooms": "公開されたルームを探索",
+    "Explore Public Rooms": "公開ルームを探索",
     "Create a Group Chat": "グループチャットを作成",
     "Go Back": "戻る",
     "Messages in this room are end-to-end encrypted.": "このルーム内でのメッセージの送受信はエンドツーエンド暗号化されています。",
     "Messages in this room are not end-to-end encrypted.": "このルーム内でのメッセージの送受信はエンドツーエンド暗号化されていません。",
-    "You signed in to a new session without verifying it:": "あなたのこのセッションはまだ検証されていません：",
-    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)sの(%(userId)s）は未検証のセッションにサインインしました：",
+    "You signed in to a new session without verifying it:": "あなたのこのセッションはまだ認証されていません：",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)sの(%(userId)s）は未認証のセッションにサインインしました：",
     "Recent Conversations": "最近会話したユーザー",
     "Suggestions": "提案",
     "Go": "続行",
-    "Session already verified!": "このセッションは検証済です!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：このセッションは検証済ですが、鍵が一致しません！",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告：鍵の検証に失敗しました！提供された鍵「%(fingerprint)s」は、%(userId)sおよびセッション %(deviceId)s の署名鍵「%(fprint)s」と一致しません。通信が傍受されている恐れがあります！",
+    "Session already verified!": "このセッションは認証済です！",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：このセッションは認証済ですが、鍵が一致しません！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告：鍵の認証に失敗しました！提供された鍵「%(fingerprint)s」は、%(userId)sおよびセッション %(deviceId)s の署名鍵「%(fprint)s」と一致しません。通信が傍受されている恐れがあります！",
     "Show typing notifications": "入力中通知を表示",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "あなたのホームサーバーが対応していない場合は代替通話支援サーバー turn.matrix.org の使用を許可（あなたの IP アドレスが通話相手に漏洩するのを防ぎます)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "あなたのホームサーバーが対応していない場合は代替通話支援サーバー turn.matrix.org の使用を許可（あなたのIPアドレスが通話相手に漏洩するのを防ぎます）",
     "Your homeserver does not support cross-signing.": "あなたのホームサーバーはクロス署名に対応していません。",
     "in memory": "メモリー内",
     "not found": "存在しない",
@@ -1030,19 +1030,19 @@
     "Custom theme URL": "カスタムテーマURL",
     "Add theme": "テーマの追加",
     "Account management": "アカウントの管理",
-    "Deactivating your account is a permanent action - be careful!": "アカウントの無効化は取り消せません。注意してください!",
+    "Deactivating your account is a permanent action - be careful!": "アカウントの無効化は取り消せません。注意してください！",
     "Deactivate account": "アカウントの無効化",
     "Room list": "ルーム一覧",
     "Timeline": "タイムライン",
     "Message search": "メッセージの検索",
     "Published Addresses": "公開アドレス",
     "Local Addresses": "ローカルアドレス",
-    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)sは検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています：",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)sは検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。",
     "Space used:": "使用中のストレージ容量：",
     "Indexed messages:": "インデックス済のメッセージ数：",
     "Indexed rooms:": "インデックス済のルーム数：",
     "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s件のルームの内%(doneRooms)s件",
-    "Error changing power level": "権限レベルの変更中にエラーが発生しました",
+    "Error changing power level": "権限レベルを変更する際のエラー",
     "Frequently Used": "使用頻度の高いリアクション",
     "Smileys & People": "表情と人々",
     "Animals & Nature": "動物と植物",
@@ -1059,8 +1059,8 @@
     "%(brand)s URL": "%(brand)sのURL",
     "Room ID": "ルームID",
     "More options": "他のオプション",
-    "Manually verify all remote sessions": "全てのリモートセッションを手動で検証",
-    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "クロス署名された端末を信頼せず、信頼済としてマークするためにユーザーが使用する各セッションを個別に検証します。",
+    "Manually verify all remote sessions": "全てのリモートセッションを手動で認証",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "クロス署名された端末を信頼せず、信頼済としてマークするためにユーザーが使用する各セッションを個別に認証します。",
     "This session is backing up your keys. ": "このセッションは鍵をバックアップしています。 ",
     "Show all": "全て表示",
     "Message deleted": "メッセージが削除されました",
@@ -1073,10 +1073,10 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "バックアップには、ID %(deviceId)s の<verify>不明な</verify>セッションによる署名があります",
     "Backup has a <validity>valid</validity> signature from this session": "バックアップには、このセッションによる<validity>有効</validity>な署名があります",
     "Backup has an <validity>invalid</validity> signature from this session": "バックアップには、このセッションによる<validity>無効</validity>な署名があります",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>検証された</verify>セッションの<device></device>による<validity>有効な</validity>署名があります",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未検証</verify>のセッションの<device></device>による<validity>有効</validity>な署名があります",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>検証済</verify>のセッションの<device></device>による<validity>無効</validity>な署名があります",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未検証</verify>のセッションの<device></device>による<validity>無効</validity>な署名があります",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>認証された</verify>セッションの<device></device>による<validity>有効な</validity>署名があります",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未認証</verify>のセッションの<device></device>による<validity>有効</validity>な署名があります",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>認証済</verify>のセッションの<device></device>による<validity>不正</validity>な署名があります",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未認証</verify>のセッションの<device></device>による<validity>無効</validity>な署名があります",
     "Backup is not signed by any of your sessions": "バックアップには、あなたのどのセッションからも署名がありません",
     "This backup is trusted because it has been restored on this session": "このバックアップは、このセッションで復元されたため信頼されています",
     "Where you’re logged in": "現在ログイン中のセッション",
@@ -1091,25 +1091,25 @@
     "Other users may not trust it": "他のユーザーはこのセッションを信頼しない可能性があります",
     "Show a placeholder for removed messages": "削除されたメッセージの場所にプレースホルダーを表示",
     "Show join/leave messages (invites/kicks/bans unaffected)": "参加/退出のメッセージを表示 (招待/追放/ブロック には影響しません)",
-    "Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のあるMatrix IDに招待を送る前に、確認を表示",
+    "Prompt before sending invites to potentially invalid matrix IDs": "不正かもしれないMatrix IDに招待を送信する前に確認を表示",
     "Order rooms by name": "名前順でルームを整列",
     "Show rooms with unread notifications first": "未読通知のあるルームをトップに表示",
     "Show shortcuts to recently viewed rooms above the room list": "最近表示したルームのショートカットをルームリストの上に表示",
     "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "あなたのアカウントではクロス署名の認証情報がシークレットストレージに保存されていますが、このセッションでは信頼されていません。",
-    "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.": "このセッションでは<b>鍵をバックアップしていません</b>が、あなたは復元に使用したり、今後鍵を追加したりできるバックアップを持っています。",
+    "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.": "このセッションでは<b>鍵をバックアップしていません</b>が、復元に使用したり、今後鍵を追加したりできるバックアップがあります。",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "サインアウトする前に、このセッションにだけある鍵を失わないよう、セッションを鍵のバックアップに接続しましょう。",
     "Connect this session to Key Backup": "このセッションを鍵のバックアップに接続",
-    "Autocomplete delay (ms)": "自動補完の遅延（ms)",
+    "Autocomplete delay (ms)": "自動補完の遅延（ms）",
     "Missing media permissions, click the button below to request.": "メディアの使用に関する権限がありません。リクエストするには下のボタンを押してください。",
     "Request media permissions": "メディア権限をリクエスト",
     "Joining room …": "ルームに参加しています…",
     "Join the discussion": "ルームに参加",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)sはプレビューできません。ルームに参加しますか？",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "アドレスを設定すれば、他のユーザーがあなたのホームサーバー（%(localDomain)s）を通じてこのルームを見つけられるようになります。",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "アドレスを設定すると、他のユーザーがあなたのホームサーバー（%(localDomain)s）を通じてこのルームを見つけられるようになります。",
     "Verify this login": "このログインを承認",
     "Signing In...": "サインインしています…",
-    "If you've joined lots of rooms, this might take a while": "たくさんのルームに参加している場合は、時間がかかる可能性があります",
+    "If you've joined lots of rooms, this might take a while": "多くのルームに参加している場合は、時間がかかる可能性があります",
     "Single Sign On": "シングルサインオン",
     "Light": "ライト",
     "Dark": "ダーク",
@@ -1127,11 +1127,11 @@
     "Appearance Settings only affect this %(brand)s session.": "外観の設定はこの%(brand)sのセッションにのみ適用されます。",
     "People": "連絡先",
     "Notification options": "通知設定",
-    "Verify User": "ユーザーの検証",
+    "Verify User": "ユーザーの認証",
     "Your homeserver": "あなたのホームサーバー",
-    "%(displayName)s cancelled verification.": "%(displayName)sが検証をキャンセルしました。",
-    "You cancelled verification.": "あなたが検証をキャンセルしました。",
-    "Verification cancelled": "検証のキャンセル",
+    "%(displayName)s cancelled verification.": "%(displayName)sが認証をキャンセルしました。",
+    "You cancelled verification.": "認証をキャンセルしました。",
+    "Verification cancelled": "認証のキャンセル",
     "Notification settings": "通知設定",
     "Switch to light mode": "ライトテーマに切り替え",
     "Switch to dark mode": "ダークテーマに切り替え",
@@ -1144,7 +1144,7 @@
     "Cannot connect to integration manager": "インテグレーションマネージャーに接続できません",
     "Leave Room": "部屋を退出",
     "Failed to connect to integration manager": "インテグレーションマネージャーへの接続に失敗しました",
-    "Start verification again from their profile.": "プロフィールから再度検証を開始してください。",
+    "Start verification again from their profile.": "プロフィールから再度認証を開始してください。",
     "Do not use an identity server": "IDサーバーを使用しない",
     "Composer": "入力欄",
     "Sort by": "並び替え",
@@ -1161,7 +1161,7 @@
     "Room options": "ルームの設定",
     "Ignored users": "無視しているユーザー",
     "Show tray icon and minimize window to it on close": "トレイアイコンを表示しウィンドウを閉じても最小化して待機する",
-    "This message cannot be decrypted": "メッセージが復号できません",
+    "This message cannot be decrypted": "メッセージが復号化できません",
     "Unencrypted": "暗号化されていません",
     "Encrypted by a deleted session": "削除済のセッションによる暗号化",
     "Scroll to most recent messages": "最新のメッセージを表示",
@@ -1186,7 +1186,7 @@
     "about a day from now": "今から約1日前",
     "%(num)s days from now": "今から%(num)s日前",
     "%(name)s (%(userId)s)": "%(name)s（%(userId)s）",
-    "User %(user_id)s may or may not exist": "ユーザー %(user_id)s は存在しないとは限りません",
+    "User %(user_id)s may or may not exist": "ユーザー %(user_id)s が存在するかどうかは不明です",
     "Unknown App": "不明なアプリ",
     "Room Info": "ルームの情報",
     "About": "概要",
@@ -1202,16 +1202,16 @@
     "Attach files from chat or just drag and drop them anywhere in a room.": "チャットでファイルを添付するか、ルームのどこかにドラッグ＆ドロップするとファイルを追加できます。",
     "Add widgets, bridges & bots": "ウィジェット、ブリッジ、ボットの追加",
     "Widgets": "ウィジェット",
-    "Cross-signing is ready for use.": "クロス署名の使用準備が完了しています。",
+    "Cross-signing is ready for use.": "クロス署名の使用準備が完了しました。",
     "Secure Backup": "セキュアバックアップ",
     "Set up Secure Backup": "セキュアバックアップの設定",
     "Go back": "戻る",
-    "Everyone in this room is verified": "このルーム内の全員を検証済",
+    "Everyone in this room is verified": "このルーム内の全員を認証済",
     "Verify all users in a room to ensure it's secure.": "このルーム内の全てのユーザーが安全であることを確認しました。",
-    "You've successfully verified %(displayName)s!": "%(displayName)sは正常に検証されました!",
-    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s（%(deviceId)s）は正常に検証されました!",
-    "You've successfully verified your device!": "この端末は正常に検証されました!",
-    "You've successfully verified this user.": "このユーザーは正常に検証されました。",
+    "You've successfully verified %(displayName)s!": "%(displayName)sは正常に認証されました！",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s（%(deviceId)s）は正常に認証されました！",
+    "You've successfully verified your device!": "この端末は正常に認証されました！",
+    "You've successfully verified this user.": "このユーザーは正常に認証されました。",
     "Reject & Ignore user": "拒否した上で、このユーザーを無視",
     "<userName/> invited you": "<userName/>があなたを招待しています",
     "Do you want to join %(roomName)s?": "%(roomName)sに参加しますか？",
@@ -1223,19 +1223,19 @@
     "Got it": "了解",
     "Got It": "了解",
     "Accepting…": "了承しています…",
-    "Waiting for %(displayName)s to verify…": "%(displayName)sによる検証を待っています…",
+    "Waiting for %(displayName)s to verify…": "%(displayName)sによる認証を待っています…",
     "Waiting for %(displayName)s to accept…": "%(displayName)sが了承するのを待っています…",
     "Room avatar": "ルームのアバター",
-    "Start Verification": "検証を開始",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "セキュリティー強化のため、両者の端末でワンタイムコードを確認し、このユーザーを検証してください。",
+    "Start Verification": "認証を開始",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "セキュリティー強化のため、両者の端末でワンタイムコードを確認し、このユーザーを認証してください。",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "あなたのメッセージは保護されています。メッセージのロックを解除するための固有の鍵は、あなたと受信者だけが持っています。",
-    "%(name)s wants to verify": "%(name)sが検証を求めています",
-    "You sent a verification request": "あなたが検証リクエストを送信しました",
+    "%(name)s wants to verify": "%(name)sが認証を求めています",
+    "You sent a verification request": "認証リクエストを送信しました",
     "This account has been deactivated.": "このアカウントは無効化されています。",
-    "Forget Room": "ルームを忘れる",
-    "Forget this room": "ルームを忘れる",
+    "Forget Room": "ルームを消去",
+    "Forget this room": "このルームを消去",
     "Recently Direct Messaged": "最近ダイレクトメッセージで会話したユーザー",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "このルームに誰かを招待したい場合は、招待したいユーザーの名前、（<userId/>の様な）ユーザー名、またはメールアドレスを指定するか、<a>このルームを共有</a>してください。",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "このルームに誰かを招待したい場合は、招待したいユーザーの名前、（<userId/>の様な）ユーザー名を指定するか、<a>このルームを共有</a>してください。",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "このルームに誰かを招待したい場合は、招待したいユーザーの名前、メールアドレス、または（<userId/>の様な）ユーザー名を指定するか、<a>このルームを共有</a>してください。",
     "Upgrade your encryption": "暗号化をアップグレード",
     "Send a reply…": "返信を送る…",
@@ -1243,17 +1243,17 @@
     "This is the beginning of your direct message history with <displayName/>.": "ここがあなたと<displayName/>のダイレクトメッセージの履歴の先頭です。",
     "This is the start of <roomName/>.": "ここが<roomName/>の先頭です。",
     "<a>Add a topic</a> to help people know what it is about.": "<a>トピックを追加する</a>と、このルームの目的が分かりやすくなります。",
-    "Topic: %(topic)s (<a>edit</a>)": "トピック：%(topic)s（<a>編集</a>)",
+    "Topic: %(topic)s (<a>edit</a>)": "トピック：%(topic)s（<a>編集</a>）",
     "Topic: %(topic)s ": "トピック：%(topic)s ",
     "%(displayName)s created this room.": "%(displayName)sがこのルームを作成しました。",
-    "You created this room.": "あなたがこのルームを作成しました。",
+    "You created this room.": "このルームを作成しました。",
     "%(creator)s created this DM.": "%(creator)sがこのダイレクトメッセージを作成しました。",
-    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "ここでのメッセージはエンドツーエンド暗号化されています。%(displayName)sのアバターをタップすると、プロフィールから検証を行うことができます。",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "このルーム内のメッセージはエンドツーエンド暗号化されています。参加者のアバターをタップすれば、プロフィールから参加者を検証することができます。",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "ここでのメッセージはエンドツーエンド暗号化されています。%(displayName)sのアバターをタップすると、プロフィールから認証を行うことができます。",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "このルーム内のメッセージはエンドツーエンド暗号化されています。参加者のアバターをタップすると、プロフィールから参加者を認証することができます。",
     "Use default": "既定の設定を使用",
     "e.g. my-room": "例：my-room",
     "Room address": "ルームのアドレス",
-    "New published address (e.g. #alias:server)": "新しい公開アドレス（例：#alias:server)",
+    "New published address (e.g. #alias:server)": "新しい公開アドレス（例：#alias:server）",
     "No other published addresses yet, add one below": "他の公開アドレスはまだありません。以下から追加できます",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s件のルームのメッセージの保存に%(size)sを使用しています。",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s件のルームのメッセージの保存に%(size)sを使用しています。",
@@ -1282,7 +1282,7 @@
     "Enter phone number (required on this homeserver)": "電話番号を入力（このホームサーバーでは必須）",
     "Enter phone number": "電話番号を入力",
     "Show avatars in user and room mentions": "ユーザーとルームでのメンションにアバターを表示",
-    "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 Security Key.": "セッションにアクセスできなくなる場合に備えて、アカウントデータと暗号鍵をバックアップします。鍵は一意のセキュリティーキーで保護されます。",
+    "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 Security Key.": "セッションにアクセスできなくなる場合に備えて、アカウントデータと暗号鍵をバックアップしましょう。鍵は一意のセキュリティーキーで保護されます。",
     "New version available. <a>Update now.</a>": "新しいバージョンが利用可能です。<a>今すぐ更新</a>",
     "Sign In": "サインイン",
     "Create Account": "アカウントを作成",
@@ -1299,18 +1299,18 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix関連のセキュリティー問題を報告するには、Matrix.orgの<a>Security Disclosure Policy</a>をご覧ください。",
     "Confirm adding email": "メールアドレスの追加を確認",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、メールアドレスの追加を承認してください。",
-    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "そのアドレスの作成中にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
-    "Error creating address": "アドレスの作成中にエラーが発生しました",
-    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "ルームの代替アドレスの更新中にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
-    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "ルームのメインアドレスの更新中にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
-    "Error updating main address": "メインアドレスの更新中にエラーが発生しました",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "そのアドレスを作成する際にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "Error creating address": "アドレスを作成する際のエラー",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "ルームの代替アドレスを更新する際にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "ルームのメインアドレスを更新する際にエラーが発生しました。サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "Error updating main address": "メインアドレスを更新する際のエラー",
     "Mark all as read": "全て既読としてマーク",
     "Invited by %(sender)s": "%(sender)sからの招待",
     "Revoke invite": "招待を取り消す",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "招待を取り消すことができませんでした。サーバーで一時的な問題が発生しているか、招待を取り消すための十分な権限がない可能性があります。",
     "Failed to revoke invite": "招待を取り消せませんでした",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "ヒント：通常メッセージをスラッシュで開始したい場合は<code>//</code>から始めます。",
-    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code>を使って利用可能なコマンドを一覧できます。メッセージとして送るつもりでしたか？",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code>を使って利用可能なコマンドを一覧できます。メッセージとして送信するつもりでしたか？",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "このルームはホームサーバーが<i>不安定</i>と判断したルームバージョン<roomVersion />で動作しています。",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "このルームをアップグレードすると、ルームの現在のインスタンスがシャットダウンされて、同じ名前でアップグレードされたルームが作成されます。",
     "This room has already been upgraded.": "このルームは既にアップグレードされています。",
@@ -1334,12 +1334,12 @@
     "This invite to %(roomName)s was sent to %(email)s": "ルーム %(roomName)sへの招待がメールアドレス %(email)s へ送られました",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "このメールアドレスを設定からあなたのアカウントにリンクすると%(brand)sから直接招待を受け取ることができます。",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "ルーム %(roomName)s への招待が、アカウントに関連付けられていないメールアドレス %(email)s に送られました",
-    "You can still join it because this is a public room.": "公開されたルームなので参加が可能です。",
-    "Try to join anyway": "無視して参加",
+    "You can still join it because this is a public room.": "公開ルームなので参加が可能です。",
+    "Try to join anyway": "参加を試みる",
     "You can only join it with a working invite.": "有効な招待がある場合にのみ参加できます。",
-    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "招待を検証しようとした際にエラー（%(errcode)s）が発生しました。この情報をルームの管理者に伝えてみてはどうでしょうか。",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "招待を認証する際にエラー（%(errcode)s）が発生しました。この情報をルームの管理者に伝えてみてください。",
     "Something went wrong with your invite to %(roomName)s": "%(roomName)sへの招待に問題が発生しました",
-    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)sにより%(roomName)sからあなたはブロックされました",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)sにより%(roomName)sからブロックされました",
     "Re-join": "再参加",
     "Reason: %(reason)s": "理由：%(reason)s",
     "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s により %(roomName)s からあなたは蹴り出されました",
@@ -1355,25 +1355,25 @@
     "Can't see what you’re looking for?": "探しているものが見つかりませんか?",
     "Custom Tag": "カスタムタグ",
     "Explore public rooms": "公開ルームを探索",
-    "Discovery options will appear once you have added a phone number above.": "上記の電話番号を追加すると、Discoveryオプションが表示されます。",
+    "Discovery options will appear once you have added a phone number above.": "上で電話番号を追加すると、ディスカバリーのオプションが表示されます。",
     "Verification code": "認証コード",
     "Please enter verification code sent via text.": "テキストで送信された確認コードを入力してください。",
-    "Unable to verify phone number.": "電話番号を検証できません。",
+    "Unable to verify phone number.": "電話番号を認証できません。",
     "Unable to share phone number": "電話番号を共有できません",
     "Unable to revoke sharing for phone number": "電話番号の共有を取り消せません",
-    "Discovery options will appear once you have added an email above.": "上記のメールを追加すると、Discoveryオプションが表示されます。",
+    "Discovery options will appear once you have added an email above.": "上でメールアドレスを追加すると、ディスカバリーのオプションが表示されます。",
     "Share": "共有",
     "Revoke": "取り消す",
     "Complete": "完了",
-    "Verify the link in your inbox": "受信したメールの検証リンクを開いてください",
-    "Click the link in the email you received to verify and then click continue again.": "受信したメールにあるリンクを開いて検証した後、改めて「続行する」を押してください。",
-    "Your email address hasn't been verified yet": "あなたのメールアドレスはまだ検証されていません",
+    "Verify the link in your inbox": "受信したメールの認証リンクを開いてください",
+    "Click the link in the email you received to verify and then click continue again.": "受信したメールにあるリンクを開いて認証した後、改めて「続行する」を押してください。",
+    "Your email address hasn't been verified yet": "あなたのメールアドレスはまだ認証されていません",
     "Unable to share email address": "メールアドレスを共有できません",
     "Unable to revoke sharing for email address": "メールアドレスの共有を取り消せません",
     "To link to this room, please add an address.": "このルームにリンクするにはアドレスを追加してください。",
     "Send %(eventType)s events": "%(eventType)sイベントの送信",
     "Remove messages sent by others": "他の人から送信されたメッセージの削除",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "ユーザーのパワーレベルの変更中にエラーが発生しました。十分な権限があることを確認して、再試行してください。",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "ユーザーの権限レベルを変更する際にエラーが発生しました。必要な権限があることを確認して、もう一度やり直してください。",
     "Uploaded sound": "アップロードされたサウンド",
     "Bridges": "ブリッジ",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "この部屋はどのプラットフォームともメッセージをブリッジしていません。<a>詳細</a>",
@@ -1384,48 +1384,48 @@
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：ルームをアップグレードしても、<i>ルームのメンバーは新しいバージョンのルームに自動的には移行されません。</i>古いバージョンのルームに、新しいルームへのリンクを投稿します。ルームのメンバーは、そのリンクをクリックして新しいルームに参加する必要があります。",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "サーバー管理者は、非公開のルームとダイレクトメッセージでデフォルトでエンドツーエンド暗号化を無効にしています。",
     "Accept all %(invitedRooms)s invites": "%(invitedRooms)sの招待を全て受け入れる",
-    "Read Marker off-screen lifetime (ms)": "既読マーカーを動かすまでの時間(画面オフ時)(ミリ秒)",
-    "Read Marker lifetime (ms)": "既読マーカーを動かすまでの時間(ミリ秒)",
+    "Read Marker off-screen lifetime (ms)": "既読マーカーを動かすまでの時間（画面オフ時）（ミリ秒）",
+    "Read Marker lifetime (ms)": "既読マーカーを動かすまでの時間（ミリ秒）",
     "Subscribe": "購読",
     "Room ID or address of ban list": "ブロックリストのルームIDまたはアドレス",
     "If this isn't what you want, please use a different tool to ignore users.": "これが希望どおりでない場合は、別のツールを使用してユーザーを無視してください。",
-    "Subscribing to a ban list will cause you to join it!": "ブロックリストを購読するとあなたはその効果が得られます!",
+    "Subscribing to a ban list will cause you to join it!": "ブロックリストを購読すると、そのリストに追加されます！",
     "Subscribed lists": "購読リスト",
     "eg: @bot:* or example.org": "例：@bot:*やexample.orgなど",
     "Server or user ID to ignore": "無視するサーバー/ユーザーID",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "あなたの個人用ブロックリストはあなたがメッセージを見たくない全てのユーザー/サーバーを保持します。最初のユーザー/サーバーを無視すると、「マイブロックリスト」という名前の新しいルームがルームリストに表示されます。このルームから出るとブロックリストは効果を失います。",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "個人用ブロックリストには、メッセージを表示しない全てのユーザーもしくはサーバーが記録されます。最初のユーザー/サーバーを無視すると、「マイブロックリスト」という名前の新しいルームがリストに表示されます。このルームから退出すると、ブロックリストは効果を失います。",
     "Personal ban list": "個人用ブロックリスト",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "人を無視することは、誰を禁止するかについての規則を含むブロックリストを通して行われます。ブロックリストに登録すると、そのリストによってブロックされたユーザー/サーバーが非表示になります。",
-    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "無視するユーザー/サーバーをここに追加します。アスタリスクを使用して%(brand)sを任意の文字と一致させます。たとえば、<code>@bot:*</code>は任意のサーバーで「bot」という名前の全てのユーザーを無視します。",
-    "⚠ These settings are meant for advanced users.": "⚠これらの設定は、上級ユーザーを対象としています。",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "無視はブロックリストにより行われます。ブロックリストは、ブロックする対象に関するルールを含みます。ブロックリストに登録されたユーザーやサーバーは、今後表示されなくなります。",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "無視するユーザー/サーバーをここに追加してください。アスタリスクを使用して%(brand)sを任意の文字と一致させてください。たとえば、<code>@bot:*</code>は、任意のサーバーで「bot」という名前の全てのユーザーを無視します。",
+    "⚠ These settings are meant for advanced users.": "⚠以下の設定は、上級ユーザーを対象としています。",
     "You are currently subscribed to:": "購読されています：",
     "View rules": "ルールを表示",
     "Unsubscribe": "購読の解除",
-    "You are not subscribed to any lists": "あなたはどのリストも購読していません",
-    "You are currently ignoring:": "あなたは以下を無視しています：",
-    "You have not ignored anyone.": "あなたは誰も無視していません。",
+    "You are not subscribed to any lists": "どのリストも購読していません",
+    "You are currently ignoring:": "以下を無視しています：",
+    "You have not ignored anyone.": "誰も無視していません。",
     "User rules": "ユーザールール",
     "Server rules": "サーバールール",
     "Ban list rules - %(roomName)s": "ブロックに関するルールのリスト - %(roomName)s",
     "None": "なし",
     "Please try again or view your console for hints.": "もう一度試すか、コンソールでヒントを確認してください。",
-    "Error unsubscribing from list": "リスト購読解除のエラー",
+    "Error unsubscribing from list": "リスト購読を解除する際のエラー",
     "Error removing ignored user/server": "ユーザー/サーバーの無視を除去する際のエラー",
     "Please verify the room ID or address and try again.": "ルームのIDやアドレスを確認して、もう一度お試しください。",
-    "Error subscribing to list": "リスト購読のエラー",
-    "Something went wrong. Please try again or view your console for hints.": "何かがうまくいきませんでした。もう一度試すか、コンソールで手がかりを確認してください。",
-    "Error adding ignored user/server": "ユーザー/サーバーの無視を追加する際のエラー",
+    "Error subscribing to list": "リストを購読する際のエラー",
+    "Something went wrong. Please try again or view your console for hints.": "問題が発生しました。もう一度試すか、コンソールで手がかりを確認してください。",
+    "Error adding ignored user/server": "無視したユーザー/サーバーを追加する際のエラー",
     "Ignored/Blocked": "無視/ブロック",
     "Chat with %(brand)s Bot": "%(brand)sボットとチャット",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)sの使用についてサポートが必要な場合は、<a>こちら</a>をクリックするか、下のボタンを使用してボットとチャットを開始してください。",
     "Discovery": "ディスカバリー（発見）",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "メールアドレスか電話番号でアカウントを見つけてもらえるようにするには、IDサーバー（%(serverName)s）の利用規約への同意が必要です。",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "パスワードは正常に変更されました。他のセッションに再度ログインするまで、他のセッションでプッシュ通知を受信しません",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "システムにインストールされているフォントの名前を設定すると、%(brand)sがそれを使おうとします。",
-    "Theme added!": "テーマが追加されました!",
-    "Error downloading theme information.": "テーマ情報のダウンロード中にエラーが発生しました。",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "システムにインストールされているフォントの名前を設定すると、%(brand)sはそれを使用します。",
+    "Theme added!": "テーマが追加されました！",
+    "Error downloading theme information.": "テーマ情報をダウンロードする際のエラー。",
     "Invalid theme schema.": "テーマスキーマが無効です。",
-    "Use between %(min)s pt and %(max)s pt": "%(min)s～%(max)s(pt)の間の数字を指定",
+    "Use between %(min)s pt and %(max)s pt": "%(min)s～%(max)s（pt）の間の数字を指定",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "カスタムフォントのサイズは%(min)s～%(max)s（単位：point）の間で指定できます",
     "Size must be a number": "サイズには数値を指定してください",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "IDサーバーから切断すると、他のユーザーから発見されたり、メールアドレスや電話番号で他のユーザーを招待したりできなくなります。",
@@ -1434,34 +1434,34 @@
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "現在<server></server>を使用して、連絡先を検出可能にしています。以下でIDサーバーを変更できます。",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "切断する前に、IDサーバーからメールアドレスと電話番号を削除することを推奨します。",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "まだIDサーバー <idserver /> で<b>個人データを共有</b>しています。",
-    "Disconnect anyway": "無視して切断",
+    "Disconnect anyway": "切断",
     "wait and try again later": "しばらく待って、後でもう一度試す",
     "contact the administrators of identity server <idserver />": "IDサーバー <idserver /> の管理者に連絡",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "ブラウザーのプラグインから、IDサーバーをブロックするかもしれないもの（Privacy Badgerなど）を確認してください",
     "You should:": "するべきこと：",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "切断する前にIDサーバー <idserver /> から<b>個人データを削除</b>する必要があります。 しかし残念ながらIDサーバー <idserver /> は現在オフライン状態か、またはアクセスできません。",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "切断する前にIDサーバー <idserver /> から<b>個人データを削除</b>する必要がありますが、IDサーバー <idserver /> は現在オフライン状態か、またはアクセスできません。",
     "Disconnect": "切断",
     "Disconnect from the identity server <idserver />?": "IDサーバー <idserver /> から切断しますか？",
     "Disconnect identity server": "IDサーバーを切断",
     "The identity server you have chosen does not have any terms of service.": "選択したIDサーバーには利用規約がありません。",
     "Terms of service not accepted or the identity server is invalid.": "利用規約に同意していないか、IDサーバーが無効です。",
-    "Disconnect from the identity server <current /> and connect to <new /> instead?": "IDサーバー <current /> から切断して <new /> に接続しますか？",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "IDサーバー <current /> から切断して<new />に接続しますか？",
     "Change identity server": "IDサーバーを変更",
     "Checking server": "サーバーをチェックしています",
-    "not ready": "準備ができていない",
+    "not ready": "準備ができていません",
     "ready": "準備ができました",
     "unexpected type": "unexpected type",
-    "well formed": "well formed",
+    "well formed": "正常な形式です",
     "Your keys are <b>not being backed up from this session</b>.": "鍵は<b>このセッションからバックアップされていません</b>。",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s個の鍵をバックアップしています…",
     "Unable to load key backup status": "鍵のバックアップの状態を読み込めません",
     "The operation could not be completed": "操作を完了できませんでした",
-    "Failed to save your profile": "プロファイルの保存に失敗しました",
+    "Failed to save your profile": "プロフィールの保存に失敗しました",
     "Clear notifications": "通知をクリア",
     "The integration manager is offline or it cannot reach your homeserver.": "インテグレーションマネージャーがオフライン状態か、またはあなたのホームサーバーに到達できません。",
     "%(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.": "Webブラウザー上で動作する%(brand)sは、暗号化メッセージの安全なキャッシュをローカルに保存できません。<desktopLink>%(brand)sのデスクトップ</desktopLink>アプリを使用すると、暗号化メッセージを検索結果に表示することができます。",
     "%(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>.": "暗号化されたメッセージの安全なキャッシュをローカルに保存するためのいくつかのコンポーネントが%(brand)sにはありません。この機能を試してみたい場合は、<nativeLink>検索コンポーネントが追加された</nativeLink>%(brand)sデスクトップのカスタム版をビルドしてください。",
-    "Securely cache encrypted messages locally for them to appear in search results.": "暗号化メッセージの安全なキャッシュをローカルに保存して、検索結果に表示できるようにします。",
+    "Securely cache encrypted messages locally for them to appear in search results.": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。",
     "Delete sessions|one": "セッションを削除する",
     "Delete sessions|other": "セッションを削除する",
     "Click the button below to confirm deleting these sessions.|one": "下のボタンをクリックしてこのセッションの削除を確認してください。",
@@ -1478,7 +1478,7 @@
     "Workspace: <networkLink/>": "Workspace：<networkLink/>",
     "This bridge is managed by <user />.": "このブリッジは<user />により管理されています。",
     "This bridge was provisioned by <user />.": "このブリッジは<user />により提供されました。",
-    "Decline (%(counter)s)": "Decline (%(counter)s）",
+    "Decline (%(counter)s)": "拒否（%(counter)s）",
     "Your server isn't responding to some <a>requests</a>.": "あなたのサーバーは数回の<a>リクエスト</a>に応答しません。",
     "Pin": "ピン",
     "Folder": "フォルダー",
@@ -1544,88 +1544,88 @@
     "Lion": "ライオン",
     "Cat": "猫",
     "Dog": "犬",
-    "To be secure, do this in person or use a trusted way to communicate.": "安全を確保するため、1人でこれを行うか、または信頼できる方法で連携してください。",
+    "To be secure, do this in person or use a trusted way to communicate.": "安全を確保するため、対面で行うか、または信頼できる方法で認証してください。",
     "They don't match": "異なる絵文字です",
     "They match": "同じ絵文字です",
     "Cancelling…": "キャンセルしています…",
     "Waiting for your other session to verify…": "他のセッションによる検証を待っています…",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "他のセッション %(deviceName)s (%(deviceId)s) による検証を待っています…",
-    "Unable to find a supported verification method.": "どの検証方法にも対応していません。",
-    "Verify this user by confirming the following number appears on their screen.": "このユーザーを検証するため、両方の画面に同じ番号が表示されていることを確認してください。",
+    "Unable to find a supported verification method.": "どの認証方法にも対応していません。",
+    "Verify this user by confirming the following number appears on their screen.": "このユーザーを認証するため、両方の画面に同じ番号が表示されていることを確認してください。",
     "The user must be unbanned before they can be invited.": "招待する前にユーザーのブロックを解除する必要があります。",
     "Unrecognised address": "認識されないアドレス",
     "Error leaving room": "ルームを出る際のエラー",
-    "Unexpected server error trying to leave the room": "ルームの退出時に予期しないサーバーエラー",
-    "Unexpected error resolving identity server configuration": "IDサーバー構成の解釈中に予期しないエラーが発生しました",
-    "Unexpected error resolving homeserver configuration": "ホームサーバー構成の解釈中に予期しないエラーが発生しました",
-    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "あなたはログインできますが、IDサーバーがオンラインに戻るまで一部の機能を使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
-    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "あなたはパスワードをリセットできますが、IDサーバーがオンラインに復帰するまで一部の機能を使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
-    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "あなたは登録できますが、IDサーバーがオンラインに復帰するまで一部の機能は使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "Unexpected server error trying to leave the room": "ルームを退出する際に予期しないサーバーエラーが発生しました",
+    "Unexpected error resolving identity server configuration": "IDサーバーの設定の解釈中に予期しないエラーが発生しました",
+    "Unexpected error resolving homeserver configuration": "ホームサーバーの設定の解釈中に予期しないエラーが発生しました",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "ログインできますが、IDサーバーがオンラインに戻るまで一部の機能を使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "パスワードをリセットできますが、IDサーバーがオンラインに復帰するまで一部の機能を使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "登録できますが、IDサーバーがオンラインに復帰するまで一部の機能は使用できません。この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "<a>設定</a>が間違っているか重複しているか確認するよう、%(brand)sの管理者に問い合わせてください。",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "安定したインターネット接続があることを確認するか、サーバー管理者に連絡してください",
-    "See <b>%(msgtype)s</b> messages posted to your active room": "アクティブなルームに送られた<b>%(msgtype)s</b>メッセージを見る",
-    "See <b>%(msgtype)s</b> messages posted to this room": "ルームに送られた<b>%(msgtype)s</b>メッセージを見る",
-    "Send <b>%(msgtype)s</b> messages as you in your active room": "あなたとしてアクティブなルームに<b>%(msgtype)s</b>メッセージを送る",
-    "Send <b>%(msgtype)s</b> messages as you in this room": "あなたとしてルームに<b>%(msgtype)s</b>メッセージを送る",
-    "See general files posted to your active room": "アクティブなルームに送られたファイルを見る",
-    "See general files posted to this room": "ルームに送られたファイルを見る",
-    "Send general files as you in your active room": "あなたとしてアクティブなルームにファイルを送る",
-    "Send general files as you in this room": "あなたとしてファイルをルームに送る",
-    "See videos posted to this room": "ルームに送られた動画を見る",
-    "See videos posted to your active room": "アクティブなルームに送られた動画を見る",
-    "Send videos as you in your active room": "あなたとしてアクティブなルームに動画を送る",
-    "Send videos as you in this room": "あなたとしてルームに動画を送る",
-    "See images posted to your active room": "アクティブなルームに送られた画像を見る",
-    "See images posted to this room": "ルームに送られた画像を見る",
-    "Send images as you in your active room": "あなたとしてアクティブなルームに画像を送る",
-    "Send images as you in this room": "あなたとしてルームに画像を送る",
-    "See emotes posted to your active room": "アクティブなルームに送られたエモートを見る",
-    "See emotes posted to this room": "ルームに送られたエモートを見る",
-    "Send emotes as you in your active room": "あなたとしてアクティブなルームにエモートを送る",
-    "Send emotes as you in this room": "あなたとしてルームにエモートを送る",
-    "See text messages posted to your active room": "アクティブなルームに送られたテキストメッセージを見る",
-    "See text messages posted to this room": "ルームに送られたテキストメッセージを見る",
-    "Send text messages as you in your active room": "あなたとしてアクティブなルームにメッセージを送る",
-    "Send text messages as you in this room": "あなたとしてテキストメッセージをルームに送る",
-    "See messages posted to your active room": "アクティブなルームに送られたメッセージを見る",
-    "See messages posted to this room": "ルームに送られたメッセージを見る",
-    "Send messages as you in your active room": "あなたとしてメッセージをアクティブなルームに送る",
-    "Send messages as you in this room": "あなたとしてメッセージをルームに送る",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "アクティブなルームに送られた<b>%(msgtype)s</b>メッセージを表示",
+    "See <b>%(msgtype)s</b> messages posted to this room": "ルームに送られた<b>%(msgtype)s</b>メッセージを表示",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "あなたとしてアクティブなルームに<b>%(msgtype)s</b>メッセージを送信",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "あなたとしてルームに<b>%(msgtype)s</b>メッセージを送信",
+    "See general files posted to your active room": "アクティブなルームに送られたファイルを表示",
+    "See general files posted to this room": "ルームに送られたファイルを表示",
+    "Send general files as you in your active room": "あなたとしてアクティブなルームにファイルを送信",
+    "Send general files as you in this room": "あなたとしてファイルをルームに送信",
+    "See videos posted to this room": "ルームに送られた動画を表示",
+    "See videos posted to your active room": "アクティブなルームに送られた動画を表示",
+    "Send videos as you in your active room": "あなたとしてアクティブなルームに動画を送信",
+    "Send videos as you in this room": "あなたとしてルームに動画を送信",
+    "See images posted to your active room": "アクティブなルームに送られた画像を表示",
+    "See images posted to this room": "ルームに送られた画像を表示",
+    "Send images as you in your active room": "あなたとしてアクティブなルームに画像を送信",
+    "Send images as you in this room": "あなたとしてルームに画像を送信",
+    "See emotes posted to your active room": "アクティブなルームに送られたエモートを表示",
+    "See emotes posted to this room": "ルームに送られたエモートを表示",
+    "Send emotes as you in your active room": "あなたとしてアクティブなルームにエモートを送信",
+    "Send emotes as you in this room": "あなたとしてルームにエモートを送信",
+    "See text messages posted to your active room": "アクティブなルームに送られたテキストメッセージを表示",
+    "See text messages posted to this room": "ルームに送られたテキストメッセージを表示",
+    "Send text messages as you in your active room": "あなたとしてアクティブなルームにメッセージを送信",
+    "Send text messages as you in this room": "あなたとしてテキストメッセージをルームに送信",
+    "See messages posted to your active room": "アクティブなルームに送られたメッセージを表示",
+    "See messages posted to this room": "ルームに送られたメッセージを表示",
+    "Send messages as you in your active room": "あなたとしてメッセージをアクティブなルームに送信",
+    "Send messages as you in this room": "あなたとしてメッセージをルームに送信",
     "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> 機能",
-    "See <b>%(eventType)s</b> events posted to your active room": "アクティブなルームに送られたイベント（<b>%(eventType)s</b>）を見る",
-    "Send <b>%(eventType)s</b> events as you in your active room": "あなたとしてイベント（<b>%(eventType)s</b>）をアクティブなルームに送る",
-    "See <b>%(eventType)s</b> events posted to this room": "このルームに送られたイベント（<b>%(eventType)s</b>）を見る",
-    "Send <b>%(eventType)s</b> events as you in this room": "あなたとしてイベント（<b>%(eventType)s</b>）をこのルームに送る",
+    "See <b>%(eventType)s</b> events posted to your active room": "アクティブなルームに送られたイベント（<b>%(eventType)s</b>）を表示",
+    "Send <b>%(eventType)s</b> events as you in your active room": "あなたとしてイベント（<b>%(eventType)s</b>）をアクティブなルームに送信",
+    "See <b>%(eventType)s</b> events posted to this room": "このルームに送られたイベント（<b>%(eventType)s</b>）を表示",
+    "Send <b>%(eventType)s</b> events as you in this room": "あなたとしてイベント（<b>%(eventType)s</b>）をこのルームに送信",
     "with state key %(stateKey)s": "ステートキー %(stateKey)s と一緒に",
     "with an empty state key": "空のステートキーと一緒に",
-    "See when anyone posts a sticker to your active room": "アクティブなルームにステッカーが送られた時刻を見る",
-    "Send stickers to your active room as you": "あなたとしてアクティブなルームにステッカーを送る",
-    "See when a sticker is posted in this room": "ルームにステッカーが投稿された時刻を見る",
-    "Send stickers to this room as you": "あなたとしてルームにステッカーを送る",
-    "See when the avatar changes in your active room": "アクティブなルームでアバターが変わった時刻を見る",
+    "See when anyone posts a sticker to your active room": "アクティブなルームにステッカーが送られた時刻を表示",
+    "Send stickers to your active room as you": "あなたとしてアクティブなルームにステッカーを送信",
+    "See when a sticker is posted in this room": "ルームにステッカーが投稿された時刻を表示",
+    "Send stickers to this room as you": "あなたとしてルームにステッカーを送信",
+    "See when the avatar changes in your active room": "アクティブなルームでアバターが変更された時刻を表示",
     "Change the avatar of your active room": "アクティブなルームのアバター画像を変更",
-    "See when the avatar changes in this room": "ルームのアバター画像が変わった時刻を見る",
+    "See when the avatar changes in this room": "ルームのアバター画像が変更された時刻を表示",
     "Change the avatar of this room": "ルームのアバター画像を変更",
-    "See when the name changes in your active room": "アクティブなルームで名前が変わった時刻を見る",
+    "See when the name changes in your active room": "アクティブなルームで名前が変更された時刻を表示",
     "Change the name of your active room": "アクティブなルームの名前を変更",
-    "See when the name changes in this room": "ルームの名前が変わった時刻を見る",
+    "See when the name changes in this room": "ルームの名前が変更された時刻を表示",
     "Change the name of this room": "ルームの名前を変更",
-    "See when the topic changes in your active room": "アクティブなルームでトピックが変わった時刻を見る",
+    "See when the topic changes in your active room": "アクティブなルームでトピックが変更された時刻を表示",
     "Change the topic of your active room": "アクティブなルームのトピックを変更",
-    "See when the topic changes in this room": "ルームのトピックが変わった時刻を見る",
+    "See when the topic changes in this room": "ルームのトピックが変わった時刻を表示",
     "Change the topic of this room": "ルームのトピックを変更",
-    "Change which room, message, or user you're viewing": "表示するルーム、メッセージ、またはユーザーを変更",
-    "Change which room you're viewing": "表示するルームを変更",
-    "Send stickers into your active room": "アクティブなルームにステッカーを送る",
-    "Send stickers into this room": "このルームにステッカーを送る",
-    "Remain on your screen while running": "実行中は画面に留める",
-    "Remain on your screen when viewing another room, when running": "他のルームを表示してる間も実行中は画面に留める",
-    "Ask this user to verify their session, or manually verify it below.": "このユーザーに彼らのセッションを検証するよう問い合わせるか、以下のように手動で検証してください。",
-    "Verify your other session using one of the options below.": "以下のどれか一つを使って他のセッションを検証します。",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sはブロックに関するルール %(oldGlob)s を %(newGlob)sに変更しました（理由 %(reason)s）",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがサーバーのブロックに関するルール %(oldGlob)s を %(newGlob)sに変更しました（理由 %(reason)s）",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがルームのブロックに関するルール %(oldGlob)s を %(newGlob)sに変更しました（理由 %(reason)s）",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがユーザーのブロックに関するルール %(oldGlob)s を %(newGlob)sに変更しました（理由 %(reason)s）",
+    "Change which room, message, or user you're viewing": "表示しているルーム、メッセージ、またはユーザーを変更",
+    "Change which room you're viewing": "表示しているルームを変更",
+    "Send stickers into your active room": "アクティブなルームにステッカーを送信",
+    "Send stickers into this room": "このルームにステッカーを送信",
+    "Remain on your screen while running": "実行中は画面に留まる",
+    "Remain on your screen when viewing another room, when running": "他のルームを表示してる間も実行中は画面に留まる",
+    "Ask this user to verify their session, or manually verify it below.": "このユーザーに彼らのセッションを認証するよう問い合わせるか、以下から手動で認証してください。",
+    "Verify your other session using one of the options below.": "以下のどれか一つを使って他のセッションを認証します。",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sはブロックに関するルール %(oldGlob)s を %(newGlob)s に変更しました（理由 %(reason)s）",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがサーバーのブロックに関するルール %(oldGlob)s を %(newGlob)s に変更しました（理由 %(reason)s）",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがルームのブロックに関するルール %(oldGlob)s を %(newGlob)s に変更しました（理由 %(reason)s）",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sがユーザーのブロックに関するルール %(oldGlob)s を %(newGlob)s に変更しました（理由 %(reason)s）",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)sがブロックに関するルール %(glob)s を作成しました（理由 %(reason)s）",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)sがサーバーのブロックに関するルール %(glob)s を作成しました（理由 %(reason)s）",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)sがルームのブロックに関するルール %(glob)s を作成しました（理由 %(reason)s）",
@@ -1655,13 +1655,13 @@
     "Converts the room to a DM": "ルームをDMに変換",
     "Takes the call in the current room off hold": "現在のルームの通話を保留から外す",
     "Places the call in the current room on hold": "保留中の現在のルームに通話を発信",
-    "Sends a message to the given user": "指定されたユーザーにメッセージを送る",
+    "Sends a message to the given user": "指定されたユーザーにメッセージを送信",
     "Opens chat with the given user": "指定されたユーザーとのチャットを開く",
-    "Send a bug report with logs": "ログ付きのバグレポートを送る",
+    "Send a bug report with logs": "ログ付きのバグレポートを送信",
     "Displays information about a user": "ユーザーの情報を表示",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "指定された署名鍵は%(userId)sのセッション %(deviceId)s から受け取った鍵と一致します。セッションは検証済です。",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "指定された署名鍵は%(userId)sのセッション %(deviceId)s から受け取った鍵と一致します。セッションは認証済です。",
     "Unknown (user, session) pair:": "ユーザーとセッションのペアが不明です:",
-    "Verifies a user, session, and pubkey tuple": "ユーザー、セッション、およびpubkeyタプルを検証",
+    "Verifies a user, session, and pubkey tuple": "ユーザー、セッション、およびpubkeyタプルを認証",
     "Please supply a widget URL or embed code": "ウィジェットのURLまたは埋め込みコードを入力してください",
     "Could not find user in room": "ルームにユーザーが見つかりません",
     "Command failed": "コマンドが失敗しました",
@@ -1669,7 +1669,7 @@
     "Joins room with given address": "指定したアドレスのルームに参加",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "メールでの招待にIDサーバーを使用します。デフォルトのIDサーバー（%(defaultIdentityServerName)s）を使用する場合は「続行する」を押してください。または設定画面を開いて変更してください。",
     "Failed to set topic": "トピックの設定に失敗しました",
-    "Double check that your server supports the room version chosen and try again.": "選択したルームのバージョンをあなたのサーバーがサポートしているか何度も確認してから、もう一度試してください。",
+    "Double check that your server supports the room version chosen and try again.": "選択したルームのバージョンをあなたのサーバーがサポートしているか改めて確認し、もう一度試してください。",
     "Sends a message as html, without interpreting it as markdown": "メッセージを（Markdownではなく）HTMLとして送信",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "プレーンテキストメッセージの前に ( ͡° ͜ʖ ͡°) を付ける",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "プレーンテキストメッセージの前に ┬──┬ ノ( ゜-゜ノ) を付ける",
@@ -1680,7 +1680,7 @@
     "Cancel entering passphrase?": "パスフレーズの入力をキャンセルしますか？",
     "Custom (%(level)s)": "カスタム（%(level)s）",
     "Use your account or create a new one to continue.": "作成済のアカウントを使用するか、新しいアカウントを作成して続けます。",
-    "Sign In or Create Account": "サインインまたはアカウントの作成",
+    "Sign In or Create Account": "サインインするか、アカウントを作成してください",
     "Zimbabwe": "ジンバブエ",
     "Zambia": "ザンビア",
     "Yemen": "イエメン",
@@ -1743,8 +1743,8 @@
     "Mod": "Mod",
     "Edit message": "メッセージの編集",
     "Someone is using an unknown session": "誰かが不明なセッションを使用しています",
-    "You have verified this user. This user has verified all of their sessions.": "このユーザーを検証しました。このユーザーは全てのセッションを検証しました。",
-    "You have not verified this user.": "あなたはこのユーザーを検証していません。",
+    "You have verified this user. This user has verified all of their sessions.": "このユーザーを認証しました。このユーザーは全てのセッションを認証しました。",
+    "You have not verified this user.": "あなたはこのユーザーを認証していません。",
     "This user has not verified all of their sessions.": "このユーザーは全てのセッションを確認していません。",
     "Phone Number": "電話番号",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "+%(msisdn)sにテキストメッセージを送りました。メッセージに含まれた確認コードを入力してください。",
@@ -1951,13 +1951,13 @@
     "Afghanistan": "アフガニスタン",
     "United States": "アメリカ",
     "United Kingdom": "イギリス",
-    "%(name)s is requesting verification": "%(name)sは検証を要望しています",
+    "%(name)s is requesting verification": "%(name)sは認証を要求しています",
     "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "ホームサーバーがログインの試行を拒否しました。時間がかかりすぎたことが原因かもしれません。もう一度やり直してください。これが続く場合はホームサーバー管理者に連絡してください。",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "ホームサーバーにアクセスできませんでした。もう一度やり直してください。これが続く場合はホームサーバー管理者に連絡してください。",
     "Try again": "もう一度試す",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "残念ながらブラウザーはサインインするホームサーバーを忘れてしまいました。サインインページに移動して再試行してください。",
     "We couldn't log you in": "ログインできませんでした",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "このアクションはデフォルトのIDサーバー <server /> にアクセスしてメールアドレスまたは電話番号を検証する必要がありますが、サーバーには利用規約がありません。",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "このアクションはデフォルトのIDサーバー <server /> にアクセスしてメールアドレスまたは電話番号を認証する必要がありますが、サーバーには利用規約がありません。",
     "Room name or address": "ルームの名前またはアドレス",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "現時点ではファイルで返信することはできません。返信せずにこのファイルをアップロードしますか？",
     "This will end the conference for everyone. Continue?": "これは全員の会議を終了させます。続けますか？",
@@ -1967,7 +1967,7 @@
     "No other application is using the webcam": "他のアプリがWebカメラを使用中ではないこと",
     "Permission is granted to use the webcam": "Webカメラを使用する権限が与えられていること",
     "A microphone and webcam are plugged in and set up correctly": "マイクとWebカメラが接続されていて、正しく設定されていること",
-    "Verify this user by confirming the following emoji appear on their screen.": "このユーザーを検証するため、両方の画面に絵文字が同じ順序で表示されていることを確認してください。",
+    "Verify this user by confirming the following emoji appear on their screen.": "このユーザーを認証するため、両方の画面に絵文字が同じ順序で表示されていることを確認してください。",
     "Verify this session by confirming the following number appears on its screen.": "このセッションを検証するため、同じ番号が両方の画面に表示されていることを確認してください。",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "以下の絵文字が両方のセッションで同じ順序で表示されていることをしてください:",
     "Start": "開始",
@@ -1977,14 +1977,14 @@
     "Scan this unique code": "ユニークなコードをスキャン",
     "Verify this session by completing one of the following:": "以下のどれか一つの方法で、このセッションを検証します。",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "ユーザー間でエンドツーエンド暗号化されたメッセージです。第三者が解読することはできません。",
-    "Verified!": "検証されました!",
-    "The other party cancelled the verification.": "相手方が確認をキャンセルしました。",
+    "Verified!": "認証されました！",
+    "The other party cancelled the verification.": "相手が認証をキャンセルしました。",
     "Unknown caller": "不明な発信者",
     "Dial pad": "ダイヤルパッド",
-    "There was an error looking up the phone number": "電話番号を見つける際にエラーがありました",
+    "There was an error looking up the phone number": "電話番号を見つける際にエラーが発生しました",
     "Unable to look up phone number": "電話番号が見つかりません",
     "%(name)s on hold": "%(name)sが保留中",
-    "Return to call": "電話に戻る",
+    "Return to call": "通話に戻る",
     "Fill Screen": "全画面",
     "Voice Call": "音声電話",
     "Video Call": "ビデオ通話",
@@ -1992,12 +1992,12 @@
     "You held the call <a>Resume</a>": "<a>再開</a>の電話をかけました",
     "You held the call <a>Switch</a>": "<a>スイッチ</a>に電話をかけました",
     "sends snowfall": "降雪を送る",
-    "Sends the given message with snowfall": "メッセージを降雪と共に送る",
+    "Sends the given message with snowfall": "メッセージを降雪と共に送信",
     "sends fireworks": "花火を送る",
-    "Sends the given message with fireworks": "メッセージを花火と共に送る",
+    "Sends the given message with fireworks": "メッセージを花火と共に送信",
     "sends confetti": "紙吹雪を送る",
-    "Sends the given message with confetti": "メッセージを紙吹雪と共に送る",
-    "This is your list of users/servers you have blocked - don't leave the room!": "あなたがブロックしたユーザーとサーバーのリストです。このルームから退出しないでください！",
+    "Sends the given message with confetti": "メッセージを紙吹雪と共に送信",
+    "This is your list of users/servers you have blocked - don't leave the room!": "ブロックしたユーザーとサーバーのリストです。このルームから退出しないでください！",
     "My Ban List": "私のブロック一覧",
     "Downloading logs": "ログをダウンロードしています",
     "Uploading logs": "ログをアップロードしています",
@@ -2011,13 +2011,13 @@
     "Expand code blocks by default": "デフォルトでコードブロックを展開",
     "Show stickers button": "ステッカーボタンを表示",
     "Show info about bridges in room settings": "ルームの設定にブリッジの情報を表示",
-    "Offline encrypted messaging using dehydrated devices": "dehydrated 端末を使用したオフライン暗号化メッセージング",
+    "Offline encrypted messaging using dehydrated devices": "乾燥した（dehydrated）端末を使用したオフライン暗号化メッセージング",
     "Show message previews for reactions in all rooms": "全てのルームでリアクションのメッセージプレビューを表示",
     "Show message previews for reactions in DMs": "DM中のリアクションにメッセージプレビューを表示",
     "Support adding custom themes": "カスタムテーマの追加に対応",
-    "Try out new ways to ignore people (experimental)": "人々を無視する新しい方法を試す（実験的)",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "カスタムタグを使ってルームをグループまたはフィルタします（ページのリロードが必要）",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. 互換性のあるホームサーバーが必要です。非常に実験的。注意して使用してください。",
+    "Try out new ways to ignore people (experimental)": "ユーザーを無視する新しい方法を試す（実験的）",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "カスタムタグを使ってルームをグループまたはフィルタリング（ページのリロードが必要）",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "コミュニティー機能のバージョン2のプロトタイプ。互換性のあるホームサーバーが必要です。非常に実験的。注意して使用してください。",
     "Render LaTeX maths in messages": "メッセージ中のLaTeX数式を描画",
     "Change notification settings": "通知設定を変更",
     "%(senderName)s: %(stickerName)s": "%(senderName)s：%(stickerName)s",
@@ -2027,7 +2027,7 @@
     "%(senderName)s is calling": "%(senderName)sが呼び出し中",
     "Waiting for answer": "応答を待っています",
     "%(senderName)s started a call": "%(senderName)sが通話を開始しました",
-    "You started a call": "あなたは通話を開始しました",
+    "You started a call": "通話を開始しました",
     "Call ended": "通話終了",
     "%(senderName)s ended the call": "%(senderName)sが通話を終了しました",
     "You ended the call": "通話を終了しました",
@@ -2036,7 +2036,7 @@
     "You joined the call": "通話に参加しました",
     "The person who invited you already left the room, or their server is offline.": "あなたを招待した人は既にルームを出たか、彼らのサーバーがオフライン状態です。",
     "The person who invited you already left the room.": "あなたを招待した人は既にルームを出ました。",
-    "There was an error joining the room": "ルームに参加する際にエラーがありました",
+    "There was an error joining the room": "ルームに参加する際にエラーが発生しました",
     "Guest": "ゲスト",
     "New login. Was this you?": "新しいログインがありました。これはあなたですか？",
     "Safeguard against losing access to encrypted messages & data": "暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう",
@@ -2058,9 +2058,9 @@
     "Straight rows of keys are easy to guess": "キーの配置順序を辿ると簡単に推測されます",
     "Common names and surnames are easy to guess": "名前と名字は簡単に推測されます",
     "Names and surnames by themselves are easy to guess": "名前や名字は簡単に推測されます",
-    "Call failed because webcam or microphone could not be accessed. Check that:": "Webカメラかマイクが利用できず通話できませんでした。確認してください：",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Webカメラかマイクが利用できなかったため、通話に失敗しました。以下を確認してください：",
     "Unable to access webcam / microphone": "Webカメラとマイクを利用できません",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "マイクを利用できなかったので通話できませんでした。マイクが接続されて正しく設定されているか確認してください。",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "マイクを利用できなかったため通話に失敗しました。マイクが接続されて正しく設定されているか確認してください。",
     "Unable to access microphone": "マイクを利用できません",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "または公開サーバー <code>turn.matrix.org</code> を使用することもできますが、信頼性は低く、また公開サーバーにIPアドレスが漏洩します。これはアプリ設定でも変更できます。",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "通話が機能するよう、ホームサーバー（<code>%(homeserverDomain)s</code>）の管理者にTURNサーバーの設定を尋ねてください。",
@@ -2074,17 +2074,17 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、電話番号の追加を承認してください。",
     "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。",
     "Reactions": "リアクション",
-    "Declining …": "断っています…",
+    "Declining …": "拒否しています…",
     "Accepting …": "受け付けています…",
     "%(name)s accepted": "%(name)sは受け付けました",
-    "You accepted": "あなたは受け付けました",
+    "You accepted": "受け付けました",
     "%(name)s cancelled": "%(name)sは中止しました",
-    "%(name)s declined": "%(name)sは断りました",
-    "You cancelled": "あなたは中止しました",
-    "You declined": "あなたは断りました",
-    "%(name)s cancelled verifying": "%(name)sは検証を中止しました",
-    "You cancelled verifying %(name)s": "%(name)sの検証を中止しました",
-    "You verified %(name)s": "%(name)sを検証しました",
+    "%(name)s declined": "%(name)sは拒否しました",
+    "You cancelled": "中止しました",
+    "You declined": "拒否しました",
+    "%(name)s cancelled verifying": "%(name)sは認証を中止しました",
+    "You cancelled verifying %(name)s": "%(name)sの認証を中止しました",
+    "You verified %(name)s": "%(name)sを認証しました",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "このユーザーを無視しているのでメッセージは隠されます。<a>表示する。</a>",
     "Video conference started by %(senderName)s": "ビデオ会議は%(senderName)sにより開始しました",
     "Video conference ended by %(senderName)s": "ビデオ会議は%(senderName)sにより終了しました",
@@ -2095,17 +2095,17 @@
     "Ignored attempt to disable encryption": "暗号化を無効にする試みを無視しました",
     "Compare emoji": "絵文字を比較",
     "You cancelled verification on your other session.": "他のセッションで検証を中止しました。",
-    "Verification timed out.": "検証がタイムアウトしました。",
-    "Start verification again from the notification.": "通知から再度検証を開始します。",
+    "Verification timed out.": "認証がタイムアウトしました。",
+    "Start verification again from the notification.": "通知から再度認証を開始してください。",
     "Verified": "検証済",
     "In encrypted rooms, verify all users to ensure it’s secure.": "暗号化された部屋では、安全確認のために全てのユーザーを検証します。",
     "Almost there! Is %(displayName)s showing the same shield?": "あと少しです！%(displayName)sは同じ盾マークを表示していますか？",
     "Almost there! Is your other session showing the same shield?": "あと少しです！ あなたの他のセッションは同じ盾マークを表示していますか？",
-    "Verify by emoji": "絵文字で検証",
-    "Verify by comparing unique emoji.": "絵文字の並びを比較して検証。",
+    "Verify by emoji": "絵文字で認証",
+    "Verify by comparing unique emoji.": "絵文字の並びを比較して認証。",
     "If you can't scan the code above, verify by comparing unique emoji.": "上記のコードをスキャンできない場合は、絵文字による確認を行ってください。",
     "Ask %(displayName)s to scan your code:": "%(displayName)sにQRコードをスキャンするよう問い合わせてください：",
-    "Verify by scanning": "QRコードスキャンで検証",
+    "Verify by scanning": "QRコードスキャンで認証",
     "The session 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.": "検証しようとしているセッションは %(brand)s で利用できる QRコードのスキャンまたは絵文字認証をサポートしていません。 別のクライアントで試してください。",
     "This client does not support end-to-end encryption.": "このクライアントはエンドツーエンド暗号化に対応していません。",
     "Failed to deactivate user": "ユーザーの非アクティブ化に失敗しました",
@@ -2120,22 +2120,22 @@
     "Remove recent messages by %(user)s": "%(user)sからの最近のメッセージを削除",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "タイムラインを上にスクロールして、以前のものがあるかどうかを確認してください。",
     "No recent messages by %(user)s found": "%(user)sからの最近のメッセージが見つかりません",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "自分自身を降格しているため、この変更を元に戻すことはできません。スペース内の最後の特権ユーザーである場合、特権を取り戻すことはできません。",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "自分自身を降格しようとしています。この変更を元に戻すことはできません。スペース内の最後の特権ユーザーである場合、特権を取り戻すことはできません。",
     "Not encrypted": "暗号化されていません",
     "Edit widgets, bridges & bots": "ウィジェット、ブリッジ、ボットを編集",
-    "Set my room layout for everyone": "私のルームのレイアウトをみんな用に設定",
+    "Set my room layout for everyone": "このルームのレイアウトを参加者全体に設定",
     "Unpin a widget to view it in this panel": "ウィジェットのピン留めを外して、このパネルに表示します",
     "Unpin": "ピン留めを外す",
     "You can only pin up to %(count)s widgets|other": "ウィジェットのピン留めは%(count)s件までです",
     "Yours, or the other users’ session": "あなたまたは他のユーザーのセッション",
     "Yours, or the other users’ internet connection": "あなたまたは他のユーザーのインターネット接続",
     "The homeserver the user you’re verifying is connected to": "あなたが検証しているユーザーが接続するホームサーバー",
-    "One of the following may be compromised:": "次のいずれかが危険にさらされる可能性があります：",
-    "Your messages are not secure": "あなたのメッセージは暗号化されていません",
+    "One of the following may be compromised:": "次のいずれかのセキュリティーが破られている可能性があります。",
+    "Your messages are not secure": "あなたのメッセージは保護されていません",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "暗号化されたルームでは、あなたのメッセージは保護されています。メッセージのロックを解除するための固有の鍵は、あなたと受信者だけが持っています。",
     "Other published addresses:": "他の公開アドレス：",
-    "Error removing address": "アドレスの削除のエラー",
-    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "アドレスの削除中にエラーがありました。既に存在しないルームか、一時的なエラーが発生したか。",
+    "Error removing address": "アドレスを削除する際のエラー",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "アドレスを削除する際にエラーが発生しました。既にルームが存在しないか、一時的なエラーが発生しました。",
     "You don't have permission to delete the address.": "アドレスを削除する権限がありません。",
     "Empty room": "空のルーム",
     "Suggested Rooms": "おすすめのルーム",
@@ -2144,12 +2144,12 @@
     "You do not have permissions to create new rooms in this space": "このスペースに新しいルームを作成する権限がありません",
     "Send message": "メッセージを送信",
     "Invite to this space": "このスペースに招待",
-    "Your message was sent": "メッセージは送信されました",
+    "Your message was sent": "メッセージが送信されました",
     "Encrypting your message...": "メッセージを暗号化しています…",
     "Sending your message...": "メッセージを送信しています…",
     "Spell check dictionaries": "スペルチェック辞書",
     "Space options": "スペースのオプション",
-    "Leave space": "スペースを退出",
+    "Leave space": "スペースから退出",
     "Invite people": "人々を招待",
     "Share your public space": "公開スペースを共有",
     "Share invite link": "招待リンクを共有",
@@ -2157,7 +2157,7 @@
     "Collapse space panel": "スペースパネルを畳む",
     "Expand space panel": "スペースパネルを展開",
     "Creating...": "作成しています…",
-    "Your private space": "あなたの非公開スペース",
+    "Your private space": "あなたの非公開のスペース",
     "Your public space": "あなたの公開スペース",
     "Invite only, best for yourself or teams": "招待者のみ参加可能。個人やチームに最適",
     "Private": "非公開",
@@ -2168,7 +2168,7 @@
     "Jump to the bottom of the timeline when you send a message": "メッセージを送信する際にタイムライン最下部に移動",
     "This homeserver has been blocked by it's administrator.": "このホームサーバーは管理者によりブロックされています。",
     "This homeserver has been blocked by its administrator.": "このホームサーバーは管理者によりブロックされています。",
-    "You're already in a call with this person.": "あなたは既にこの人と通話中です。",
+    "You're already in a call with this person.": "既にこの人と通話中です。",
     "Already in call": "既に電話中です",
     "Invite People": "ユーザーを招待",
     "Edit devices": "端末を編集",
@@ -2178,7 +2178,7 @@
     "You have no ignored users.": "無視しているユーザーはいません。",
     "Join the beta": "ベータ版に参加",
     "Leave the beta": "ベータ版を終了",
-    "Your access token gives full access to your account. Do not share it with anyone.": "アクセストークンを用いるとあなたのアカウントの全てにアクセスできます。外部に公開しないでください。",
+    "Your access token gives full access to your account. Do not share it with anyone.": "アクセストークンを用いると、あなたのアカウントの全ての情報にアクセスできます。外部に公開したり、誰かと共有したりしないでください。",
     "Access Token": "アクセストークン",
     "Filter all spaces": "全スペースを検索",
     "Save Changes": "変更を保存",
@@ -2191,12 +2191,12 @@
     "Invite to just this room": "このルームに招待",
     "Invite to %(spaceName)s": "%(spaceName)sに招待",
     "Quick actions": "クイックアクション",
-    "A private space for you and your teammates": "あなたとチームメイトのプライベートスペース",
+    "A private space for you and your teammates": "あなたとチームメイトの非公開のスペース",
     "Me and my teammates": "自分とチームメイト",
     "Just me": "自分専用",
-    "Make sure the right people have access to %(name)s": "必要な人が%(name)sにアクセスできるようにします",
-    "Who are you working with?": "誰が使いますか？",
-    "Beta": "Beta",
+    "Make sure the right people have access to %(name)s": "必要な人が%(name)sにアクセスできるようにしましょう",
+    "Who are you working with?": "誰と使いますか？",
+    "Beta": "ベータ版",
     "Tap for more info": "タップして詳細を表示",
     "Check your devices": "端末を確認",
     "Invite to %(roomName)s": "%(roomName)sへ招待",
@@ -2204,9 +2204,9 @@
     "Send feedback": "フィードバックを送信",
     "Manage & explore rooms": "ルームの管理および探索",
     "Select a room below first": "以下からルームを選択してください",
-    "A private space to organise your rooms": "ルームを整理するためのプライベートスペース",
-    "Private space": "プライベートスペース",
-    "Leave Space": "スペースを退出",
+    "A private space to organise your rooms": "ルームを整理するための非公開のスペース",
+    "Private space": "非公開のスペース",
+    "Leave Space": "スペースから退出",
     "Welcome %(name)s": "ようこそ、%(name)s",
     "Are you sure you want to leave the space '%(spaceName)s'?": "このスペース「%(spaceName)s」から退出してよろしいですか？",
     "This space is not public. You will not be able to rejoin without an invite.": "このスペースは公開されていません。再度参加するには、招待が必要です。",
@@ -2255,7 +2255,7 @@
     "Upgrade required": "アップグレードが必要",
     "Only invited people can join.": "招待された人のみ参加できます。",
     "Private (invite only)": "非公開（招待者のみ）",
-    "Decide who can join %(roomName)s.": "%(roomName)sに参加できる人を設定します。",
+    "Decide who can join %(roomName)s.": "%(roomName)sに参加できる人を設定してください。",
     "%(senderName)s invited %(targetName)s": "%(senderName)sが%(targetName)sを招待しました",
     "Verify other login": "他のログインを使用した検証",
     "Accept on your other login…": "他のログインで了承してください…",
@@ -2281,7 +2281,7 @@
     "To join a space you'll need an invite.": "スペースに参加するには招待が必要です。",
     "You can also make Spaces from <a>communities</a>.": "<a>コミュニティー</a>からスペースを作成することもできます。",
     "You can change this later.": "これは後から変更できます。",
-    "What kind of Space do you want to create?": "どんなスペースを作りますか？",
+    "What kind of Space do you want to create?": "どんなスペースを作りたいですか？",
     "Sign out %(count)s selected devices|one": "%(count)s個の端末からサインアウト",
     "Sign out %(count)s selected devices|other": "%(count)s個の端末からサインアウト",
     "Last seen %(date)s at %(ip)s": "最終接続日：%(date)s（%(ip)s）",
@@ -2295,7 +2295,7 @@
     "Group all your favourite rooms and people in one place.": "お気に入りのルームと連絡先を表示します。",
     "Show all your rooms in Home, even if they're in a space.": "他のスペースに存在するルームを含めて、全てのルームをホームに表示します。",
     "Home is useful for getting an overview of everything.": "ホームは全体を把握するのに便利です。",
-    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "スペースは、ルームや連絡先をグループ化する方法です。いくつかの構築済スペースと、あなたが参加しているスペースを使用できます。",
+    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "スペースは、ルームや連絡先をグループ化する方法です。いくつかの構築済スペースと、参加済のスペースを使用できます。",
     "Spaces to show": "表示するスペース",
     "Sidebar": "サイドバー",
     "Show all rooms": "全てのルームを表示",
@@ -2303,7 +2303,7 @@
     "Home options": "ホームのオプション",
     "Report": "報告",
     "Message Previews": "メッセージプレビュー",
-    "Forward message": "メッセージの転送",
+    "Forward message": "メッセージを転送",
     "Forward": "転送",
     "Files": "ファイル",
     "Number of messages": "メッセージ数",
@@ -2325,7 +2325,7 @@
     "%(senderName)s set a profile picture": "%(senderName)sがプロフィール画像を設定しました",
     "%(senderName)s changed their profile picture": "%(senderName)sがプロフィール画像を変更しました",
     "%(senderName)s removed their profile picture": "%(senderName)sがプロフィール画像を削除しました",
-    "%(targetName)s left the room": "%(targetName)sがこのルームを退出しました",
+    "%(targetName)s left the room": "%(targetName)sがこのルームから退出しました",
     "Change main address for the space": "スペースのメインアドレスの変更",
     "Copy room link": "ルームのリンクをコピー",
     "Remove users": "ユーザーの追放",
@@ -2342,10 +2342,10 @@
     "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "クッキーの使用に関するポリシーは<CookiePolicyLink>ここ</CookiePolicyLink>から閲覧できます。",
     "Hide stickers": "ステッカーを隠す",
     "Send voice message": "音声メッセージを送信",
-    "You do not have permission to start polls in this room.": "このルームで投票を開始する権限がありません。",
+    "You do not have permission to start polls in this room.": "このルームでアンケートを開始する権限がありません。",
     "Voice Message": "音声メッセージ",
     "Sticker": "ステッカー",
-    "Poll": "投票",
+    "Poll": "アンケート",
     "Insert link": "リンクを挿入",
     "Calls are unsupported": "通話はサポートされていません",
     "Play": "再生",
@@ -2417,7 +2417,7 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "このウィジェットを使うと、データ<helpIcon />が%(widgetDomain)sと共有される可能性があります。",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your integration manager.": "このウィジェットを使うと、データ<helpIcon />が%(widgetDomain)sとインテグレーションマネージャーと共有される可能性があります。",
     "Widget ID": "ウィジェットID",
-    "Use the <a>Desktop app</a> to see all encrypted files": "全ての暗号化されたファイルを見るには<a>デスクトップ用のアプリ</a>を使用してください",
+    "Use the <a>Desktop app</a> to see all encrypted files": "全ての暗号化されたファイルを表示するには<a>デスクトップ用のアプリ</a>を使用してください",
     "User Directory": "ユーザーディレクトリ",
     "Or send invite link": "もしくはリンクを送信",
     "If you can't see who you're looking for, send them your invite link below.": "探している相手が見つからなければ、以下のリンクを送信してください。",
@@ -2426,7 +2426,7 @@
     "Write an option": "選択肢を記入",
     "Use <arrows/> to scroll": "<arrows/>でスクロール",
     "Clear": "消去",
-    "Public rooms": "公開されたルーム",
+    "Public rooms": "公開ルーム",
     "Use \"%(query)s\" to search": "「%(query)s」のキーワードで検索",
     "Join %(roomAddress)s": "%(roomAddress)sに参加",
     "Other rooms in %(spaceName)s": "%(spaceName)sの他のルーム",
@@ -2461,7 +2461,7 @@
     "Jump to oldest unread message": "最も古い未読メッセージに移動",
     "Sign in with single sign-on": "シングルサインオンを使用してサインイン",
     "In reply to <a>this message</a>": "<a>このメッセージ</a>への返信",
-    "Edit poll": "投票を編集",
+    "Edit poll": "アンケートを編集",
     "Select room from the room list": "ルーム一覧からルームを選択",
     "Jump to room search": "ルームの検索に移動",
     "Navigate to previous message in composer history": "入力履歴の前のメッセージに移動",
@@ -2499,7 +2499,7 @@
     "Page Up": "Page Up",
     "Location": "位置情報",
     "Submit logs": "ログを提出",
-    "Click to view edits": "クリックして変更履歴を見る",
+    "Click to view edits": "クリックして変更履歴を表示",
     "Can't load this message": "このメッセージを読み込めません",
     "Show join/leave messages (invites/removes/bans unaffected)": "参加/退出のメッセージを表示（招待/削除/ブロックには影響しません）",
     "Autoplay videos": "動画を自動再生",
@@ -2542,11 +2542,11 @@
     "Are you sure you want to remove <b>%(serverName)s</b>": "<b>%(serverName)s</b>を削除してよろしいですか",
     "Server Options": "サーバーのオプション",
     "Question or topic": "質問あるいはトピック",
-    "Create poll": "投票を作成",
-    "Create Poll": "投票を作成",
+    "Create poll": "アンケートを作成",
+    "Create Poll": "アンケートを作成",
     "Message deleted on %(date)s": "%(date)sにメッセージが削除されました",
     "Add reaction": "リアクションを追加",
-    "Edited at %(date)s": "%(date)sに編集",
+    "Edited at %(date)s": "%(date)sに編集済",
     "Internal room ID": "内部ルームID：",
     "Search (must be enabled)": "検索（有効とされている場合のみ）",
     "Toggle hidden event visibility": "非表示のイベントの見え方を切り替える",
@@ -2584,13 +2584,13 @@
     "Restoring keys from backup": "バックアップから鍵を復元",
     "Unable to set up keys": "鍵を設定できません",
     "Use your Security Key to continue.": "続行するにはセキュリティーキーを使用してください。",
-    "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "続行するにはセキュリティーフレーズを入力するか<button>セキュリティーキーを使用</button>してください。",
-    "Invalid Security Key": "不正なセキュリティーキー",
+    "Enter your Security Phrase or <button>use your Security Key</button> to continue.": "続行するにはセキュリティーフレーズを入力するか、<button>セキュリティーキーを使用</button>してください。",
+    "Invalid Security Key": "セキュリティーキーが正しくありません",
     "Wrong Security Key": "正しくないセキュリティーキー",
     "a key signature": "鍵の署名",
     "Cross-signing is ready but keys are not backed up.": "クロス署名は準備できましたが、鍵はバックアップされていません。",
-    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)sがメッセージをこのルームに固定しました。全ての固定されたメッセージを確認。",
-    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)sが<a>メッセージ</a>をこのルームに固定しました。全ての<b>固定されたメッセージ</b>を確認。",
+    "%(senderName)s pinned a message to this room. See all pinned messages.": "%(senderName)sがメッセージをこのルームに固定しました。全ての固定されたメッセージを表示。",
+    "%(senderName)s pinned <a>a message</a> to this room. See all <b>pinned messages</b>.": "%(senderName)sが<a>メッセージ</a>をこのルームに固定しました。全ての<b>固定されたメッセージ</b>を表示。",
     "Someone already has that username. Try another or if it is you, sign in below.": "そのユーザー名は既に使用されています。別のユーザー名を試すか、あなたのユーザー名なら、以下でサインインしてください。",
     "Sign in with SSO": "シングルサインオンでサインイン",
     "Use email or phone to optionally be discoverable by existing contacts.": "メールアドレスまたは電話番号で知人に見つけてもらえるようにできます（任意）。",
@@ -2606,12 +2606,12 @@
     "Continue with %(provider)s": "%(provider)sで続行",
     "Join millions for free on the largest public server": "最大のパブリックサーバーで、数百万人に無料で参加",
     "Already have an account? <a>Sign in here</a>": "既にアカウントを持っていますか？<a>ここからサインインしてください</a>",
-    "You can now close this window or <a>log in</a> to your new account.": "このウィンドウを閉じるか、新しいアカウントに<a>ログイン</a>できます。",
+    "You can now close this window or <a>log in</a> to your new account.": "このウィンドウを閉じるか、新しいアカウントに<a>ログイン</a>してください。",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "新しいアカウント（%(newAccountId)s）が登録されましたが、あなたは別のアカウント（%(loggedInUserId)s）でログインしています。",
     "Continue with previous account": "以前のアカウントで続行",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)sあるいは、以下に入力して登録%(usernamePassword)s",
     "Continue with %(ssoButtons)s": "以下のサービスにより続行%(ssoButtons)s",
-    "That e-mail address is already in use.": "このメールアドレスは既に使われています。",
+    "That e-mail address is already in use.": "このメールアドレスは既に使用されています。",
     "Someone already has that username, please try another.": "そのユーザー名は既に使用されています。他のユーザー名を試してください。",
     "Registration has been disabled on this homeserver.": "このサーバーはアカウントの新規登録を受け入れていません。",
     "Registration Successful": "登録に成功しました",
@@ -2631,13 +2631,13 @@
     "Use an email address to recover your account": "アカウント復旧用のメールアドレスを設定してください",
     "Learn more": "詳しく知る",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "異なるホームサーバーのURLを入力すると、そのMatrixサーバーにサインインして接続することができます。それにより、他のホームサーバー上にあるMatrixのアカウントによって、Elementを使用することができます。",
-    "Verify this device": "この端末を検証",
+    "Verify this device": "この端末を認証",
     "Verify with another device": "別の端末を使って認証",
     "Forgotten or lost all recovery methods? <a>Reset all</a>": "復元方法を全て失ってしまいましたか？<a>リセットできます</a>",
     "You aren't signed into any other devices.": "他にサインインしている端末はありません。",
-    "Unverified devices": "未検証の端末",
+    "Unverified devices": "未認証の端末",
     "Review to ensure your account is safe": "アカウントが安全かどうか確認してください",
-    "You have unverified logins": "未検証のログインがあります",
+    "You have unverified logins": "未認証のログインがあります",
     "Own your conversations.": "自分の会話は、自分のもの。",
     "Confirm your identity by entering your account password below.": "アカウントのパスワードを入力して本人確認を行ってください。",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "セキュリティーキーは、暗号化されたデータを保護するために使用されます。パスワードマネージャーもしくは金庫のような安全な場所で保管してください。",
@@ -2657,8 +2657,8 @@
     "Close dialog or context menu": "ダイアログかコンテクストメニューを閉じる",
     "Explore rooms in %(communityName)s": "%(communityName)sのルームを探索",
     "Enter the name of a new server you want to explore.": "探索したい新しいサーバーの名前を入力してください。",
-    "Upgrade public room": "公開されたルームをアップグレード",
-    "Public room": "公開されたルーム",
+    "Upgrade public room": "公開ルームをアップグレード",
+    "Public room": "公開ルーム",
     "Upgrade private room": "非公開のルームをアップグレード",
     "Private room (invite only)": "非公開のルーム（招待者のみ）",
     "Can't find this server or its room list": "サーバーまたはそのルーム一覧が見つかりません",
@@ -2707,6 +2707,857 @@
     "Other rooms": "他のルーム",
     "Pin to sidebar": "サイドバーに固定",
     "Quick settings": "クイック設定",
-    "Invite anyway": "無視して招待",
-    "Invite anyway and never warn me again": "無視して招待し、再び警告しない"
+    "Invite anyway": "招待",
+    "Invite anyway and never warn me again": "招待し、再び警告しない",
+    "Recovery Method Removed": "復元方法を削除しました",
+    "Failed to remove some rooms. Try again later": "いくつかのルームの削除に失敗しました。後でもう一度やり直してください",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "ルームのアドレス %(alias)s を削除して%(name)sをディレクトリから削除しますか？",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sがメッセージを削除しました",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sが%(count)s件のメッセージを削除しました",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sがメッセージを削除しました",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sが%(count)s件のメッセージを削除しました",
+    "Remove from room": "ルームから追放",
+    "Failed to remove user": "ユーザーの追放に失敗しました",
+    "Success!": "成功しました！",
+    "Collapse": "折りたたむ",
+    "Comment": "コメント",
+    "Information": "情報",
+    "Restore": "復元",
+    "Failed to get room topic: Unable to find room (%(roomId)s": "ルームのトピックの取得に失敗しました：ルームを発見できません（%(roomId)s）",
+    "Remove messages sent by me": "自分が送信したメッセージの削除",
+    "Search for spaces": "スペースを検索",
+    "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "規約は<PrivacyPolicyUrl>ここ</PrivacyPolicyUrl>で確認できます",
+    "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Elementの改善と課題抽出のために、匿名の使用状況データの送信をお願いします。複数の端末での使用を分析するために、あなたの全端末共通のランダムな識別子を生成します。",
+    "Share location": "位置情報を共有",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sが%(count)s回変更を加えませんでした",
+    "Don't send read receipts": "開封確認メッセージを送信しない",
+    "Feedback sent! Thanks, we appreciate it!": "フィードバックを送信しました！ありがとうございました！",
+    "Results not as expected? Please <a>give feedback</a>.": "期待通りの結果ではありませんか？<a>フィードバックを送信してください</a>。",
+    "This is a beta feature": "この機能はベータ版です",
+    "Maximise": "最大化",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)sがルームの<a>固定メッセージ</a>を変更しました。",
+    "<%(count)s spaces>|zero": "<空の文字列>",
+    "Can't edit poll": "アンケートは編集できません",
+    "Show current avatar and name for users in message history": "ユーザーのアバターと名前をメッセージの履歴に表示",
+    "Poll type": "アンケートの種類",
+    "Open poll": "投票の際に結果を公開",
+    "Closed poll": "アンケートの終了後に結果を公開",
+    "Voters see results as soon as they have voted": "投票した人には、投票の際に即座に結果が表示されます",
+    "Results are only revealed when you end the poll": "結果はアンケートを終了した後でのみ明らかにされます",
+    "Search Dialog": "検索ダイアログ",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "無効にすると、暗号化されたルームのメッセージは検索結果に表示されません。",
+    "Not currently indexing messages for any room.": "現在、どのルームのメッセージもインデックス化していません。",
+    "Currently indexing: %(currentRoom)s": "現在インデックス中のルーム：%(currentRoom)s",
+    "Accessibility": "アクセシビリティー",
+    "Switch to space by number": "スペースを番号で切り替える",
+    "Open user settings": "ユーザーの設定を開く",
+    "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "入力した日時（%(inputDate)s）を理解できませんでした。YYYY-MM-DDのフォーマットを使用してください。",
+    "Some invites couldn't be sent": "いくつかの招待が送信できませんでした",
+    "Upload %(count)s other files|one": "あと%(count)s個のファイルをアップロード",
+    "Upload %(count)s other files|other": "あと%(count)s個のファイルをアップロード",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "アップロードしようとしているファイルのサイズが<b>大きすぎます</b>。最大のサイズは%(limit)sですが、ファイルのサイズは%(sizeOfThisFile)sです。",
+    "Approve": "同意",
+    "Away": "退席中",
+    "Categories": "カテゴリー",
+    "Space": "スペース",
+    "Disable": "無効にする",
+    "New search experience": "新しい検索機能",
+    "Themes": "テーマ",
+    "Developer": "開発者",
+    "Experimental": "実験的",
+    "Back to chat": "チャットに戻る",
+    "Room members": "ルームのメンバー",
+    "Back to thread": "スレッドに戻る",
+    "Create options": "選択肢を作成",
+    "View all %(count)s members|one": "1人のメンバーを表示",
+    "View all %(count)s members|other": "全%(count)s人のメンバーを表示",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました。",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|other": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました。",
+    "%(oneUser)schanged the server ACLs %(count)s times|one": "%(oneUser)sがサーバーのアクセス制御リストを変更しました",
+    "%(oneUser)schanged the server ACLs %(count)s times|other": "%(oneUser)sがサーバーのアクセス制御リストを%(count)s回変更しました",
+    "%(severalUsers)schanged the server ACLs %(count)s times|one": "%(severalUsers)sがサーバーのアクセス制御リストを変更しました",
+    "%(severalUsers)schanged the server ACLs %(count)s times|other": "%(severalUsers)sはサーバーのアクセス制御リストを%(count)s回変更しました",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sは変更を加えませんでした",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sが%(count)s回変更を加えませんでした",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sは変更を加えませんでした",
+    "<%(count)s spaces>|one": "<スペース>",
+    "Results will be visible when the poll is ended": "アンケートが終了するまで結果は表示できません",
+    "Open thread": "スレッドを開く",
+    "Pinned": "固定メッセージ",
+    "Signature upload success": "署名のアップロードに成功しました",
+    "Cancelled signature upload": "署名のアップロードをキャンセルしました",
+    "Collapse quotes │ ⇧+click": "引用を折りたたむ｜⇧＋クリック",
+    "This address does not point at this room": "このアドレスはこのルームを指していません",
+    "You do not have permissions to add spaces to this space": "スペースをこのスペースに追加する権限がありません",
+    "Open in OpenStreetMap": "OpenStreetMapで開く",
+    "You do not have permission to create rooms in this community.": "このコミュニティーにルームを作成する権限がありません。",
+    "Please enter a name for the room": "ルームの名称を入力してください",
+    "Enter name": "名称を入力",
+    "Invite people to join %(communityName)s": "連絡先を%(communityName)sに招待",
+    "The following users may not exist": "次のユーザーは存在しない可能性があります",
+    "To leave the beta, visit your settings.": "ベータ版の使用を終了するには、設定を開いてください。",
+    "Option %(number)s": "選択肢%(number)s",
+    "Unable to validate homeserver": "ホームサーバーを認証できません",
+    "Abort": "中断",
+    "Message preview": "メッセージのプレビュー",
+    "Open link": "リンクを開く",
+    "Sent": "送信済",
+    "You don't have permission to do this": "これを行う権限がありません",
+    "Joining": "参加しています",
+    "Share %(name)s": "%(name)sを共有",
+    "Application window": "アプリケーションのウィンドウ",
+    "Verification Request": "認証の要求",
+    "Value:": "値：",
+    "Value": "値",
+    "Setting ID": "設定のID",
+    "Level": "レベル",
+    "Update community": "コミュニティーを更新",
+    "Processing...": "処理しています…",
+    "Exporting your data": "データをエクスポートしています",
+    "Feedback sent": "フィードバックを送信しました",
+    "You may contact me if you want to follow up or to let me test out upcoming ideas": "追加で確認が必要な事項や、テストすべき新しいアイデアがある場合は、連絡可",
+    "Verification requested": "認証が必要です",
+    "Unable to copy a link to the room to the clipboard.": "ルームのリンクをクリップボードにコピーできませんでした。",
+    "Unable to copy room link": "ルームのリンクをコピーできません",
+    "Cannot create rooms in this community": "このコミュニティーではルームを作成できません",
+    "Private community": "非公開のコミュニティー",
+    "Public community": "公開のコミュニティー",
+    "This homeserver does not support communities": "このホームサーバーはコミュニティー機能をサポートしていません",
+    "Sign into your homeserver": "あなたのホームサーバーにサインイン",
+    "Specify a homeserver": "ホームサーバーを指定",
+    "Invalid URL": "不正なURL",
+    "The server is offline.": "サーバーはオフラインです。",
+    "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "匿名のデータを共有すると、問題の特定に役立ちます。個人情報の収集や、第三者とのデータ共有はありません。<LearnMoreLink>詳しく知る</LearnMoreLink>",
+    "Stop": "停止",
+    "Fetching events...": "イベントを取得しています…",
+    "Creating HTML...": "HTMLファイルを作成しています…",
+    "JSON": "JSON",
+    "HTML": "HTML",
+    "Generating a ZIP": "ZIPファイルを生成しています",
+    "User %(userId)s is already invited to the room": "ユーザー %(userId)s は既にこのルームに招待されています",
+    "New Recovery Method": "新しい復元方法",
+    "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)sがこのルームの<a>固定メッセージ</a>を変更しました。",
+    "%(senderName)s unpinned a message from this room. See all pinned messages.": "%(senderName)sがメッセージの固定を解除しました。全ての固定メッセージを表示。",
+    "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)sが<a>このメッセージ</a>の固定を解除しました。全ての<b>固定メッセージ</b>を表示。",
+    "%(senderName)s has updated the room layout": "%(senderName)sがルームのレイアウトを更新しました",
+    "No answer": "応答がありません",
+    "Almost there! Is your other device showing the same shield?": "あと少しです！ あなたの他の端末は同じ盾マークを表示していますか？",
+    "A link to the Space will be put in your community description.": "スペースへのリンクがコミュニティーの説明文に置かれます。",
+    "Find a room…": "ルームを探す…",
+    "Delete all": "全て削除",
+    "You don't have permission": "権限がありません",
+    "Results": "結果",
+    "Room name": "ルーム名",
+    "Random": "ランダム",
+    "Creating rooms...": "ルームを作成しています…",
+    "Failed to invite the following users to your space: %(csvUsers)s": "以下のユーザーをスペースに招待するのに失敗しました：%(csvUsers)s",
+    "Inviting...": "招待しています…",
+    "Invite by username": "ユーザー名で招待",
+    "Show all threads": "全てのスレッドを表示",
+    "Could not load user profile": "ユーザーのプロフィールを読み込めませんでした",
+    "Device verified": "端末が認証されました",
+    "Clear status": "ステータスを消去",
+    "Set a new status": "新しいステータスを設定",
+    "Set status": "ステータスを設定",
+    "This session is encrypting history using the new recovery method.": "このセッションでは新しい復元方法を使用して履歴を暗号化しています。",
+    "Go to Settings": "設定を開く",
+    "%(count)s rooms|one": "%(count)s個のルーム",
+    "%(count)s rooms|other": "%(count)s個のルーム",
+    "Would you like to leave the rooms in this space?": "このスペースのルームから退出しますか？",
+    "Don't leave any rooms": "どのルームからも退出しない",
+    "Unable to upload": "アップロードできません",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "このスペースに誰かを招待したい場合は、招待したいユーザーの名前、（<userId/>の様な）ユーザー名を指定するか、<a>このスペースを共有</a>してください。",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "このスペースに誰かを招待したい場合は、招待したいユーザーの名前、メールアドレス、または（<userId/>の様な）ユーザー名を指定するか、<a>このスペースを共有</a>してください。",
+    "Transfer": "転送",
+    "Upload completed": "アップロードが完了しました",
+    "Leave %(spaceName)s": "%(spaceName)sから退出",
+    "Leave some rooms": "退出するルームを選択",
+    "Leave all rooms": "全てのルームから退出",
+    "Select spaces": "スペースを選択",
+    "Your homeserver doesn't seem to support this feature.": "ホームサーバーはこの機能をサポートしていません。",
+    "Verify session": "セッションを認証",
+    "Spam or propaganda": "スパム、プロパガンダ",
+    "Illegal Content": "不法なコンテンツ",
+    "Remove from chat": "チャットから削除",
+    "To view all keyboard shortcuts, <a>click here</a>.": "全てのキーボードのショートカットを表示するには、<a>ここをクリック</a>してください。",
+    "Thread": "スレッド",
+    "Threads": "スレッド",
+    "<b>It's not recommended to make encrypted rooms public.</b> It will mean anyone can find and join the room, so anyone can read messages. You'll get none of the benefits of encryption. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>暗号化されたルームを公開することは推奨されません。</b>ルームを公開すると、誰でもルームを検索、参加して、メッセージを読むことができるため、暗号化の利益を得ることができません。また、公開ルームでメッセージを暗号化すると、メッセージの送受信が遅くなります。",
+    "Are you sure you want to make this encrypted room public?": "この暗号化されたルームを公開してよろしいですか？",
+    "Unknown failure": "不明なエラー",
+    "Removes user with given id from this room": "指定したIDのユーザーをこのルームから追放",
+    "Unrecognised room address: %(roomAlias)s": "ルームのアドレスが認識できません：%(roomAlias)s",
+    "%(senderName)s has shared their location": "%(senderName)sが位置情報を共有しました",
+    "Incorrect Security Phrase": "セキュリティーフレーズが正しくありません",
+    "Threaded messaging": "スレッド機能",
+    "Messaging": "メッセージ",
+    "%(senderName)s has ended a poll": "%(senderName)sがアンケートを終了しました",
+    "If you have permissions, open the menu on any message and select <b>Pin</b> to stick them here.": "権限がある場合は、メッセージのメニューを開いて<b>固定</b>を選択すると、ここにメッセージが表示されます。",
+    "The export was cancelled successfully": "エクスポートをキャンセルしました",
+    "Invite your teammates": "チームの仲間を招待",
+    "Created from <Community />": "<Community />から作成",
+    "No results found": "検索結果がありません",
+    "Private space (invite only)": "非公開のスペース（招待者のみ参加可能）",
+    "Public space": "公開スペース",
+    "Sending": "送信しています",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "ヒント：バグレポートを報告する場合は、問題の分析のために<debugLogsLink>デバッグログ</debugLogsLink>を送信してください。",
+    "MB": "MB",
+    "Failed to end poll": "アンケートの終了に失敗しました",
+    "Edit Values": "値を編集",
+    "End Poll": "アンケートを終了",
+    "Export Successful": "エクスポートが成功しました",
+    "Add people": "連絡先を追加",
+    "View message": "メッセージを表示",
+    "End-to-end encryption isn't enabled": "エンドツーエンド暗号化が有効になっていません",
+    "Enable encryption in settings.": "暗号化を設定から有効にする。",
+    "Reply to thread…": "スレッドに返信…",
+    "Reply to encrypted thread…": "暗号化されたスレッドに返信…",
+    "Show %(count)s other previews|one": "他%(count)s個のプレビューを表示",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "このユーザーを認証して、信頼済としてマークします。ユーザーを信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "この端末を認証して、信頼済としてマークします。相手の端末を信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "以下のMatrix IDのプロフィールを発見できません。招待しますか？",
+    "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.": "新しい復元方法を設定しなかった場合、攻撃者がアカウントへアクセスしようとしている可能性があります。設定画面にて、すぐにアカウントのパスワードを変更し、新しい復元方法を設定してください。",
+    "General failure": "一般エラー",
+    "Failed to load group members": "グループのメンバーの読み込みに失敗しました",
+    "Failed to perform homeserver discovery": "ホームサーバーを発見できませんでした",
+    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s個のセッションの復号化に失敗しました！",
+    "No backup found!": "バックアップがありません！",
+    "Unable to restore backup": "バックアップを復元できません",
+    "Unable to load backup status": "バックアップの状態を読み込めません",
+    "Retry": "やり直す",
+    "Unable to create key backup": "鍵のバックアップを作成できません",
+    "Go back to set it again.": "戻って、改めて設定してください。",
+    "That doesn't match.": "合致しません。",
+    "Continue With Encryption Disabled": "暗号化を無効にして続行",
+    "You have no visible notifications.": "未読の通知はありません。",
+    "Get notified only with mentions and keywords as set up in your <a>settings</a>": "メンションと、<a>設定</a>したキーワードのみを通知",
+    "@mentions & keywords": "メンションとキーワード",
+    "Get notified for every message": "全てのメッセージを通知",
+    "You won't get any notifications": "通知を送信しません",
+    "Get notifications as set up in your <a>settings</a>": "<a>設定</a>に従って通知",
+    "Failed to update the guest access of this space": "ゲストのアクセスの更新に失敗しました",
+    "Failed to update the history visibility of this space": "スペースの見え方の更新に失敗しました",
+    "Invite with email or username": "メールアドレスまたはユーザー名で招待",
+    "Guests can join a space without having an account.": "ゲストはアカウントを使用せずに参加できます。",
+    "Visibility": "見え方",
+    "Recommended for public spaces.": "公開のスペースでは許可することを推奨します。",
+    "Allow people to preview your space before they join.": "参加する前にスペースのプレビューを閲覧することを許可。",
+    "Preview Space": "スペースのプレビュー",
+    "Recently viewed": "最近表示したルーム",
+    "This room isn't bridging messages to any platforms. <a>Learn more.</a>": "このルームはどのプラットフォームにもメッセージをブリッジしていません。<a>詳細</a>",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "この変更は、ルームがサーバー上で処理される方法にのみ影響します。%(brand)sで問題が発生した場合は、<a>不具合を報告してください</a>。",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "この変更は、ルームがサーバー上で処理される方法にのみ影響します。%(brand)sで問題が発生した場合は、不具合を報告してください。",
+    "People with supported clients will be able to join the room without having a registered account.": "サポートしているクライアントから、登録済のアカウントを使用せずルームに参加できるようになります。",
+    "Enable guest access": "ゲストによるアクセスを有効にする",
+    "Select the roles required to change various parts of the space": "スペースに関する変更を行うために必要な役割を選択",
+    "Set addresses for this space so users can find this space through your homeserver (%(localDomain)s)": "アドレスを設定すると、他のユーザーがあなたのホームサーバー（%(localDomain)s）を通じてこのスペースを見つけられるようになります。",
+    "This may be useful for public spaces.": "公開のスペースに適しているかもしれません。",
+    "Decide who can view and join %(spaceName)s.": "%(spaceName)sを表示、参加できる範囲を設定してください。",
+    "Space information": "スペースの情報",
+    "Retry all": "全て再試行",
+    "You can select all or individual messages to retry or delete": "全てのメッセージ、あるいは個別のメッセージを選択して、再送を試みるか削除することができます",
+    "Some of your messages have not been sent": "メッセージが送信されませんでした",
+    "Mentions only": "メンションのみ",
+    "Forget": "消去",
+    "Not a valid Security Key": "正しいセッションキーではありません",
+    "This looks like a valid Security Key!": "正しいセキュリティーキーです！",
+    "Enter Security Phrase": "セキュリティーフレーズを入力",
+    "Click the button below to confirm setting up encryption.": "以下のボタンをクリックして、暗号化の設定を承認してください。",
+    "Confirm encryption setup": "暗号化の設定を確認してください",
+    "Security Phrase": "セキュリティーフレーズ",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "全てをリセットすると、履歴とメッセージが消去され、信頼済の端末、信頼済のユーザーが取り消されます。また、過去のメッセージを表示できなくなる可能性があります。",
+    "Reset everything": "全てリセット",
+    "Decline All": "全て拒否",
+    "Approve widget permissions": "ウィジェットの権限を承認",
+    "Verify other device": "他の端末を認証",
+    "Upload Error": "アップロードエラー",
+    "View in room": "ルーム内で表示",
+    "Message didn't send. Click for info.": "メッセージが送信されませんでした。クリックすると詳細を表示します。",
+    "Move down": "下に移動",
+    "Move up": "上に移動",
+    "Show preview": "プレビューを表示",
+    "Thread options": "スレッドの設定",
+    "Invited people will be able to read old messages.": "招待したユーザーは、以前のメッセージを見られるようになります。",
+    "You're signed out": "サインアウトしました",
+    "Forgotten your password?": "パスワードを忘れてしまいましたか？",
+    "Clear personal data": "個人データを消去",
+    "Starting backup...": "バックアップを開始しています…",
+    "This homeserver does not support login using email address.": "このホームサーバーではメールアドレスによるログインをサポートしていません。",
+    "Set a new password": "新しいパスワードを設定",
+    "Your password has been reset.": "パスワードがリセットされました。",
+    "Couldn't load page": "ページを読み込めませんでした",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "以下の絵文字が、両方の端末で、同じ順番で表示されているかどうか確認してください：",
+    "Show sidebar": "サイドバーを表示",
+    "File Attached": "添付されたファイル",
+    "%(creatorName)s created this room.": "%(creatorName)sがこのルームを作成しました。",
+    "We couldn't create your DM.": "ダイレクトメッセージを作成できませんでした。",
+    "Confirm to continue": "確認して続行",
+    "Failed to find the following users": "次のユーザーの発見に失敗しました",
+    "Privacy Policy": "個人情報保護方針",
+    "Cookie Policy": "Cookieの使用方針",
+    "Sorry, the poll did not end. Please try again.": "アンケートを終了できませんでした。もう一度やり直してください。",
+    "Are you sure you want to stop exporting your data? If you do, you'll need to start over.": "データのエクスポートを停止してよろしいですか？改めてやり直す必要があります。",
+    "Your export was successful. Find it in your Downloads folder.": "エクスポートに成功しました。ダウンロード先のフォルダーを確認してください。",
+    "Enter a number between %(min)s and %(max)s": "%(min)sから%(max)sまでの間の数字を入力してください",
+    "Export Cancelled": "エクスポートをキャンセルしました",
+    "There was an error updating your community. The server is unable to process your request.": "コミュニティーを更新する際にエラーが発生しました。サーバーはリクエストを処理できません。",
+    "Caution:": "注意：",
+    "Setting:": "設定：",
+    "Edit setting": "設定を編集",
+    "Are you sure you want to deactivate your account? This is irreversible.": "アカウントを非アクティブ化してよろしいですか？この操作は元に戻すことができません。",
+    "Failed to migrate community": "コミュニティーからの移行に失敗しました",
+    "To view Spaces, hide communities in <a>Preferences</a>": "スペースを表示するには、<a>設定画面</a>からコミュニティーを非表示にしてください",
+    "To create a Space from another community, just pick the community in Preferences.": "コミュニティーからスペースを作成するには、設定画面からコミュニティーを選択してください。",
+    "This description will be shown to people when they view your space": "この説明文は、このスペースを閲覧する際に表示されます",
+    "Flair won't be available in Spaces for the foreseeable future.": "コミュニティーのアバターは、スペースではしばらく利用できません。",
+    "All rooms will be added and all community members will be invited.": "全てのルームを追加し、コミュニティーの全ての参加者を招待します。",
+    "Adding...": "追加しています…",
+    "Want to add an existing space instead?": "代わりに既存のスペースを追加しますか？",
+    "Space visibility": "スペースの見え方",
+    "Create Space from community": "「コミュニティー」から「スペース」を作成",
+    "Creating Space...": "スペースを作成しています…",
+    "Fetching data...": "データを取得しています…",
+    "<SpaceName/> has been made and everyone who was a part of the community has been invited to it.": "<SpaceName/>が作成されました。コミュニティーの参加者に招待が送信されました。",
+    "Space created": "スペースを作成しました",
+    "This community has been upgraded into a Space": "このコミュニティーをスペースにアップグレードしました",
+    "Room visibility": "ルームの見え方",
+    "Create a room in %(communityName)s": "%(communityName)sにルームを作成",
+    "Create a room": "ルームを作成",
+    "Communities won't receive further updates.": "今後「コミュニティー」機能のアップデートはありません。",
+    "Spaces are a new way to make a community, with new features coming.": "「スペース」は、コミュニティーを作る新しい方法です。今後、新しい機能が追加される予定です。",
+    "Communities can now be made into Spaces": "「コミュニティー」を「スペース」に更新することができます",
+    "You can create a Space from this community <a>here</a>.": "<a>ここ</a>で、このコミュニティーからスペースを作成できます。",
+    "Create community": "コミュニティーを作成",
+    "That phone number doesn't look quite right, please check and try again": "電話番号が正しくありません。確認してもう一度やり直してください",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "ホームサーバーの設定にcaptchaの公開鍵が入力されていません。ホームサーバーの管理者に報告してください。",
+    "This room is public": "このルームは公開されています",
+    "Avatar": "アバター",
+    "Revoke permissions": "権限を取り消す",
+    "Incompatible Database": "互換性のないデータベース",
+    "Disagree": "同意しない",
+    "Hold": "保留",
+    "Resume": "再開",
+    "Country Dropdown": "国一覧",
+    "Moderation": "モデレート",
+    "Space selection": "スペースの選択",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)sの設定",
+    "Looks good!": "問題ありません！",
+    "View": "表示",
+    "Zoom out": "縮小",
+    "Backspace": "バックスペース",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "Unnamed Space": "名前のないスペース",
+    "Zoom in": "拡大",
+    "Emoji Autocomplete": "絵文字の自動補完",
+    "Notification Autocomplete": "通知の自動補完",
+    "Community settings": "コミュニティーの設定",
+    "Keep going...": "続行…",
+    "Cancel All": "全てキャンセル",
+    "Chat": "会話",
+    "Looks good": "問題ありません",
+    "Language Dropdown": "言語一覧",
+    "Active Widgets": "使用中のウィジェット",
+    "Verification Requests": "認証リクエスト",
+    "Location sharing - pin drop (under active development)": "位置情報の共有 - ピンで現在地を共有（開発中）",
+    "You cancelled verification on your other device.": "他の端末で認証がキャンセルされました。",
+    "You won't be able to rejoin unless you are re-invited.": "再び招待されない限り、再参加することはできません。",
+    "Search %(spaceName)s": "%(spaceName)sを検索",
+    "Your status will be shown to people you have a DM with.": "ステータスは、ダイレクトメッセージをやりとりする相手に表示されます。",
+    "Fetched %(count)s events out of %(total)s|one": "%(total)s個のうち%(count)s個のイベントを取得しました",
+    "Fetched %(count)s events out of %(total)s|other": "%(total)s個のうち%(count)s個のイベントを取得しました",
+    "Are you sure you want to exit during this export?": "エクスポートを中断してよろしいですか？",
+    "Fetched %(count)s events so far|one": "%(count)s個のイベントを取得しました",
+    "Fetched %(count)s events so far|other": "%(count)s個のイベントを取得しました",
+    "Processing event %(number)s out of %(total)s": "%(total)s個のうち%(number)s個のイベントを処理しています",
+    "Error fetching file": "ファイルを取得する際のエラー",
+    "Exported %(count)s events in %(seconds)s seconds|one": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました",
+    "Exported %(count)s events in %(seconds)s seconds|other": "%(count)s個のイベントを%(seconds)s秒でエクスポートしました",
+    "Fetched %(count)s events in %(seconds)ss|other": "%(count)s個のイベントを%(seconds)s秒で取得しました",
+    "That's fine": "問題ありません",
+    "Your new device is now verified. Other users will see it as trusted.": "端末が認証されました。他のユーザーには「信頼済」として表示されます。",
+    "Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "端末が認証されました。暗号化されたメッセージにアクセスすることができます。また、端末は他のユーザーに「信頼済」として表示されます。",
+    "Verify with Security Key": "セキュリティーキーで認証",
+    "Verify with Security Key or Phrase": "セキュリティーキーあるいはセキュリティーフレーズで認証",
+    "A new Security Phrase and key for Secure Messages have been detected.": "新しいセキュリティーフレーズと、セキュアメッセージの鍵が検出されました。",
+    "a new cross-signing key signature": "新しいクロス署名鍵の署名",
+    "An error occurred whilst saving your notification preferences.": "通知の設定を保存する際にエラーが発生しました。",
+    "a device cross-signing signature": "端末のクロス署名",
+    "A connection error occurred while trying to contact the server.": "サーバーに接続する際にエラーが発生しました。",
+    "A browser extension is preventing the request.": "ブラウザーの拡張機能がリクエストを妨げています。",
+    "Only do this if you have no other device to complete verification with.": "認証を行うための端末がない場合のみ行ってください。",
+    "You may contact me if you have any follow up questions": "追加で確認が必要な事項がある場合は、連絡可",
+    "Temporarily show communities instead of Spaces for this session. Support for this will be removed in the near future. This will reload Element.": "スペースの代わりにコミュニティーを一時的に表示します。この機能は近日中に削除されます。この機能を有効にすると、Elementを再読み込みします。",
+    "Show my Communities": "自分のコミュニティーを表示",
+    "Verified devices": "認証済の端末",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "すべてのセッションからログアウトしており、これ以上プッシュ通知を受け取れません。通知を再び有効にするには、各端末でサインインしてください。",
+    "Sends the given message as a spoiler": "選択したメッセージをネタバレとして送信",
+    "There was a problem communicating with the homeserver, please try again later.": "ホームサーバーとの通信時に問題が発生しました。後でもう一度やり直してください。",
+    "The email address doesn't appear to be valid.": "メールアドレスが正しくありません。",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "パスワードを変更すると、すべてのセッションでのエンドツーエンド暗号鍵がリセットされ、暗号化されたメッセージ履歴が読めなくなります。パスワードを再設定する前に、鍵のバックアップを設定するか、他のセッションからルームの鍵をエクスポートしておいてください。",
+    "From a thread": "スレッドから",
+    "Got an account? <a>Sign in</a>": "アカウントがありますか？<a>ログインしてください</a>",
+    "New here? <a>Create an account</a>": "初めてですか？<a>アカウントを作成しましょう</a>",
+    "Use new room breadcrumbs": "新しいルームのパンくずリストを使用",
+    "Identity server URL does not appear to be a valid identity server": "これは正しいIDサーバーのURLではありません",
+    "<%(count)s spaces>|other": "<%(count)s個のスペース>",
+    "Create key backup": "鍵のバックアップを作成",
+    "My current location": "自分の現在の位置情報",
+    "My live location": "自分の現在の位置情報（ライブ）",
+    "What location type do you want to share?": "どのような種類の位置情報を共有したいですか？",
+    "Match system": "システムに合致",
+    "We couldn't send your location": "位置情報を送信できませんでした",
+    "This is a beta feature. Click for more info": "この機能はベータ版です。クリックすると詳細を表示します",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)sは位置情報を送信できませんでした。後でもう一度やり直してください。",
+    "Could not fetch location": "位置情報を取得できませんでした",
+    "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "通常ダイレクトメッセージは暗号化されていますが、このルームは暗号化されていません。一般にこれは、非サポートの端末が使用されているか、電子メールなどによる招待が行われたことが理由です。",
+    "%(count)s reply|other": "%(count)s件の返信",
+    "Call declined": "拒否しました",
+    "Right panel stays open (defaults to room member list)": "右のパネルを開いたままにする（既定ではルームの参加者の一覧を表示します）",
+    "To leave, just return to this page or click on the beta badge when you search.": "ベータ版の使用を終了するには、このページに戻ってくるか、検索を行う際に「ベータ版」のバッジをクリックしてください。",
+    "To feedback, join the beta, start a search and click on feedback.": "フィードバックを送るには、ベータ版に参加して、検索を行い、フィードバックをクリックしてください。",
+    "This feature is a work in progress, we'd love to hear your feedback.": "この機能は開発中です。フィードバックをお聞かせください。",
+    "A new, quick way to search spaces and rooms you're in.": "参加しているスペースとルームと検索する新しい方法です。",
+    "Unable to check if username has been taken. Try again later.": "そのユーザー名が既に取得されているか確認できません。後でもう一度やり直してください。",
+    "Show tray icon and minimise window to it on close": "トレイアイコンを表示し、ウインドウを閉じるとトレイに最小化",
+    "Open Space": "スペースを開く",
+    "Create Space": "スペースを作成",
+    "Code blocks": "コードブロック",
+    "If a community isn't shown you may not have permission to convert it.": "コミュニティーが表示されない場合は、コミュニティーを変換するための権限がない可能性があります。",
+    "Without verifying, you won't have access to all your messages and may appear as untrusted to others.": "認証を行わないと、あなたのメッセージの全てにアクセスできず、他のユーザーに信頼済として表示されない可能性があります。",
+    "I'll verify later": "後で認証する",
+    "To proceed, please accept the verification request on your other device.": "続行するには、他の端末で認証リクエストを承認してください。",
+    "You can also set up Secure Backup & manage your keys in Settings.": "セキュアバックアップを設定し、設定画面から鍵を管理することもできます。",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "いまキャンセルすると、ログイン情報にアクセスできなくなった場合に、暗号化されたメッセージやデータを失ってしまう可能性があります。",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "パスワードマネージャー（もしくは金庫）のような安全な場所で保管してください。",
+    "Set up with a Security Key": "セキュリティーキーを設定",
+    "Your Security Key": "あなたのセキュリティーキー",
+    "Repeat your Security Phrase...": "セキュリティーフレーズを再入力してください…",
+    "Make a copy of your Security Key": "セキュリティーキーのコピーを作成",
+    "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "あなただけが知っているセキュリティーフレーズを入力してください。あなたのデータを保護するために使用されます。セキュリティーの観点から、アカウントのパスワードと異なるものを設定してください。",
+    "Enter your Security Phrase a second time to confirm it.": "確認のため、セキュリティーフレーズを再入力してください。",
+    "Enter a Security Phrase": "セキュリティーフレーズを入力",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "このセキュリティーフレーズではバックアップを復号化できませんでした。正しいセキュリティーフレーズを入力したことを確認してください。",
+    "%(count)s reply|one": "%(count)s件の返信",
+    "Switches to this room's virtual room, if it has one": "このルームのバーチャルルームに移動（あれば）",
+    "No virtual room for this room": "このルームのバーチャルルームはありません",
+    "Drop a Pin": "場所を選択",
+    "No votes cast": "投票がありません",
+    "What is your poll question or topic?": "アンケートの質問、あるいはトピックは何でしょうか？",
+    "Failed to post poll": "アンケートの作成に失敗しました",
+    "Write something...": "記入してください…",
+    "Based on %(count)s votes|one": "%(count)s個の投票に基づく途中結果",
+    "Based on %(count)s votes|other": "%(count)s個の投票に基づく途中結果",
+    "Final result based on %(count)s votes|one": "%(count)s個の投票に基づく最終結果",
+    "Final result based on %(count)s votes|other": "%(count)s個の投票に基づく最終結果",
+    "Sorry, you can't edit a poll after votes have been cast.": "投票があったアンケートは編集できません。",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sが1件の非表示のメッセージを送信しました",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sが%(count)s件の非表示のメッセージを送信しました",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sが1件の非表示のメッセージを送信しました",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sが%(count)s件の非表示のメッセージを送信しました",
+    "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "アンケートを終了してよろしいですか？投票を締め切り、最終結果を表示します。",
+    "Call": "通話",
+    "Your camera is still enabled": "カメラがまだ有効です",
+    "Your camera is turned off": "カメラが無効です",
+    "Sends the given message with a space themed effect": "メッセージを宇宙のテーマのエフェクトと共に送信",
+    "sends rainfall": "雨を送信",
+    "Sends the given message with rainfall": "メッセージを雨と共に送信",
+    "Low bandwidth mode (requires compatible homeserver)": "低帯域幅モード（対応したホームサーバーが必要です）",
+    "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "不明な（ユーザー、セッション）ペア：（%(userId)s、%(deviceId)s）",
+    "The homeserver may be unavailable or overloaded.": "ホームサーバーは使用できないか、オーバーロードしている可能性があります。",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "パスワードの再設定を確認するために認証メールを送信します。",
+    "Missing session data": "セッションのデータがありません",
+    "Waiting for partner to confirm...": "相手の承認を待機しています…",
+    "Sorry, the poll you tried to create was not posted.": "アンケートを作成できませんでした。",
+    "Vote not registered": "投票できませんでした",
+    "Sorry, your vote was not registered. Please try again.": "投票できませんでした。もう一度やり直してください。",
+    "Something went wrong trying to invite the users.": "ユーザーを招待する際に、問題が発生しました。",
+    "Your keys are being backed up (the first backup could take a few minutes).": "鍵をバックアップしています（最初のバックアップは数分かかる可能性があります）。",
+    "Confirm account deactivation": "アカウントの無効化を承認",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、アカウントの無効化を承認してください。",
+    "The poll has ended. Top answer: %(topAnswer)s": "アンケートが終了しました。最も多い投票数を獲得した選択肢：%(topAnswer)s",
+    "The poll has ended. No votes were cast.": "アンケートが終了しました。投票はありませんでした。",
+    "Value in this room:": "このルームでの値：",
+    "Failed to save settings": "設定の保存に失敗しました",
+    "Confirm signing out these devices": "端末からのサインアウトを承認",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。",
+    "Unable to load device list": "端末一覧を読み込めません",
+    "Click the button below to confirm signing out these devices.|one": "下のボタンをクリックして、この端末からのログアウトを承認してください。",
+    "Click the button below to confirm signing out these devices.|other": "下のボタンをクリックして、これらの端末からのログアウトを承認してください。",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "シングルサインオンを使用して本人確認を行い、端末からのログアウトを承認してください。",
+    "Waiting for you to verify on your other device…": "他の端末での認証を待機しています…",
+    "Light high contrast": "ライト（高コントラスト）",
+    "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)sがアンケートを開始しました - %(pollQuestion)s",
+    "Failed to fetch your location. Please try again later.": "位置情報の取得に失敗しました。後でもう一度やり直してください。",
+    "Timed out trying to fetch your location. Please try again later.": "位置情報を取得する際にタイムアウトになりました。後でもう一度やり直してください。",
+    "Unknown error fetching location. Please try again later.": "位置情報を取得する際に不明なエラーが発生しました。後でもう一度やり直してください。",
+    "Remove from %(roomName)s": "%(roomName)sから追放",
+    "Unable to find event at that date. (%(code)s)": "その日のイベントを発見できません。（%(code)s）",
+    "Wait!": "お待ちください！",
+    "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "ここでコピーペーストを行うように伝えられた場合は、あなたが詐欺の対象となっている可能性が非常に高いです！",
+    "You don't have permission to view messages from before you joined.": "参加する前のメッセージを表示する権限がありません。",
+    "You don't have permission to view messages from before you were invited.": "招待される前のメッセージを表示する権限がありません。",
+    "Show %(count)s other previews|other": "他%(count)s個のプレビューを表示",
+    "Error processing audio message": "音声メッセージを処理する際のエラー",
+    "The beginning of the room": "ルームの先頭",
+    "Jump to date": "日付に移動",
+    "Incoming Verification Request": "認証のリクエストが届いています",
+    "Set up Secure Messages": "セキュアメッセージを設定",
+    "Use a different passphrase?": "異なるパスフレーズを使用しますか？",
+    "Please review and accept all of the homeserver's policies": "ホームサーバーの運営方針を確認し、同意してください",
+    "Space Autocomplete": "スペースの自動補完",
+    "Click for more info": "クリックすると詳細を表示",
+    "Start audio stream": "音声ストリーミングを開始",
+    "Failed to start livestream": "ライブストリームの開始に失敗しました",
+    "Unable to start audio streaming.": "音声ストリーミングを開始できません。",
+    "Collapse reply thread": "返信のスレッドを折りたたむ",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "セキュリティーキーを無くした場合は、<button>新しい復元方法を設定</button>できます",
+    "Wrong file type": "正しくないファイルの種類",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "機密ストレージにアクセスできません。正しいセキュリティーフレーズを入力したことを確認してください。",
+    "Settings - %(spaceName)s": "設定 - %(spaceName)s",
+    "The server has denied your request.": "サーバーがリクエストを拒否しました。",
+    "Server isn't responding": "サーバーが応答していません",
+    "You're all caught up.": "未読はありません。",
+    "Toxic Behaviour": "危害を加える振る舞い",
+    "Continuing without email": "メールアドレスを使用せずに続行",
+    "Data on this screen is shared with %(widgetDomain)s": "このスクリーンのデータは%(widgetDomain)sと共有されます",
+    "If they don't match, the security of your communication may be compromised.": "一致していない場合は、あなたのコミュニケーションの安全性が損なわれている可能性があります。",
+    "Unknown failure: %(reason)s": "不明なエラー：%(reason)s",
+    "Connection failed": "接続に失敗しました",
+    "Could not connect media": "メディアに接続できませんでした",
+    "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.": "認証しようとしている端末は、QRコードのスキャンや絵文字による認証をサポートしていませんが、%(brand)sではサポートされています。異なるクライアントで試してください。",
+    "Role in <RoomName/>": "<RoomName/>での役割",
+    "Ban from %(roomName)s": "%(roomName)sからブロック",
+    "Unban from %(roomName)s": "%(roomName)sからのブロックを解除",
+    "Close this widget to view it in this panel": "ウィジェットを閉じて、このパネルに表示",
+    "Unpin this widget to view it in this panel": "ウィジェットの固定を解除して、このパネルに表示",
+    "Stop recording": "録音を停止",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "マイクが見つかりません。設定を確認して、もう一度やり直してください。",
+    "No microphone found": "マイクが見つかりません",
+    "We were unable to access your microphone. Please check your browser settings and try again.": "マイクにアクセスできませんでした。ブラウザーの設定を確認して、もう一度やり直してください。",
+    "Unable to access your microphone": "マイクを利用できません",
+    "Joining space …": "スペースに参加しています…",
+    "Are you sure you want to add encryption to this public room?": "公開ルームに暗号化を追加してよろしいですか？",
+    "Warn before quitting": "終了する際に警告",
+    "Olm version:": "Olmのバージョン：",
+    "There was an error loading your notification settings.": "通知設定を読み込む際にエラーが発生しました。",
+    "Error saving notification preferences": "通知設定を保存する際のエラー",
+    "Updating spaces... (%(progress)s out of %(count)s)|other": "スペースを更新しています…（%(count)s個のうち%(progress)s）",
+    "Message search initialisation failed": "メッセージの検索機能の初期化に失敗しました",
+    "Your homeserver does not support device management.": "このホームサーバーは端末の管理に対応していません。",
+    "Failed to update the visibility of this space": "このスペースの見え方の更新に失敗しました",
+    "Your server requires encryption to be enabled in private rooms.": "このサーバーでは、非公開のルームでは暗号化を有効にする必要があります。",
+    "Community ID: +<localpart />:%(domain)s": "コミュニティーID：+<localpart />:%(domain)s",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "コミュニティーを作成する際にエラーが発生しました。名前が既に取得されているか、サーバーがリクエストを処理できません。",
+    "Your Security Key is in your <b>Downloads</b> folder.": "セキュリティーキーは<b>ダウンロード</b>先のフォルダーにあります。",
+    "Command failed: Unable to find room (%(roomId)s": "コマンドエラー：ルーム（%(roomId)s）が見つかりません",
+    "Go to my space": "自分のスペースに移動",
+    "To join this Space, hide communities in your <a>preferences</a>": "このスペースに参加するには、<a>設定画面</a>にてコミュニティー機能を非表示に設定してください",
+    "To view this Space, hide communities in your <a>preferences</a>": "このスペースを表示するには、<a>設定画面</a>にてコミュニティー機能を非表示に設定してください",
+    "Failed to load list of rooms.": "ルームの一覧を読み込むのに失敗しました。",
+    "Filter rooms and people": "ルームと連絡先を絞り込む",
+    "No results for \"%(query)s\"": "「%(query)s」の結果がありません",
+    "Unable to set up secret storage": "機密ストレージを設定できません",
+    "Save your Security Key": "セキュリティーキーを保存",
+    "Confirm Security Phrase": "セキュリティーフレーズを確認",
+    "Set a Security Phrase": "セキュリティーフレーズを設定",
+    "Confirm your Security Phrase": "セキュリティーフレーズを確認",
+    "User Autocomplete": "ユーザーの自動補完",
+    "Community Autocomplete": "コミュニティーの自動補完",
+    "Command Autocomplete": "コマンドの自動補完",
+    "Room Autocomplete": "ルームの自動補完",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "アカウントにサインインできません。ホームサーバーの管理者に連絡して詳細を確認してください。",
+    "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)sがこのルームに参加できる対象を変更しました。",
+    "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)sがこのルームに参加できる対象を変更しました。<a>設定を表示</a>。",
+    "Command error: Unable to find rendering type (%(renderingType)s)": "コマンドエラー：レンダリングの種類（%(renderingType)s）が見つかりません",
+    "Creating output...": "出力しています…",
+    "Error processing voice message": "音声メッセージを処理する際のエラー",
+    "Error loading Widget": "ウィジェットを読み込む際のエラー",
+    "View Servers in Room": "ルームに参加しているサーバーを表示",
+    "Settings Explorer": "設定の一覧を表示",
+    "Please fill why you're reporting.": "報告する理由を記入してください。",
+    "It looks like you don't have a Security 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.": "セキュリティーキーもしくは認証可能な端末が設定されていません。この端末では、以前暗号化されたメッセージにアクセスすることができません。この端末で本人確認を行うには、認証用の鍵を再設定する必要があります。",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "不具合をGitHubで報告した場合は、デバッグログが問題の特定に役立つ可能性があります。デバッグログは、ユーザー名、ID、訪問したルームやグループのアドレス、最後に使用した機能、他のユーザーのユーザー名を含む使用状況に関する情報を含みます。メッセージは含まれません。",
+    "<inviter/> invites you": "<inviter/>があなたを招待しています",
+    "Decrypted event source": "復号化したイベントのソースコード",
+    "Save setting values": "設定の値を保存",
+    "delete the address.": "アドレスを削除。",
+    "Signature upload failed": "署名のアップロードに失敗しました",
+    "Remove for everyone": "全員から削除",
+    "Failed to re-authenticate": "再認証に失敗しました",
+    "toggle event": "イベントを切り替える",
+    "%(spaceName)s menu": "%(spaceName)sのメニュー",
+    "Minimise dialog": "ダイアログを最小化",
+    "Maximise dialog": "ダイアログを最大化",
+    "Delete avatar": "アバターを削除",
+    "Share content": "コンテンツを共有",
+    "Search spaces": "スペースを検索",
+    "Unnamed audio": "名前のない音声",
+    "e.g. my-space": "例：my-space",
+    "Silence call": "サイレントモード",
+    "%(seconds)ss left": "残り%(seconds)s秒",
+    "Move right": "右に移動",
+    "Move left": "左に移動",
+    "Rotate Right": "右に回転",
+    "Rotate Left": "左に回転",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "不具合を調査できるように、GitHubで<newIssueLink>新しいIssueを作成</newIssueLink>してください。",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "既存のスレッドに返信するか、メッセージの「%(replyInThread)s」機能を使用すると新しいスレッドを開始できます。",
+    "Other searches": "その他の検索",
+    "To search messages, look for this icon at the top of a room <icon/>": "メッセージを検索する場合は、ルームの上に表示されるアイコン<icon/>をクリックしてください。",
+    "See when people join, leave, or are invited to this room": "このルームに参加、退出、招待された日時を表示",
+    "No active call in this room": "このルームにアクティブな通話はありません",
+    "Jump to the given date in the timeline (YYYY-MM-DD)": "タイムライン上の指定した日時に移動（YYYY-MM-DD）",
+    "Secure your backup with a Security Phrase": "バックアップをセキュリティーフレーズで保護",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "鍵の暗号化されたコピーをサーバーに保存します。バックアップをセキュリティーフレーズで保護してください。",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "アカウントにアクセスし、このセッションに保存されている暗号鍵を回復してください。暗号鍵がなければ、いかなるセッションの暗号化されたメッセージも読むことができなくなります。",
+    "Enter your password to sign in and regain access to your account.": "パスワードを入力してサインインし、アカウントへのアクセスを回復する。",
+    "Sign in and regain access to your account.": "サインインして、アカウントへのアクセスを回復する。",
+    "Failed to re-authenticate due to a homeserver problem": "ホームサーバーの問題のため再認証に失敗しました",
+    "Invalid base_url for m.identity_server": "m.identity_serverの不正なbase_url",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "ホームサーバーのURLが、正しいMatrixのホームサーバーのURLではありません",
+    "Invalid base_url for m.homeserver": "m.homeserverの不正なbase_url",
+    "Skip verification for now": "認証をスキップ",
+    "Unable to verify this device": "この端末を認証できません",
+    "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>これは実験的な機能です。</b>現在、招待を受け取る新規ユーザーが実際に参加するには<link/>のリンクで招待を受諾する必要があります。",
+    "Go to my first room": "最初のルームに移動",
+    "Failed to create initial space rooms": "最初のスペースのルームの作成に失敗しました",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "%(communityName)sに参加するには、<a>設定画面</a>でコミュニティーに変更してください",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "%(communityName)sを表示するには、<a>設定画面</a>でコミュニティーに変更してください",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "このコミュニティーの<a>管理者</a>に連絡して、コミュニティーをスペースに変更するように依頼し、招待をお待ちください。",
+    "Want more than a community? <a>Get your own server</a>": "いくつかのコミュニティーを使用したいですか？<a>ご自身のサーバーを使用しましょう</a>",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>あなたのコミュニティーのページのHTMLソースコード</h1>\n<p>\n    説明文を記入してコミュニティーを新しい参加者に紹介したり、\n    重要な<a href=\"foo\">リンク</a>を共有しましょう。\n</p>\n<p>\n    Matrixに対応したURL <img src=\"mxc://url\" /> で画像を表示することもできます。\n</p>\n",
+    "Other users can invite you to rooms using your contact details": "他のユーザーはあなたの連絡先の情報を用いてルームに招待することができます",
+    "Something went wrong in confirming your identity. Cancel and try again.": "本人確認を行う際に問題が発生しました。キャンセルして、もう一度やり直してください。",
+    "See room timeline (devtools)": "ルームのタイムラインを表示（開発者ツール）",
+    "Other spaces or rooms you might not know": "知らないかもしれない他のスペースやルーム",
+    "You're removing all spaces. Access will default to invite only": "全てのスペースを削除しようとしています。招待者しかアクセスできなくなります",
+    "To continue, use Single Sign On to prove your identity.": "続行するには、シングルサインオンを使用して、本人確認を行ってください。",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "このユーザーを認証すると、相手のセッションと自分のセッションを信頼済として表示します。",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "ホームサーバーへの接続に失敗しました。このダイアログを閉じて、もう一度やり直してください。",
+    "Remove, ban, or invite people to this room, and make you leave": "ルームから追放、ブロック、ルームに招待、また、退出を要求",
+    "Verify this device by confirming the following number appears on its screen.": "以下の数字がスクリーンに表示されていることを確認し、この端末を認証してください。",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "アップロードしようとしているいくつかのファイルのサイズが<b>大きすぎます</b>。最大のサイズは%(limit)sです。",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "アップロードしようとしているファイルのサイズが<b>大きすぎます</b>。最大のサイズは%(limit)sです。",
+    "People you know on %(brand)s": "%(brand)sでの知人",
+    "a new master key signature": "新しいマスターキーの署名",
+    "This widget may use cookies.": "このウィジェットはCookieを使用する可能性があります。",
+    "Report the entire room": "ルーム全体を報告",
+    "Value in this room": "このルームでの値",
+    "Visible to space members": "スペースの参加者に表示",
+    "Failed to find the general chat for this community": "このコミュニティーの一般チャットの発見に失敗しました",
+    "Search names and descriptions": "名前と説明文を検索",
+    "Currently joining %(count)s rooms|one": "現在%(count)s個のルームに参加しています",
+    "Currently joining %(count)s rooms|other": "現在%(count)s個のルームに参加しています",
+    "Error downloading audio": "音声をダウンロードする際のエラー",
+    "Share entire screen": "全画面を共有",
+    "Show polls button": "アンケートのボタンを表示",
+    "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s個のリアクションを再送信",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "セキュリティーキーが<b>クリップボードにコピーされました</b>。ペーストし、",
+    "Enter your account password to confirm the upgrade:": "アップグレードを承認するには、アカウントのパスワードを入力してください：",
+    "You'll need to authenticate with the server to confirm the upgrade.": "サーバーをアップグレードするには認証が必要です。",
+    "Unable to query secret storage status": "機密ストレージの状態を読み込めません",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "復元方法を削除しなかった場合、攻撃者がアカウントへアクセスしようとしている可能性があります。設定画面にて、すぐにアカウントのパスワードを変更し、新しい復元方法を設定してください。",
+    "Insert a trailing colon after user mentions at the start of a message": "ユーザーをメンションする際にコロンを挿入",
+    "Your browser likely removed this data when running low on disk space.": "ディスクの空き容量が少なかったため、ブラウザーはこのデータを削除しました。",
+    "Do not disturb": "応答不可",
+    "You are about to leave <spaceName/>.": "<spaceName/>から退出しようとしています。",
+    "You're the only admin of some of the rooms or spaces you wish to leave. Leaving them will leave them without any admins.": "あなたは、退出しようとしているいくつかのルームとスペースの唯一の管理者です。退出すると、誰もそれらを管理できなくなります。",
+    "You're the only admin of this space. Leaving it will mean no one has control over it.": "あなたはこのスペースの唯一の管理者です。退出すると、誰もそれを管理できなくなります。",
+    "There was an error finding this widget.": "このウィジェットを発見する際にエラーが発生しました。",
+    "Server did not return valid authentication information.": "サーバーは正しい認証情報を返しませんでした。",
+    "Server did not require any authentication": "サーバーは認証を要求しませんでした",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "暗号化されたメッセージの鍵を含むセッションのデータが見つかりません。サインアウトして改めてサインインすると、バックアップから鍵を回復します。",
+    "Recent searches": "最近の検索",
+    "Multiple integration managers (requires manual setup)": "複数のインテグレーションマネージャー（手動での設定が必要）",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "セキュリティーキーを入力し、保護されたメッセージの履歴にアクセスして、安全なメッセージングを設定。",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "セキュリティーフレーズを入力し、保護されたメッセージの履歴にアクセスして、安全なメッセージングを設定。",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "セキュリティーフレーズを無くした場合は、<button1>セキュリティーキーを使用</button1>するか、<button2>新しい復旧用の手段</button2>を設定することができます",
+    "Remember this": "これを記憶",
+    "Message search initialisation failed, check <a>your settings</a> for more information": "メッセージの検索の初期化に失敗しました。<a>設定</a>から詳細を確認してください",
+    "Any of the following data may be shared:": "以下のデータが共有される可能性があります：",
+    "%(reactors)s reacted with %(content)s": "%(reactors)sは%(content)sでリアクションしました",
+    "%(count)s votes cast. Vote to see the results|one": "%(count)s個の投票がありました。投票すると結果を表示します",
+    "%(count)s votes cast. Vote to see the results|other": "%(count)s個の投票がありました。投票すると結果を表示します",
+    "Some encryption parameters have been changed.": "暗号化のパラメーターのいくつかが変更されました。",
+    "The call is in an unknown state!": "通話の状態が不明です！",
+    "Verify this device by completing one of the following:": "以下のいずれかでこの端末を認証してください：",
+    "They won't be able to access whatever you're not an admin of.": "あなたが管理者でない場所にアクセスすることができなくなります。",
+    "Can't see what you're looking for?": "お探しのものが見つかりませんか？",
+    "Failed to update the join rules": "参加のルールの更新に失敗しました",
+    "<b>It's not recommended to add encryption to public rooms.</b>Anyone can find and join public rooms, so anyone can read messages in them. You'll get none of the benefits of encryption, and you won't be able to turn it off later. Encrypting messages in a public room will make receiving and sending messages slower.": "<b>公開ルームを暗号化することは推奨されません。</b>公開ルームでは、誰でもルームを検索、参加して、メッセージを読むことができるため、暗号化の利益を得ることができません。また、後で暗号化を無効にすることはできません。公開ルームでメッセージを暗号化すると、メッセージの送受信が遅くなります。",
+    "Show options to enable 'Do not disturb' mode": "「応答不可」を有効にするオプションを表示",
+    "Surround selected text when typing special characters": "特殊な文字の入力中に、選択した文章を囲む",
+    "Let moderators hide messages pending moderation.": "モデレーターに、保留中のモデレーションのメッセージを非表示にすることを許可。",
+    "Report to moderators prototype. In rooms that support moderation, the `report` button will let you report abuse to room moderators": "モデレーターへの報告機能のプロトタイプ。モデレーションをサポートするルームで「報告」ボタンを押すと、ルームのモデレーターに報告",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sがこのルームの<a>固定メッセージ</a>を変更しました",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を%(count)s回変更しました",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sがこのルームの<a>固定メッセージ</a>を変更しました",
+    "They'll still be able to access whatever you're not an admin of.": "あなたが管理者ではないスペースやルームには、引き続きアクセスできます。",
+    "Setting definition:": "設定の定義：",
+    "Restore your key backup to upgrade your encryption": "鍵のバックアップを復元し、暗号化をアップグレードしてください",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "セキュリティーフレーズと、セキュアメッセージの鍵が削除されました。",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "偶然これをしてしまった場合は、このセッションでメッセージの暗号化を設定することができます。設定すると、新しい復元方法でセッションのデータを改めて暗号化します。",
+    "Message downloading sleep time(ms)": "メッセージをダウンロードする際の待機時間（ミリ秒）",
+    "Next recently visited room or community": "次に訪れたルームあるいはスペース",
+    "Previous recently visited room or community": "以前に訪れたルームあるいはスペース",
+    "%(count)s members including you, %(commaSeparatedMembers)s|other": "あなたと%(commaSeparatedMembers)sを含む%(count)s人のメンバー",
+    "%(count)s people you know have already joined|one": "%(count)s人の知人が既に参加しています",
+    "%(count)s people you know have already joined|other": "知り合いの%(count)s人が既に参加しています",
+    "%(count)s members including you, %(commaSeparatedMembers)s|one": "あなたと%(commaSeparatedMembers)sを含む%(count)s人のメンバー",
+    "Sections to show": "表示するセクション",
+    "Missing domain separator e.g. (:domain.org)": "ドメイン名のセパレーターが入力されていません。例は:domain.orgとなります",
+    "Missing room name or separator e.g. (my-room:domain.org)": "ルーム名あるいはセパレーターが入力されていません。例はmy-room:domain.orgとなります",
+    "This address had invalid server or is already in use": "このアドレスは不正なサーバーを含んでいるか、既に使用されています",
+    "Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…": "端末 %(deviceName)s（%(deviceId)s）での認証を待機しています…",
+    "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "ここが<roomName/>のエクスポートの先頭です。<exporterDetails/>により%(exportDate)sにエクスポートされました。",
+    "Media omitted - file size limit exceeded": "ファイルのサイズの超過により、メディアファイルは省かれました",
+    "Media omitted": "メディアファイルは省かれました",
+    "See when people join, leave, or are invited to your active room": "アクティブなルームに参加、退出、招待された日時を表示",
+    "Remove, ban, or invite people to your active room, and make you leave": "アクティブなルームから追放、ブロック、ルームに招待、また、退出を要求",
+    "Fetched %(count)s events in %(seconds)ss|one": "%(count)s個のイベントを%(seconds)s秒で取得しました",
+    "What are some things you want to discuss in %(spaceName)s?": "%(spaceName)sのテーマは何でしょうか？",
+    "You can add more later too, including already existing ones.": "ルームは後からも追加できます。",
+    "Let's create a room for each of them.": "テーマごとにルームを作りましょう。",
+    "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.": "クロス署名鍵の削除は取り消せません。認証した相手には、セキュリティーに関する警告が表示されます。クロス署名を行える全ての端末を失ったのでない限り、続行すべきではありません。",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "このセッションをアップグレードすると、他のセッションを認証できるようになります。また、暗号化されたメッセージへのアクセスが可能となり、メッセージを信頼済として相手に表示できるようになります。",
+    "It's just you at the moment, it will be even better with others.": "まだ他の参加者はいません。招待しましょう。",
+    "Yours, or the other users' session": "あなた、もしくは他のユーザーのセッション",
+    "Yours, or the other users' internet connection": "あなた、もしくは他のユーザーのインターネット接続",
+    "The homeserver the user you're verifying is connected to": "認証しようとしているユーザーが接続しているホームサーバー",
+    "Your platform and username will be noted to help us use your feedback as much as we can.": "フィードバックを最大限に活用するため、使用中のプラットフォームとユーザー名が送信されます。",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "詳細は<privacyPolicyLink />、<termsOfServiceLink />、<cookiePolicyLink />よりご確認ください。",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "続行すると、アカウントにアクセスし、認証済のメールアドレスを取得する権限を%(hostSignupBrand)sに一時的に付与します。データは保存されません。",
+    "You should know": "ご確認ください",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "ホストの作成を中断してよろしいですか？もう一度初めからやり直す必要があります。",
+    "Confirm abort of host creation": "ホストの作成を中断",
+    "There was a problem communicating with the server. Please try again.": "サーバーとの通信時に問題が発生しました。もう一度やり直してください。",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "セキュリティーキーはセーフティーネットとなります。セキュリティーフレーズを忘れた場合でも、セキュリティーキーを使えば、暗号化されたメッセージにアクセスすることができます。",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "ベータ版をお試しいただきありがとうございます。改善に役立てるため、できるだけ詳細にご記入ください。",
+    "Show extensible event representation of events": "イベントの拡張表示を有効にする",
+    "%(deviceId)s from %(ip)s": "%(ip)sの%(deviceId)s",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "注意：メールアドレスを追加せずパスワードを忘れた場合、<b>永久にアカウントにアクセスできなくなる</b>可能性があります。",
+    "Location sharing - share your current location with live updates (under active development)": "位置情報の共有 - ピンで現在地（ライブ）を共有（開発中）",
+    "Element was denied permission to fetch your location. Please allow location access in your browser settings.": "Elementは位置情報を取得する権限がありません。ブラウザーの設定から位置情報へのアクセスを許可してください。",
+    "Some characters not allowed": "使用できない文字が含まれています",
+    "Send a sticker": "ステッカーを送信",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "スペースは、ルームや連絡先をグループ化する新しい方法です。どんなグループを作りますか？これは後から変更できます。",
+    "Collapse quotes": "引用を折りたたむ",
+    "Expand quotes": "引用を展開",
+    "Click": "クリック",
+    "We'll create rooms for each of them.": "それぞれのプロジェクトにルームを作りましょう。",
+    "What projects are your team working on?": "あなたのチームはどのようなプロジェクトに取り組みますか？",
+    "Jump to date (adds /jumptodate and jump to date headers)": "日付に移動（/jumptodateを追加すると、日付のヘッダーに移動します）",
+    "Pick a date to jump to": "日付を選択して移動",
+    "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "もし開発者の方であれば、Elementはオープンソースですので、ぜひ私たちのGitHub（https://github.com/vector-im/element-web/）をご覧いただき、開発にご参加ください！",
+    "You are not allowed to view this server's rooms list": "このルームの一覧を表示する許可がありません",
+    "This version of %(brand)s does not support viewing some encrypted files": "この%(brand)sのバージョンは、暗号化されたファイルの表示をサポートしていません",
+    "This version of %(brand)s does not support searching encrypted messages": "この%(brand)sのバージョンは、暗号化されたメッセージの検索をサポートしていません",
+    "Their device couldn't start the camera or microphone": "相手の端末はカメラ、もしくはマイクを使用できませんでした",
+    "We <Bold>don't</Bold> record or profile any account data": "私たちは、アカウントのいかなるデータも記録したり分析したり<Bold>しません</Bold>",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "IDサーバーを使うと、メールアドレスで招待できます。<settings>設定画面</settings>で管理できます。",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "IDサーバーを使うと、メールアドレスで招待できます。<default>既定（%(defaultIdentityServerName)s）のサーバーを使う</default>か、<settings>設定画面</settings>で管理できます。",
+    "Adding spaces has moved.": "スペースの追加機能は移動しました。",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "デバッグログは、ユーザー名、ID、訪問したルームやグループのアドレス、最後に使用した機能、他のユーザーのユーザー名を含む使用状況に関する情報を含みます。メッセージは含まれません。",
+    "You can turn this off anytime in settings": "これはいつでも設定から無効にできます",
+    "We <Bold>don't</Bold> share information with third parties": "私たちは、情報を第三者と共有することは<Bold>ありません</Bold>",
+    "Click to drop a pin": "クリックして現在地を共有",
+    "Click to move the pin": "クリックしてピンを移動",
+    "Shared a location: ": "位置情報を共有しました： ",
+    "This homeserver is not configured to display maps.": "このホームサーバーは地図を表示するように設定されていません。",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "このホームサーバーが地図を表示するよう正しく設定されていないか、地図のサーバーに接続できません。",
+    "Unable to load map": "地図を読み込めません",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "以前このセッションで、より新しい%(brand)sのバージョンを使用していました。エンドツーエンド暗号化を有効にしてこのバージョンを再び使用するには、サインアウトして、再びサインインする必要があります。",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが管理者によりブロックされているため、メッセージを送信できませんでした。サービスの利用を継続するには、<a>サービスの管理者に連絡</a>してください。",
+    "%(brand)s failed to get the public room list.": "%(brand)sは公開ルームの一覧の取得に失敗しました。",
+    "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "%(brand)sでは、インテグレーションマネージャーでこれを行うことができません。管理者に連絡してください。",
+    "To avoid these issues, create a <a>new encrypted room</a> for the conversation you plan to have.": "これらの問題を避けるには、予定している会話用に<a>暗号化されたルーム</a>を新しく作成してください。",
+    "To avoid these issues, create a <a>new public room</a> for the conversation you plan to have.": "これらの問題を避けるには、予定している会話用に<a>公開ルーム</a>を新しく作成してください。",
+    "Size can only be a number between %(min)s MB and %(max)s MB": "サイズは%(min)sMBから%(max)sMBの間でなければなりません",
+    "Number of messages can only be a number between %(min)s and %(max)s": "メッセージの数は%(min)sから%(max)sまででなければなりません",
+    "In encrypted rooms, verify all users to ensure it's secure.": "暗号化されたルームでは、安全確認のために全てのユーザーを認証しましょう。",
+    "Including you, %(commaSeparatedMembers)s": "あなたと%(commaSeparatedMembers)sを含む",
+    "Can't create a thread from an event with an existing relation": "既存の関係のあるイベントからスレッドを作成することはできません",
+    "Remove them from everything I'm able to": "自分に可能な範囲で、全てのものから追放",
+    "Remove them from specific things I'm able to": "自分に可能な範囲で、特定のものから追放",
+    "Make sure the right people have access. You can invite more later.": "必要な人がアクセスできるようにしましょう。後から追加で招待できます。",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "チャットの履歴の消去を防ぐには、ログアウトする前にルームの鍵をエクスポートする必要があります。そのためには%(brand)sの新しいバージョンへと戻る必要があります",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "このセッションのデータの消去は取り消せません。鍵がバックアップされていない限り、暗号化されたメッセージを読むことはできなくなります。",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(commaSeparatedMembers)sを含む%(count)s人のメンバー",
+    "Including %(commaSeparatedMembers)s": "%(commaSeparatedMembers)sを含む",
+    "Error - Mixed content": "エラー - 混在コンテンツ",
+    "This room is in some spaces you're not an admin of. In those spaces, the old room will still be shown, but people will be prompted to join the new one.": "このルームは、あなたが管理者でないスペースの中にあります。そのスペースでは古いルームは表示され続けますが、参加者は新しいルームに参加するように求められます。",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "フィルターパネルのアバターをクリックすると、そのコミュニティーに関係のあるルームと連絡先のみを表示できます。",
+    "Disinvite from %(roomName)s": "%(roomName)sへの招待を取り消す",
+    "Unban them from specific things I'm able to": "自分に可能な範囲で、特定のものからブロック解除",
+    "Unban them from everything I'm able to": "自分に可能な範囲で、全てのものからブロック解除",
+    "Ban them from specific things I'm able to": "自分に可能な範囲で、特定のものからブロック",
+    "Ban them from everything I'm able to": "自分に可能な範囲で、全てのものからブロック",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "もしGitHubで不具合を報告した場合は、デバッグログが問題の解決に役立ちます。 ",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "テスト中に作成されたスレッドに関するイベントは、ルームのタイムライン上では返信として表示されます。これは一度限りの移行です。スレッドはMatrixの仕様の一部になりました。",
+    "Thank you for helping us testing Threads!": "スレッド機能のテストにご協力いただき、ありがとうございました！",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "スレッド機能の安定性が改善したため、スレッド機能のテスト版のサポートを終了します。",
+    "Threads are no longer experimental! 🎉": "スレッドは正式版になりました🎉",
+    "Do you want to enable threads anyway?": "スレッドを有効にしますか？",
+    "Yes, enable": "有効にする",
+    "Live location error": "位置情報（ライブ）のエラー",
+    "sends hearts": "ハートを送信",
+    "Confirm signing out these devices|other": "これらの端末からのサインアウトを承認",
+    "Confirm signing out these devices|one": "この端末からのサインアウトを承認",
+    "View live location": "位置情報（ライブ）を表示",
+    "Loading live location...": "位置情報（ライブ）を読み込んでいます…",
+    "Video rooms (under active development)": "ビデオ通話ルーム（開発中）",
+    "How can I start a thread?": "スレッドの開始方法",
+    "Failed to join": "参加に失敗しました",
+    "The person who invited you has already left, or their server is offline.": "招待した人が既に退出したか、サーバーがオフラインです。",
+    "The person who invited you has already left.": "招待した人は既に退出しました。",
+    "Sorry, your homeserver is too old to participate here.": "申し訳ありませんが、あなたのホームサーバーはここに参加するには古すぎます。",
+    "There was an error joining.": "参加する際にエラーが発生しました。",
+    "%(value)sm": "%(value)s分",
+    "%(value)sh": "%(value)s時",
+    "%(value)sd": "%(value)s日",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "このページがルームやユーザーIDなどの特定可能な情報を含んでいる場合は、その情報はサーバーに送信される前に削除されます。",
+    "Beta feature": "ベータ版の機能",
+    "Live location enabled": "位置情報が有効です",
+    "Jump to the given date in the timeline": "タイムラインの指定した日に移動",
+    "Unban from space": "スペースからのブロックを解除",
+    "Ban from space": "スペースからブロック",
+    "Unban from room": "ルームからのブロックを解除",
+    "Ban from room": "ルームからブロック",
+    "Copy link": "リンクをコピー",
+    "%(featureName)s Beta feedback": "%(featureName)sのベータ版のフィードバック",
+    "Threads are a beta feature": "スレッドはベータ版の機能です",
+    "<a>Give feedback</a>": "<a>フィードバックを送信</a>",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "警告：あなたの個人情報（暗号化の鍵を含む）が、このセッションに保存されています。このセッションの使用を終了するか、他のアカウントにログインしたい場合は、そのデータを消去してください。",
+    "The user's homeserver does not support the version of the space.": "ユーザーのホームサーバーは、このバージョンのスペースをサポートしていません。",
+    "User may or may not exist": "ユーザーが存在するか不明です",
+    "User does not exist": "ユーザーは存在しません",
+    "User is already in the room": "ユーザーは既にルームに入っています",
+    "User is already in the space": "ユーザーは既にスペースに入っています",
+    "User is already invited to the room": "ユーザーは既にルームに招待されています",
+    "User is already invited to the space": "ユーザーは既にスペースに招待されています",
+    "You do not have permission to invite people to this space.": "ユーザーをこのスペースに招待する権限がありません。",
+    "Failed to invite users to %(roomName)s": "ユーザーを%(roomName)sに招待するのに失敗しました",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "コミュニティーのリンク（%(groupId)s）にアクセスしようとしています。<br/>コミュニティー機能はスペースにより置き換えられ、サポート外になりました。<br2/><a>スペースに関しては、こちらをご参照ください。</a>",
+    "That link is no longer supported": "このリンクはサポートされていません",
+    "%(value)ss": "%(value)s秒",
+    "You can still join here.": "参加できます。",
+    "This invite was sent to %(email)s": "招待が%(email)sに送信されました",
+    "This room or space does not exist.": "このルームまたはスペースは存在しません。",
+    "This room or space is not accessible at this time.": "このルームまたはスペースは現在アクセスできません。",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "ルームまたはスペースにアクセスする際に%(errcode)sのエラーが発生しました。エラー発生時にこのメッセージが表示されているなら、<issueLink>バグレポートを送信してください</issueLink>。",
+    "Stop sharing and close": "共有を停止して閉じる",
+    "An error occured whilst sharing your live location": "位置情報（ライブ）を共有する際にエラーが発生しました",
+    "New room": "新しいルーム",
+    "New video room": "新しいビデオ通話ルーム",
+    "%(count)s participants|other": "%(count)s人の参加者",
+    "%(count)s participants|one": "1人の参加者",
+    "Create a video room": "ビデオ通話ルームを作成",
+    "Create video room": "ビデオ通話ルームを作成",
+    "Create room": "ルームを作成",
+    "Threads help keep your conversations on-topic and easy to track.": "スレッド機能を使うと、会話のテーマを維持したり、会話を簡単に追跡したりすることができます。",
+    "Keep discussions organised with threads.": "スレッド機能を使って、会話をまとめましょう。",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "スレッド機能を使うと、会話のテーマを維持したり、会話を簡単に追跡したりすることができます。<a>詳しく知る</a>。",
+    "Beta feature. Click to learn more.": "ベータ版の機能です。クリックすると詳細を表示します。",
+    "Partial Support for Threads": "スレッド機能の部分的サポート",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "ホームサーバーがサポートしていないため、スレッド機能は不安定かもしれません。スレッドのメッセージは安定して表示されないおそれがあります。<a>詳しく知る</a>。"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 5b8ab905114..467bb0badaa 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1271,7 +1271,7 @@
     "Find a room…": "Zoek een kamer…",
     "Find a room… (e.g. %(exampleRoom)s)": "Zoek een kamer… (bv. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u de kamer niet kunt vinden is het mogelijk privé, vraag dan om een uitnodiging of <a>maak een nieuwe kamer aan</a>.",
-    "Explore rooms": "Kamers verkennen",
+    "Explore rooms": "Kamers ontdekken",
     "Show previews/thumbnails for images": "Miniaturen voor afbeeldingen tonen",
     "Clear cache and reload": "Cache wissen en herladen",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
@@ -2765,7 +2765,7 @@
     "%(seconds)ss left": "%(seconds)s's over",
     "Change server ACLs": "Wijzig server ACL's",
     "Show options to enable 'Do not disturb' mode": "Toon opties om de 'Niet storen' modus in te schakelen",
-    "You can select all or individual messages to retry or delete": "U kunt alles selecteren of per individueel bericht opnieuw verzenden of verwijderen",
+    "You can select all or individual messages to retry or delete": "U kunt alles selecteren of per individueel bericht opnieuw versturen of verwijderen",
     "Sending": "Wordt verstuurd",
     "Retry all": "Alles opnieuw proberen",
     "Delete all": "Verwijder alles",
@@ -2775,7 +2775,7 @@
     "Including %(commaSeparatedMembers)s": "Inclusief %(commaSeparatedMembers)s",
     "View all %(count)s members|one": "1 lid bekijken",
     "View all %(count)s members|other": "Bekijk alle %(count)s personen",
-    "Failed to send": "Verzenden is mislukt",
+    "Failed to send": "Versturen is mislukt",
     "Enter your Security Phrase a second time to confirm it.": "Voor uw veiligheidswachtwoord een tweede keer in om het te bevestigen.",
     "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Kies een kamer of gesprek om hem toe te voegen. Dit is een Space voor u, niemand zal hiervan een melding krijgen. U kan er later meer toevoegen.",
     "What do you want to organise?": "Wat wilt u organiseren?",
@@ -3530,7 +3530,7 @@
     "Message pending moderation": "Bericht in afwachting van moderatie",
     "Message pending moderation: %(reason)s": "Bericht in afwachting van moderatie: %(reason)s",
     "Remove from room": "Verwijderen uit kamer",
-    "Failed to remove user": "Kan gebruiker niet verwijderen",
+    "Failed to remove user": "Kan persoon niet verwijderen",
     "Remove them from specific things I'm able to": "Verwijder ze van specifieke dingen die ik kan",
     "Remove them from everything I'm able to": "Verwijder ze van alles wat ik kan",
     "Remove from %(roomName)s": "Verwijderen uit %(roomName)s",
@@ -3541,10 +3541,10 @@
     "You don't have permission to view messages from before you joined.": "U heeft geen toestemming om berichten te bekijken voor voordat u lid word.",
     "You don't have permission to view messages from before you were invited.": "U bent niet gemachtigd om berichten te bekijken van voordat u werd uitgenodigd.",
     "From a thread": "Uit een conversatie",
-    "Remove users": "Gebruikers verwijderen",
+    "Remove users": "Personen verwijderen",
     "Keyboard": "Toetsenbord",
     "Widget": "Widget",
-    "Automatically send debug logs on decryption errors": "Automatisch foutopsporingslogboeken verzenden bij decoderingsfouten",
+    "Automatically send debug logs on decryption errors": "Automatisch foutopsporingslogboeken versturen bij decoderingsfouten",
     "Show join/leave messages (invites/removes/bans unaffected)": "Toon deelname/laat berichten (uitnodigingen/verwijderingen/bans onaangetast)",
     "Enable location sharing": "Locatie delen inschakelen",
     "Show extensible event representation of events": "Toon uitbreidbare gebeurtenisweergave van gebeurtenissen",
@@ -3556,7 +3556,7 @@
     "%(senderName)s has shared their location": "%(senderName)s heeft zijn locatie gedeeld",
     "%(senderName)s removed %(targetName)s": "%(senderName)s verwijderd %(targetName)s",
     "%(senderName)s removed %(targetName)s: %(reason)s": "%(senderName)s verwijderd %(targetName)s: %(reason)s",
-    "Removes user with given id from this room": "Verwijdert gebruiker met opgegeven ID uit deze kamer",
+    "Removes user with given id from this room": "Verwijder persoon met opgegeven ID uit deze kamer",
     "Previous autocomplete suggestion": "Vorige suggestie voor automatisch aanvullen",
     "Next autocomplete suggestion": "Volgende suggestie voor automatisch aanvullen",
     "Previous room or DM": "Vorige kamer of DM",
@@ -3587,7 +3587,7 @@
     "If you know what you're doing, Element is open-source, be sure to check out our GitHub (https://github.com/vector-im/element-web/) and contribute!": "Als u weet wat u doet, Element is open-source, bekijk dan zeker onze GitHub (https://github.com/vector-im/element-web/) en draag bij!",
     "If someone told you to copy/paste something here, there is a high likelihood you're being scammed!": "Als iemand u heeft gezegd iets hier te kopiëren/plakken, is de kans groot dat u wordt opgelicht!",
     "Wait!": "Wacht!",
-    "Unable to check if username has been taken. Try again later.": "Kan niet controleren of gebruikersnaam is gebruikt. Probeer het later nog eens.",
+    "Unable to check if username has been taken. Try again later.": "Kan niet controleren of inlognaam is gebruikt. Probeer het later nog eens.",
     "This address does not point at this room": "Dit adres verwijst niet naar deze kamer",
     "Pick a date to jump to": "Kies een datum om naar toe te springen",
     "Jump to date": "Spring naar datum",
@@ -3619,7 +3619,7 @@
     "<%(count)s spaces>|other": "<%(count)s spaces>",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sverzond een verborgen bericht",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sverzond %(count)s verborgen berichten",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sverzond %(count)s verborgen bericht",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sverzond verborgen bericht",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sverzond %(count)s verborgen berichten",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sheeft een bericht verwijderd",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sverwijderde %(count)s berichten",
@@ -3628,7 +3628,7 @@
     "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times.|one": "%(severalUsers)s hebben de <a>vastgezette berichten</a> voor de kamer gewijzigd.",
     "Maximise": "Maximaliseren",
     "You do not have permissions to add spaces to this space": "U bent niet gemachtigd om spaces aan deze space toe te voegen",
-    "Automatically send debug logs when key backup is not functioning": "Automatisch foutopsporingslogboeken verzenden wanneer de sleutelback-up niet werkt",
+    "Automatically send debug logs when key backup is not functioning": "Automatisch foutopsporingslogboeken versturen wanneer de sleutelback-up niet werkt",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Bedankt voor het proberen van de bèta. Ga alsjeblieft zo gedetailleerd mogelijk in op de details zodat we deze kunnen verbeteren.",
     "To leave, just return to this page or click on the beta badge when you search.": "Om te vertrekken, keert u gewoon terug naar deze pagina of klikt u op het bèta label tijdens het zoeken.",
     "How can I leave the beta?": "Hoe kan ik de bèta verlaten?",
@@ -3638,5 +3638,206 @@
     "A new, quick way to search spaces and rooms you're in.": "Een nieuwe, snelle manier om spaces en kamers te zoeken waarin u zich bevindt.",
     "The new search": "De nieuwe zoekopdracht",
     "New search experience": "Nieuwe zoekervaring",
-    "%(space1Name)s and %(space2Name)s": "%(space1Name)s en %(space2Name)s"
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s en %(space2Name)s",
+    "You do not have permission to invite people to this space.": "U bent niet gemachtigd om mensen voor deze space uit te nodigen.",
+    "No virtual room for this room": "Geen virtuele ruimte voor deze ruimte",
+    "Switches to this room's virtual room, if it has one": "Schakelt over naar de virtuele kamer van deze kamer, als die er is",
+    "Failed to invite users to %(roomName)s": "Kan personen niet uitnodigen voor %(roomName)s",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "U probeert toegang te krijgen tot een communitylink (%(groupId)s).<br/>Communities worden niet langer ondersteund en zijn vervangen door spaces.<br2/><a>Lees hier meer over spaces.</a>",
+    "That link is no longer supported": "Deze link wordt niet langer ondersteund",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Als deze pagina identificeerbare informatie bevat, zoals een kamer, persoon-ID, worden die gegevens verwijderd voordat ze naar de server worden verzonden.",
+    "Observe only": "Alleen observeren",
+    "Requester": "Aanvrager",
+    "Methods": "Methoden",
+    "Timeout": "Time-out",
+    "Phase": "Fase",
+    "Transaction": "Transactie",
+    "Cancelled": "Geannuleerd",
+    "Started": "Begonnen",
+    "Ready": "Gereed",
+    "Requested": "Aangevraagd",
+    "Unsent": "niet verstuurd",
+    "Edit values": "Bewerk waarden",
+    "Failed to save settings.": "Kan instellingen niet opslaan.",
+    "Number of users": "Aantal personen",
+    "Server": "Server",
+    "Server Versions": "Serverversies",
+    "Client Versions": "cliëntversies",
+    "Failed to load.": "Laden mislukt.",
+    "Capabilities": "Mogelijkheden",
+    "Send custom state event": "Aangepaste statusgebeurtenis versturen",
+    "Failed to send event!": "Kan gebeurtenis niet versturen!",
+    "Doesn't look like valid JSON.": "Lijkt niet op geldige JSON.",
+    "Send custom room account data event": "Gegevensgebeurtenis van aangepaste kamer account versturen",
+    "Send custom account data event": "Aangepaste accountgegevens gebeurtenis versturen",
+    "Search Dialog": "Dialoogvenster Zoeken",
+    "Join %(roomAddress)s": "%(roomAddress)s toetreden",
+    "Export Cancelled": "Export geannuleerd",
+    "Room ID: %(roomId)s": "Kamer ID: %(roomId)s",
+    "Server info": "Server info",
+    "Settings explorer": "Instellingen verkenner",
+    "Explore account data": "Accountgegevens ontdekken",
+    "Verification explorer": "Verificatie verkenner",
+    "View servers in room": "Servers in de kamer bekijken",
+    "Explore room account data": "Kamer accountgegevens ontdekken",
+    "Explore room state": "Kamerstatus ontdekken",
+    "Send custom timeline event": "Aangepaste tijdlijngebeurtenis versturen",
+    "Create room": "Ruimte aanmaken",
+    "Create video room": "Videokamer maken",
+    "Create a video room": "Creëer een videokamer",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Schakel het vinkje uit als u ook systeemberichten van deze persoon wilt verwijderen (bijv. lidmaatschapswijziging, profielwijziging...)",
+    "Preserve system messages": "Systeemberichten behouden",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "U staat op het punt %(count)s bericht te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wilt u doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "U staat op het punt %(count)s berichten te verwijderen door %(user)s. Hierdoor worden ze permanent verwijderd voor iedereen in het gesprek. Wilt u doorgaan?",
+    "%(featureName)s Beta feedback": "%(featureName)s Bèta-feedback",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Help ons problemen te identificeren en %(analyticsOwner)s te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door uw apparaten wordt gedeeld.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "U kunt de aangepaste serveropties gebruiken om u aan te melden bij andere Matrix-servers door een andere server-URL op te geven. Hierdoor kunt u %(brand)s gebruiken met een bestaand Matrix-account op een andere thuisserver.",
+    "Results are only revealed when you end the poll": "Resultaten worden pas onthuld als u de poll beëindigt",
+    "Voters see results as soon as they have voted": "Kiezers zien resultaten zodra ze hebben gestemd",
+    "Closed poll": "Gesloten poll",
+    "Open poll": "Start poll",
+    "Poll type": "Poll type",
+    "Edit poll": "Bewerk poll",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer gewijzigd",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)shebben de <a>vastgezette berichten</a> voor de kamer gewijzigd",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sheeft de <a>vastgezette berichten</a> voor de kamer %(count)s keer gewijzigd",
+    "What location type do you want to share?": "Welk locatietype wilt u delen?",
+    "Drop a Pin": "Zet een pin neer",
+    "My live location": "Mijn live locatie",
+    "My current location": "Mijn huidige locatie",
+    "%(displayName)s's live location": "De live locatie van %(displayName)s",
+    "We couldn't send your location": "We kunnen uw locatie niet versturen",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s kan uw locatie niet versturen. Probeer het later opnieuw.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s heeft geen toestemming gekregen om uw locatie op te halen. Sta locatietoegang toe in uw browserinstellingen.",
+    "Click to drop a pin": "Klik om een pin neer te zetten",
+    "Click to move the pin": "Klik om de pin te verplaatsen",
+    "Share for %(duration)s": "Delen voor %(duration)s",
+    "Results will be visible when the poll is ended": "Resultaten zijn zichtbaar wanneer de poll is afgelopen",
+    "Sorry, you can't edit a poll after votes have been cast.": "Sorry, u kunt een poll niet bewerken nadat er gestemd is.",
+    "Can't edit poll": "Kan poll niet bewerken",
+    "Shared a location: ": "Een locatie gedeeld: ",
+    "Shared their location: ": "Hun locatie gedeeld: ",
+    "Unable to load map": "Kan kaart niet laden",
+    "Click": "Klik",
+    "Expand quotes": "Citaten uitvouwen",
+    "Collapse quotes": "Citaten invouwen",
+    "Beta feature. Click to learn more.": "Bètafunctie. Klik om meer te leren.",
+    "Beta feature": "Bètafunctie",
+    "Can't create a thread from an event with an existing relation": "Kan geen discussie maken van een gebeurtenis met een bestaande relatie",
+    "Pinned": "Vastgezet",
+    "Open thread": "Open discussie",
+    "%(count)s participants|one": "1 deelnemer",
+    "%(count)s participants|other": "%(count)s deelnemers",
+    "Connected": "Verbonden",
+    "Video": "Video",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s is geretourneerd tijdens een poging om toegang te krijgen tot de kamer of space. Als u denkt dat je dit bericht ten onrechte ziet, <issueLink>dien dan een bugrapport in</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Probeer het later opnieuw of vraag een kamer- of space beheerder om te controleren of u toegang heeft.",
+    "This room or space is not accessible at this time.": "Deze kamer of space is op dit moment niet toegankelijk.",
+    "Are you sure you're at the right place?": "Weet u zeker dat je op de goede locatie bent?",
+    "This room or space does not exist.": "Deze kamer of space bestaat niet.",
+    "There's no preview, would you like to join?": "Er is geen preview, wilt u toetreden?",
+    "This invite was sent to %(email)s": "De uitnodiging is verzonden naar %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Deze uitnodiging is verzonden naar %(email)s die niet is gekoppeld aan uw account",
+    "You can still join here.": "U kunt hier nog toetreden.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Er is een fout (%(errcode)s) geretourneerd tijdens het valideren van uw uitnodiging. U kunt proberen deze informatie door te geven aan de persoon die u heeft uitgenodigd.",
+    "Something went wrong with your invite.": "Er is iets misgegaan met uw uitnodiging.",
+    "You were banned by %(memberName)s": "U bent verbannen door %(memberName)s",
+    "Forget this space": "Vergeet deze space",
+    "You were removed by %(memberName)s": "U bent verwijderd door %(memberName)s",
+    "Loading preview": "Voorbeeld laden",
+    "Joining …": "Deelnemen…",
+    "Currently removing messages in %(count)s rooms|one": "Momenteel berichten in %(count)s kamer aan het verwijderen",
+    "Currently removing messages in %(count)s rooms|other": "Momenteel berichten in %(count)s kamers aan het verwijderen",
+    "New video room": "Nieuwe video kamer",
+    "New room": "Nieuwe kamer",
+    "Busy": "Bezet",
+    "Remove messages sent by me": "Door mij verzonden berichten verwijderen",
+    "View older version of %(spaceName)s.": "Bekijk oudere versie van %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Upgrade deze ruimte naar de aanbevolen kamerversie",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Foutopsporingslogboeken bevatten toepassingsgebruiksgegevens, waaronder uw inlognaam, de ID's of aliassen van de kamers die u heeft bezocht, met welke UI-elementen u voor het laatst interactie heeft gehad en de inlognamen van andere personen. Ze bevatten geen berichten.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Als u een bug via GitHub heeft ingediend, kunnen foutopsporingslogboeken ons helpen het probleem op te sporen. ",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Spaces zijn een nieuwe manier om kamers en mensen te groeperen. Wat voor ruimte wilt u aanmaken? U kunt dit later wijzigen.",
+    "Match system": "Match systeem",
+    "Developer tools": "Ontwikkelaarstools",
+    "sends hearts": "stuurt hartjes",
+    "Sends the given message with hearts": "Stuurt het bericht met hartjes",
+    "Insert a trailing colon after user mentions at the start of a message": "Voeg een dubbele punt in nadat de persoon het aan het begin van een bericht heeft vermeld",
+    "Show polls button": "Toon polls-knop",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Live locatie delen - deel huidige locatie (actieve ontwikkeling, en tijdelijk, locaties blijven bestaan in kamergeschiedenis)",
+    "Location sharing - pin drop (under active development)": "Locatie delen - pin drop (in actieve ontwikkeling)",
+    "Show current avatar and name for users in message history": "Toon huidige avatar en naam voor persoon in berichtgeschiedenis",
+    "Video rooms (under active development)": "Videokamers (in actieve ontwikkeling)",
+    "To leave, return to this page and use the “Leave the beta” button.": "Om te verlaten, keer terug naar deze pagina en gebruik de knop \"Verlaat de bèta\".",
+    "Use \"Reply in thread\" when hovering over a message.": "Gebruik \"Beantwoorden in gesprek\" wanneer u de muisaanwijzer op een bericht plaatst.",
+    "How can I start a thread?": "Hoe kan ik een discussie starten?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Discussies helpen om gesprekken on-topic te houden en gemakkelijk te volgen. <a>Meer informatie</a>.",
+    "Keep discussions organised with threads.": "Houd discussies georganiseerd met discussielijnen.",
+    "Failed to join": "Kan niet deelnemen",
+    "The person who invited you has already left, or their server is offline.": "De persoon die u heeft uitgenodigd is al vertrokken, of zijn server is offline.",
+    "The person who invited you has already left.": "De persoon die u heeft uitgenodigd is al vertrokken.",
+    "Sorry, your homeserver is too old to participate here.": "Sorry, uw server is te oud om hier deel te nemen.",
+    "There was an error joining.": "Er is een fout opgetreden bij het deelnemen.",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s is experimenteel in een mobiele webbrowser. Gebruik onze gratis native app voor een betere ervaring en de nieuwste functies.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Deze server is niet correct geconfigureerd om kaarten weer te geven, of de geconfigureerde kaartserver is mogelijk onbereikbaar.",
+    "The user's homeserver does not support the version of the space.": "De server van de persoon ondersteunt de versie van de ruimte niet.",
+    "This homeserver is not configured to display maps.": "Deze server is niet geconfigureerd om kaarten weer te geven.",
+    "User may or may not exist": "Persoon kan wel of niet bestaan",
+    "User does not exist": "Persoon bestaat niet",
+    "User is already invited to the room": "Persoon is al uitgenodigd voor de kamer",
+    "User is already in the room": "Persoon is al in de kamer",
+    "User is already in the space": "Persoon is al in de space",
+    "User is already invited to the space": "Persoon is al uitgenodigd voor de space",
+    "Toggle Code Block": "Codeblok wisselen",
+    "Toggle Link": "Koppeling wisselen",
+    "Accessibility": "Toegankelijkheid",
+    "Event ID: %(eventId)s": "Gebeurtenis ID: %(eventId)s",
+    "<a>Give feedback</a>": "<a>Feedback geven</a>",
+    "Threads are a beta feature": "Discussies zijn een bètafunctie",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Tip:</b> gebruik \"Antwoord in discussie\" wanneer u de muisaanwijzer op een bericht plaatst.",
+    "Threads help keep your conversations on-topic and easy to track.": "Discussies helpen u gesprekken on-topic te houden en gemakkelijk bij te houden.",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Reageer op een lopende discussie of gebruik \"%(replyInThread)s\" wanneer u de muisaanwijzer op een bericht plaatst om een nieuwe te starten.",
+    "We'll create rooms for each of them.": "We zullen kamers voor elk van hen maken.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Als u de kamer die u zoekt niet kunt vinden, vraag dan om een uitnodiging of <a>maak een nieuwe kamer aan</a>.",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Dit zal een eenmalige overgang zijn, aangezien discussies nu deel uitmaken van de Matrix-specificatie.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Terwijl we ons erop voorbereiden, moeten we enkele wijzigingen aanbrengen: discussies die vóór dit punt zijn gemaakt, worden <strong>weergegeven als gewone antwoorden</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "We komen dichter bij de release van een publieke bètaversie voor Discussies.",
+    "Threads Approaching Beta 🎉": "Discussies naderen bèta 🎉",
+    "Stop sharing and close": "Stop met delen en sluit",
+    "Stop sharing": "Stop delen",
+    "An error occurred while stopping your live location, please try again": "Er is een fout opgetreden bij het stoppen van uw live locatie, probeer het opnieuw",
+    "An error occured whilst sharing your live location, please try again": "Er is een fout opgetreden bij het delen van uw live locatie, probeer het opnieuw",
+    "%(timeRemaining)s left": "%(timeRemaining)s over",
+    "You are sharing your live location": "U deelt uw live locatie",
+    "An error occured whilst sharing your live location": "Er is een fout opgetreden bij het delen van uw live locatie",
+    "No verification requests found": "Geen verificatieverzoeken gevonden",
+    "Open user settings": "Open persooninstellingen",
+    "Switch to space by number": "Overschakelen naar space op nummer",
+    "Next recently visited room or space": "Volgende recent bezochte kamer of space",
+    "Previous recently visited room or space": "Vorige recent bezochte kamer of ruimte",
+    "Live location enabled": "Live locatie ingeschakeld",
+    "Live location error": "Live locatie error",
+    "Live location ended": "Live locatie beëindigd",
+    "Loading live location...": "Live locatie laden...",
+    "Live until %(expiryTime)s": "Live tot %(expiryTime)s",
+    "View live location": "Bekijk live locatie",
+    "Ban from room": "Verban van kamer",
+    "Unban from room": "Ontban van kamer",
+    "Ban from space": "Verban van space",
+    "Unban from space": "Unban van space",
+    "Disinvite from room": "Uitnodiging van kamer afwijzen",
+    "Remove from space": "Verwijder van space",
+    "Disinvite from space": "Uitnodiging van space afwijzen",
+    "Confirm signing out these devices|one": "Uitloggen van dit apparaat bevestigen",
+    "Confirm signing out these devices|other": "Uitloggen van deze apparaten bevestigen",
+    "Yes, enable": "Ja, inschakelen",
+    "Do you want to enable threads anyway?": "Wil je toch discussies inschakelen?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Uw server ondersteunt momenteel geen discussies, dus deze functie kan onbetrouwbaar zijn. Sommige berichten in een discussie zijn mogelijk niet betrouwbaar beschikbaar. <a>Meer informatie</a>.",
+    "Partial Support for Threads": "Gedeeltelijke ondersteuning voor Discussies",
+    "Right-click message context menu": "Rechtermuisknop op het bericht voor opties",
+    "Jump to the given date in the timeline": "Spring naar de opgegeven datum in de tijdlijn"
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index c4ab04c7baa..37d7f77128c 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1220,5 +1220,35 @@
     "%(senderName)s has ended a poll": "%(senderName)s har avslutta ei røysting",
     "%(senderName)s has started a poll - %(pollQuestion)s": "%(senderName)s har starta ei røysting - %(pollQuestion)s",
     "Are you sure you want to end this poll? This will show the final results of the poll and stop people from being able to vote.": "Er du sikker på at du vil avslutta denne røystinga ? Dette vil gjelde for alle, og dei endelege resultata vil bli presentert.",
-    "%(count)s results|other": "%(count)s resultat"
+    "%(count)s results|other": "%(count)s resultat",
+    "Cookie Policy": "Informasjonskapslar",
+    "Privacy Policy": "Personvern",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Viss du frå før har rapportert feil via GitHub, så kan ein feilrapport hjelpe oss vidare med å finne årsaka. Feilrapportar inneheld detaljerte data om bruken av programmet, inkludert ditt brukarnamn, ID-ar eller alias av rom og grupper du har samhandla med, kva element i appen du sist trykte på og brukarnamn til andre folk. Meldingane dine blir ikkje tatt med.",
+    "New keyword": "Nytt nøkkelord",
+    "Keyword": "Nøkkelord",
+    "Messages containing keywords": "Meldingar som inneheld nøkkelord",
+    "Mentions & keywords": "Nemningar & nøkkelord",
+    "Enable email notifications for %(email)s": "Aktiver varsel på epost for %(email)s",
+    "Modern": "Moderne",
+    "Message bubbles": "Snakkebobler",
+    "Message layout": "Utforming for meldingar",
+    "IRC (Experimental)": "IRC (eksperimentell)",
+    "Keyboard shortcuts": "Tastatursnarvegar",
+    "Keyboard": "Tastatur",
+    "Use Ctrl + F to search timeline": "Bruk Ctrl + F for å søka på tidslinja",
+    "Use Command + F to search timeline": "Bruk Command + F for å søka på tidslinja",
+    "Image size in the timeline": "Storleik for bilete på tidslinja",
+    "Large": "Stor",
+    "Use between %(min)s pt and %(max)s pt": "Må vere mellom %(min)s og %(max)s punkt",
+    "Use custom size": "Bruk ein spesifikk skriftstorleik",
+    "Identity server (%(server)s)": "Identietstenar (%(server)s)",
+    "Change identity server": "Endre identitetstenar",
+    "Not a valid identity server (status code %(code)s)": "Ikkje ein gyldig identietstenar (statuskode %(code)s)",
+    "Identity server URL must be HTTPS": "URL for identitetstenar må vera HTTPS",
+    "Share": "Del",
+    "Spell check dictionaries": "Installerte ordbøker for stavekontroll",
+    "Review to ensure your account is safe": "Undersøk dette for å gjere kontoen trygg",
+    "Review": "Undersøk",
+    "Results are only revealed when you end the poll": "Resultatet blir synleg når du avsluttar røystinga",
+    "Results will be visible when the poll is ended": "Resultata vil bli synlege når røystinga er ferdig"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 8269a24ce5d..e45f4cb8ddf 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -330,12 +330,12 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uwaga: każda osoba dodana do Społeczności będzie publicznie widoczna dla każdego, go zna identyfikator społeczności",
     "Invite new community members": "Zaproś nowych członków Społeczności",
-    "Show these rooms to non-members on the community page and room list?": "Pokazać te pokoje dla osób niebędących członkami na stronie Społeczności oraz liście pokoi?",
+    "Show these rooms to non-members on the community page and room list?": "Pokazać te pokoje dla osób niebędących członkami na stronie Społeczności oraz liście pokojów?",
     "Add rooms to the community": "Dodaj pokoje do Społeczności",
     "Failed to invite the following users to %(groupId)s:": "Nie udało się zaprosić poniższych użytkowników do %(groupId)s:",
     "Failed to invite users to community": "Nie udało się zaprosić użytkowników do Społeczności",
     "Failed to invite users to %(groupId)s": "Nie udało się zaprosić użytkowników do %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "Nie udało się dodać poniższych pokoi do %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Nie udało się dodać poniższych pokojów do %(groupId)s:",
     "Restricted": "Ograniczony",
     "Ignored user": "Ignorowany użytkownik",
     "You are now ignoring %(userId)s": "Ignorujesz teraz %(userId)s",
@@ -364,7 +364,7 @@
     "Unknown for %(duration)s": "Nieznany przez %(duration)s",
     "Unknown": "Nieznany",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Widziane przez %(displayName)s (%(userName)s) o %(dateTime)s",
-    "No rooms to show": "Brak pokoi do wyświetlenia",
+    "No rooms to show": "Brak pokojów do wyświetlenia",
     "Unnamed room": "Pokój bez nazwy",
     "Guests can join": "Goście mogą dołączyć",
     "Fetching third party location failed": "Pobranie lokalizacji zewnętrznej nie powiodło się",
@@ -560,7 +560,7 @@
     "Unable to leave community": "Nie udało się opuścić Społeczności",
     "Community Settings": "Ustawienia Społeczności",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Zmiany <bold1>nazwy</bold1> oraz <bold2>awataru</bold2> Twojej Społeczności mogą nie być widoczne przez innych użytkowników nawet przez 30 minut.",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Te pokoje są wyświetlane członkom społeczności na stronie społeczności. Członkowie społeczności mogą dołączyć do pokoi, klikając je.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Te pokoje są wyświetlane członkom społeczności na stronie społeczności. Członkowie społeczności mogą dołączyć do pokojów, klikając je.",
     "%(inviter)s has invited you to join this community": "%(inviter)s zaprosił(a) Cię do przyłączenia się do tej Społeczności",
     "Join this community": "Dołącz do tej Społeczności",
     "Leave this community": "Opuść tę Społeczność",
@@ -809,7 +809,7 @@
     "Versions": "Wersje",
     "Preferences": "Preferencje",
     "Timeline": "Oś czasu",
-    "Room list": "Lista pokoi",
+    "Room list": "Lista pokojów",
     "Security & Privacy": "Bezpieczeństwo i prywatność",
     "Room Addresses": "Adresy pokoju",
     "Change room avatar": "Zmień awatar pokoju",
@@ -871,7 +871,7 @@
     "Once enabled, encryption cannot be disabled.": "Po włączeniu szyfrowanie nie może zostać wyłączone.",
     "Go back": "Wróć",
     "Whether or not you're logged in (we don't record your username)": "Czy jesteś zalogowany(-a) lub niezalogowany(-a) (nie zapisujemy Twojej nazwy użytkownika)",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Czy używasz korzystasz z funkcji „okruchów” (awatary nad listą pokoi)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Czy używasz korzystasz z funkcji „okruchów” (awatary nad listą pokojów)",
     "Call failed due to misconfigured server": "Połączenie nie udało się przez błędną konfigurację serwera",
     "Try using turn.matrix.org": "Spróbuj użyć serwera turn.matrix.org",
     "The file '%(fileName)s' failed to upload.": "Nie udało się przesłać pliku '%(fileName)s'.",
@@ -903,7 +903,7 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s zmienił(a) zasadę dołączania na %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s pozwolił(a) by goście dołączali do pokoju.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zabronił(a) gościom dołączać do pokoju.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmienił dostęp gościnny na %(rule)s",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmienił dostęp dla gości dla %(rule)s",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(groups)s w tym pokoju.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s dezaktywował Flair dla %(groups)s w tym pokoju.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(newGroups)s i dezaktywował Flair dla %(oldGroups)s w tym pokoju.",
@@ -1080,8 +1080,8 @@
     "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
     "Enable audible notifications for this session": "Włącz powiadomienia dźwiękowe dla tej sesji",
     "Direct Messages": "Wiadomości bezpośrednie",
-    "Create Account": "Stwórz konto",
-    "Sign In": "Zaloguj",
+    "Create Account": "Utwórz konto",
+    "Sign In": "Zaloguj się",
     "a few seconds ago": "kilka sekund temu",
     "%(num)s minutes ago": "%(num)s minut temu",
     "%(num)s hours ago": "%(num)s godzin temu",
@@ -1107,7 +1107,7 @@
     "Create account": "Utwórz konto",
     "Navigation": "Nawigacja",
     "Calls": "Połączenia",
-    "Room List": "Lista pokoi",
+    "Room List": "Lista pokojów",
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
@@ -1743,7 +1743,7 @@
     "Custom Tag": "Niestandardowy tag",
     "Explore community rooms": "Przeglądaj pokoje społeczności",
     "Hide Widgets": "Ukryj widgety",
-    "No recently visited rooms": "Brak ostatnio odwiedzonych pokoi",
+    "No recently visited rooms": "Brak ostatnio odwiedzonych pokojów",
     "Show Widgets": "Pokaż widgety",
     "Can't see what you’re looking for?": "Nie możesz znaleźć tego, czego szukasz?",
     "Start a new chat": "Rozpocznij nową rozmowę",
@@ -1831,7 +1831,7 @@
     "Use an email address to recover your account": "Użyj adresu e-mail, aby odzyskać swoje konto",
     "Doesn't look like a valid email address": "To nie wygląda na prawidłowy adres e-mail",
     "Incompatible local cache": "Niekompatybilna lokalna pamięć podręczna",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Przed wysłaniem logów, <a>zgłoś problem na GitHubie</a> opisujący twój problem.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Niektóre pliki są <b>zbyt duże</b> do wysłania. Ograniczenie wielkości plików to %(limit)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Te pliki są <b>zbyt duże</b> do wysłania. Ograniczenie wielkości plików to %(limit)s.",
     "Remember my selection for this widget": "Zapamiętaj mój wybór dla tego widżetu",
@@ -1969,7 +1969,7 @@
     "For maximum security, this should be different from your account password.": "Dla maksymalnego bezpieczeństwa, powinno się ono różnić od hasła do Twojego konta.",
     "Discovery options will appear once you have added an email above.": "Opcje odkrywania pojawią się, gdy dodasz adres e-mail powyżej.",
     "Discovery options will appear once you have added a phone number above.": "Opcje odkrywania pojawią się, gdy dodasz numer telefonu powyżej.",
-    "Show shortcuts to recently viewed rooms above the room list": "Pokazuj skróty do ostatnio wyświetlonych pokoi nad listą pokoi",
+    "Show shortcuts to recently viewed rooms above the room list": "Pokazuj skróty do ostatnio wyświetlonych pokojów nad listą pokojów",
     "Signature upload failed": "Wysłanie podpisu nie powiodło się",
     "Signature upload success": "Wysłanie podpisu udało się",
     "Manually export keys": "Ręcznie eksportuj klucze",
@@ -2035,17 +2035,17 @@
     "Suggested": "Polecany",
     "This room is suggested as a good one to join": "Ten pokój jest polecany jako dobry do dołączenia",
     "%(count)s rooms|one": "%(count)s pokój",
-    "%(count)s rooms|other": "%(count)s pokoi",
+    "%(count)s rooms|other": "%(count)s pokojów",
     "%(count)s members|one": "%(count)s członek",
     "%(count)s members|other": "%(count)s członkowie",
     "You don't have permission": "Nie masz uprawnień",
-    "Failed to remove some rooms. Try again later": "Nie udało się usunąć niektórych pokoi. Spróbuj ponownie później",
+    "Failed to remove some rooms. Try again later": "Nie udało się usunąć niektórych pokojów. Spróbuj ponownie później",
     "Select a room below first": "Najpierw wybierz poniższy pokój",
     "Filter all spaces": "Filtruj wszystkie przestrzenie",
     "Spaces is a beta feature": "Przestrzenie są funkcją beta",
     "%(count)s results in all spaces|one": "%(count)s wynik we wszystkich przestrzeniach",
     "%(count)s results in all spaces|other": "%(count)s wyników we wszystkich przestrzeniach",
-    "Spaces are a new way to group rooms and people.": "Przestrzenie to nowy sposób grupowania pokoi i ludzi.",
+    "Spaces are a new way to group rooms and people.": "Przestrzenie to nowy sposób grupowania pokojów i ludzi.",
     "Spaces": "Przestrzenie",
     "Feeling experimental? Labs are the best way to get things early, test out new features and help shape them before they actually launch. <a>Learn more</a>.": "Chcesz eksperymentować? Laboratoria to najlepszy sposób na uzyskanie nowości wcześniej, przetestowanie nowych funkcji i pomoc w kształtowaniu ich zanim będą ogólnodostępne. <a>Dowiedz się więcej</a>.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Będziemy przechowywać zaszyfrowaną kopię Twoich kluczy na naszym serwerze. Zabezpiecz swoją kopię zapasową frazą bezpieczeństwa.",
@@ -2077,10 +2077,10 @@
     "Or send invite link": "Lub wyślij odnośnik z zaproszeniem",
     "Integration manager": "Menedżer integracji",
     "Identity server is": "Serwer tożsamości to",
-    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Zarządcy integracji otrzymują dane konfiguracji, mogą modyfikować widżety, wysyłać zaproszenia do pokoi i ustawiać poziom uprawnień w Twoim imieniu.",
+    "Integration managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Zarządcy integracji otrzymują dane konfiguracji, mogą modyfikować widżety, wysyłać zaproszenia do pokojów i ustawiać poziom uprawnień w Twoim imieniu.",
     "Use an integration manager to manage bots, widgets, and sticker packs.": "Użyj zarządcy integracji aby zarządzać botami, widżetami i pakietami naklejek.",
     "Use an integration manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Użyj zarządcy Integracji <b>%(serverName)s</b> aby zarządzać botami, widżetami i pakietami naklejek.",
-    "Identity server": "Serwer toższamości",
+    "Identity server": "Serwer tożsamości",
     "Identity server (%(server)s)": "Serwer tożsamości (%(server)s)",
     "Could not connect to identity server": "Nie można połączyć z serwerem tożsamości",
     "Not a valid identity server (status code %(code)s)": "Nieprawidłowy serwer tożsamości (kod statusu %(code)s)",
@@ -2119,8 +2119,8 @@
     "Connectivity to the server has been lost": "Połączenie z serwerem zostało przerwane",
     "You cannot place calls in this browser.": "Nie możesz wykonywać połączeń z tej przeglądarki.",
     "Calls are unsupported": "Rozmowy nie są obsługiwane",
-    "Some examples of the information being sent to us to help make %(brand)s better includes:": "Przykładowe informacje wysyłane do nas w celu poprawienia %(brand)s zawierają:",
-    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Nasza pełna polityka cookies znajduje się <CookiePolicyLink>tutaj</CookiePolicyLink>.",
+    "Some examples of the information being sent to us to help make %(brand)s better includes:": "Przykładowe informacje wysyłane do nas w celu ulepszenia %(brand)s zawierają:",
+    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Nasza pełna polityka cookies jest dostępna <CookiePolicyLink>tutaj</CookiePolicyLink>.",
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s usunął swoją widoczną nazwę (%(oldDisplayName)s)",
     "%(senderName)s set their display name to %(displayName)s": "%(senderName)s ustawił(-a) widoczną nazwę jako %(displayName)s",
     "%(oldDisplayName)s changed their display name to %(displayName)s": "%(oldDisplayName)s zmienił(-a) wyświetlaną nazwę na %(displayName)s",
@@ -2272,7 +2272,7 @@
     "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Dodaj użytkowników i serwery tutaj które chcesz ignorować. Użyj znaku gwiazdki (*) żeby %(brand)s zgadzał się z każdym znakiem. Na przykład, <code>@bot:*</code> może ignorować wszystkich użytkowników którzy mają nazwę 'bot' na każdym serwerze.",
     "Lock": "Zamek",
     "Don't send read receipts": "Nie wysyłaj potwierdzeń przeczytania",
-    "%(senderName)s has shared their location": "%(senderName)s udostępnił swoją lokalizację",
+    "%(senderName)s has shared their location": "%(senderName)s udostępnił lokalizację",
     "Location sharing (under active development)": "Udostępnianie lokalizacji (wczesny dostęp)",
     "Not trusted": "Nie zaufane",
     "Empty room": "Pusty pokój",
@@ -2280,12 +2280,35 @@
     "Message": "Wiadomość",
     "Set a new status": "Ustaw nowy status",
     "ready": "gotowy",
-    "Disagree": "Odrzuć",
+    "Disagree": "Nie zgadzam się",
     "Create a new room": "Stwórz nowy pokój",
     "Adding rooms... (%(progress)s out of %(count)s)|other": "Dodawanie pokojów... (%(progress)s z %(count)s)",
     "Adding rooms... (%(progress)s out of %(count)s)|one": "Dodawanie pokoju...",
     "Adding...": "Dodawanie...",
     "Autoplay GIFs": "Auto odtwarzanie GIF'ów",
     "Enable location sharing": "Włącz udostępnianie lokalizacji",
-    "Let moderators hide messages pending moderation.": "Daj moderatorom ukrycie wiadomości które są sprawdzane."
+    "Let moderators hide messages pending moderation.": "Daj moderatorom ukrycie wiadomości które są sprawdzane.",
+    "Show current avatar and name for users in message history": "Pokaż obecne awatary i nazwy użytkowników w historii wiadomości",
+    "Show extensible event representation of events": "Pokaż rozszerzalną reprezentację wydarzeń",
+    "No virtual room for this room": "Brak wirtualnego pokoju dla tego pokoju",
+    "Switches to this room's virtual room, if it has one": "Przełącza do wirtualnego pokoju tego pokoju, jeśli taki istnieje",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s i %(space2Name)s",
+    "There was a problem communicating with the homeserver, please try again later.": "Wystąpił problem przy łączeniu się z twoim serwerem, spróbuj ponownie później.",
+    "Report the entire room": "Zgłoś cały pokój",
+    "Spam or propaganda": "Spam lub propaganda",
+    "Illegal Content": "Nielegalna treść",
+    "Toxic Behaviour": "Toksyczne zachowanie",
+    "Please pick a nature and describe what makes this message abusive.": "Wybierz powód oraz opisz dlaczego ta wiadomość jest niestosowna.",
+    "Include Attachments": "Dodaj załączniki",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Ten interfejs nie sprawdza typów wartości. Używaj na własne ryzyko.",
+    "Caution:": "Ostrzeżenie:",
+    "Failed to save settings": "Nie udało się zapisać ustawień",
+    "Settings Explorer": "Przeglądarka ustawień",
+    "Stop recording": "Skończ nagrywanie",
+    "We didn't find a microphone on your device. Please check your settings and try again.": "Nie udało się znaleźć żadnego mikrofonu w twoim urządzeniu. Sprawdź ustawienia i spróbuj ponownie.",
+    "No microphone found": "Nie znaleziono mikrofonu",
+    "Can't see what you're looking for?": "Nie możesz znaleźć czego szukasz?",
+    "Sticker": "Naklejka",
+    "Rooms outside of a space": "Pokoje poza przestrzenią",
+    "Autoplay videos": "Auto odtwarzanie filmów"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 2ca17015873..35d794f7b01 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -1675,7 +1675,7 @@
     "Everyone in this room is verified": "Todos nesta sala estão confirmados",
     "Edit message": "Editar mensagem",
     "Mod": "Moderador",
-    "Scroll to most recent messages": "Ir para as mensagens mais recentes",
+    "Scroll to most recent messages": "Ir para as mensagens recentes",
     "Close preview": "Fechar a visualização",
     "Send a reply…": "Digite sua resposta…",
     "Send a message…": "Digite uma mensagem…",
@@ -2641,7 +2641,7 @@
     "This space is not public. You will not be able to rejoin without an invite.": "Este espaço não é público. Você não poderá entrar novamente sem um convite.",
     "Save Changes": "Salvar alterações",
     "Saving...": "Salvando...",
-    "Leave space": "Sair desse espaço",
+    "Leave space": "Sair do espaço",
     "Leave Space": "Sair desse espaço",
     "Edit settings relating to your space.": "Editar configurações relacionadas ao seu espaço.",
     "Space settings": "Configurações desse espaço",
@@ -3023,7 +3023,7 @@
     "Connectivity to the server has been lost": "A conectividade com o servidor foi perdida",
     "You cannot place calls in this browser.": "Você não pode fazer chamadas neste navegador.",
     "Calls are unsupported": "Chamadas não suportadas",
-    "Some examples of the information being sent to us to help make %(brand)s better includes:": "Alguns exemplos das informações que estão sendo enviadas para nos ajudar %(brand)s melhorar incluem:",
+    "Some examples of the information being sent to us to help make %(brand)s better includes:": "Alguns exemplos das informações que estão sendo enviadas para ajudar %(brand)s a melhorar incluem:",
     "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "Nossa política de cookies completa pode ser encontrada <CookiePolicyLink>aqui</CookiePolicyLink>.",
     "Error fetching file": "Erro ao buscar arquivo",
     "Cross-signing is ready but keys are not backed up.": "A verificação está pronta mas as chaves não tem um backup configurado.",
@@ -3181,5 +3181,28 @@
     "Verified devices": "Dispositivos verificados",
     "Select all": "Selecionar tudo",
     "Sign out devices|one": "Desconectar dispositivo",
-    "Sign out devices|other": "Desconectar dispositivos"
+    "Sign out devices|other": "Desconectar dispositivos",
+    "Command error: Unable to handle slash command.": "Erro de comando: Não é possível manipular o comando de barra.",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Você está tentando acessar um link de comunidade (%(groupId)s).<br/>As comunidades não são mais compatíveis e foram substituídas por espaços.<br2/><a>Saiba mais sobre espaços aqui.</a>",
+    "That link is no longer supported": "Esse link não é mais suportado",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Onde esta página inclui informações identificáveis, como uma sala, ID do usuário, esses dados são removidos antes de serem enviados ao servidor.",
+    "Open user settings": "Abrir as configurações do usuário",
+    "Switch to space by number": "Mudar para o espaço por número",
+    "Next recently visited room or space": "Próxima sala ou espaço visitado recentemente",
+    "Previous recently visited room or space": "Sala ou espaço visitado recentemente",
+    "Redo edit": "Refazer edição",
+    "Undo edit": "Desfazer edição",
+    "Jump to last message": "Ir para a última mensagem",
+    "Jump to first message": "Ir para primeira mensagem",
+    "Show:": "Exibir:",
+    "You can't see earlier messages": "Você não pode ver as mensagens anteriores",
+    "Encrypted messages before this point are unavailable.": "As mensagens criptografadas antes deste ponto não estão disponíveis.",
+    "Leave some rooms": "Sair de algumas salas",
+    "Leave all rooms": "Sair de todas as salas",
+    "Don't leave any rooms": "Não saia de nenhuma sala",
+    "Jump to date": "Ir para Data",
+    "Command error: Unable to find rendering type (%(renderingType)s)": "Erro de comando: Não é possível manipular o tipo (%(renderingType)s)"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 75d3cfe30d9..f65d5cf828e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3590,5 +3590,89 @@
     "You cannot place calls in this browser.": "Вы не можете совершать вызовы в этом браузере.",
     "Calls are unsupported": "Вызовы не поддерживаются",
     "Some examples of the information being sent to us to help make %(brand)s better includes:": "Некоторые примеры информации, передаваемой нам, чтобы помочь сделать %(brand)s лучше:",
-    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "С нашей полной политикой использования файлов cookie можно ознакомиться <CookiePolicyLink>здесь</CookiePolicyLink>."
+    "Our complete cookie policy can be found <CookiePolicyLink>here</CookiePolicyLink>.": "С нашей полной политикой использования файлов cookie можно ознакомиться <CookiePolicyLink>здесь</CookiePolicyLink>.",
+    "Open user settings": "Открыть пользовательские настройки",
+    "Switch to space by number": "Перейти к пространству по номеру",
+    "Next recently visited room or community": "Следующая недавно посещенная комната или сообщество",
+    "Previous recently visited room or community": "Предыдущая недавно посещенная комната или сообщество",
+    "Accessibility": "Доступность",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Ответьте в существующую ветку или создайте новую, наведя курсор на сообщение и нажав «%(replyInThread)s».",
+    "We'll create rooms for each of them.": "Мы создадим комнаты для каждого из них.",
+    "We're testing a new search to make finding what you want quicker.\n": "Мы тестируем новый поиск, чтобы быстрее найти то, что вам нужно.\n",
+    "New search beta available": "Доступна новая бета-версия поиска",
+    "Click for more info": "Нажмите, чтобы узнать больше",
+    "This is a beta feature": "Это бета-функция",
+    "This is a beta feature. Click for more info": "Это бета-функция. Нажмите, чтобы узнать больше",
+    "Results not as expected? Please <a>give feedback</a>.": "Результаты не соответствуют ожиданиям? Пожалуйста, оставьте <a>отзыв</a>.",
+    "Search Dialog": "Окно поиска",
+    "Use <arrows/> to scroll": "Используйте <arrows/> для прокрутки",
+    "Join %(roomAddress)s": "Присоединиться к %(roomAddress)s",
+    "Feedback sent! Thanks, we appreciate it!": "Отзыв отправлен! Спасибо, мы ценим это!",
+    "Export Cancelled": "Экспорт отменён",
+    "<%(count)s spaces>|zero": "<пустая строка>",
+    "<%(count)s spaces>|one": "<пространство>",
+    "<%(count)s spaces>|other": "<%(count)s пространств>",
+    "Results are only revealed when you end the poll": "Результаты отображаются только после завершения опроса",
+    "Voters see results as soon as they have voted": "Голосующие увидят результаты сразу после голосования",
+    "Closed poll": "Закрытый опрос",
+    "Open poll": "Открытый опрос",
+    "Poll type": "Тип опроса",
+    "Edit poll": "Редактировать опрос",
+    "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s отправляет скрытое сообщение",
+    "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s отправляет %(count)s скрытых сообщений",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s отправляют скрытое сообщение",
+    "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s отправляют %(count)s скрытых сообщений",
+    "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s удаляет сообщение",
+    "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s удаляет %(count)s сообщений",
+    "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s удаляют сообщение",
+    "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s удаляют %(count)s сообщений",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s изменяет <a>закрепленные сообщения</a> комнаты",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s изменяет <a>закрепленные сообщения</a> комнаты %(count)s раз",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s изменяют <a>закрепленные сообщения</a> комнаты",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s изменяют <a>закрепленные сообщения</a> комнаты %(count)s раз",
+    "What location type do you want to share?": "Каким типом местоположения вы хотите поделиться?",
+    "Drop a Pin": "Маркер на карте",
+    "My live location": "Мое местоположение в реальном времени",
+    "My current location": "Моё текущее местоположение",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s не удаётся отправить ваше местоположение. Пожалуйста, повторите попытку позже.",
+    "We couldn't send your location": "Мы не смогли отправить ваше местоположение",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Этот домашний сервер неправильно настроен для отображения карт, или настроенный сервер карт может быть недоступен.",
+    "This homeserver is not configured to display maps.": "Этот домашний сервер не настроен на отображение карт.",
+    "Click to drop a pin": "Нажмите, чтобы создать маркер",
+    "Click to move the pin": "Нажмите, чтобы сдвинуть маркер",
+    "Results will be visible when the poll is ended": "Результаты будут видны после завершения опроса",
+    "Sorry, you can't edit a poll after votes have been cast.": "Вы не можете редактировать опрос после завершения голосования.",
+    "Can't edit poll": "Невозможно редактировать опрос",
+    "Shared a location: ": "Делится местоположением: ",
+    "Shared their location: ": "Поделились своим местоположением: ",
+    "Unable to load map": "Не удается загрузить карту",
+    "Click": "Нажать",
+    "Expand quotes": "Развернуть цитаты",
+    "Collapse quotes": "Свернуть цитаты",
+    "Can't create a thread from an event with an existing relation": "Невозможно создать ветку из события с существующей связью",
+    "Pinned": "Закреплено",
+    "Maximise": "Развернуть",
+    "Open thread": "Открыть ветку",
+    "You do not have permissions to add spaces to this space": "У вас нет разрешения добавлять пространства в это пространство",
+    "Remove messages sent by me": "Удалить отправленные мной сообщения",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Пространства – это новый способ групповых комнат и людей. Какой вид пространства вы хотите создать? Вы можете изменить это позже.",
+    "Match system": "Как в системе",
+    "Automatically send debug logs when key backup is not functioning": "Автоматически отправлять журналы отладки, когда резервное копирование ключей не работает",
+    "Insert a trailing colon after user mentions at the start of a message": "Вставьте двоеточие после упоминания пользователя в начале сообщения",
+    "Show polls button": "Показывать кнопку опроса",
+    "Location sharing - share your current location with live updates (under active development)": "Поделиться местоположением - делитесь своими текущими местоположением в реальном времени (в активной разработке)",
+    "Location sharing - pin drop (under active development)": "Поделиться местоположением - маркер на карте (в активной разработке)",
+    "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Спасибо, что попробовали бета-версию, пожалуйста, опишите как можно подробнее, что нам следует улучшить.",
+    "To leave, just return to this page or click on the beta badge when you search.": "Просто вернитесь к этой странице или нажмите «Бета» во время поиска.",
+    "How can I leave the beta?": "Как отключить бета-версию?",
+    "To feedback, join the beta, start a search and click on feedback.": "Чтобы оставить отзыв, присоединитесь к бета-версии, начните поиск и нажмите кнопку «Обратная связь».",
+    "How can I give feedback?": "Как я могу оставить отзыв?",
+    "This feature is a work in progress, we'd love to hear your feedback.": "Эта функция находится в процессе разработки, мы будем рады услышать ваши отзывы.",
+    "A new, quick way to search spaces and rooms you're in.": "Новый быстрый способ поиска пространств и комнат, в которых вы находитесь.",
+    "The new search": "Новый поиск",
+    "New search experience": "Новые возможности поиска",
+    "Show current avatar and name for users in message history": "Показывать текущий аватар и имя пользователей в истории сообщений",
+    "No virtual room for this room": "Эта комната не имеет виртуальной комнаты",
+    "Switches to this room's virtual room, if it has one": "Переключается на виртуальную комнату, если ваша комната её имеет",
+    "%(space1Name)s and %(space2Name)s": "%(space1Name)s и %(space2Name)s"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 19438c2fafb..37804f2f1c0 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -269,7 +269,7 @@
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s krát opustili",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sopustili",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s krát opustil",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sopustil",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sodišiel/a",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s%(count)s krát vstúpili a opustili",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)svstúpili a opustili",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s%(count)s krát vstúpil a opustil",
@@ -387,7 +387,7 @@
     "Failed to reject invitation": "Nepodarilo sa odmietnuť pozvanie",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ste si istí, že chcete opustiť miestnosť '%(roomName)s'?",
     "Signed Out": "Ste odhlásení",
-    "For security, this session has been signed out. Please sign in again.": "Kôli bezpečnosti ste boli odhlásení z tejto relácie. Prosím, prihláste sa znovu.",
+    "For security, this session has been signed out. Please sign in again.": "Z bezpečnostných dôvodov bola táto relácia odhlásená. Prosím, prihláste sa znova.",
     "Logout": "Odhlásiť sa",
     "Your Communities": "Vaše komunity",
     "You're not currently a member of any communities.": "V súčasnosti nie ste členom žiadnej komunity.",
@@ -412,7 +412,7 @@
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detekciu jazyka pre zvýraznenie syntaxe",
-    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové emotikony modernými emoji",
+    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové emotikony modernými",
     "Mirror local video feed": "Zrkadliť lokálne video",
     "Sign out": "Odhlásiť sa",
     "Failed to change password. Is your password correct?": "Nepodarilo sa zmeniť heslo. Zadali ste správne heslo?",
@@ -462,7 +462,7 @@
     "Ignores a user, hiding their messages from you": "Ignoruje používateľa a skryje pred vami jeho správy",
     "Stops ignoring a user, showing their messages going forward": "Prestane ignorovať používateľa a začne zobrazovať jeho správy",
     "Commands": "Príkazy",
-    "Emoji": "Emoji",
+    "Emoji": "Emotikon",
     "Notify the whole room": "Oznamovať celú miestnosť",
     "Room Notification": "Oznámenie miestnosti",
     "Users": "Používatelia",
@@ -811,14 +811,14 @@
     "The user must be unbanned before they can be invited.": "Tomuto používateľovi musíte pred odoslaním pozvania povoliť vstup.",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Zoskupiť a filtrovať miestnosti podľa vlastných značiek (zmeny sa prejavia po obnovení stránky)",
     "Render simple counters in room header": "Zobraziť jednoduchú štatistiku v záhlaví miestnosti",
-    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy emoji počas písania",
+    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy emotikonov počas písania",
     "Show a placeholder for removed messages": "Zobrazovať náhrady za odstránené správy",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovať správy o vstupe a opustení miestnosti (pozvánky/vylúčenia/zákazy nie sú ovplyvnené)",
     "Show avatar changes": "Zobrazovať zmeny obrázka v profile",
     "Show display name changes": "Zobrazovať zmeny zobrazovaného mena",
     "Show read receipts sent by other users": "Zobrazovať potvrdenia o prečítaní od ostatných používateľov",
     "Show avatars in user and room mentions": "Pri zmienkach používateľov a miestností zobrazovať aj obrázok",
-    "Enable big emoji in chat": "Povoliť veľké emoji v konverzáciách",
+    "Enable big emoji in chat": "Povoliť veľké emotikony v konverzáciách",
     "Send typing notifications": "Posielať oznámenia, keď píšete",
     "Enable Community Filter Panel": "Povoliť panel filter komunít",
     "Messages containing my username": "Správy obsahujúce moje meno používateľa",
@@ -827,72 +827,72 @@
     "You've successfully verified this user.": "Úspešne ste overili tohoto používateľa.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Zabezpečené správy s týmto používateľom sú end-to-end šifrované a tretie strany ich nemôžu čítať.",
     "Got It": "Rozumiem",
-    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohto používateľa tak, že zistíte, či sa na jeho obrazovke objavia nasledujúce emoji.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohto používateľa potvrdením, že sa na jeho obrazovke zobrazujú nasledujúce emotikony.",
     "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
     "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.",
-    "Dog": "Hlava psa",
-    "Cat": "Hlava mačky",
-    "Lion": "Hlava leva",
+    "Dog": "Pes",
+    "Cat": "Mačka",
+    "Lion": "Lev",
     "Horse": "Kôň",
-    "Unicorn": "Hlava jednorožca",
-    "Pig": "Hlava Prasaťa",
+    "Unicorn": "Jednorožec",
+    "Pig": "Prasa",
     "Elephant": "Slon",
-    "Rabbit": "Hlava Zajaca",
-    "Panda": "Hlava Pandy",
+    "Rabbit": "Zajac",
+    "Panda": "Panda",
     "Rooster": "Kohút",
     "Penguin": "Tučniak",
     "Turtle": "Korytnačka",
     "Fish": "Ryba",
     "Octopus": "Chobotnica",
     "Butterfly": "Motýľ",
-    "Flower": "Tulipán",
-    "Tree": "Listnatý strom",
+    "Flower": "Kvet",
+    "Tree": "Strom",
     "Cactus": "Kaktus",
     "Mushroom": "Huba",
     "Globe": "Zemeguľa",
-    "Moon": "Polmesiac",
+    "Moon": "Mesiac",
     "Cloud": "Oblak",
     "Fire": "Oheň",
     "Banana": "Banán",
-    "Apple": "Červené jablko",
+    "Apple": "Jablko",
     "Strawberry": "Jahoda",
-    "Corn": "Kukuričný klas",
+    "Corn": "Kukurica",
     "Pizza": "Pizza",
-    "Cake": "Narodeninová torta",
-    "Heart": "Červené srdce",
-    "Smiley": "Škeriaca sa tvár",
+    "Cake": "Torta",
+    "Heart": "Srdce",
+    "Smiley": "Smajlík",
     "Robot": "Robot",
-    "Hat": "Cylinder",
+    "Hat": "Klobúk",
     "Glasses": "Okuliare",
-    "Spanner": "Francúzsky kľúč",
-    "Santa": "Santa Claus",
-    "Thumbs up": "palec nahor",
+    "Spanner": "Vidlicový kľúč",
+    "Santa": "Mikuláš",
+    "Thumbs up": "Palec nahor",
     "Umbrella": "Dáždnik",
     "Hourglass": "Presýpacie hodiny",
     "Clock": "Budík",
-    "Gift": "Zabalený darček",
+    "Gift": "Darček",
     "Light bulb": "Žiarovka",
-    "Book": "Zatvorená kniha",
+    "Book": "Kniha",
     "Pencil": "Ceruzka",
-    "Paperclip": "Sponka na papier",
+    "Paperclip": "Kancelárska sponka",
     "Scissors": "Nožnice",
     "Key": "Kľúč",
     "Hammer": "Kladivo",
     "Telephone": "Telefón",
-    "Flag": "Kockovaná zástava",
-    "Train": "Rušeň",
+    "Flag": "Zástava",
+    "Train": "Vlak",
     "Bicycle": "Bicykel",
     "Aeroplane": "Lietadlo",
     "Rocket": "Raketa",
     "Trophy": "Trofej",
-    "Ball": "Futbal",
+    "Ball": "Lopta",
     "Guitar": "Gitara",
     "Trumpet": "Trúbka",
-    "Bell": "Zvon",
+    "Bell": "Zvonec",
     "Anchor": "Kotva",
     "Headphones": "Slúchadlá",
     "Folder": "Fascikel",
-    "Pin": "Pripnúť",
+    "Pin": "Špendlík",
     "Yes": "Áno",
     "No": "Nie",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali sme vám email, aby sme mohli overiť vašu adresu. Postupujte podľa odoslaných inštrukcií a potom klepnite na nižšie zobrazené tlačidlo.",
@@ -1199,7 +1199,7 @@
     "Ask this user to verify their session, or manually verify it below.": "Poproste tohto používateľa, aby si overil svoju reláciu alebo ju nižšie manuálne overte.",
     "Not Trusted": "Nedôveryhodné",
     "Manually Verify by Text": "Manuálne overte pomocou textu",
-    "Interactively verify by Emoji": "Interaktívne overte pomocou emoji",
+    "Interactively verify by Emoji": "Interaktívne overte pomocou emotikonov",
     "Done": "Hotovo",
     "a few seconds ago": "pred pár sekundami",
     "about a minute ago": "približne pred minútou",
@@ -1246,8 +1246,8 @@
     "Verify this session by completing one of the following:": "Overte túto reláciu dokončením jedného z nasledujúcich:",
     "Scan this unique code": "Naskenujte tento jedinečný kód",
     "or": "alebo",
-    "Compare unique emoji": "Porovnajte jedinečnú kombináciu emoji",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Pokiaľ nemáte na svojich zariadeniach kameru, porovnajte jedinečnú kombináciu emoji",
+    "Compare unique emoji": "Porovnajte jedinečnú kombináciu emotikonov",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Pokiaľ nemáte na svojich zariadeniach kameru, porovnajte jedinečnú kombináciu emotikonov",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Potvrďte, že nasledujúce emoji sú zobrazené na oboch reláciach v rovnakom poradí:",
     "The session 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.": "Relácia, ktorú sa snažíte overiť, nepodporuje overovanie QR kódom a ani pomocou emoji, čo sú funkcie, ktoré %(brand)s podporuje. Skúste použiť iného klienta.",
     "QR Code": "QR kód",
@@ -1260,7 +1260,7 @@
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varovanie: Vaše osobné údaje (vrátane šifrovacích kľúčov) sú stále uložené v tejto relácií. Zmažte ich, ak chcete túto reláciu zahodiť alebo sa chcete prihlásiť cez iný účet.",
     "Command Autocomplete": "Automatické dopĺňanie príkazov",
     "Community Autocomplete": "Automatické dopĺňanie skupín",
-    "Emoji Autocomplete": "Automatické dopĺňanie emoji",
+    "Emoji Autocomplete": "Automatické dopĺňanie emotikonov",
     "Notification Autocomplete": "Automatické dopĺňanie oznámení",
     "Room Autocomplete": "Automatické dopĺňanie miestností",
     "User Autocomplete": "Automatické dopĺňanie používateľov",
@@ -1273,10 +1273,10 @@
     "They match": "Zhodujú sa",
     "They don't match": "Nezhodujú sa",
     "To be secure, do this in person or use a trusted way to communicate.": "Aby ste si boli istý, urobte to osobne alebo použite dôveryhodný spôsob komunikácie.",
-    "Lock": "Zámok",
-    "If you can't scan the code above, verify by comparing unique emoji.": "Ak sa vám nepodarí naskenovať uvedený kód, overte pomocou porovnania jedinečných emoji.",
+    "Lock": "Zámka",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ak sa vám nepodarí naskenovať uvedený kód, overte pomocou porovnania jedinečných emotikonov.",
     "Verify by comparing unique emoji.": "Overenie porovnaním jedinečnej kombinácie emotikonov.",
-    "Verify by emoji": "Overte pomocou emoji",
+    "Verify by emoji": "Overiť pomocou emotikonov",
     "Compare emoji": "Porovnajte emoji",
     "Review": "Skontrolovať",
     "Later": "Neskôr",
@@ -1333,7 +1333,7 @@
     "Size must be a number": "Veľkosť musí byť číslo",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastná veľkosť písma môže byť len v rozmedzí %(min)s pt až %(max)s pt",
     "Help us improve %(brand)s": "Pomôžte nám zlepšovať %(brand)s",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Posielať <UsageDataLink>anonymné dáta o používaní</UsageDataLink>, ktoré nám pomôžu zlepšiť %(brand)s. Toto bude vyžadovať <PolicyLink>sušienku</PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Posielať <UsageDataLink>anonymné dáta o používaní</UsageDataLink>, ktoré nám pomôžu zlepšiť %(brand)s. Toto bude vyžadovať <PolicyLink>koláčik</PolicyLink>.",
     "Your homeserver has exceeded its user limit.": "Na vašom domovskom serveri bol prekročený limit počtu používateľov.",
     "Your homeserver has exceeded one of its resource limits.": "Na vašom domovskom serveri bol prekročený jeden z limitov systémových zdrojov.",
     "Contact your <a>server admin</a>.": "Kontaktujte svojho <a>administrátora serveru</a>.",
@@ -1394,8 +1394,8 @@
     "View rules": "Zobraziť pravidlá",
     "You are currently subscribed to:": "Aktuálne odoberáte:",
     "⚠ These settings are meant for advanced users.": "⚠ Tieto nastavenia sú určené pre pokročilých používateľov.",
-    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Pridajte používateľov a servery, ktorých chcete ignorovať. Použite hviezdičku '*', aby %(brand)s ju priradil každému symbolu. Napríklad <code>@bot:*</code> by odignoroval všetkých používateľov s menom 'bot' na akomkoľvek serveri.",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignorovanie ľudí sa vykonáva prostredníctvom zoznamov zákazov, ktoré obsahujú pravidlá pre zakazovanie. Prihlásenie sa na zoznam zákazov znamená, že používatelia/servery zablokované týmto zoznamom budú pred vami skryté.",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Pridajte používateľov a servery, ktorých chcete ignorovať. Použite hviezdičku '*', aby ju %(brand)s priradil každému symbolu. Napríklad <code>@bot:*</code> by odignoroval všetkých používateľov s menom 'bot' na akomkoľvek serveri.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignorovanie ľudí sa vykonáva prostredníctvom zoznamov zákazov, ktoré obsahujú pravidlá pre zakazovanie. Pridanie na zoznam zákazov znamená, že používatelia/servery na tomto zozname pred vami skryté.",
     "Personal ban list": "Osobný zoznam zákazov",
     "Server or user ID to ignore": "Server alebo ID používateľa na odignorovanie",
     "eg: @bot:* or example.org": "napr.: @bot:* alebo napriklad.sk",
@@ -1781,7 +1781,7 @@
     "Encryption enabled": "Šifrovanie zapnuté",
     "End-to-end encryption isn't enabled": "End-to-end šifrovanie nie je zapnuté",
     "Unencrypted": "Nešifrované",
-    "%(creator)s created this DM.": "%(creator)s vytvoril túto PS.",
+    "%(creator)s created this DM.": "%(creator)s vytvoril/a túto priamu správu.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "V tejto konverzácii ste len vy dvaja, pokiaľ niektorý z vás nepozve niekoho iného, aby sa pripojil.",
     "This is the beginning of your direct message history with <displayName/>.": "Toto je začiatok histórie vašich priamych správ s používateľom <displayName/>.",
     "%(senderName)s kicked %(targetName)s": "%(senderName)s vylúčil/a %(targetName)s",
@@ -2560,7 +2560,7 @@
     "Upload Error": "Chyba pri nahrávaní",
     "Your browser likely removed this data when running low on disk space.": "Váš prehliadač pravdepodobne odstránil tieto údaje, keď mal málo miesta na disku.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Chýbajú niektoré údaje relácie vrátane zašifrovaných kľúčov správ. Odhláste sa a prihláste sa, aby ste to opravili a obnovili kľúče zo zálohy.",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Aby ste nám pomohli tomuto v budúcnosti zabrániť, pošlite nám, prosím, <a>záznamy</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Aby ste nám pomohli tomuto v budúcnosti zabrániť, pošlite nám prosím <a>záznamy o chybe</a>.",
     "The homeserver may be unavailable or overloaded.": "Domovský server môže byť nedostupný alebo preťažený.",
     "Remember my selection for this widget": "Zapamätať si môj výber pre tento widget",
     "Invited by %(sender)s": "Pozvaný používateľom %(sender)s",
@@ -3022,9 +3022,9 @@
     "This address had invalid server or is already in use": "Táto adresa mala neplatný server alebo sa už používa",
     "Back to chat": "Späť na konverzáciu",
     "Back to thread": "Späť na vlákno",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Potvrďte, že nasledujúce emoji sú zobrazené na oboch zariadeniach v rovnakom poradí:",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Potvrďte, že nasledujúce emotikony sú zobrazené na oboch zariadeniach v rovnakom poradí:",
     "Verify this device by confirming the following number appears on its screen.": "Overte toto zariadenie potvrdením, že sa na jeho obrazovke zobrazí nasledujúce číslo.",
-    "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.": "Zariadenie, ktoré sa snažíte overiť, nepodporuje overnie skenovaním QR kódu ani overenie pomocou emoji, ktoré podporuje aplikácia %(brand)s. Skúste použiť iného klienta.",
+    "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.": "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.",
     "Verify this device by completing one of the following:": "Overte toto zariadenie dokončením jednej z nasledujúcich možností:",
     "Almost there! Is your other device showing the same shield?": "Už je to takmer hotové! Zobrazuje vaše druhé zariadenie rovnaký štít?",
     "You cancelled verification on your other device.": "Zrušili ste overovanie na vašom druhom zariadení.",
@@ -3398,7 +3398,7 @@
     "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s odstránili správu",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s odstránil/a %(count)s správ",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sodstránil správu",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sposlalo %(count)s skrytú správu",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sposlalo skrytú správu",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sposlal %(count)s skrytých správ",
     "There was an error looking up the phone number": "Pri vyhľadávaní telefónneho čísla došlo k chybe",
     "Unable to look up phone number": "Nie je možné vyhľadať telefónne číslo",
@@ -3440,5 +3440,350 @@
     "This room is dedicated to illegal or toxic content or the moderators fail to moderate illegal or toxic content.\n This will be reported to the administrators of %(homeserver)s.": "Táto miestnosť je venovaná nelegálnemu alebo nebezpečnému obsahu alebo moderátori nedokážu moderovať nelegálny alebo nebezpečný obsah.\n Toto bude nahlásené správcom %(homeserver)s.",
     "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Tento používateľ spamuje miestnosť reklamami, odkazmi na reklamy alebo propagandou.\nToto bude nahlásené moderátorom miestnosti.",
     "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Tento používateľ prejavuje nepriateľské správanie, napríklad uráža ostatných používateľov alebo zdieľa obsah určený len pre dospelých v miestnosti určenej pre rodiny alebo inak porušuje pravidlá tejto miestnosti.\nToto bude nahlásené moderátorom miestnosti.",
-    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Tento používateľ prejavuje protiprávne správanie, napríklad zverejňuje doxing (citlivé informácie o ľudoch) alebo sa vyhráža násilím.\nToto bude nahlásené moderátorom miestnosti, ktorí to môžu postúpiť právnym orgánom."
+    "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Tento používateľ prejavuje protiprávne správanie, napríklad zverejňuje doxing (citlivé informácie o ľudoch) alebo sa vyhráža násilím.\nToto bude nahlásené moderátorom miestnosti, ktorí to môžu postúpiť právnym orgánom.",
+    "Open user settings": "Otvoriť používateľské nastavenia",
+    "Switch to space by number": "Prepnúť do priestoru podľa čísla",
+    "Next recently visited room or community": "Ďalšia nedávno navštívená miestnosť alebo komunita",
+    "Previous recently visited room or community": "Predchádzajúca nedávno navštívená miestnosť alebo komunita",
+    "Accessibility": "Prístupnosť",
+    "Proceed with reset": "Pokračovať v obnovení",
+    "Failed to create initial space rooms": "Nepodarilo sa vytvoriť počiatočné miestnosti v priestore",
+    "Joining": "Pripájanie sa",
+    "delete the address.": "vymazať adresu.",
+    "%(brand)s failed to get the public room list.": "Aplikácii %(brand)s sa nepodarilo získať zoznam verejných miestností.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Aplikácii %(brand)s sa nepodarilo získať zoznam protokolov z domovského servera. Domovský server môže byť príliš starý na to, aby podporoval siete tretích strán.",
+    "You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Na paneli filtrov môžete kedykoľvek kliknúť na obrázok a zobraziť len miestnosti a ľudí spojených s danou komunitou.",
+    "You do not have permission to create rooms in this community.": "Nemáte povolenie vytvárať miestnosti v tejto komunite.",
+    "Cannot create rooms in this community": "Nie je možné vytvárať miestnosti v tejto komunite",
+    "To join %(communityName)s, swap to communities in your <a>preferences</a>": "Ak chcete pripojiť do %(communityName)s, prepnite na komunity vo svojich <a>predvoľbách</a>",
+    "To view %(communityName)s, swap to communities in your <a>preferences</a>": "Ak chcete zobraziť %(communityName)s, prepnite na komunity vo svojich <a>predvoľbách</a>",
+    "Ask the <a>admins</a> of this community to make it into a Space and keep a look out for the invite.": "Požiadajte <a>správcov</a> tejto komunity, aby z nej urobili priestor a očakávajte pozvánku.",
+    "Sign in with SSO": "Prihlásiť sa pomocou jednotného prihlásenia SSO",
+    "Search Dialog": "Vyhľadávacie dialógové okno",
+    "Join %(roomAddress)s": "Pripojiť sa k %(roomAddress)s",
+    "Modal Widget": "Modálny widget",
+    "%(brand)s encountered an error during upload of:": "%(brand)s zaznamenal chybu pri nahrávaní:",
+    "a key signature": "podpis kľúča",
+    "a new master key signature": "nový podpis hlavného kľúča",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Týmto ich nepozvete do %(communityName)s. Ak chcete niekoho pozvať do %(communityName)s, kliknite <a>sem</a>",
+    "May include members not in %(communityName)s": "Môže zahŕňať členov, ktorí nie sú v %(communityName)s",
+    "To continue, use Single Sign On to prove your identity.": "Ak chcete pokračovať, použite jednotné prihlásenie SSO na preukázanie svojej totožnosti.",
+    "Server did not return valid authentication information.": "Server nevrátil späť platné informácie o overení.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Potvrďte deaktiváciu konta pomocou jednotného prihlásenia SSO na preukázanie svojej totožnosti.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Súkromné miestnosti je možné nájsť a pripojiť sa k nim len na pozvanie. Verejné miestnosti môže nájsť a pripojiť sa k nim ktokoľvek v tejto komunite.",
+    "What's the name of your community or team?": "Ako sa volá vaša komunita alebo tím?",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Použite toto, keď ostatným odkazujete na svoju komunitu. ID komunity sa nedá zmeniť.",
+    "Results are only revealed when you end the poll": "Výsledky sa zobrazia až po ukončení ankety",
+    "Voters see results as soon as they have voted": "Hlasujúci uvidia výsledky hneď po hlasovaní",
+    "Closed poll": "Uzavretá anketa",
+    "Open poll": "Otvorená anketa",
+    "Poll type": "Typ ankety",
+    "Edit poll": "Upraviť anketu",
+    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "Vy",
+    "toggle event": "prepnúť udalosť",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s reagovali s %(content)s",
+    "Results will be visible when the poll is ended": "Výsledky budú viditeľné po ukončení ankety",
+    "Sorry, you can't edit a poll after votes have been cast.": "Je nám ľúto, ale po odovzdaní hlasov nie je možné anketu upravovať.",
+    "Can't edit poll": "Nie je možné upraviť anketu",
+    "Ignored attempt to disable encryption": "Ignorovaný pokus o vypnutie šifrovania",
+    "The call is in an unknown state!": "Hovor je v neznámom stave!",
+    "Could not connect media": "Nepodarilo sa pripojiť médiá",
+    "They won't be able to access whatever you're not an admin of.": "Nebudú mať prístup k tomu, čoho nie ste správcom.",
+    "They'll still be able to access whatever you're not an admin of.": "Stále budú mať prístup ku všetkému, čoho nie ste správcom.",
+    "Pinned": "Pripnuté",
+    "Failed to find the general chat for this community": "Nepodarilo sa nájsť všeobecný konverzáciu pre túto komunitu",
+    "Custom Tag": "Vlastná značka",
+    "Open thread": "Otvoriť vlákno",
+    "Failed to update the join rules": "Nepodarilo sa aktualizovať pravidlá pripojenia",
+    "Remove messages sent by me": "Odstrániť správy odoslané mnou",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Potvrďte odhlásenie týchto zariadení pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Potvrďte odhlásenie tohto zariadenia pomocou jednotného prihlásenia (SSO) na preukázanie svojej totožnosti.",
+    "%(peerName)s held the call": "%(peerName)s podržal hovor",
+    "You held the call <a>Resume</a>": "Podržali ste hovor <a>Pokračovať</a>",
+    "You held the call <a>Switch</a>": "Podržali ste hovor <a>Prepnúť</a>",
+    "sends rainfall": "odošle dážď",
+    "Sends the given message with rainfall": "Odošle danú správu s dažďom",
+    "Automatically send debug logs when key backup is not functioning": "Automaticky odosielať záznamy o ladení, ak zálohovanie kľúčov nefunguje",
+    "Location sharing - pin drop (under active development)": "Zdieľanie polohy - pripnutie špendlíka (v štádiu aktívneho vývoja)",
+    "Show current avatar and name for users in message history": "Zobraziť aktuálny obrázok a meno používateľov v histórii správ",
+    "Error fetching file": "Chyba pri načítaní súboru",
+    "Generating a ZIP": "Vytváranie súboru ZIP",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Zobraziť <b>%(msgtype)s</b> správy zverejnené vo vašej aktívnej miestnosti",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Zobraziť <b>%(msgtype)s</b> správy zverejnené v tejto miestnosti",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Odoslať <b>%(msgtype)s</b> správy pod vaším menom vo vašej aktívnej miestnosti",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Odoslať <b>%(msgtype)s</b> správy pod vaším menom v tejto miestnosti",
+    "See general files posted to this room": "Zobraziť všeobecné súbory zverejnené v tejto miestnosti",
+    "Send general files as you in your active room": "Posielať všeobecné súbory pod vaším menom vo vašej aktívnej miestnosti",
+    "Send general files as you in this room": "Posielať všeobecné súbory pod vaším menom v tejto miestnosti",
+    "Send videos as you in your active room": "Posielať videá pod vaším menom vo vašej aktívnej miestnosti",
+    "Send videos as you in this room": "Posielať videá pod vaším menom v tejto miestnosti",
+    "Send images as you in your active room": "Posielať obrázky pod vaším menom vo vašej aktívnej miestnosti",
+    "Send images as you in this room": "Posielať obrázky pod vaším menom v tejto miestnosti",
+    "See emotes posted to your active room": "Zobraziť emotikony zverejnené vo vašej aktívnej miestnosti",
+    "See emotes posted to this room": "Zobraziť emotikony zverejnené v tejto miestnosti",
+    "Send emotes as you in your active room": "Posielať emotikony pod vaším menom vo vašej aktívnej miestnosti",
+    "Send emotes as you in this room": "Posielať emotikony pod vaším menom v tejto miestnosti",
+    "See text messages posted to your active room": "Zobraziť textové správy zverejnené vo vašej aktívnej miestnosti",
+    "See text messages posted to this room": "Zobraziť textové správy zverejnené v tejto miestnosti",
+    "Send text messages as you in this room": "Posielať textové správy pod vaším menom v tejto miestnosti",
+    "Send text messages as you in your active room": "Posielať textové správy pod vaším menom vo vašej aktívnej miestnosti",
+    "See messages posted to your active room": "Zobraziť správy zverejnené vo vašej aktívnej miestnosti",
+    "See messages posted to this room": "Zobraziť správy zverejnené v tejto miestnosti",
+    "Send messages as you in your active room": "Posielať správy pod vaším menom vo vašej aktívnej miestnosti",
+    "Send messages as you in this room": "Posielať správy pod vaším menom v tejto miestnosti",
+    "See <b>%(eventType)s</b> events posted to your active room": "Zobraziť <b>%(eventType)s</b> udalosti zverejnené vo vašej aktívnej miestnosti",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Odoslať <b>%(eventType)s</b> udalosti pod vaším menom vo vašej aktívnej miestnosti",
+    "See <b>%(eventType)s</b> events posted to this room": "Zobraziť <b>%(eventType)s</b> udalosti zverejnené v tejto miestnosti",
+    "Send <b>%(eventType)s</b> events as you in this room": "Odoslať <b>%(eventType)s</b> udalosti pod vaším menom v tejto miestnosti",
+    "See when anyone posts a sticker to your active room": "Zobraziť, keď niekto zverejní nálepku vo vašej aktívnej miestnosti",
+    "Send stickers to your active room as you": "Poslať nálepky do tejto miestnosti pod vaším menom",
+    "See when a sticker is posted in this room": "Zobraziť, keď sa v tejto miestnosti zverejní nálepka",
+    "See when people join, leave, or are invited to this room": "Zobraziť, keď sa ľudia pridajú, odídu alebo sú pozvaní do tejto miestnosti",
+    "See when the topic changes in your active room": "Zobraziť, keď sa zmení téma vo vašej aktívnej miestnosti",
+    "Change which room you're viewing": "Zmeniť zobrazovanú miestnosť",
+    "Light high contrast": "Ľahký vysoký kontrast",
+    "No virtual room for this room": "Žiadna virtuálna miestnosť pre túto miestnosť",
+    "Switches to this room's virtual room, if it has one": "Prepne do virtuálnej miestnosti tejto miestnosti, ak ju má",
+    "Sends the given message as a spoiler": "Odošle danú správu ako spojler",
+    "Processing event %(number)s out of %(total)s": "Spracovanie udalosti %(number)s z %(total)s",
+    "Media omitted": "Médium vynechané",
+    "Media omitted - file size limit exceeded": "Médium vynechané - prekročený limit veľkosti súboru",
+    "Fetched %(count)s events so far|one": "Zatiaľ získaná %(count)s udalosť",
+    "Fetched %(count)s events so far|other": "Zatiaľ získané %(count)s udalosti",
+    "Fetched %(count)s events out of %(total)s|one": "Získaná %(count)s udalosť z %(total)s",
+    "Fetched %(count)s events out of %(total)s|other": "Získané %(count)s udalosti z %(total)s",
+    "Command error: Unable to find rendering type (%(renderingType)s)": "Chyba príkazu: Nie je možné nájsť typ vykresľovania (%(renderingType)s)",
+    "Command error: Unable to handle slash command.": "Chyba príkazu: Nie je možné spracovať lomkový príkaz.",
+    "Already in call": "Hovor už prebieha",
+    "Command Help": "Pomocník príkazov",
+    "Export Cancelled": "Export zrušený",
+    "My live location": "Moja poloha v reálnom čase",
+    "My current location": "Moja aktuálna poloha",
+    "Drop a Pin": "Označiť špendlíkom",
+    "What location type do you want to share?": "Aký typ polohy chcete zdieľať?",
+    "We couldn't send your location": "Nepodarilo sa nám odoslať vašu polohu",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s nemohol odoslať vašu polohu. Skúste to prosím neskôr.",
+    "This is a beta feature. Click for more info": "Toto je beta funkcia. Kliknutím získate ďalšie informácie",
+    "Insert a trailing colon after user mentions at the start of a message": "Vložiť na koniec dvojbodku za zmienkou používateľa na začiatku správy",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Odpovedzte na prebiehajúce vlákno alebo použite \"%(replyInThread)s\", keď prejdete nad správu a začnete novú.",
+    "Show polls button": "Zobraziť tlačidlo ankiet",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti %(count)s krát",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti %(count)s krát",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)szmenil <a>pripnuté správy</a> v miestnosti",
+    "Location sharing - share your current location with live updates (under active development)": "Zdieľanie polohy - zdieľanie aktuálnej polohy so živými aktualizáciami (v štádiu aktívneho vývoja)",
+    "We sent the others, but the below people couldn't be invited to <RoomName/>": "Ostatným sme pozvánky poslali, ale nižšie uvedené osoby nemohli byť pozvané do <RoomName/>",
+    "Answered Elsewhere": "Hovor prijatý inde",
+    "Takes the call in the current room off hold": "Zruší podržanie hovoru v aktuálnej miestnosti",
+    "Remove them from everything I'm able to": "Odstrániť ich zo všetkého, na čo mám oprávnenie",
+    "Remove them from specific things I'm able to": "Odstrániť ich z konkrétnych vecí, na ktoré mám oprávnenie",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Priestory sú novým spôsobom zoskupovania miestností a ľudí. Aký druh priestoru chcete vytvoriť? Neskôr to môžete zmeniť.",
+    "Collapse quotes": "Zbaliť citácie",
+    "Expand quotes": "Rozbaliť citácie",
+    "Click": "Kliknúť",
+    "We'll create rooms for each of them.": "Pre každú z nich vytvoríme miestnosti.",
+    "Click to drop a pin": "Kliknutím umiestníte špendlík",
+    "Click to move the pin": "Kliknutím presuniete špendlík",
+    "Unban them from everything I'm able to": "Zrušiť im zákaz zo všetkého, na čo mám oprávnenie",
+    "Ban them from everything I'm able to": "Zakázať im všetko, na čo mám oprávnenie",
+    "Unban them from specific things I'm able to": "Zrušiť im zákaz z konkrétnych právomocí, na ktoré mám oprávnenie",
+    "Ban them from specific things I'm able to": "Zakázať im konkrétne právomoci, na ktoré mám oprávnenie",
+    "Remove, ban, or invite people to this room, and make you leave": "Odstrániť, zakázať alebo pozvať ľudí do tejto miestnosti, a odísť",
+    "Unable to load map": "Nie je možné načítať mapu",
+    "Shared their location: ": "Zdieľali svoju polohu: ",
+    "Shared a location: ": "Zdieľal/a polohu: ",
+    "This homeserver is not configured to display maps.": "Tento domovský server nie je nastavený na zobrazovanie máp.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Tento domovský server nie je správne nastavený na zobrazovanie máp alebo nastavený mapový server môže byť nedostupný.",
+    "Can't create a thread from an event with an existing relation": "Nie je možné vytvoriť vlákno z udalosti s existujúcim vzťahom",
+    "Busy": "Obsadený/zaneprázdnený",
+    "Match system": "Zhoda so systémom",
+    "The <b>%(capability)s</b> capability": "Schopnosť <b>%(capability)s</b>",
+    "Host account on": "Hostiteľský účet na",
+    "Joined": "Sa pripojil/a",
+    "Resend %(unsentCount)s reaction(s)": "Opätovné odoslanie %(unsentCount)s reakcií",
+    "Consult first": "Najprv konzultovať",
+    "Values at explicit levels in this room:": "Hodnoty na explicitných úrovniach v tejto miestnosti:",
+    "Values at explicit levels:": "Hodnoty na explicitných úrovniach:",
+    "Values at explicit levels in this room": "Hodnoty na explicitných úrovniach v tejto miestnosti",
+    "Values at explicit levels": "Hodnoty na explicitných úrovniach",
+    "Flair won't be available in Spaces for the foreseeable future.": "Štýl nebude v dohľadnej dobe dostupný v Priestoroch.",
+    "Disinvite from %(roomName)s": "Zrušenie pozvania z %(roomName)s",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Ak ste odoslali chybu prostredníctvom služby GitHub, záznamy o ladení nám môžu pomôcť nájsť problém. ",
+    "You are presenting": "Prezentujete",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Konzultovanie s %(transferTarget)s. <a>Presmerovanie na %(transferee)s</a>",
+    "sends space invaders": "odošle vesmírnych útočníkov",
+    "Sends the given message with a space themed effect": "Odošle zadanú správu s efektom vesmíru",
+    "Silence call": "Stlmiť hovor",
+    "Don't miss a reply": "Nezmeškajte odpoveď",
+    "The above, but in <Room /> as well": "Vyššie uvedené, ale aj v <Room />",
+    "The above, but in any room you are joined or invited to as well": "Vyššie uvedené, ale tiež v akejkoľvek miestnosti do ktorej ste sa pripojili alebo do ktorej ste boli prizvaný",
+    "with state key %(stateKey)s": "so stavovým kľúčom %(stateKey)s",
+    "with an empty state key": "s prázdnym stavovým kľúčom",
+    "Toggle Link": "Prepnúť odkaz",
+    "Toggle Code Block": "Prepnutie bloku kódu",
+    "Thank you for helping us testing Threads!": "Ďakujeme vám za pomoc pri testovaní vlákien!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Všetky udalosti vlákna vytvorené počas experimentálneho obdobia sa teraz zobrazia na časovej osi miestnosti a zobrazia sa ako odpovede. Ide o jednorazový prechod. Vlákna sú teraz súčasťou špecifikácie Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Nedávno sme zaviedli kľúčové vylepšenia stability pre vlákna, čo znamená aj postupné ukončenie podpory experimentálnych vlákien.",
+    "Threads are no longer experimental! 🎉": "Vlákna už nie sú experimentálne! 🎉",
+    "You are sharing your live location": "Zdieľate svoju polohu v reálnom čase",
+    "%(displayName)s's live location": "Poloha používateľa %(displayName)s v reálnom čase",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Zrušte označenie, ak chcete odstrániť aj systémové správy o tomto používateľovi (napr. zmena členstva, zmena profilu...)",
+    "Preserve system messages": "Zachovať systémové správy",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|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ť?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|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ť?",
+    "Currently removing messages in %(count)s rooms|one": "V súčasnosti sa odstraňujú správy v %(count)s miestnosti",
+    "Currently removing messages in %(count)s rooms|other": "V súčasnosti sa odstraňujú správy v %(count)s miestnostiach",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "Share for %(duration)s": "Zdieľať na %(duration)s",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Pôjde o jednorazový prechod, keďže vlákna sú teraz súčasťou špecifikácie Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Keďže sa na to pripravujeme, musíme urobiť niekoľko zmien: vlákna vytvorené pred týmto bodom sa budú <strong>zobrazovať ako bežné odpovede</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Blížime sa k vydaniu verejnej beta verzie pre vlákna.",
+    "Threads Approaching Beta 🎉": "Vlákna sa blížia k beta verzii 🎉",
+    "Stop sharing": "Zastaviť zdieľanie",
+    "You are sharing %(count)s live locations|one": "Zdieľate svoju polohu v reálnom čase",
+    "You are sharing %(count)s live locations|other": "Zdieľate %(count)s polôh v reálnom čase",
+    "%(timeRemaining)s left": "zostáva %(timeRemaining)s",
+    "Next recently visited room or space": "Ďalšia nedávno navštívená miestnosť alebo priestor",
+    "Previous recently visited room or space": "Predchádzajúca nedávno navštívená miestnosť alebo priestor",
+    "Room details": "Podrobnosti o miestnosti",
+    "Voice & video room": "Hlasová a video miestnosť",
+    "Text room": "Textová miestnosť",
+    "Room type": "Typ miestnosti",
+    "Connecting...": "Pripájanie…",
+    "Voice room": "Hlasová miestnosť",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Ladiace záznamy obsahujú údaje o používaní aplikácie vrátane vášho používateľského mena, ID alebo aliasov navštívených miestností alebo skupín, prvkov používateľského rozhrania, s ktorými ste naposledy interagovali, a používateľských mien iných používateľov. Neobsahujú správy.",
+    "Mic": "Mikrofón",
+    "Mic off": "Mikrofón vypnutý",
+    "Video": "Video",
+    "Video off": "Video vypnuté",
+    "Connected": "Pripojené",
+    "Voice & video rooms (under active development)": "Hlasové a video miestnosti (v aktívnom vývoji)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Pokúšate sa získať prístup k odkazu na komunitu (%(groupId)s).<br/>Komunity už nie sú podporované a boli nahradené priestormi.<br2/><a>Viac informácií o priestoroch nájdete tu.</a>",
+    "That link is no longer supported": "Tento odkaz už nie je podporovaný",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Ak sa na stránke vyskytujú identifikujúce údaje, akými sú napríklad miestnosť, ID používateľa, tieto údaje sú pred odoslaním na server odstránené.",
+    "Event ID: %(eventId)s": "ID udalosti: %(eventId)s",
+    "No verification requests found": "Nenašli sa žiadne žiadosti o overenie",
+    "Observe only": "Iba pozorovať",
+    "Requester": "Žiadateľ",
+    "Methods": "Metódy",
+    "Timeout": "Časový limit",
+    "Phase": "Fáza",
+    "Transaction": "Transakcia",
+    "Cancelled": "Zrušené",
+    "Started": "Spustené",
+    "Ready": "Pripravené",
+    "Requested": "Vyžiadané",
+    "Unsent": "Neodoslané",
+    "Edit values": "Upraviť hodnoty",
+    "Failed to save settings.": "Nepodarilo sa uložiť nastavenia.",
+    "Number of users": "Počet používateľov",
+    "Server": "Server",
+    "Server Versions": "Verzie servera",
+    "Client Versions": "Verzie klienta",
+    "Failed to load.": "Nepodarilo sa načítať.",
+    "Capabilities": "Schopnosti",
+    "Send custom state event": "Odoslať vlastnú udalosť stavu",
+    "Failed to send event!": "Nepodarilo sa odoslať udalosť!",
+    "Doesn't look like valid JSON.": "Nevyzerá to ako platný JSON.",
+    "Send custom room account data event": "Odoslať vlastnú udalosť s údajmi o účte miestnosti",
+    "Send custom account data event": "Odoslať vlastnú udalosť s údajmi o účte",
+    "Room ID: %(roomId)s": "ID miestnosti: %(roomId)s",
+    "Server info": "Informácie o serveri",
+    "Settings explorer": "Prieskumník nastavení",
+    "Explore account data": "Preskúmať údaje o účte",
+    "Verification explorer": "Prieskumník overenia",
+    "View servers in room": "Zobraziť servery v miestnosti",
+    "Explore room account data": "Preskúmať údaje o účte miestnosti",
+    "Explore room state": "Preskúmať stav miestnosti",
+    "Send custom timeline event": "Poslať vlastnú udalosť na časovej osi",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Pomôžte nám identifikovať problémy a zlepšiť %(analyticsOwner)s zdieľaním anonymných údajov o používaní. Aby sme pochopili, ako ľudia používajú viacero zariadení, vygenerujeme náhodný identifikátor zdieľaný vašimi zariadeniami.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Môžete použiť nastavenia vlastného servera na prihlásenie sa na iné servery Matrix-u zadaním inej adresy URL domovského servera. To vám umožní používať %(brand)s s existujúcim účtom Matrix na inom domovskom serveri.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "Aplikácii %(brand)s bolo zamietnuté povolenie na načítanie vašej polohy. Povoľte prístup k polohe v nastaveniach prehliadača.",
+    "Developer tools": "Vývojárske nástroje",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(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.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Ak nemôžete nájsť hľadanú miestnosť, požiadajte o pozvánku alebo <a>vytvorte novú miestnosť</a>.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Zdieľanie polohy v reálnom čase - zdieľanie aktuálnej polohy (v aktívnom vývoji a polohy dočasne pretrvávajú v histórii miestnosti)",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Pri pokuse o prístup do miestnosti alebo priestoru bolo vrátené %(errcode)s. Ak si myslíte, že sa vám táto správa zobrazuje chybne, <issueLink>odošlite hlásenie o chybe</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Skúste to neskôr alebo požiadajte správcu miestnosti alebo priestoru, aby skontroloval, či máte prístup.",
+    "This room or space is not accessible at this time.": "Táto miestnosť alebo priestor nie je momentálne prístupná.",
+    "Are you sure you're at the right place?": "Ste si istí, že ste na správnom mieste?",
+    "This room or space does not exist.": "Táto miestnosť alebo priestor neexistuje.",
+    "There's no preview, would you like to join?": "Nie je tu žiadny náhľad, chcete sa pripojiť?",
+    "This invite was sent to %(email)s": "Táto pozvánka bola odoslaná na %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Táto pozvánka bola odoslaná na %(email)s, ktorý nie je spojený s vaším účtom",
+    "You can still join here.": "Stále sa môžete pripojiť tu.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Pri pokuse o overenie vašej pozvánky bola vrátená chyba (%(errcode)s). Túto informáciu môžete skúsiť odovzdať osobe, ktorá vás pozvala.",
+    "Something went wrong with your invite.": "Niečo sa pokazilo s vašou pozvánkou.",
+    "You were banned by %(memberName)s": "%(memberName)s vám zakázal prístup",
+    "Forget this space": "Zabudnúť tento priestor",
+    "You were removed by %(memberName)s": "Odstránil vás %(memberName)s",
+    "Loading preview": "Načítavanie náhľadu",
+    "Joining …": "Pripájanie sa…",
+    "View older version of %(spaceName)s.": "Zobraziť staršiu verziu %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Aktualizovať tento priestor na odporúčanú verziu miestnosti",
+    "Failed to join": "Nepodarilo sa pripojiť",
+    "The person who invited you has already left, or their server is offline.": "Osoba, ktorá vás pozvala, už odišla alebo je jej server vypnutý.",
+    "The person who invited you has already left.": "Osoba, ktorá vás pozvala, už odišla.",
+    "Sorry, your homeserver is too old to participate here.": "Prepáčte, ale váš domovský server je príliš zastaralý na to, aby sa tu mohol zúčastniť.",
+    "There was an error joining.": "Pri pripájaní došlo k chybe.",
+    "The user's homeserver does not support the version of the space.": "Používateľov domovský server nepodporuje verziu priestoru.",
+    "User may or may not exist": "Používateľ môže, ale nemusí existovať",
+    "User does not exist": "Používateľ neexistuje",
+    "User is already in the room": "Používateľ sa už nachádza v miestnosti",
+    "User is already in the space": "Používateľ sa už nachádza v priestore",
+    "User is already invited to the room": "Používateľ už bol pozvaný do miestnosti",
+    "User is already invited to the space": "Používateľ už bol pozvaný do priestoru",
+    "You do not have permission to invite people to this space.": "Nemáte povolenie pozývať ľudí do tohto priestoru.",
+    "Failed to invite users to %(roomName)s": "Nepodarilo pozvať používateľov do %(roomName)s",
+    "An error occurred while stopping your live location, please try again": "Pri vypínaní polohy v reálnom čase došlo k chybe, skúste to prosím znova",
+    "Stop sharing and close": "Zastaviť zdieľanie a zatvoriť",
+    "An error occured whilst sharing your live location, please try again": "Pri zdieľaní vašej polohy v reálnom čase došlo k chybe, skúste to prosím znova",
+    "An error occured whilst sharing your live location": "Pri zdieľaní vašej polohy v reálnom čase došlo k chybe",
+    "Create room": "Vytvoriť miestnosť",
+    "Create video room": "Vytvoriť video miestnosť",
+    "Create a video room": "Vytvoriť video miestnosť",
+    "%(count)s participants|one": "1 účastník",
+    "%(count)s participants|other": "%(count)s účastníkov",
+    "New video room": "Nová video miestnosť",
+    "New room": "Nová miestnosť",
+    "Video rooms (under active development)": "Video miestnosti (v aktívnom vývoji)",
+    "<a>Give feedback</a>": "<a>Poskytnúť spätnú väzbu</a>",
+    "Threads are a beta feature": "Vlákna sú beta funkciou",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Tip:</b> Použite položku \"Odpovedať vo vlákne\", keď prejdete nad správu.",
+    "Threads help keep your conversations on-topic and easy to track.": "Vlákna pomáhajú udržiavať konverzácie v téme a uľahčujú ich sledovanie.",
+    "%(featureName)s Beta feedback": "%(featureName)s Beta spätná väzba",
+    "Beta feature. Click to learn more.": "Beta funkcia. Kliknutím sa dozviete viac.",
+    "Beta feature": "Beta funkcia",
+    "To leave, return to this page and use the “Leave the beta” button.": "Ak chcete odísť, vráťte sa na túto stránku a použite tlačidlo \"Opustiť beta verziu\".",
+    "Use \"Reply in thread\" when hovering over a message.": "Použite položku \"Odpovedať vo vlákne\", keď prejdete nad správu.",
+    "How can I start a thread?": "Ako môžem začať vlákno?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Vlákna pomáhajú udržiavať konverzácie v téme a uľahčujú ich sledovanie. <a>Zistite viac</a>.",
+    "Keep discussions organised with threads.": "Udržujte diskusie organizované pomocou vlákien.",
+    "sends hearts": "pošle srdiečka",
+    "Sends the given message with hearts": "Odošle danú správu so srdiečkami",
+    "Confirm signing out these devices|one": "Potvrďte odhlásenie z tohto zariadenia",
+    "Confirm signing out these devices|other": "Potvrdiť odhlásenie týchto zariadení",
+    "Live location ended": "Ukončenie polohy v reálnom čase",
+    "Loading live location...": "Načítavanie polohy v reálnom čase...",
+    "View live location": "Zobraziť polohu v reálnom čase",
+    "Live until %(expiryTime)s": "Poloha v reálnom čase do %(expiryTime)s",
+    "Live location enabled": "Poloha v reálnom čase zapnutá",
+    "Live location error": "Chyba polohy v reálnom čase",
+    "Ban from room": "Zakázať vstup do miestnosti",
+    "Unban from room": "Zrušiť zákaz vstupu do miestnosti",
+    "Unban from space": "Zrušiť zákaz vstupu do priestoru",
+    "Ban from space": "Zakázať vstup do priestoru",
+    "Yes, enable": "Áno, povoliť",
+    "Do you want to enable threads anyway?": "Chcete aj napriek tomu povoliť vlákna?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Váš domovský server v súčasnosti nepodporuje vlákna, takže táto funkcia môže byť nespoľahlivá. Niektoré správy vo vláknach nemusia byť spoľahlivo dostupné. <a>Získajte viac informácií</a>.",
+    "Partial Support for Threads": "Čiastočná podpora vlákien",
+    "Jump to the given date in the timeline": "Prejsť na zadaný dátum na časovej osi",
+    "Copy link": "Kopírovať odkaz",
+    "Right-click message context menu": "Kontextové menu správy pravým kliknutím",
+    "Disinvite from room": "Zrušiť pozvánku z miestnosti",
+    "Remove from space": "Odstrániť z priestoru",
+    "Disinvite from space": "Zrušiť pozvánku z priestoru"
 }
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7c8b1475cb4..16c70db0f6c 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -858,7 +858,7 @@
     "Room avatar": "Avatar dhome",
     "Room Name": "Emër Dhome",
     "Room Topic": "Temë Dhome",
-    "Join": "Bëhuni pjesë",
+    "Join": "Hyni",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifikojeni këtë përdorues që t’i vihet shenjë si i besuar. Përdoruesit e besuar ju më tepër siguri kur përdorni mesazhe të fshehtëzuar skaj-më-skaj.",
     "Waiting for partner to confirm...": "Po pritet ripohimi nga partneri…",
     "Incoming Verification Request": "Kërkesë Verifikimi e Ardhur",
@@ -3626,7 +3626,7 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s dhe %(space2Name)s",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sdërgoi një mesazh të fshehur",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s dërgoi %(count)s mesazhe të fshehur",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s dërgoi %(count)s mesazh të fshehur",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s dërguan një mesazh të fshehur",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s dërgoi %(count)s mesazhe të fshehur",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s hoqi një mesazh",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s hoqi %(count)s mesazhe",
@@ -3648,5 +3648,189 @@
     "Closed poll": "Pyetësor i mbyllur",
     "Open poll": "Pyetësor i hapur",
     "Poll type": "Lloj pyetësori",
-    "Results will be visible when the poll is ended": "Përfundimet do të jenë të dukshme pasi të ketë përfunduar pyetësori"
+    "Results will be visible when the poll is ended": "Përfundimet do të jenë të dukshme pasi të ketë përfunduar pyetësori",
+    "Open user settings": "Hap rregullime përdoruesi",
+    "Switch to space by number": "Kalo te hapësirë përmes numri",
+    "Next recently visited room or community": "Dhomë ose bashkësi pasuese e vizituar më herët",
+    "Previous recently visited room or community": "Dhomë ose bashkësi e mëparshme e vizituar më herët",
+    "Search Dialog": "Dialog Kërkimi",
+    "Pinned": "I fiksuar",
+    "Open thread": "Hape rrjedhën",
+    "Remove messages sent by me": "Hiq mesazhe të dërguar nga unë",
+    "No virtual room for this room": "S’ka dhomë virtuale për këtë dhomë",
+    "Switches to this room's virtual room, if it has one": "Kalohet te dhoma virtuale e kësaj dhome, në pastë",
+    "This is a beta feature. Click for more info": "Kjo është një veçori në version beta. Klikoni për më tepër hollësi",
+    "Export Cancelled": "Eksportimi u Anulua",
+    "What location type do you want to share?": "Ç’llok vendndodhje doni të ndahet me të tjerë?",
+    "My current location": "Vendndodhja ime e tanishme",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s s’dërgoi dot vendndodhjen tuaj. Ju lutemi, riprovoni.",
+    "We couldn't send your location": "S’e dërguam dot vendndodhjen tuaj",
+    "Match system": "Përputhe me sistemin",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Përgjigjuni te një rrjedhë në zhvillim e sipër, ose përdorni “%(replyInThread)s”, kur kalohet kursori sipër një mesazhi për të filluar një të re.",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sndryshoi <a>mesazhet e fiksuar</a> për dhomën %(count)s herë",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sndryshuan <a>mesazhet e fiksuar</a> për dhomën %(count)s herë",
+    "My live location": "Vendndodhja ime drejtpërsëdrejti",
+    "Show polls button": "Shfaq buton pyetësorësh",
+    "Location sharing - share your current location with live updates (under active development)": "Tregim vendndodhjeje - tregoni vendndodhjen tuaj aktuale, me përditësime drejtpërsëdrejti (nën zhvillim aktiv)",
+    "Expand quotes": "Zgjeroji thonjëzat",
+    "Collapse quotes": "Tkurri thonjëzat",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Hapësirat janë një mënyrë e re grupimi dhomash dhe njerëzish. Ç’lloj Hapësire doni të krijoni? Këtë mund ta ndryshoni më vonë.",
+    "We'll create rooms for each of them.": "Do të krijojmë dhoma për çdo prej tyre.",
+    "Drop a Pin": "Lini një Piketë",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Ky shërbyes Home s’është formësuar saktë për të shfaqur harta, ose shërbyesi i formësuar për harta mund të jetë i pakapshëm.",
+    "This homeserver is not configured to display maps.": "Ky shërbyes Home s’është formësuar të shfaqë harta.",
+    "Click to drop a pin": "Klikoni që të lihet një piketë",
+    "Click to move the pin": "Klikoni që të lëvizet piketa",
+    "Unable to load map": "S’arrihet të ngarkohet hartë",
+    "Click": "Klikim",
+    "Can't create a thread from an event with an existing relation": "S’mund të krijohet një rrjedhë prej një akti me një marrëdhënie ekzistuese",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Nëse keni parashtruar një të metë përmes GitHub-i, regjistrat e diagnostikimit na ndihmojnë të kapim problemin. ",
+    "Thank you for helping us testing Threads!": "Faleminderit që na ndihmuat të testojmë Rrjedha!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Krejt aktet e rrjedhave të krijuara gjatë periudhës eksperimentale tani do të rikrijohen te rrjedha kohore e dhomës dhe do të shfaqen si përgjigje. Ky është një tranzicion vetëm një herë. Rrjedhat tani janë pjesë e protokollit Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Kemi sjellë tani së fundi përmirësime kyçe të qëndrueshmërisë për Rrjedha, që do të thotë gjithashtu braktisje e mbulimit të Rrjedhave eksperimentale.",
+    "Threads are no longer experimental! 🎉": "Rrjedhat s’janë më eksperimentale! 🎉",
+    "Toggle Code Block": "Shfaq/Fshih Bllok Kodi",
+    "You are sharing your live location": "Po tregoni vendndodhjen tuaj drejtpërdrejt",
+    "%(displayName)s's live location": "Vendndodhje e %(displayName)s drejtpërdrejt",
+    "Preserve system messages": "Ruaji mesazhet e sistemit",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Hiqini shenjën, nëse doni të hiqni mesazhe sistemi në këtë përdorues (p.sh., ndryshime anëtarësimi, ndryshime profili…)",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë për këdo te biseda. Doni të vazhdohet?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Ju ndan një hap nga heqja e %(count)s mesazheve nga %(user)s. Kjo do t’i heqë përgjithnjë, për këdo në bisedë. Doni të vazhdohet?",
+    "Share for %(duration)s": "Ndaje me të tjerë për %(duration)s",
+    "Currently removing messages in %(count)s rooms|one": "Aktualisht po hiqen mesazhe në %(count)s dhomë",
+    "Currently removing messages in %(count)s rooms|other": "Aktualisht po hiqen mesazhe në %(count)s dhoma",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)sh",
+    "%(value)sd": "%(value)sd",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Ky do të jetë një tranzicion një herësh, ngaqë rrjedhat tani janë pjesë e protokollit Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Teksa e përgatisim, na duhet të bëjnë ca ndryshime: rrjedhat e krijuara para kësaj pike do të <strong>shfaqen si përgjigje të zakonshme</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Po i afrohemi hedhjes në qarkullim të një versioni publik Beta për Rrjedhat.",
+    "Threads Approaching Beta 🎉": "Rrjedhat Po i Afrohen Beta-s 🎉",
+    "Shared a location: ": "Tregoi një vendndodhje: ",
+    "Shared their location: ": "Tregoi vendndodhjen e vet: ",
+    "Busy": "I zënë",
+    "Insert a trailing colon after user mentions at the start of a message": "Fut dy pika pas përmendjesh përdoruesi, në fillim të një mesazhi",
+    "Command error: Unable to handle slash command.": "Gabim urdhri: S’arrihet të trajtohet urdhër i dhënë me / .",
+    "That link is no longer supported": "Ajo lidhje nuk mbulohet më",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Kur kjo faqe përmban informacion të identifikueshëm, bie fjala, një dhomë, ID përdoruesi, ato të dhëna hiqen, para se të dërgohen te shërbyesi.",
+    "Next recently visited room or space": "Dhoma ose hapësira pasuese vizituar së fundi",
+    "Previous recently visited room or space": "Dhoma ose hapësira e mëparshme vizituar së fundi",
+    "%(timeRemaining)s left": "Edhe %(timeRemaining)s",
+    "Room details": "Hollësi dhome",
+    "Voice & video room": "Dhomë me zë & video",
+    "Text room": "Dhomë tekstesh",
+    "Room type": "Lloj dhome",
+    "Connecting...": "Po lidhet…",
+    "Voice room": "Dhomë me zë",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Regjistrat e diagnostikimit përmbajnë të dhëna përdorimi aplikacioni, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave që keni vizituar, me cilët elementë të UI-t keni ndërvepruar së fundi dhe emrat e përdoruesve të përdoruesve të tjerë. Ata s’përmbajnë mesazhe.",
+    "Mic": "Mik.",
+    "Mic off": "Mik. fikur",
+    "Video": "Video",
+    "Video off": "Video e fikur",
+    "Connected": "I lidhur",
+    "Voice & video rooms (under active development)": "Dhoma me zë & video (nën zhvillim aktiv)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Po përpiqeni të hyni te një lidhje bashkësie (%(groupId)s).<br/>Bashkësitë nuk mbulohen më dhe janë zëvendësuar nga hapësira.<br2/><a>Mësoni më tepër mbi hapësira, këtu.</a>",
+    "Accessibility": "Përdorim nga persona me aftësi të kufizuara",
+    "Event ID: %(eventId)s": "ID Veprimtarie: %(eventId)s",
+    "Stop sharing": "Resht së ndari",
+    "No verification requests found": "S’u gjetën kërkesa verifikimi",
+    "Observe only": "Vetëm vëzhgo",
+    "Requester": "Kërkues",
+    "Methods": "Metoda",
+    "Timeout": "Mbarim kohe",
+    "Phase": "Fazë",
+    "Transaction": "Transaksion",
+    "Cancelled": "Anuluar",
+    "Started": "Nisur më",
+    "Ready": "Gati",
+    "Requested": "E kërkuar",
+    "Unsent": "Të padërguar",
+    "Edit values": "Përpunoni vlera",
+    "Failed to save settings.": "S’u arrit të ruhen rregullimet.",
+    "Number of users": "Numër përdoruesish",
+    "Server": "Shërbyes",
+    "Server Versions": "Versione Shërbyesi",
+    "Client Versions": "Versione Klienti",
+    "Failed to load.": "S’u arrit të ngarkohej.",
+    "Capabilities": "Aftësi",
+    "Send custom state event": "Dërgoni akt vetjak gjendjeje",
+    "Failed to send event!": "S’u arrit të dërgohet akt!",
+    "Doesn't look like valid JSON.": "S’duket si JSON i vlefshëm.",
+    "Send custom room account data event": "Dërgo akt vetjak të dhënash llogarie dhome",
+    "Send custom account data event": "Dërgoni akt vetjak të dhënash llogarie",
+    "Room ID: %(roomId)s": "ID Dhome: %(roomId)s",
+    "Server info": "Hollësi shërbyesi",
+    "Settings explorer": "Eksplorues rregullimesh",
+    "Explore account data": "Eksploroni të dhëna llogarie",
+    "Verification explorer": "Eksplorues verifikimi",
+    "View servers in room": "Shihni shërbyes në dhomë",
+    "Explore room account data": "Eksploroni të dhëna llogarie dhome",
+    "Explore room state": "Eksploroni gjendje dhome",
+    "Send custom timeline event": "Dërgoni akt vetjak rrjedhe kohore",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Ndihmonani të gjejmë probleme dhe të përmirësojmë %(analyticsOwner)s-in duke ndarë me ne të dhëna anonime përdorimi. Që të kuptohet se si përdorin njerëzit disa pajisje, do të prodhojmë një identifikues kuturu, që na jepet nga pajisjet tuaja.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Që të bëni hyrjen te shërbyes të tjerë Matrix, duke specifikuar një URL të një shërbyesi Home tjetër, mund të përdorni mundësitë vetjake për shërbyesin. Kjo ju lejon të përdorni %(brand)s në një tjetër shërbyes Home me një llogari Matrix ekzistuese.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s iu mohua leja për të sjellë vendndodhjen tuaj. Ju lutemi, lejoni përdorim vendndodhjeje, te rregullimet e shfletuesit tuaj.",
+    "Developer tools": "Mjete zhvilluesi",
+    "Location sharing - pin drop (under active development)": "Ndarje vendndodhjeje me të tjerë - lënie pikete (në zhvillim aktiv)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s është eksperimental në një shfletues telefoni celular. Për punimin më të mirë dhe veçoritë më të reja, përdorni aplikacionin tonë falas.",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Nëse s’gjeni dot dhomën që po kërkoni, kërkoni një ftesë, ose <a>krijoni një dhomë të re</a>.",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s erdhi teksa provohej të hyhej në dhomë ose hapësirë. Nëse mendoni se po e shihni gabimisht këtë mesazh, ju lutemi, <issueLink>parashtroni një njoftim të mete</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Riprovoni më vonë, ose kërkojini një përgjegjësi dhome apo hapësire të kontrollojë nëse keni apo jo hyrje.",
+    "This room or space is not accessible at this time.": "Te kjo dhomë ose hapësirë s’hyhet dot tani.",
+    "Are you sure you're at the right place?": "Jeni i sigurt se jeni në vendin e duhur?",
+    "This room or space does not exist.": "Kjo dhomë ose hapësirë s’ekziston.",
+    "There's no preview, would you like to join?": "S’ka paraparje, doo të donit të merrnit pjesë?",
+    "This invite was sent to %(email)s": "Kjo ftesë u dërgua për %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Kjo ftesë u dërgua për %(email)s, që s’është i përshoqëruar me llogarinë tuaj",
+    "You can still join here.": "Mundeni prapëseprapë të hyni këtu.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "U mor si përgjigje një gabim (%(errcode)s), teksa provohej të kontrollohej vlefshmëria e ftesës tuaj. Mund të provonit t’i kaloni këto hollësi personit që ju ftoi.",
+    "Something went wrong with your invite.": "Diç shkoi ters me ftesën tuaj",
+    "You were banned by %(memberName)s": "U dëbuat nga %(memberName)s",
+    "Forget this space": "Harroje këtë hapësirë",
+    "You were removed by %(memberName)s": "U hoqët nga %(memberName)s",
+    "Loading preview": "Po ngarkohet paraparje",
+    "Joining …": "Po hyhet …",
+    "View older version of %(spaceName)s.": "Shihni version më të vjetër të %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Përmirësojeni këtë hapësirë me versionin e rekomanduar të dhomës",
+    "Failed to join": "S’u arrit të hyhej",
+    "The person who invited you has already left, or their server is offline.": "Personi që ju ftoi, ka dalë tashmë, ose shërbyesi i tij është jashtë funksionimi.",
+    "The person who invited you has already left.": "Personi që ju ftoi ka dalë nga dhoma tashmë.",
+    "Sorry, your homeserver is too old to participate here.": "Na ndjeni, shërbyesi juaj Home është shumë i vjetër për të marrë pjesë këtu.",
+    "There was an error joining.": "Pati një gabim në hyrjen.",
+    "The user's homeserver does not support the version of the space.": "Shërbyesi Home i përdoruesit s’e mbulon versionin e hapësirës.",
+    "User may or may not exist": "Përdorues mund të ekzistojë ose jo",
+    "User does not exist": "Përdoruesi s’ekziston",
+    "User is already in the room": "Përdoruesi gjendet tashmë te dhoma",
+    "User is already in the space": "Përdoruesit gjendet tashmë te hapësira",
+    "User is already invited to the room": "Përdoruesi është ftuar tashmë te dhoma",
+    "User is already invited to the space": "Përdoruesi është ftuar tashmë te hapësira",
+    "You do not have permission to invite people to this space.": "S’keni leje të ftoni njerëz në këtë hapësirë.",
+    "Failed to invite users to %(roomName)s": "S’u arrit të ftoheshin përdoruesit te %(roomName)s",
+    "An error occurred while stopping your live location, please try again": "Ndodhi një gabim teksa ndalej dhënia aty për aty e vendndodhjes tuaj, ju lutemi, riprovoni",
+    "Stop sharing and close": "Resht tregimin dhe mbylle",
+    "An error occured whilst sharing your live location, please try again": "Ndodhi një gabim teksa tregohej vendndodhja juaj aty për aty, ju lutemi, riprovoni",
+    "An error occured whilst sharing your live location": "Ndodhi një gabim teksa tregohej vendndodhja juaj “live”",
+    "Create room": "Krijoje dhomën",
+    "Create video room": "Krijoni dhomë me video",
+    "Create a video room": "Krijoni një dhomë me video",
+    "%(count)s participants|one": "1 pjesëmarrës",
+    "%(count)s participants|other": "%(count)s pjesëmarrës",
+    "New video room": "Dhomë e re me video",
+    "New room": "Dhomë e re",
+    "Video rooms (under active development)": "Dhoma me video (nën zhvillim aktiv)",
+    "<a>Give feedback</a>": "<a>Jepni përshtypjet</a>",
+    "Threads are a beta feature": "Rrjedhat janë një veçori beta",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Ndihmëz:</b> Përdorni “Përgjigjuni në rrjedhë”, teksa kaloni kursorin sipër një mesazhi.",
+    "Threads help keep your conversations on-topic and easy to track.": "Rrjedhat ndihmojnë që të mbahen bisedat tuaja brenda temës dhe të ndiqen kollaj.",
+    "%(featureName)s Beta feedback": "Përshtypje për %(featureName)s Beta",
+    "Beta feature. Click to learn more.": "Veçori në version beta. Klikoni për të mësuar më tepër.",
+    "Beta feature": "Veçori në version beta",
+    "To leave, return to this page and use the “Leave the beta” button.": "Për ta braktisur, kthehuni te kjo faqe dhe përdorni butonin “Braktise beta-n”.",
+    "Use \"Reply in thread\" when hovering over a message.": "Përdorni “Përgjigjuni në rrjedhë”, teksa kaloni kursorin sipër një mesazhi.",
+    "How can I start a thread?": "Si mund të nis një rrjedhë?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Rrjedhat ndihmojnë që të mbahen bisedat tuaja brenda temës dhe të ndiqen kollaj. <a>Mësoni më tepër</a>.",
+    "Keep discussions organised with threads.": "Mbajini diskutimet të sistemuara në rrjedha."
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index d33bdfdb72c..6351262b59e 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2933,7 +2933,7 @@
     "Space information": "Utrymmesinfo",
     "Images, GIFs and videos": "Bilder, GIF:ar och videor",
     "Code blocks": "Kodblock",
-    "Displaying time": "Visar tid",
+    "Displaying time": "Tidvisning",
     "To view all keyboard shortcuts, click here.": "För att se alla tangentbordsgenvägar, klicka här.",
     "Keyboard shortcuts": "Tangentbordsgenvägar",
     "If a community isn't shown you may not have permission to convert it.": "Om en gemenskap inte syns så kanske du inte har behörighet att se den.",
@@ -3605,7 +3605,7 @@
     "Maximise": "Maximera",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sskickade ett dolt meddelande",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sskickade %(count)s dolda meddelanden",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sskickade %(count)s ett dolt meddelande",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sskickade ett dolt meddelande",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sskickade %(count)s dolda meddelanden",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)stog bort ett meddelande",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)stog bort %(count)s meddelanden",
@@ -3627,5 +3627,105 @@
     "Closed poll": "Sluten omröstning",
     "Open poll": "Öppen omröstning",
     "Poll type": "Omröstningstyp",
-    "Results will be visible when the poll is ended": "Resultat kommer att visas när omröstningen avslutas"
+    "Results will be visible when the poll is ended": "Resultat kommer att visas när omröstningen avslutas",
+    "Open user settings": "Öppna användarinställningar",
+    "Switch to space by number": "Byt till utrymme med nummer",
+    "Next recently visited room or community": "Nästa nyligen besökta rummet eller gemenskapen",
+    "Previous recently visited room or community": "Förra nyligen besökta rummet eller gemenskapen",
+    "Accessibility": "Tillgänglighet",
+    "Pinned": "Fäst",
+    "Open thread": "Öppna tråd",
+    "Remove messages sent by me": "Ta bort meddelanden skickade av mig",
+    "Location sharing - pin drop (under active development)": "Platsdelning - stiftsläpp (under aktiv utveckling)",
+    "No virtual room for this room": "Inget virtuellt rum för det här rummet",
+    "Switches to this room's virtual room, if it has one": "Byter till det här rummets virtuella rum, om det har ett",
+    "Match system": "Matcha systemet",
+    "Developer tools": "Utvecklarverktyg",
+    "Mic": "Mick",
+    "Mic off": "Mick av",
+    "Video": "Video",
+    "Video off": "Video av",
+    "Connected": "Ansluten",
+    "Insert a trailing colon after user mentions at the start of a message": "Infoga kolon efter användaromnämnande på början av ett meddelande",
+    "Show polls button": "Visa omröstningsknapp",
+    "Location sharing - share your current location with live updates (under active development)": "Platsdelning - dela din nuvarande position med kontinuerliga uppdateringar (under aktiv utveckling)",
+    "Voice & video rooms (under active development)": "Röst- & videorum (under aktiv utveckling)",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s är experimentell i mobila webbläsare. För en bättre upplevelse och de senaste funktionerna använd våran nativa app.",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Den här hemservern är inte korrekt konfigurerad för att visa kartor, eller så kanske den konfigurerade kartserven inte är nåbar.",
+    "This homeserver is not configured to display maps.": "Den här hemservern har inte konfigurerats för att visa kartor.",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Du försöker komma åt en gemenskapslänk (%(groupId)s). <br/>Gemenskaper stöds inte längre och har ersatts av utrymmen.<br/><a>Läs mer om utrymmen här.</a>",
+    "That link is no longer supported": "Den länken stöds inte längre",
+    "%(value)ss": "%(value)ss",
+    "%(value)sm": "%(value)sm",
+    "%(value)sh": "%(value)st",
+    "%(value)sd": "%(value)sd",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Där den här sidan innehåller identifierande information som ett rum eller användar-ID så tas den data:n bort innan den skickas till servern.",
+    "This invite was sent to %(email)s": "Denna inbjudan skickades till %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Denna inbjudan skickades till %(email)s vilken inte är associerad med ditt konto",
+    "You can still join here.": "Du kan fortfarande gå med här.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Ett fel (%(errcode)s) returnerades vid försök att validera din inbjudan. Du kan pröva att ge den här informationen till personen som bjöd in dig.",
+    "Something went wrong with your invite.": "Nånting gick fel med din inbjudan.",
+    "You were banned by %(memberName)s": "Du bannades av %(memberName)s",
+    "Forget this space": "Glöm det här utrymmet",
+    "You were removed by %(memberName)s": "Du togs bort av %(memberName)s",
+    "Loading preview": "Laddar förhandsgranskning",
+    "Joining …": "Går med…",
+    "Currently removing messages in %(count)s rooms|one": "Tar just nu bort meddelanden i %(count)s rum",
+    "Currently removing messages in %(count)s rooms|other": "Tar just nu bort meddelanden i %(count)s rum",
+    "New video room": "Nytt videorum",
+    "New room": "Nytt rum",
+    "Busy": "Upptagen",
+    "View older version of %(spaceName)s.": "Visa tidigare version av %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Uppgradera det här utrymmet till den rekommenderade rumsversionen",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Felsökningsloggar innehåller programanvändningsdata som ditt användarnamn, ID:n eller alias för rum du har besökt, vilka UI-element du senast interagerade med och användarnamn för andra användare. De innehåller inte meddelanden.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Om du har rapporterat en bugg via GitHub så kan felsökningsloggar hjälpa oss att hitta problemet. ",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Utrymmen är ett nytt sätt att gruppera rum och personer. Vad för slags utrymme vill du skapa? Du kan ändra detta senare.",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Kontinuerlig platsdelning - dela nuvarande plats (aktiv utveckling, och för tillfället blir platser kvar i rumshistoriken)",
+    "Video rooms (under active development)": "Videorum (under aktiv utveckling)",
+    "Failed to join": "Misslyckades att gå med",
+    "The person who invited you has already left, or their server is offline.": "Personen som bjöd in dig har redan lämnat, eller så är deras hemserver offline.",
+    "The person who invited you has already left.": "Personen som bjöd in dig har redan lämnat.",
+    "Sorry, your homeserver is too old to participate here.": "Din hemserver är tyvärr för gammal för att delta här.",
+    "There was an error joining.": "Fel vid försök att gå med.",
+    "The user's homeserver does not support the version of the space.": "Användarens hemserver stöder inte utrymmets version.",
+    "User may or may not exist": "Användaren kanske eller kanske inte finns",
+    "User does not exist": "Användaren finns inte",
+    "User is already in the room": "Användaren är redan med i rummet",
+    "User is already in the space": "Användaren är redan med i utrymmet",
+    "User is already invited to the room": "Användaren är redan inbjuden till det här rummet",
+    "User is already invited to the space": "Användaren är redan inbjuden till det här utrymmet",
+    "You do not have permission to invite people to this space.": "Du är inte behörig att bjuda in folk till det här utrymmet.",
+    "Failed to invite users to %(roomName)s": "Misslyckades att bjuda in användare till %(roomName)s",
+    "%(count)s participants|one": "1 deltagare",
+    "%(count)s participants|other": "%(count)s deltagare",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s returnerades vid försök att komma åt rummet eller utrymmet. Om du tror att du ser det här meddelandet felaktigt, vänligen <issueLink>skicka en buggrapport</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Pröva igen senare eller be en rums- eller utrymmesadministratör att kolla om du har åtkomst.",
+    "This room or space is not accessible at this time.": "Det är rummet eller utrymmet är inte åtkomligt för tillfället.",
+    "Are you sure you're at the right place?": "Är du säker på att du är på rätt ställe?",
+    "This room or space does not exist.": "Det här rummet eller utrymmet finns inte.",
+    "There's no preview, would you like to join?": "Det finns ingen förhandsgranskning, vill du gå med?",
+    "Shared a location: ": "Delade en plats: ",
+    "Shared their location: ": "Delade sin plats: ",
+    "Unable to load map": "Kunde inte ladda kartan",
+    "Click": "Klicka",
+    "Expand quotes": "Expandera citat",
+    "Collapse quotes": "Kollapsa citat",
+    "Beta feature. Click to learn more.": "Betafunktion. Klicka för att läsa mer.",
+    "Beta feature": "Betafunktion",
+    "Can't create a thread from an event with an existing relation": "Kan inte skapa tråd från en händelse med en existerande relation",
+    "sends hearts": "skicka hjärtan",
+    "Sends the given message with hearts": "Skickar det givna meddelandet med hjärtan",
+    "To leave, return to this page and use the “Leave the beta” button.": "För att lämna, återvänd till den här sidan och använd \"Lämna betan\"-knappen.",
+    "Use \"Reply in thread\" when hovering over a message.": "Använd \"Svara i tråd\" när du håller pekaren över ett meddelande.",
+    "How can I start a thread?": "Hur kan jag starta en tråd?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Trådar hjälper till att hålla diskussioner till ämnet och lätta att hålla reda på. <a>Läs mer</a>.",
+    "Keep discussions organised with threads.": "Håll diskussioner organiserade med trådar.",
+    "Confirm signing out these devices|one": "Bekräfta utloggning av denna enhet",
+    "Confirm signing out these devices|other": "Bekräfta utloggning av dessa enheter",
+    "Yes, enable": "Ja, aktivera",
+    "Do you want to enable threads anyway?": "Vill du aktivera trådar iallafall?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Din hemserver stöder för närvarande inte trådar, så den här funktionen kan vara opålitlig. Vissa trådade kanske inte är tillgängliga. <a>Läs mer</a>.",
+    "Partial Support for Threads": "Delvist stöd för trådar",
+    "Right-click message context menu": "Kontextmeny vid högerklick på meddelande",
+    "Jump to the given date in the timeline": "Hoppa till det angivna datumet i tidslinjen"
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index f1e7cb727ec..667242cb524 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -2117,8 +2117,8 @@
     "Can't load this message": "Не вдалося завантажити це повідомлення",
     "Click here to see older messages.": "Клацніть тут, щоб переглянути давніші повідомлення.",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s вилучає аватар кімнати.",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>реагує на %(shortName)s</reactedWith>",
-    "%(reactors)s reacted with %(content)s": "%(reactors)s реагує на %(content)s",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>додає реакцію %(shortName)s</reactedWith>",
+    "%(reactors)s reacted with %(content)s": "%(reactors)s додає реакцію %(content)s",
     "Reactions": "Реакції",
     "Add reaction": "Додати реакцію",
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s надсилає наліпку.",
@@ -2375,7 +2375,7 @@
     "Confirm signing out these devices": "Підтвердьте вихід з цих пристроїв",
     "Confirm logging out these devices by using Single Sign On to prove your identity.|other": "Підтвердьте вихід із цих пристроїв за допомогою єдиного входу, щоб довести вашу справжність.",
     "To continue, use Single Sign On to prove your identity.": "Щоб продовжити, скористайтеся єдиним входом для підтвердження особи.",
-    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Підтвердьте вхід на це пристрій за допомогою єдиного входу, щоб підтвердити вашу особу.",
+    "Confirm logging out these devices by using Single Sign On to prove your identity.|one": "Підтвердьте вихід із цього пристрою за допомогою єдиного входу, щоб підтвердити вашу особу.",
     "Click the button below to confirm signing out these devices.|one": "Натисніть кнопку внизу, щоб підтвердити вихід із цього пристрою.",
     "This device": "Цей пристрій",
     "Your private messages are normally encrypted, but this room isn't. Usually this is due to an unsupported device or method being used, like email invites.": "Ваші приватні повідомлення, зазвичай, зашифровані, але ця кімната — ні. Зазвичай це пов'язано з непідтримуваним пристроєм або використаним методом, наприклад, запрошення електронною поштою.",
@@ -2428,7 +2428,7 @@
     "Quick settings": "Швидкі налаштування",
     "Home options": "Параметри домівки",
     "Files": "Файли",
-    "Export chat": "Експортувати чат",
+    "Export chat": "Експортувати бесіду",
     "View in room": "Дивитися в кімнаті",
     "Copy link to thread": "Копіювати лінк треду",
     "Thread options": "Параметри треду",
@@ -3160,7 +3160,7 @@
     "This user is spamming the room with ads, links to ads or to propaganda.\nThis will be reported to the room moderators.": "Користувач засмічує кімнату рекламою, посиланнями на рекламу чи пропагандою.\nМодератори кімнати отримають скаргу на це.",
     "This user is displaying illegal behaviour, for instance by doxing people or threatening violence.\nThis will be reported to the room moderators who may escalate this to legal authorities.": "Користувач порушує закон, наприклад зливає особисті дані людей чи погрожує насиллям.\nМодератори кімнати отримають скаргу на це й зможуть передати її правоохоронцям.",
     "This user is displaying toxic behaviour, for instance by insulting other users or sharing  adult-only content in a family-friendly room  or otherwise violating the rules of this room.\nThis will be reported to the room moderators.": "Користувач поводиться токсично, наприклад ображає інших користувачів, поширює  дорослий вміст у сімейній кімнаті  чи ще якось порушує правила цієї кімнати.\nМодератори кімнати отримають скаргу на це.",
-    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Зауважте, якщо ви не додасте пошту й забудете пароль, то можете <b>назовсім втратити доступ до свого облікового запису</b>.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Зауважте, якщо ви не додасте пошту й забудете пароль, то можете <b>назавжди втратити доступ до свого облікового запису</b>.",
     "Continuing without email": "Продовження без е-пошти",
     "Data on this screen is shared with %(widgetDomain)s": "Дані на цьому екрані надсилаються до %(widgetDomain)s",
     "If they don't match, the security of your communication may be compromised.": "Якщо вони не збігаються, безпека вашого спілкування ймовірно скомпрометована.",
@@ -3584,7 +3584,7 @@
     "Maximise": "Розгорнути",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sнадсилає приховане повідомлення",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)sнадсилає %(count)s прихованих повідомлень",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sнадсилають %(count)s приховане повідомлення",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)sнадсилають приховане повідомлення",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)sнадсилають %(count)s прихованих повідомлень",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)sвидаляє повідомлення",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)sвидаляє %(count)s повідомлень",
@@ -3606,5 +3606,218 @@
     "Open poll": "Відкрите опитування",
     "Poll type": "Тип опитування",
     "Results will be visible when the poll is ended": "Результати будуть видимі після завершення опитування",
-    "Search Dialog": "Вікно пошуку"
+    "Search Dialog": "Вікно пошуку",
+    "Location sharing - pin drop (under active development)": "Поширення місцеперебування — маркер на мапі (в активній розробці)",
+    "Open user settings": "Відкрити користувацькі налаштування",
+    "Switch to space by number": "Перейти до простору за номером",
+    "Next recently visited room or community": "Наступна недавно відвідана кімната чи спільнота",
+    "Previous recently visited room or community": "Попередня недавно відвідана кімната чи спільнота",
+    "Accessibility": "Доступність",
+    "Pinned": "Закріплені",
+    "Open thread": "Відкрити тред",
+    "Remove messages sent by me": "Вилучити надіслані мною повідомлення",
+    "No virtual room for this room": "Ця кімната не має віртуальної кімнати",
+    "Switches to this room's virtual room, if it has one": "Переходить до віртуальної кімнати, якщо ваша кімната її має",
+    "This is a beta feature. Click for more info": "Це бета-функція. Натисніть, щоб дізнатися більше",
+    "Export Cancelled": "Експорт скасовано",
+    "What location type do you want to share?": "Який вид місцеперебування поширити?",
+    "Drop a Pin": "Маркер на карті",
+    "My live location": "Змінне місцеперебування наживо",
+    "My current location": "Лише поточне місцеперебування",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s не вдалося надіслати ваше місцеперебування. Повторіть спробу пізніше.",
+    "We couldn't send your location": "Не вдалося надіслати ваше місцеперебування",
+    "Match system": "Як у системі",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Дайте відповідь у наявний тред — або створіть новий, навівши курсор на повідомлення й натиснувши «%(replyInThread)s».",
+    "Insert a trailing colon after user mentions at the start of a message": "Додавати двокрапку після згадки користувача на початку повідомлення",
+    "Show polls button": "Показувати кнопку опитування",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)sзмінює <a>закріплені повідомлення</a> кімнати %(count)s разів",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)sзмінюють <a>закріплені повідомлення</a> кімнати %(count)s разів",
+    "Location sharing - share your current location with live updates (under active development)": "Поширення місцеперебування — діліться своїми поточними координатами (оновлення наживо; в активній розробці)",
+    "We'll create rooms for each of them.": "Ми створимо кімнати для кожного з них.",
+    "Click": "Клацнути",
+    "Expand quotes": "Розгорнути цитати",
+    "Collapse quotes": "Згорнути цитати",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "Простори — це новий спосіб групових кімнат та людей. Який вид простору ви хочете створити? Ви можете змінити це пізніше.",
+    "Click to drop a pin": "Натисніть, щоб створити маркер",
+    "Click to move the pin": "Натисніть, щоб посунути маркер",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "Цей домашній сервер налаштованно неправильно, щоб показати карти, або сконфігурований сервер карт може бути недосяжним.",
+    "This homeserver is not configured to display maps.": "Цей домашній сервер не налаштовано на показ карт.",
+    "Shared a location: ": "Повідомляє місцеперебування: ",
+    "Shared their location: ": "Повідомляє своє місцеперебування: ",
+    "Unable to load map": "Неможливо завантажити карту",
+    "Can't create a thread from an event with an existing relation": "Неможливо створити тред з події з наявним співвідношенням",
+    "Busy": "Зайнятий",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "Якщо ви надіслали звіт про ваду на GitHub, журнали зневадження можуть допомогти нам визначити проблему. ",
+    "Toggle Link": "Перемкнути посилання",
+    "Toggle Code Block": "Перемкнути блок коду",
+    "Thank you for helping us testing Threads!": "Дякуємо за тестування тредів!",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "Усі треди подій, створені за час тестування, тепер будуть показані в часовій шкалі кімнат та показані як відповіді. Це одноразовий перехід. Треди є частиною специфікації Matrix.",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "Нещодавно ми представили основні покращення стабільності для тредів, що також означає завершення їхнього тестування.",
+    "Threads are no longer experimental! 🎉": "Треди більше не експериментальна функція 🎉",
+    "You are sharing your live location": "Ви ділитеся місцеперебуванням",
+    "%(displayName)s's live location": "Місцеперебування %(displayName)s наживо",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "Вимкніть, щоб також видалити системні повідомлення про користувача (зміни членства, редагування профілю…)",
+    "Preserve system messages": "Залишити системні повідомлення",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "Ви збираєтеся видалити %(count)s повідомлення від %(user)s. Це видалить його назавжди для всіх у розмові. Точно продовжити?",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "Ви збираєтеся видалити %(count)s повідомлень від %(user)s. Це видалить їх назавжди для всіх у розмові. Точно продовжити?",
+    "Currently removing messages in %(count)s rooms|one": "Триває видалення повідомлень в %(count)s кімнаті",
+    "Currently removing messages in %(count)s rooms|other": "Триває видалення повідомлень у %(count)s кімнатах",
+    "%(value)ss": "%(value)sс",
+    "%(value)sm": "%(value)sхв",
+    "%(value)sh": "%(value)sгод",
+    "%(value)sd": "%(value)sд",
+    "Share for %(duration)s": "Поділитися на %(duration)s",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "Це буде одноразовий перехід, бо треди — тепер частина специфікації Matrix.",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "Готуючись, маємо дещо змінити: раніше створені треди буде <strong>показано як звичайні відповіді</strong>.",
+    "We're getting closer to releasing a public Beta for Threads.": "Наближаємось до випуску тредів у загальнодоступну бета-версію.",
+    "Threads Approaching Beta 🎉": "Незабаром бета-версія тредів 🎉",
+    "Stop sharing": "Зупинити поширення",
+    "You are sharing %(count)s live locations|one": "Ви поширюєте своє місцеперебування наживо",
+    "You are sharing %(count)s live locations|other": "Ви поширюєте наживо %(count)s місцеперебувань",
+    "%(timeRemaining)s left": "Іще %(timeRemaining)s",
+    "Room details": "Подробиці кімнати",
+    "Voice & video room": "Голосова й відеокімната",
+    "Text room": "Текстова кімната",
+    "Room type": "Тип кімнати",
+    "Connecting...": "З'єднання...",
+    "Voice room": "Голосова кімната",
+    "Mic": "Мікрофон",
+    "Mic off": "Мікрофон вимкнено",
+    "Video": "Відео",
+    "Video off": "Відео вимкнено",
+    "Connected": "З'єднано",
+    "Voice & video rooms (under active development)": "Голосові й відеокімнати (активно розробляються)",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "Ви намагаєтеся отримати доступ до посилання на спільноту (%(groupId)s).<br/>Спільноти більше не підтримуються і їх замінили просторами.<br2/><a>Докладніше про простори тут.</a>",
+    "That link is no longer supported": "Це посилання більше не підтримується",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "Якщо ця сторінка містить ідентифіковану інформацію, наприклад, кімнату, ID користувача, ці дані вилучаються перед надсиланням на сервер.",
+    "Previous recently visited room or space": "Попередня недавно відвідана кімната або простір",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "Журнали зневадження містять дані використання застосунків, включно з вашим іменем користувача, ID або псевдонімами відвіданих вами кімнат, дані про взаємодію з елементами, та імена користувачів інших користувачів. Вони не містять повідомлень.",
+    "Next recently visited room or space": "Наступна недавно відвідана кімната або простір",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Допомагайте нам визначати проблеми й удосконалювати %(analyticsOwner)s, надсилаючи анонімні дані про використання. Щоб розуміти, як люди використовують кілька пристроїв, ми створимо спільний для ваших пристроїв випадковий ідентифікатор.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Використайте нетипові параметри сервера, щоб увійти в інший домашній сервер Matrix, вказавши його URL-адресу. Це дасть вам змогу використовувати %(brand)s з уже наявним у вас на іншому домашньому сервері обліковим записом Matrix.",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s не отримав доступу до вашого місцеперебування. Дозвольте доступ до місцеперебування в налаштуваннях переглядача.",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s у мобільних вебпереглядачах лише випробовується. Поки що кращі враження й новіші функції — в нашому вільному мобільному застосунку.",
+    "Settings explorer": "Налаштування оглядача",
+    "Explore account data": "Переглянути дані облікового запису",
+    "Verification explorer": "Оглядач автентифікації",
+    "View servers in room": "Переглянути сервери в кімнаті",
+    "Explore room account data": "Переглянути дані облікового запису кімнати",
+    "Explore room state": "Переглянути стан кімнати",
+    "Send custom timeline event": "Надіслати спеціальну подію стрічки",
+    "Developer tools": "Інструменти розробника",
+    "Room ID: %(roomId)s": "ID кімнати: %(roomId)s",
+    "Server info": "Інформація сервера",
+    "Server Versions": "Версії сервера",
+    "Client Versions": "Версії клієнта",
+    "Failed to load.": "Не вдалося завантажити.",
+    "Capabilities": "Можливості",
+    "Send custom state event": "Надіслати нетипову подію стану",
+    "Failed to send event!": "Не вдалося надіслати подію!",
+    "Doesn't look like valid JSON.": "Не схоже на чинний JSON.",
+    "Send custom room account data event": "Надіслати нетипову подію даних кімнати",
+    "Send custom account data event": "Надіслати нетипову подію даних облікового запису",
+    "Phase": "Фаза",
+    "Transaction": "Транзакція",
+    "Cancelled": "Скасовано",
+    "Started": "Почато",
+    "Ready": "Готово",
+    "Requested": "Подано запит",
+    "Unsent": "Не надіслано",
+    "Edit values": "Редагувати значення",
+    "Failed to save settings.": "Не вдалося зберегти налаштування.",
+    "Number of users": "Кількість користувачів",
+    "Server": "Сервер",
+    "Event ID: %(eventId)s": "ID події: %(eventId)s",
+    "No verification requests found": "Запитів на звірку не знайдено",
+    "Observe only": "Лише спостерігати",
+    "Requester": "Адресант",
+    "Methods": "Методи",
+    "Timeout": "Обмеження часу",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Якщо не вдається знайти потрібну кімнату, попросіть вас запросити чи <a>створіть нову кімнату</a>.",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Під час спроби отримати доступ до кімнати або простору було повернено помилку %(errcode)s. Якщо ви думаєте, що ви бачите це повідомлення помилково, будь ласка, <issueLink>надішліть звіт про помилку</issueLink>.",
+    "Try again later, or ask a room or space admin to check if you have access.": "Повторіть спробу пізніше, або запитайте у кімнати або простору перевірку, чи маєте ви доступ.",
+    "This room or space is not accessible at this time.": "Ця кімната або простір на разі не доступні.",
+    "Are you sure you're at the right place?": "Ви впевнені, що перебуваєте в потрібному місці?",
+    "This room or space does not exist.": "Такої кімнати або простору не існує.",
+    "There's no preview, would you like to join?": "Попереднього перегляду немає, бажаєте приєднатися?",
+    "This invite was sent to %(email)s": "Це запрошення було надіслано на %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "Це запрошення надіслано на %(email)s, яка не пов’язана з вашим обліковим записом",
+    "You can still join here.": "Ви досі можете приєднатися сюди.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "Під час спроби перевірити ваше запрошення було повернуто помилку (%(errcode)s). Ви можете спробувати передати цю інформацію особі, яка вас запросила.",
+    "Something went wrong with your invite.": "Сталася помилка під час запрошення.",
+    "You were banned by %(memberName)s": "Вас заблоковано користувачем %(memberName)s",
+    "Forget this space": "Забути цей простір",
+    "You were removed by %(memberName)s": "Вас вилучено користувачем %(memberName)s",
+    "Loading preview": "Завантаження попереднього перегляду",
+    "Joining …": "Приєднання …",
+    "View older version of %(spaceName)s.": "Переглянути давнішу версію %(spaceName)s.",
+    "Upgrade this space to the recommended room version": "Оновити цей простір до рекомендованої версії кімнати",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "Повідомлення про місцеперебування наживо — поділіться поточним місцеперебуванням (в розробці, тож місцеперебування тимчасово зберігається в історії кімнати)",
+    "Failed to join": "Не вдалося приєднатися",
+    "The person who invited you has already left, or their server is offline.": "Особа, котра вас запросила, вже вийшла або її сервер офлайн.",
+    "The person who invited you has already left.": "Особа, котра вас запросила, вже вийшла.",
+    "Sorry, your homeserver is too old to participate here.": "На жаль, ваш домашній сервер застарий для участі тут.",
+    "There was an error joining.": "Сталася помилка під час приєднання.",
+    "The user's homeserver does not support the version of the space.": "Домашній сервер користувача не підтримувати версію простору.",
+    "User may or may not exist": "Користувач може або не може існувати",
+    "User does not exist": "Користувача не існує",
+    "User is already in the room": "Користувач уже долучився до цієї кімнати",
+    "User is already in the space": "Користувач уже долучився до цього простору",
+    "User is already invited to the room": "Користувача вже запрошено до цієї кімнати",
+    "User is already invited to the space": "Користувача вже запрошено до цього простору",
+    "You do not have permission to invite people to this space.": "Ви не маєте дозволу запрошувати людей у цей простір.",
+    "Failed to invite users to %(roomName)s": "Не вдалося запросити користувачів до %(roomName)s",
+    "Stop sharing and close": "Зупинити надсилання й закрити",
+    "An error occurred while stopping your live location, please try again": "Сталася помилка припинення надсилання вашого місцеперебування, повторіть спробу",
+    "An error occured whilst sharing your live location, please try again": "Сталася помилка надсилання вашого місцеперебування, повторіть спробу",
+    "An error occured whilst sharing your live location": "Сталася помилка надсилання вашого місцеперебування",
+    "Create room": "Створити кімнату",
+    "Create video room": "Створити відеокімнату",
+    "Create a video room": "Створити відеокімнату",
+    "%(count)s participants|one": "1 учасник",
+    "%(count)s participants|other": "%(count)s учасників",
+    "New video room": "Нова відеокімната",
+    "New room": "Нова кімната",
+    "Video rooms (under active development)": "Відеокімнати (в активній розробці)",
+    "<a>Give feedback</a>": "<a>Залиште відгук</a>",
+    "Threads are a beta feature": "Треди — бетафункція",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Підказка:</b> наведіть курсор на повідомлення й натисніть «Відповісти в тред».",
+    "Threads help keep your conversations on-topic and easy to track.": "Треди допомагають підтримувати розмови за темою та за ними легко стежити.",
+    "%(featureName)s Beta feedback": "%(featureName)s — відгук про бетаверсію",
+    "Beta feature. Click to learn more.": "Бетафункція. Натисніть, щоб дізнатися більше.",
+    "Beta feature": "Бетафункція",
+    "To leave, return to this page and use the “Leave the beta” button.": "Щоб вийти, поверніться до цієї сторінки й натисніть «Вийти з бета-тестування».",
+    "Use \"Reply in thread\" when hovering over a message.": "Наведіть курсор на повідомлення й натисніть «Відповісти в тред».",
+    "How can I start a thread?": "Як створити тред?",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Треди допомагають розмежовувати розмови на різні теми. <a>Дізнайтеся більше</a>.",
+    "Keep discussions organised with threads.": "Спілкуйтеся за темою в тредах.",
+    "sends hearts": "надсилає сердечка",
+    "Sends the given message with hearts": "Надсилає це повідомлення з сердечками",
+    "Confirm signing out these devices|one": "Підтвердьте вихід із цього пристрою",
+    "Confirm signing out these devices|other": "Підтвердьте вихід із цих пристроїв",
+    "Live location ended": "Показ місцеперебування наживо завершено",
+    "Loading live location...": "Завантаження місцеперебування наживо...",
+    "View live location": "Показувати місцеперебування наживо",
+    "Partial Support for Threads": "Часткова підтримка тредів",
+    "Jump to the given date in the timeline": "Перейти до вказаної дати в стрічці",
+    "Live location enabled": "Показ місцеперебування наживо ввімкнено",
+    "Live location error": "Помилка показу місцеперебування наживо",
+    "Live until %(expiryTime)s": "Наживо до %(expiryTime)s",
+    "Yes, enable": "Так, увімкнути",
+    "Do you want to enable threads anyway?": "Усе одно хочете увімкнути треди?",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "Ваш домашній сервер не підтримує треди, тому ця функція може бути неповносправною. Деякі треди повідомлень можуть бути не доступними. <a>Докладніше</a>.",
+    "Ban from space": "Заблокувати у просторі",
+    "Unban from space": "Розблокувати у просторі",
+    "Ban from room": "Заблокувати в кімнаті",
+    "Unban from room": "Розблокувати в кімнаті",
+    "Right-click message context menu": "Права кнопка миші — контекстне меню повідомлення",
+    "Use “%(replyInThread)s” when hovering over a message.": "Застосовувати «%(replyInThread)s» після наведення вказівника на повідомлення.",
+    "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.": "<b>Порада:</b> Використовуйте «%(replyInThread)s» навівши вказівник на повідомлення.",
+    "Disinvite from room": "Відкликати запрошення до кімнати",
+    "Remove from space": "Вилучити з простору",
+    "Disinvite from space": "Відкликати запрошення до простору",
+    "To leave, return to this page and use the “%(leaveTheBeta)s” button.": "Щоб вийти, поверніться на цю сторінку й натисніть кнопку «%(leaveTheBeta)s».",
+    "No live locations": "Передавання місцеперебування наживо відсутні"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index cbf06428c48..8bc0d27e04e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -3634,7 +3634,7 @@
     "Maximise": "最大化",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s 傳送了 1 個隱藏的訊息",
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s 傳送了 %(count)s 個隱藏的訊息",
-    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s 傳送了 %(count)s 個隱藏的訊息",
+    "%(severalUsers)ssent %(count)s hidden messages|one": "%(severalUsers)s 傳送了 1 個隱藏的訊息",
     "%(severalUsers)ssent %(count)s hidden messages|other": "%(severalUsers)s 傳送了 %(count)s 個隱藏的訊息",
     "%(oneUser)sremoved a message %(count)s times|one": "%(oneUser)s 移除了 1 個訊息",
     "%(oneUser)sremoved a message %(count)s times|other": "%(oneUser)s 移除了 %(count)s 個訊息",
@@ -3656,5 +3656,214 @@
     "Open poll": "開放投票",
     "Closed poll": "已關閉的投票",
     "Poll type": "投票類型",
-    "Results will be visible when the poll is ended": "結果將在投票結束時可見"
+    "Results will be visible when the poll is ended": "結果將在投票結束時可見",
+    "Open user settings": "開啟使用者設定",
+    "Switch to space by number": "根據數字切換到空格",
+    "Next recently visited room or community": "下一個近期造訪過的聊天室或社群",
+    "Previous recently visited room or community": "上一個近期造訪過的聊天室或社群",
+    "Accessibility": "可近用性",
+    "Pinned": "已釘選",
+    "Open thread": "開啟討論串",
+    "Remove messages sent by me": "移除我傳送的訊息",
+    "Location sharing - pin drop (under active development)": "位置分享 - 大頭針釘選（仍在積極開發中）",
+    "No virtual room for this room": "此聊天室沒有虛擬聊天室",
+    "Switches to this room's virtual room, if it has one": "切換到此聊天室的虛擬聊天室（若有）",
+    "This is a beta feature. Click for more info": "這是測試版功能。點擊以取得更多資訊",
+    "Export Cancelled": "匯出已取消",
+    "What location type do you want to share?": "您要分享哪種位置類型？",
+    "Drop a Pin": "放下圖釘",
+    "My live location": "我的即時位置",
+    "My current location": "我目前的位置",
+    "%(brand)s could not send your location. Please try again later.": "%(brand)s 無法傳送您的位置。請稍後再試。",
+    "We couldn't send your location": "我們無法傳送您的位置",
+    "Match system": "符合系統",
+    "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "將滑鼠游標停留在訊息上時，回覆正在進行的討論串或使用「%(replyInThread)s」來開始新的討論串。",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a>",
+    "%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(oneUser)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|one": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a>",
+    "%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times|other": "%(severalUsers)s 變更了聊天室的<a>釘選訊息</a> %(count)s 次",
+    "Insert a trailing colon after user mentions at the start of a message": "在使用者於訊息開頭提及之後插入跟隨冒號",
+    "Show polls button": "顯示投票按鈕",
+    "Location sharing - share your current location with live updates (under active development)": "位置分享 - 透過即時更新分享您目前的位置（正在積極開發中）",
+    "Spaces are a new way to group rooms and people. What kind of Space do you want to create? You can change this later.": "空間是一種將聊天室與夥伴分組的新方式。您想要建立何種類型的空間？您稍後仍可變更。",
+    "We'll create rooms for each of them.": "我們將會為每個人建立聊天室。",
+    "Click to drop a pin": "點擊以放置圖釘",
+    "Click to move the pin": "點擊以移動圖釘",
+    "Click": "點擊",
+    "Expand quotes": "展開引號",
+    "Collapse quotes": "折疊引號",
+    "This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.": "此家伺服器未正確設定，無法顯示地圖，或是設定的地圖伺服器無法使用。",
+    "This homeserver is not configured to display maps.": "此家伺服器未設定為顯示地圖。",
+    "Shared a location: ": "已分享了位置： ",
+    "Shared their location: ": "已分享了他們的位置： ",
+    "Unable to load map": "無法載入地圖",
+    "Can't create a thread from an event with an existing relation": "無法從有既有關係的活動建立討論串",
+    "Busy": "忙碌",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. ": "若您透過 GitHub 遞交臭蟲，除錯紀錄檔可以協助我們追蹤問題。 ",
+    "Toggle Link": "切換連結",
+    "Toggle Code Block": "切換程式碼區塊",
+    "Thank you for helping us testing Threads!": "感謝您協助我們測試討論串！",
+    "All thread events created during the experimental period will now be rendered in the room timeline and displayed as replies. This is a one-off transition. Threads are now part of the Matrix specification.": "在實驗期間建立的所有討論串事件現在都將在聊天室時間軸中呈現並顯示為回覆。這是一次性的過渡。討論串現在是 Matrix 規範的一部分。",
+    "We’ve recently introduced key stability improvements for Threads, which also means phasing out support for experimental Threads.": "我們最近為討論串引入了關鍵的穩定性改進，這同時也代表了逐步停止對實驗性討論串的支援。",
+    "Threads are no longer experimental! 🎉": "討論串不再是實驗性的了！🎉",
+    "You are sharing your live location": "您正在分享您的即時位置",
+    "Uncheck if you also want to remove system messages on this user (e.g. membership change, profile change…)": "若您也想移除關於此使用者的系統訊息（例如成員資格變更、個人資料變更……）",
+    "Preserve system messages": "保留系統訊息",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|one": "您將要移除 %(user)s 的 %(count)s 則訊息。這將會為對話中的所有人永久移除它們。您想要繼續嗎？",
+    "You are about to remove %(count)s messages by %(user)s. This will remove them permanently for everyone in the conversation. Do you wish to continue?|other": "您將要移除 %(user)s 的 %(count)s 則訊息。這將會為對話中的所有人永久移除它們。您想要繼續嗎？",
+    "%(displayName)s's live location": "%(displayName)s 的即時位置",
+    "Currently removing messages in %(count)s rooms|one": "目前正在移除 %(count)s 個聊天室中的訊息",
+    "Currently removing messages in %(count)s rooms|other": "目前正在移除 %(count)s 個聊天室中的訊息",
+    "Share for %(duration)s": "分享 %(duration)s",
+    "%(value)sm": "%(value)s分鐘",
+    "%(value)ss": "%(value)s秒",
+    "%(value)sh": "%(value)s小時",
+    "%(value)sd": "%(value)s天",
+    "This will be a one-off transition, as threads are now part of the Matrix specification.": "這會是一次性的過渡，因為討論串現在是 Matrix 規範的一部分了。",
+    "As we prepare for it, we need to make some changes: threads created before this point will be <strong>displayed as regular replies</strong>.": "在我們為此做準備時，我們需要做出一些變動：先前建立的討論串將會<strong>顯示為一般回覆</strong>。",
+    "We're getting closer to releasing a public Beta for Threads.": "我們愈來愈接近將討論串釋出為公開測試版。",
+    "Threads Approaching Beta 🎉": "討論串正在接近測試版 🎉",
+    "Stop sharing": "停止分享",
+    "You are sharing %(count)s live locations|one": "您正在分享您的即時位置",
+    "You are sharing %(count)s live locations|other": "您正在分享 %(count)s 個即時位置",
+    "%(timeRemaining)s left": "剩下 %(timeRemaining)s",
+    "Room details": "聊天室詳細資訊",
+    "Voice & video room": "影音聊天室",
+    "Text room": "文字聊天室",
+    "Room type": "聊天室類型",
+    "Connecting...": "正在連線……",
+    "Voice room": "語音聊天室",
+    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms you have visited, which UI elements you last interacted with, and the usernames of other users. They do not contain messages.": "除錯紀錄檔包含了應用程式使用資料，其中包括了您的使用者名稱、ID 或您造訪過的聊天室別名，您上次與哪些使用者介面元素互動，以及其他使用者的使用者名稱。但並不包含訊息。",
+    "Mic": "麥克風",
+    "Mic off": "麥克風關閉",
+    "Video": "視訊",
+    "Video off": "視訊關閉",
+    "Connected": "已連結",
+    "Voice & video rooms (under active development)": "影音聊天室（正在積極開發中）",
+    "You're trying to access a community link (%(groupId)s).<br/>Communities are no longer supported and have been replaced by spaces.<br2/><a>Learn more about spaces here.</a>": "您正在嘗試存取社群連結 (%(groupId)s)。<br/>已不再支援社群，並被空間取代。<br2/><a>在此取得更多關於空間的資訊。</a>",
+    "That link is no longer supported": "不再支援該連結",
+    "Where this page includes identifiable information, such as a room, user ID, that data is removed before being sent to the server.": "若此頁面包含可供辨識的資訊，如聊天室、使用者 ID，則那些資料會在傳送到伺服器前被移除。",
+    "Next recently visited room or space": "下一個最近造訪過的聊天室或空間",
+    "Previous recently visited room or space": "上一個最近造訪過的聊天室或空間",
+    "Event ID: %(eventId)s": "事件 ID：%(eventId)s",
+    "No verification requests found": "找不到驗證請求",
+    "Observe only": "僅觀察",
+    "Requester": "請求者",
+    "Methods": "方法",
+    "Timeout": "逾時",
+    "Phase": "階段",
+    "Transaction": "交易",
+    "Cancelled": "已取消",
+    "Started": "已開始",
+    "Ready": "準備",
+    "Requested": "已請求",
+    "Unsent": "取消傳送",
+    "Edit values": "編輯值",
+    "Failed to save settings.": "儲存設定失敗。",
+    "Number of users": "使用者數量",
+    "Server": "伺服器",
+    "Server Versions": "伺服器版本",
+    "Client Versions": "客戶端版本",
+    "Failed to load.": "載入失敗。",
+    "Capabilities": "功能",
+    "Send custom state event": "傳送自訂狀態事件",
+    "Failed to send event!": "傳送事件失敗！",
+    "Doesn't look like valid JSON.": "看起來不像有效的 JSON。",
+    "Send custom room account data event": "傳送自訂聊天室帳號資料事件",
+    "Send custom account data event": "傳送自訂帳號資料事件",
+    "Room ID: %(roomId)s": "聊天室 ID：%(roomId)s",
+    "Server info": "伺服器資訊",
+    "Settings explorer": "設定探索程式",
+    "Explore account data": "探索帳號資料",
+    "Verification explorer": "驗證探索程式",
+    "View servers in room": "檢視聊天室內的伺服器",
+    "Explore room account data": "探索聊天室帳號資料",
+    "Explore room state": "探索聊天室狀態",
+    "Send custom timeline event": "傳送自訂時間軸事件",
+    "Help us identify issues and improve %(analyticsOwner)s by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "透過分享匿名使用資料，協助我們識別問題並改進 %(analyticsOwner)s。為了了解人們如何使用多個裝置，我們將生成一個隨機識別字串，在您的裝置間分享。",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "您可以使用自訂伺服器選項透過指定不同的家伺服器 URL 來登入至其他的 Matrix 伺服器。這讓您可以將 %(brand)s 與不同家伺服器上的既有 Matrix 帳號一起使用。",
+    "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s 無法擷取您的位置。請在您的瀏覽器設定中允許位置存取權限。",
+    "Developer tools": "開發者工具",
+    "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s 在行動裝置的網路瀏覽器上仍為實驗性。要取得更好的體驗與最新的功能，請使用我們的免費原生應用程式。",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "如果找不到您要找的聊天室，請要求邀請或<a>建立新聊天室</a>。",
+    "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "嘗試存取聊天室或空間時發生錯誤 %(errcode)s。若您認為您看到這個訊息是有問題的，請<issueLink>遞交臭蟲回報</issueLink>。",
+    "Try again later, or ask a room or space admin to check if you have access.": "稍後再試，或是要求聊天室或空間的管理員檢查您是否有權存取。",
+    "This room or space is not accessible at this time.": "目前無法存取此聊天室或空間。",
+    "Are you sure you're at the right place?": "您確定您在正確的地方嗎？",
+    "This room or space does not exist.": "此聊天室或空間不存在。",
+    "There's no preview, would you like to join?": "沒有預覽，您想要加入嗎？",
+    "This invite was sent to %(email)s": "此邀請已傳送至 %(email)s",
+    "This invite was sent to %(email)s which is not associated with your account": "此邀請已傳送到與您的帳號無關的 %(email)s",
+    "You can still join here.": "您仍可加入此處。",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.": "嘗試驗證您的邀請時發生錯誤 (%(errcode)s)。您可以嘗試傳遞此資訊給邀請您的人。",
+    "Something went wrong with your invite.": "您的邀請出了點問題。",
+    "You were banned by %(memberName)s": "您被 %(memberName)s 封鎖",
+    "Forget this space": "忘記此空間",
+    "You were removed by %(memberName)s": "您被 %(memberName)s 移除",
+    "Loading preview": "正在載入預覽",
+    "Joining …": "正在加入……",
+    "View older version of %(spaceName)s.": "檢視 %(spaceName)s 的較舊版本。",
+    "Upgrade this space to the recommended room version": "升級此空間到建議的聊天室版本",
+    "Live location sharing - share current location (active development, and temporarily, locations persist in room history)": "即時位置分享 - 分享目前位置（活躍開發中，且位置會暫時留存在聊天室歷史紀錄中）",
+    "Failed to join": "加入失敗",
+    "The person who invited you has already left, or their server is offline.": "邀請您的人已經離開了，或是他們的伺服器離線。",
+    "The person who invited you has already left.": "邀請您的人已經離開了。",
+    "Sorry, your homeserver is too old to participate here.": "抱歉，您的家伺服器太舊，無法在此參與。",
+    "There was an error joining.": "加入時發生錯誤。",
+    "The user's homeserver does not support the version of the space.": "使用者的家伺服器不支援空間的版本。",
+    "User may or may not exist": "使用者可能存在也可能不存在",
+    "User does not exist": "使用者不存在",
+    "User is already in the room": "使用者已在聊天室中",
+    "User is already in the space": "使用者已在空間中",
+    "User is already invited to the room": "使用者已被邀請到聊天室",
+    "User is already invited to the space": "使用者已被邀請到空間",
+    "You do not have permission to invite people to this space.": "您無權邀請他人加入此空間。",
+    "Failed to invite users to %(roomName)s": "未能邀請使用者加入 %(roomName)s",
+    "An error occurred while stopping your live location, please try again": "停止您的即時位置時發生錯誤，請再試一次",
+    "Stop sharing and close": "停止分享並關閉",
+    "An error occured whilst sharing your live location, please try again": "分享您的即時位置時發生錯誤，請重試",
+    "An error occured whilst sharing your live location": "分享您的即時位置時發生錯誤",
+    "<a>Give feedback</a>": "<a>給予回饋</a>",
+    "Threads are a beta feature": "討論串是測試版功能",
+    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>秘訣：</b>在游標停於訊息之上時使用「在討論串中回覆」。",
+    "Threads help keep your conversations on-topic and easy to track.": "討論串可讓您的對話不離題且易於追蹤。",
+    "Create room": "建立聊天室",
+    "Create video room": "建立視訊聊天室",
+    "Create a video room": "建立視訊聊天室",
+    "%(featureName)s Beta feedback": "%(featureName)s 測試版回饋",
+    "Beta feature. Click to learn more.": "測試版功能。點擊以取得更多資訊。",
+    "Beta feature": "測試版功能",
+    "%(count)s participants|one": "1 個參與者",
+    "%(count)s participants|other": "%(count)s 個參與者",
+    "New video room": "新視訊聊天室",
+    "New room": "新聊天室",
+    "Video rooms (under active development)": "視訊聊天室（仍在積極開發中）",
+    "To leave, return to this page and use the “Leave the beta” button.": "若要離開，返回此頁面並使用「離開測試版」按鈕。",
+    "Use \"Reply in thread\" when hovering over a message.": "在游標停於訊息之上時使用「在討論串中回覆」。",
+    "How can I start a thread?": "我要如何啟動討論串？",
+    "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "討論串讓對話不離題且易於追蹤。<a>取得更多資訊</a>。",
+    "Keep discussions organised with threads.": "透過討論串讓討論保持有條不紊。",
+    "sends hearts": "傳送愛心",
+    "Sends the given message with hearts": "與愛心一同傳送指定的訊息",
+    "Live location ended": "即時位置已結束",
+    "Loading live location...": "正在載入即時位置……",
+    "View live location": "檢視即時位置",
+    "Confirm signing out these devices|one": "確認登出此裝置",
+    "Confirm signing out these devices|other": "確認登出這些裝置",
+    "Live location enabled": "即時位置已啟用",
+    "Live location error": "即時位置錯誤",
+    "Live until %(expiryTime)s": "即時分享直到 %(expiryTime)s",
+    "Ban from room": "從聊天室封鎖",
+    "Unban from room": "從聊天室取消封鎖",
+    "Ban from space": "從空間封鎖",
+    "Unban from space": "從空間取消封鎖",
+    "Yes, enable": "是的，請啟用",
+    "Do you want to enable threads anyway?": "您無論如何都想要啟用討論串嗎？",
+    "Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. <a>Learn more</a>.": "您的家伺服器目前不支援討論串，所以此功能可能不可靠。部份討論串訊息可能無法可靠地使用。<a>取得更多資訊</a>。",
+    "Partial Support for Threads": "部份支援討論串",
+    "Jump to the given date in the timeline": "跳至時間軸中指定的日期",
+    "Disinvite from room": "從聊天室取消邀請",
+    "Remove from space": "從空間移除",
+    "Disinvite from space": "從空間取消邀請",
+    "Right-click message context menu": "右鍵點擊訊息情境選單"
 }
diff --git a/src/index.ts b/src/index.ts
index c57722376ff..6d942597b59 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,21 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Skinner, { ISkinObject } from './Skinner';
-
 // Import the js-sdk so the proper `request` object can be set. This does some
 // magic with the browser injection to make all subsequent imports work fine.
 import "matrix-js-sdk/src/browser-index";
-
-export function loadSkin(skinObject: ISkinObject): void {
-    Skinner.load(skinObject);
-}
-
-export function resetSkin(): void {
-    Skinner.reset();
-}
-
-export function getComponent(componentName: string): any {
-    return Skinner.getComponent(componentName);
-}
-
diff --git a/src/integrations/IntegrationManagers.ts b/src/integrations/IntegrationManagers.ts
index 55772a7498d..32bb224f741 100644
--- a/src/integrations/IntegrationManagers.ts
+++ b/src/integrations/IntegrationManagers.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import url from 'url';
 import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixClient, ClientEvent } from "matrix-js-sdk/src/client";
+import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
 
 import type { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import type { Room } from "matrix-js-sdk/src/models/room";
@@ -24,12 +24,16 @@ import SdkConfig from '../SdkConfig';
 import Modal from '../Modal';
 import { IntegrationManagerInstance, Kind } from "./IntegrationManagerInstance";
 import IntegrationsImpossibleDialog from "../components/views/dialogs/IntegrationsImpossibleDialog";
-import TabbedIntegrationManagerDialog from "../components/views/dialogs/TabbedIntegrationManagerDialog";
 import IntegrationsDisabledDialog from "../components/views/dialogs/IntegrationsDisabledDialog";
 import WidgetUtils from "../utils/WidgetUtils";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";
 import { compare } from "../utils/strings";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import {
+    OpenTabbedIntegrationManagerDialogPayload,
+} from "../dispatcher/payloads/OpenTabbedIntegrationManagerDialogPayload";
+import { Action } from "../dispatcher/actions";
 
 const KIND_PREFERENCE = [
     // Ordered: first is most preferred, last is least preferred.
@@ -77,8 +81,8 @@ export class IntegrationManagers {
     }
 
     private setupConfiguredManager() {
-        const apiUrl: string = SdkConfig.get()['integrations_rest_url'];
-        const uiUrl: string = SdkConfig.get()['integrations_ui_url'];
+        const apiUrl: string = SdkConfig.get("integrations_rest_url");
+        const uiUrl: string = SdkConfig.get("integrations_ui_url");
 
         if (apiUrl && uiUrl) {
             this.managers.push(new IntegrationManagerInstance(Kind.Config, apiUrl, uiUrl));
@@ -186,10 +190,12 @@ export class IntegrationManagers {
             return this.openNoManagerDialog();
         }
 
-        Modal.createTrackedDialog(
-            'Tabbed Integration Manager', '', TabbedIntegrationManagerDialog,
-            { room, screen, integrationId }, 'mx_TabbedIntegrationManagerDialog',
-        );
+        defaultDispatcher.dispatch(<OpenTabbedIntegrationManagerDialogPayload>{
+            action: Action.OpenTabbedIntegrationManagerDialog,
+            room,
+            screen,
+            integrationId,
+        });
     }
 
     showDisabledDialog(): void {
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index a2037e640f6..6dfef6d1aeb 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -290,7 +290,7 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
             matchFoundSomewhere = true;
 
             // The textual part before the first match
-            const head = inputText.substr(0, match.index);
+            const head = inputText.slice(0, match.index);
 
             const parts = [];
             // keep track of prevMatch
@@ -326,9 +326,9 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
                 let tail;
                 if (match) {
                     const startIndex = prevMatch.index + prevMatch[0].length;
-                    tail = inputText.substr(startIndex, match.index - startIndex);
+                    tail = inputText.slice(startIndex, match.index);
                 } else {
-                    tail = inputText.substr(prevMatch.index + prevMatch[0].length);
+                    tail = inputText.slice(prevMatch.index + prevMatch[0].length);
                 }
                 if (tail) {
                     parts.push(tail);
@@ -500,7 +500,7 @@ export function pickBestLanguage(langs: string[]): string {
 
     {
         // Failing that, a different dialect of the same language
-        const closeLangIndex = normalisedLangs.findIndex((l) => l.substr(0, 2) === currentLang.substr(0, 2));
+        const closeLangIndex = normalisedLangs.findIndex((l) => l.slice(0, 2) === currentLang.slice(0, 2));
         if (closeLangIndex > -1) return langs[closeLangIndex];
     }
 
diff --git a/src/linkify-matrix.ts b/src/linkify-matrix.ts
index 1fdd8106ba1..c42d98d326c 100644
--- a/src/linkify-matrix.ts
+++ b/src/linkify-matrix.ts
@@ -31,12 +31,13 @@ import dis from './dispatcher/dispatcher';
 import { Action } from './dispatcher/actions';
 import { ViewUserPayload } from './dispatcher/payloads/ViewUserPayload';
 import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
+import { showGroupReplacedWithSpacesDialog } from "./group_helpers";
 
 export enum Type {
     URL = "url",
     UserId = "userid",
     RoomAlias = "roomalias",
-    GroupId = "groupid"
+    GroupId = "groupid",
 }
 
 // Linkify stuff doesn't type scanner/parser/utils properly :/
@@ -115,6 +116,11 @@ function onUserClick(event: MouseEvent, userId: string) {
     });
 }
 
+function onGroupClick(event: MouseEvent, groupId: string) {
+    event.preventDefault();
+    showGroupReplacedWithSpacesDialog(groupId);
+}
+
 function onAliasClick(event: MouseEvent, roomAlias: string) {
     event.preventDefault();
     dis.dispatch<ViewRoomPayload>({
@@ -125,11 +131,6 @@ function onAliasClick(event: MouseEvent, roomAlias: string) {
     });
 }
 
-function onGroupClick(event: MouseEvent, groupId: string) {
-    event.preventDefault();
-    dis.dispatch({ action: 'view_group', group_id: groupId });
-}
-
 const escapeRegExp = function(string): string {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
@@ -155,21 +156,21 @@ export const options = {
                 // intercept local permalinks to users and show them like userids (in userinfo of current room)
                 try {
                     const permalink = parsePermalink(href);
-                    if (permalink && permalink.userId) {
+                    if (permalink?.userId) {
                         return {
                             // @ts-ignore see https://linkify.js.org/docs/options.html
-                            click: function(e) {
+                            click: function(e: MouseEvent) {
                                 onUserClick(e, permalink.userId);
                             },
                         };
                     } else {
-                        // for events, rooms etc. (anything other then users)
+                        // for events, rooms etc. (anything other than users)
                         const localHref = tryTransformPermalinkToLocalHref(href);
                         if (localHref !== href) {
                             // it could be converted to a localHref -> therefore handle locally
                             return {
                             // @ts-ignore see https://linkify.js.org/docs/options.html
-                                click: function(e) {
+                                click: function(e: MouseEvent) {
                                     e.preventDefault();
                                     window.location.hash = localHref;
                                 },
@@ -184,7 +185,7 @@ export const options = {
             case Type.UserId:
                 return {
                     // @ts-ignore see https://linkify.js.org/docs/options.html
-                    click: function(e) {
+                    click: function(e: MouseEvent) {
                         const userId = parsePermalink(href).userId;
                         onUserClick(e, userId);
                     },
@@ -192,15 +193,16 @@ export const options = {
             case Type.RoomAlias:
                 return {
                     // @ts-ignore see https://linkify.js.org/docs/options.html
-                    click: function(e) {
+                    click: function(e: MouseEvent) {
                         const alias = parsePermalink(href).roomIdOrAlias;
                         onAliasClick(e, alias);
                     },
                 };
+
             case Type.GroupId:
                 return {
                     // @ts-ignore see https://linkify.js.org/docs/options.html
-                    click: function(e) {
+                    click: function(e: MouseEvent) {
                         const groupId = parsePermalink(href).groupId;
                         onGroupClick(e, groupId);
                     },
diff --git a/src/mjolnir/BanList.ts b/src/mjolnir/BanList.ts
index 5a84970b257..d9980c714e5 100644
--- a/src/mjolnir/BanList.ts
+++ b/src/mjolnir/BanList.ts
@@ -29,15 +29,15 @@ export const ROOM_RULE_TYPES = [RULE_ROOM, "m.room.rule.room", "org.matrix.mjoln
 export const SERVER_RULE_TYPES = [RULE_SERVER, "m.room.rule.server", "org.matrix.mjolnir.rule.server"];
 export const ALL_RULE_TYPES = [...USER_RULE_TYPES, ...ROOM_RULE_TYPES, ...SERVER_RULE_TYPES];
 
-export function ruleTypeToStable(rule: string, unstable = true): string {
+export function ruleTypeToStable(rule: string): string {
     if (USER_RULE_TYPES.includes(rule)) {
-        return unstable ? USER_RULE_TYPES[USER_RULE_TYPES.length - 1] : RULE_USER;
+        return RULE_USER;
     }
     if (ROOM_RULE_TYPES.includes(rule)) {
-        return unstable ? ROOM_RULE_TYPES[ROOM_RULE_TYPES.length - 1] : RULE_ROOM;
+        return RULE_ROOM;
     }
     if (SERVER_RULE_TYPES.includes(rule)) {
-        return unstable ? SERVER_RULE_TYPES[SERVER_RULE_TYPES.length - 1] : RULE_SERVER;
+        return RULE_SERVER;
     }
     return null;
 }
@@ -68,19 +68,19 @@ export class BanList {
     }
 
     async banEntity(kind: string, entity: string, reason: string): Promise<any> {
-        await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind, true), {
+        await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind), {
             entity: entity,
             reason: reason,
             recommendation: recommendationToStable(RECOMMENDATION_BAN, true),
         }, "rule:" + entity);
-        this._rules.push(new ListRule(entity, RECOMMENDATION_BAN, reason, ruleTypeToStable(kind, false)));
+        this._rules.push(new ListRule(entity, RECOMMENDATION_BAN, reason, ruleTypeToStable(kind)));
     }
 
     async unbanEntity(kind: string, entity: string): Promise<any> {
         // Empty state event is effectively deleting it.
-        await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind, true), {}, "rule:" + entity);
+        await MatrixClientPeg.get().sendStateEvent(this._roomId, ruleTypeToStable(kind), {}, "rule:" + entity);
         this._rules = this._rules.filter(r => {
-            if (r.kind !== ruleTypeToStable(kind, false)) return true;
+            if (r.kind !== ruleTypeToStable(kind)) return true;
             if (r.entity !== entity) return true;
             return false; // we just deleted this rule
         });
@@ -97,7 +97,7 @@ export class BanList {
             for (const ev of events) {
                 if (!ev.getStateKey()) continue;
 
-                const kind = ruleTypeToStable(eventType, false);
+                const kind = ruleTypeToStable(eventType);
 
                 const entity = ev.getContent()['entity'];
                 const recommendation = ev.getContent()['recommendation'];
diff --git a/src/notifications/VectorPushRulesDefinitions.ts b/src/notifications/VectorPushRulesDefinitions.ts
index 4a5bcc4e597..85cefd51941 100644
--- a/src/notifications/VectorPushRulesDefinitions.ts
+++ b/src/notifications/VectorPushRulesDefinitions.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2016 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { PushRuleAction, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules";
+import { IAnnotatedPushRule, PushRuleAction } from "matrix-js-sdk/src/@types/PushRules";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _td } from '../languageHandler';
@@ -26,32 +26,29 @@ type StateToActionsMap = {
     [state in VectorState]?: PushRuleAction[];
 };
 
-interface IProps {
-    kind: PushRuleKind;
+interface IVectorPushRuleDefinition {
     description: string;
     vectorStateToActions: StateToActionsMap;
 }
 
 class VectorPushRuleDefinition {
-    private kind: PushRuleKind;
-    private description: string;
+    public readonly description: string;
     public readonly vectorStateToActions: StateToActionsMap;
 
-    constructor(opts: IProps) {
-        this.kind = opts.kind;
+    constructor(opts: IVectorPushRuleDefinition) {
         this.description = opts.description;
         this.vectorStateToActions = opts.vectorStateToActions;
     }
 
     // Translate the rule actions and its enabled value into vector state
-    public ruleToVectorState(rule): VectorPushRuleDefinition {
+    public ruleToVectorState(rule: IAnnotatedPushRule): VectorState {
         let enabled = false;
         if (rule) {
             enabled = rule.enabled;
         }
 
         for (const stateKey in PushRuleVectorState.states) { // eslint-disable-line guard-for-in
-            const state = PushRuleVectorState.states[stateKey];
+            const state: VectorState = PushRuleVectorState.states[stateKey];
             const vectorStateToActions = this.vectorStateToActions[state];
 
             if (!vectorStateToActions) {
@@ -78,6 +75,7 @@ class VectorPushRuleDefinition {
         return undefined;
     }
 }
+export type { VectorPushRuleDefinition };
 
 /**
  * The descriptions of rules managed by the Vector UI.
@@ -85,7 +83,6 @@ class VectorPushRuleDefinition {
 export const VectorPushRulesDefinitions = {
     // Messages containing user's display name
     ".m.rule.contains_display_name": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Override,
         description: _td("Messages containing my display name"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -96,7 +93,6 @@ export const VectorPushRulesDefinitions = {
 
     // Messages containing user's username (localpart/MXID)
     ".m.rule.contains_user_name": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Override,
         description: _td("Messages containing my username"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -107,7 +103,6 @@ export const VectorPushRulesDefinitions = {
 
     // Messages containing @room
     ".m.rule.roomnotif": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Override,
         description: _td("Messages containing @room"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -118,7 +113,6 @@ export const VectorPushRulesDefinitions = {
 
     // Messages just sent to the user in a 1:1 room
     ".m.rule.room_one_to_one": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("Messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -129,7 +123,6 @@ export const VectorPushRulesDefinitions = {
 
     // Encrypted messages just sent to the user in a 1:1 room
     ".m.rule.encrypted_room_one_to_one": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("Encrypted messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -142,7 +135,6 @@ export const VectorPushRulesDefinitions = {
     // 1:1 room messages are catched by the .m.rule.room_one_to_one rule if any defined
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.message": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("Messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -155,7 +147,6 @@ export const VectorPushRulesDefinitions = {
     // Encrypted 1:1 room messages are catched by the .m.rule.encrypted_room_one_to_one rule if any defined
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.encrypted": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("Encrypted messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -166,7 +157,6 @@ export const VectorPushRulesDefinitions = {
 
     // Invitation for the user
     ".m.rule.invite_for_me": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("When I'm invited to a room"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -177,7 +167,6 @@ export const VectorPushRulesDefinitions = {
 
     // Incoming call
     ".m.rule.call": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Underride,
         description: _td("Call invitation"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
@@ -188,7 +177,6 @@ export const VectorPushRulesDefinitions = {
 
     // Notifications from bots
     ".m.rule.suppress_notices": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Override,
         description: _td("Messages sent by bot"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             // .m.rule.suppress_notices is a "negative" rule, we have to invert its enabled value for vector UI
@@ -200,7 +188,6 @@ export const VectorPushRulesDefinitions = {
 
     // Room upgrades (tombstones)
     ".m.rule.tombstone": new VectorPushRuleDefinition({
-        kind: PushRuleKind.Override,
         description: _td("When rooms are upgraded"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             [VectorState.On]: StandardActions.ACTION_NOTIFY,
diff --git a/src/sentry.ts b/src/sentry.ts
index 4fdcd95635e..476da497a7b 100644
--- a/src/sentry.ts
+++ b/src/sentry.ts
@@ -20,6 +20,7 @@ import { MatrixClient } from "matrix-js-sdk/src/client";
 import SdkConfig from "./SdkConfig";
 import { MatrixClientPeg } from "./MatrixClientPeg";
 import SettingsStore from "./settings/SettingsStore";
+import { IConfigOptions } from "./IConfigOptions";
 
 /* eslint-disable camelcase */
 
@@ -173,7 +174,7 @@ async function getContexts(): Promise<Contexts> {
 }
 
 export async function sendSentryReport(userText: string, issueUrl: string, error: Error): Promise<void> {
-    const sentryConfig = SdkConfig.get()["sentry"];
+    const sentryConfig = SdkConfig.getObject("sentry");
     if (!sentryConfig) return;
 
     const captureContext = {
@@ -198,12 +199,7 @@ export function setSentryUser(mxid: string): void {
     Sentry.setUser({ username: mxid });
 }
 
-interface ISentryConfig {
-    dsn: string;
-    environment?: string;
-}
-
-export async function initSentry(sentryConfig: ISentryConfig): Promise<void> {
+export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promise<void> {
     if (!sentryConfig) return;
     // Only enable Integrations.GlobalHandlers, which hooks uncaught exceptions, if automaticErrorReporting is true
     const integrations = [
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 0b6574a3dc7..e4247908ddf 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -42,6 +42,7 @@ import IncompatibleController from "./controllers/IncompatibleController";
 import { ImageSize } from "./enums/ImageSize";
 import { MetaSpace } from "../stores/spaces";
 import SdkConfig from "../SdkConfig";
+import ThreadBetaController from './controllers/ThreadBetaController';
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = [
@@ -132,7 +133,7 @@ export interface IBaseSetting<T extends SettingValueType = SettingValueType> {
     };
 
     // Optional description which will be shown as microCopy under SettingsFlags
-    description?: string;
+    description?: string | (() => ReactNode);
 
     // The supported levels are required. Preferably, use the preset arrays
     // at the top of this file to define this rather than a custom array.
@@ -165,7 +166,7 @@ export interface IBaseSetting<T extends SettingValueType = SettingValueType> {
         title: string; // _td
         caption: () => ReactNode;
         disclaimer?: (enabled: boolean) => ReactNode;
-        image: string; // require(...)
+        image?: string; // require(...)
         feedbackSubheading?: string;
         feedbackLabel?: string;
         extraSettings?: string[];
@@ -186,6 +187,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     "feature_msc3531_hide_messages_pending_moderation": {
         isFeature: true,
         labsGroup: LabGroup.Moderation,
+        // Requires a reload since this setting is cached in EventUtils
+        controller: new ReloadOnChangeController(),
         displayName: _td("Let moderators hide messages pending moderation."),
         supportedLevels: LEVELS_FEATURE,
         default: false,
@@ -212,17 +215,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_communities_v2_prototypes": {
-        isFeature: true,
-        labsGroup: LabGroup.Spaces,
-        displayName: _td(
-            "Communities v2 prototypes. Requires compatible homeserver. " +
-            "Highly experimental - use with caution.",
-        ),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
-    },
     "feature_pinning": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,
@@ -233,12 +225,42 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     "feature_thread": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,
-        // Requires a reload as we change an option flag on the `js-sdk`
-        // And the entire sync history needs to be parsed again
-        controller: new ReloadOnChangeController(),
+        controller: new ThreadBetaController(),
         displayName: _td("Threaded messaging"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        betaInfo: {
+            title: _td("Threads"),
+            caption: () => <>
+                <p>{ _t("Keep discussions organised with threads.") }</p>
+                <p>{ _t("Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.", {}, {
+                    a: (sub) => <a href="https://element.io/help#threads" rel="noreferrer noopener" target="_blank">
+                        { sub }
+                    </a>,
+                }) }</p>
+            </>,
+            disclaimer: () =>
+                SdkConfig.get().bug_report_endpoint_url && <>
+                    <h4>{ _t("How can I start a thread?") }</h4>
+                    <p>
+                        { _t("Use “%(replyInThread)s” when hovering over a message.", {
+                            replyInThread: _t("Reply in thread"),
+                        }) }
+                    </p>
+                    <h4>{ _t("How can I leave the beta?") }</h4>
+                    <p>
+                        { _t("To leave, return to this page and use the “%(leaveTheBeta)s” button.", {
+                            leaveTheBeta: _t("Leave the beta"),
+                        }) }
+                    </p>
+                </>,
+            feedbackLabel: "thread-feedback",
+            feedbackSubheading: _td("Thank you for trying the beta, " +
+                "please go into as much detail as you can so we can improve it."),
+            image: require("../../res/img/betas/threads.png"),
+            requiresRefresh: true,
+        },
+
     },
     "feature_custom_status": {
         isFeature: true,
@@ -248,13 +270,14 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new CustomStatusController(),
     },
-    "feature_custom_tags": {
+    "feature_video_rooms": {
         isFeature: true,
-        labsGroup: LabGroup.Experimental,
-        displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),
+        labsGroup: LabGroup.Rooms,
+        displayName: _td("Video rooms (under active development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
+        // Reload to ensure that the left panel etc. get remounted
+        controller: new ReloadOnChangeController(),
     },
     "feature_state_counters": {
         isFeature: true,
@@ -399,11 +422,27 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Don't send read receipts"),
         default: false,
     },
+    "feature_message_right_click_context_menu": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        labsGroup: LabGroup.Rooms,
+        displayName: _td("Right-click message context menu"),
+        default: false,
+    },
     "feature_location_share_pin_drop": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,
         supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Location sharing - pin drop (under active development)"),
+        displayName: _td("Location sharing - pin drop"),
+        default: false,
+    },
+    "feature_location_share_live": {
+        isFeature: true,
+        labsGroup: LabGroup.Messaging,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td(
+            "Live Location Sharing (temporary implementation: locations persist in room history)",
+        ),
         default: false,
     },
     "baseFontSize": {
@@ -571,19 +610,21 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td('Automatically replace plain text Emoji'),
         default: false,
     },
+    "MessageComposerInput.useMarkdown": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Enable Markdown'),
+        description: () => _t(
+            "Start messages with <code>/plain</code> to send without markdown and <code>/md</code> to send with.",
+            {},
+            { code: (sub) => <code>{ sub }</code> },
+        ),
+        default: true,
+    },
     "VideoView.flipVideoHorizontally": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Mirror local video feed'),
         default: false,
     },
-    "TagPanel.enableTagPanel": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Enable Community Filter Panel'),
-        default: true,
-        invertedSettingName: 'TagPanel.disableTagPanel',
-        // We force the value to true because the invertedSettingName causes it to flip
-        controller: new UIFeatureController(UIFeature.Communities, true),
-    },
     "theme": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: "light",
@@ -747,11 +788,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td('Prompt before sending invites to potentially invalid matrix IDs'),
         default: true,
     },
-    "showDeveloperTools": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Show developer tools'),
-        default: false,
-    },
     "widgetOpenIDPermissions": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: {
@@ -875,16 +911,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: {},
     },
-    "Widgets.leftPanel": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: null,
-    },
     "Spaces.allRoomsInHome": {
         displayName: _td("Show all rooms in Home"),
         description: _td("All rooms you're in will appear in Home."),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: false,
-        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", null),
     },
     "Spaces.enabledMetaSpaces": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -895,15 +926,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     "Spaces.showPeopleInSpace": {
         supportedLevels: [SettingLevel.ROOM_ACCOUNT],
         default: true,
-        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", null),
-    },
-    "showCommunitiesInsteadOfSpaces": {
-        displayName: _td("Display Communities instead of Spaces"),
-        description: _td("Temporarily show communities instead of Spaces for this session. " +
-            "Support for this will be removed in the near future. This will reload Element."),
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        default: false,
-        controller: new ReloadOnChangeController(),
     },
     "developerMode": {
         displayName: _td("Developer mode"),
@@ -981,17 +1003,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
-    [UIFeature.Flair]: {
-        supportedLevels: LEVELS_UI_FEATURE,
-        default: true,
-        // Disable Flair when Communities are disabled
-        controller: new UIFeatureController(UIFeature.Communities),
-    },
-    [UIFeature.Communities]: {
-        supportedLevels: LEVELS_UI_FEATURE,
-        default: true,
-        controller: new IncompatibleController("showCommunitiesInsteadOfSpaces", false, false),
-    },
     [UIFeature.AdvancedSettings]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index ca9bfe3703e..19a419afb7f 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
+import { ReactNode } from "react";
 
 import DeviceSettingsHandler from "./handlers/DeviceSettingsHandler";
 import RoomDeviceSettingsHandler from "./handlers/RoomDeviceSettingsHandler";
@@ -257,9 +258,11 @@ export default class SettingsStore {
      * @param {string} settingName The setting to look up.
      * @return {String} The description for the setting, or null if not found.
      */
-    public static getDescription(settingName: string) {
-        if (!SETTINGS[settingName]?.description) return null;
-        return _t(SETTINGS[settingName].description);
+    public static getDescription(settingName: string): string | ReactNode {
+        const description = SETTINGS[settingName]?.description;
+        if (!description) return null;
+        if (typeof description !== 'string') return description();
+        return _t(description);
     }
 
     /**
@@ -451,12 +454,13 @@ export default class SettingsStore {
             throw new Error("User cannot set " + settingName + " at " + level + " in " + roomId);
         }
 
+        if (setting.controller && !(await setting.controller.beforeChange(level, roomId, value))) {
+            return; // controller says no
+        }
+
         await handler.setValue(settingName, roomId, value);
 
-        const controller = setting.controller;
-        if (controller) {
-            controller.onChange(level, roomId, value);
-        }
+        setting.controller?.onChange(level, roomId, value);
     }
 
     /**
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
index b7f107254af..9dbe8c15779 100644
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@@ -28,8 +28,6 @@ export enum UIFeature {
     ShareSocial = "UIFeature.shareSocial",
     IdentityServer = "UIFeature.identityServer",
     ThirdPartyID = "UIFeature.thirdPartyId",
-    Flair = "UIFeature.flair",
-    Communities = "UIFeature.communities",
     AdvancedSettings = "UIFeature.advancedSettings",
     RoomHistorySettings = "UIFeature.roomHistorySettings",
     TimelineEnableRelativeDates = "UIFeature.timelineEnableRelativeDates",
diff --git a/src/settings/controllers/SettingController.ts b/src/settings/controllers/SettingController.ts
index 292b2d63e59..a274bcff2c3 100644
--- a/src/settings/controllers/SettingController.ts
+++ b/src/settings/controllers/SettingController.ts
@@ -46,6 +46,17 @@ export default abstract class SettingController {
         return null; // no override
     }
 
+    /**
+     * Called before the setting value has been changed, can abort the change.
+     * @param {string} level The level at which the setting has been modified.
+     * @param {String} roomId The room ID, may be null.
+     * @param {*} newValue The new value for the setting, may be null.
+     * @return {boolean} Whether the settings change should be accepted.
+     */
+    public async beforeChange(level: SettingLevel, roomId: string, newValue: any): Promise<boolean> {
+        return true;
+    }
+
     /**
      * Called when the setting value has been changed.
      * @param {string} level The level at which the setting has been modified.
diff --git a/src/settings/controllers/ThreadBetaController.tsx b/src/settings/controllers/ThreadBetaController.tsx
new file mode 100644
index 00000000000..487d2013b17
--- /dev/null
+++ b/src/settings/controllers/ThreadBetaController.tsx
@@ -0,0 +1,53 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+import { Thread } from "matrix-js-sdk/src/models/thread";
+
+import SettingController from "./SettingController";
+import PlatformPeg from "../../PlatformPeg";
+import { SettingLevel } from "../SettingLevel";
+import Modal from "../../Modal";
+import QuestionDialog from "../../components/views/dialogs/QuestionDialog";
+import { _t } from "../../languageHandler";
+
+export default class ThreadBetaController extends SettingController {
+    public async beforeChange(level: SettingLevel, roomId: string, newValue: any): Promise<boolean> {
+        if (Thread.hasServerSideSupport || !newValue) return true; // Full support or user is disabling
+
+        const { finished } = Modal.createTrackedDialog<[boolean]>("Thread beta", "degraded mode", QuestionDialog, {
+            title: _t("Partial Support for Threads"),
+            description: <>
+                <p>{ _t("Your homeserver does not currently support threads, so this feature may be unreliable. " +
+                    "Some threaded messages may not be reliably available. <a>Learn more</a>.", {}, {
+                    a: sub => (
+                        <a href="https://element.io/help#threads" target="_blank" rel="noreferrer noopener">{ sub }</a>
+                    ),
+                }) }</p>
+                <p>{ _t("Do you want to enable threads anyway?") }</p>
+            </>,
+            button: _t("Yes, enable"),
+        });
+        const [enable] = await finished;
+        return enable;
+    }
+
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        // Requires a reload as we change an option flag on the `js-sdk`
+        // And the entire sync history needs to be parsed again
+        PlatformPeg.get().reload();
+    }
+}
diff --git a/src/settings/enums/ImageSize.ts b/src/settings/enums/ImageSize.ts
index 84dbb2fd3a7..93cc2362737 100644
--- a/src/settings/enums/ImageSize.ts
+++ b/src/settings/enums/ImageSize.ts
@@ -15,24 +15,46 @@ limitations under the License.
 */
 
 // For Large the image gets drawn as big as possible.
-// constraint by: timeline width, manual heigh overrides, SIZE_LARGE.h
+// constraint by: timeline width, manual height overrides, SIZE_LARGE.h
 const SIZE_LARGE = { w: 800, h: 600 };
-
 // For Normal the image gets drawn to never exceed SIZE_NORMAL.w, SIZE_NORMAL.h
-// constraint by: timeline width, manual heigh overrides
+// constraint by: timeline width, manual height overrides
 const SIZE_NORMAL_LANDSCAPE = { w: 324, h: 324 }; // for w > h
 const SIZE_NORMAL_PORTRAIT = { w: 324 * (9/16), h: 324 }; // for h > w
+
+type Dimensions = { w: number, h: number };
+
 export enum ImageSize {
     Normal = "normal",
     Large = "large",
 }
 
-export function suggestedSize(size: ImageSize, portrait = false): { w: number, h: number} {
-    switch (size) {
-        case ImageSize.Large:
-            return SIZE_LARGE;
-        case ImageSize.Normal:
-        default:
-            return portrait ? SIZE_NORMAL_PORTRAIT : SIZE_NORMAL_LANDSCAPE;
+/**
+ * @param {ImageSize} size The user's image size preference
+ * @param {Dimensions} contentSize The natural dimensions of the content
+ * @param {number} maxHeight Overrides the default height limit
+ * @returns {Dimensions} The suggested maximum dimensions for the image
+ */
+export function suggestedSize(size: ImageSize, contentSize: Dimensions, maxHeight?: number): Dimensions {
+    const aspectRatio = contentSize.w / contentSize.h;
+    const portrait = aspectRatio < 1;
+
+    const maxSize = (size === ImageSize.Large) ? SIZE_LARGE :
+        portrait ? SIZE_NORMAL_PORTRAIT : SIZE_NORMAL_LANDSCAPE;
+    if (!contentSize.w || !contentSize.h) {
+        return maxSize;
+    }
+
+    const constrainedSize = {
+        w: Math.min(maxSize.w, contentSize.w),
+        h: maxHeight ? Math.min(maxSize.h, contentSize.h, maxHeight) : Math.min(maxSize.h, contentSize.h),
+    };
+
+    if (constrainedSize.h * aspectRatio < constrainedSize.w) {
+        // Height dictates width
+        return { w: Math.floor(constrainedSize.h * aspectRatio), h: constrainedSize.h };
+    } else {
+        // Width dictates height
+        return { w: constrainedSize.w, h: Math.floor(constrainedSize.w / aspectRatio) };
     }
 }
diff --git a/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts b/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
new file mode 100644
index 00000000000..5d64009b6fe
--- /dev/null
+++ b/src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
@@ -0,0 +1,87 @@
+/*
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingsHandler from "./SettingsHandler";
+
+/**
+ * Abstract settings handler wrapping around localStorage making getValue calls cheaper
+ * by caching the values and listening for localStorage updates from other tabs.
+ */
+export default abstract class AbstractLocalStorageSettingsHandler extends SettingsHandler {
+    private itemCache = new Map<string, any>();
+    private objectCache = new Map<string, object>();
+
+    protected constructor() {
+        super();
+
+        // Listen for storage changes from other tabs to bust the cache
+        window.addEventListener("storage", (e: StorageEvent) => {
+            if (e.key === null) {
+                this.itemCache.clear();
+                this.objectCache.clear();
+            } else {
+                this.itemCache.delete(e.key);
+                this.objectCache.delete(e.key);
+            }
+        });
+    }
+
+    protected getItem(key: string): any {
+        if (!this.itemCache.has(key)) {
+            const value = localStorage.getItem(key);
+            this.itemCache.set(key, value);
+            return value;
+        }
+
+        return this.itemCache.get(key);
+    }
+
+    protected getObject<T extends object>(key: string): T | null {
+        if (!this.objectCache.has(key)) {
+            try {
+                const value = JSON.parse(localStorage.getItem(key));
+                this.objectCache.set(key, value);
+                return value;
+            } catch (err) {
+                console.error("Failed to parse localStorage object", err);
+                return null;
+            }
+        }
+
+        return this.objectCache.get(key) as T;
+    }
+
+    protected setItem(key: string, value: any): void {
+        this.itemCache.set(key, value);
+        localStorage.setItem(key, value);
+    }
+
+    protected setObject(key: string, value: object): void {
+        this.objectCache.set(key, value);
+        localStorage.setItem(key, JSON.stringify(value));
+    }
+
+    // handles both items and objects
+    protected removeItem(key: string): void {
+        localStorage.removeItem(key);
+        this.itemCache.delete(key);
+        this.objectCache.delete(key);
+    }
+
+    public isSupported(): boolean {
+        return localStorage !== undefined && localStorage !== null;
+    }
+}
diff --git a/src/settings/handlers/ConfigSettingsHandler.ts b/src/settings/handlers/ConfigSettingsHandler.ts
index 0120b94b13a..24d635528ef 100644
--- a/src/settings/handlers/ConfigSettingsHandler.ts
+++ b/src/settings/handlers/ConfigSettingsHandler.ts
@@ -19,6 +19,8 @@ import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 
 import SettingsHandler from "./SettingsHandler";
 import SdkConfig from "../../SdkConfig";
+import { SnakedObject } from "../../utils/SnakedObject";
+import { IConfigOptions } from "../../IConfigOptions";
 
 /**
  * Gets and sets settings at the "config" level. This handler does not make use of the
@@ -30,10 +32,10 @@ export default class ConfigSettingsHandler extends SettingsHandler {
     }
 
     public getValue(settingName: string, roomId: string): any {
-        const config = SdkConfig.get() || {};
+        const config = new SnakedObject<IConfigOptions>(SdkConfig.get());
 
         if (this.featureNames.includes(settingName)) {
-            const labsConfig = config["features"] || {};
+            const labsConfig = config.get("features") || {};
             const val = labsConfig[settingName];
             if (isNullOrUndefined(val)) return null; // no definition at this level
             if (val === true || val === false) return val; // new style: mapped as a boolean
@@ -45,10 +47,10 @@ export default class ConfigSettingsHandler extends SettingsHandler {
 
         // Special case themes
         if (settingName === "theme") {
-            return config["default_theme"];
+            return config.get("default_theme");
         }
 
-        const settingsConfig = config["settingDefaults"];
+        const settingsConfig = config.get("setting_defaults");
         if (!settingsConfig || isNullOrUndefined(settingsConfig[settingName])) return null;
         return settingsConfig[settingName];
     }
diff --git a/src/settings/handlers/DeviceSettingsHandler.ts b/src/settings/handlers/DeviceSettingsHandler.ts
index 7d2fbaf236a..25c75c67a19 100644
--- a/src/settings/handlers/DeviceSettingsHandler.ts
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Travis Ralston
 Copyright 2019 New Vector Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsHandler from "./SettingsHandler";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import { SettingLevel } from "../SettingLevel";
 import { CallbackFn, WatchManager } from "../WatchManager";
+import AbstractLocalStorageSettingsHandler from "./AbstractLocalStorageSettingsHandler";
 
 /**
  * Gets and sets settings at the "device" level for the current device.
  * This handler does not make use of the roomId parameter. This handler
  * will special-case features to support legacy settings.
  */
-export default class DeviceSettingsHandler extends SettingsHandler {
+export default class DeviceSettingsHandler extends AbstractLocalStorageSettingsHandler {
     /**
      * Creates a new device settings handler
      * @param {string[]} featureNames The names of known features.
@@ -43,15 +43,15 @@ export default class DeviceSettingsHandler extends SettingsHandler {
 
         // Special case notifications
         if (settingName === "notificationsEnabled") {
-            const value = localStorage.getItem("notifications_enabled");
+            const value = this.getItem("notifications_enabled");
             if (typeof(value) === "string") return value === "true";
             return null; // wrong type or otherwise not set
         } else if (settingName === "notificationBodyEnabled") {
-            const value = localStorage.getItem("notifications_body_enabled");
+            const value = this.getItem("notifications_body_enabled");
             if (typeof(value) === "string") return value === "true";
             return null; // wrong type or otherwise not set
         } else if (settingName === "audioNotificationsEnabled") {
-            const value = localStorage.getItem("audio_notifications_enabled");
+            const value = this.getItem("audio_notifications_enabled");
             if (typeof(value) === "string") return value === "true";
             return null; // wrong type or otherwise not set
         }
@@ -68,15 +68,15 @@ export default class DeviceSettingsHandler extends SettingsHandler {
 
         // Special case notifications
         if (settingName === "notificationsEnabled") {
-            localStorage.setItem("notifications_enabled", newValue);
+            this.setItem("notifications_enabled", newValue);
             this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         } else if (settingName === "notificationBodyEnabled") {
-            localStorage.setItem("notifications_body_enabled", newValue);
+            this.setItem("notifications_body_enabled", newValue);
             this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         } else if (settingName === "audioNotificationsEnabled") {
-            localStorage.setItem("audio_notifications_enabled", newValue);
+            this.setItem("audio_notifications_enabled", newValue);
             this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         }
@@ -87,7 +87,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
 
             delete settings["useIRCLayout"];
             settings["layout"] = newValue;
-            localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+            this.setObject("mx_local_settings", settings);
 
             this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
@@ -95,7 +95,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
 
         const settings = this.getSettings() || {};
         settings[settingName] = newValue;
-        localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+        this.setObject("mx_local_settings", settings);
         this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
 
         return Promise.resolve();
@@ -105,10 +105,6 @@ export default class DeviceSettingsHandler extends SettingsHandler {
         return true; // It's their device, so they should be able to
     }
 
-    public isSupported(): boolean {
-        return localStorage !== undefined && localStorage !== null;
-    }
-
     public watchSetting(settingName: string, roomId: string, cb: CallbackFn) {
         this.watchers.watchSetting(settingName, roomId, cb);
     }
@@ -118,9 +114,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     }
 
     private getSettings(): any { // TODO: [TS] Type return
-        const value = localStorage.getItem("mx_local_settings");
-        if (!value) return null;
-        return JSON.parse(value);
+        return this.getObject("mx_local_settings");
     }
 
     // Note: features intentionally don't use the same key as settings to avoid conflicts
@@ -132,7 +126,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return false;
         }
 
-        const value = localStorage.getItem("mx_labs_feature_" + featureName);
+        const value = this.getItem("mx_labs_feature_" + featureName);
         if (value === "true") return true;
         if (value === "false") return false;
         // Try to read the next config level for the feature.
@@ -140,7 +134,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     }
 
     private writeFeature(featureName: string, enabled: boolean | null) {
-        localStorage.setItem("mx_labs_feature_" + featureName, `${enabled}`);
+        this.setItem("mx_labs_feature_" + featureName, `${enabled}`);
         this.watchers.notifyUpdate(featureName, null, SettingLevel.DEVICE, enabled);
     }
 }
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts
index 3e2cea18aed..47135aa92ce 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.ts
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -100,15 +100,15 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
         if (field === null) {
             content = value;
         } else {
-            const content = this.getSettings(roomId, eventType) || {};
+            content = this.getSettings(roomId, eventType) || {};
             content[field] = value;
         }
 
         await this.client.setRoomAccountData(roomId, eventType, content);
 
         const deferred = defer<void>();
-        const handler = (event: MatrixEvent) => {
-            if (event.getRoomId() !== roomId || event.getType() !== eventType) return;
+        const handler = (event: MatrixEvent, room: Room) => {
+            if (room.roomId !== roomId || event.getType() !== eventType) return;
             if (field !== null && event.getContent()[field] !== value) return;
             this.client.off(RoomEvent.AccountData, handler);
             deferred.resolve();
diff --git a/src/settings/handlers/RoomDeviceSettingsHandler.ts b/src/settings/handlers/RoomDeviceSettingsHandler.ts
index 47fcecdfacd..c1d1b57e9b6 100644
--- a/src/settings/handlers/RoomDeviceSettingsHandler.ts
+++ b/src/settings/handlers/RoomDeviceSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsHandler from "./SettingsHandler";
 import { SettingLevel } from "../SettingLevel";
 import { WatchManager } from "../WatchManager";
+import AbstractLocalStorageSettingsHandler from "./AbstractLocalStorageSettingsHandler";
 
 /**
  * Gets and sets settings at the "room-device" level for the current device in a particular
  * room.
  */
-export default class RoomDeviceSettingsHandler extends SettingsHandler {
+export default class RoomDeviceSettingsHandler extends AbstractLocalStorageSettingsHandler {
     constructor(public readonly watchers: WatchManager) {
         super();
     }
@@ -32,7 +32,7 @@ export default class RoomDeviceSettingsHandler extends SettingsHandler {
         // Special case blacklist setting to use legacy values
         if (settingName === "blacklistUnverifiedDevices") {
             const value = this.read("mx_local_settings");
-            if (value && value['blacklistUnverifiedDevicesPerRoom']) {
+            if (value?.['blacklistUnverifiedDevicesPerRoom']) {
                 return value['blacklistUnverifiedDevicesPerRoom'][roomId];
             }
         }
@@ -49,16 +49,15 @@ export default class RoomDeviceSettingsHandler extends SettingsHandler {
             if (!value) value = {};
             if (!value["blacklistUnverifiedDevicesPerRoom"]) value["blacklistUnverifiedDevicesPerRoom"] = {};
             value["blacklistUnverifiedDevicesPerRoom"][roomId] = newValue;
-            localStorage.setItem("mx_local_settings", JSON.stringify(value));
+            this.setObject("mx_local_settings", value);
             this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
             return Promise.resolve();
         }
 
         if (newValue === null) {
-            localStorage.removeItem(this.getKey(settingName, roomId));
+            this.removeItem(this.getKey(settingName, roomId));
         } else {
-            newValue = JSON.stringify({ value: newValue });
-            localStorage.setItem(this.getKey(settingName, roomId), newValue);
+            this.setObject(this.getKey(settingName, roomId), { value: newValue });
         }
 
         this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
@@ -69,14 +68,8 @@ export default class RoomDeviceSettingsHandler extends SettingsHandler {
         return true; // It's their device, so they should be able to
     }
 
-    public isSupported(): boolean {
-        return localStorage !== undefined && localStorage !== null;
-    }
-
     private read(key: string): any {
-        const rawValue = localStorage.getItem(key);
-        if (!rawValue) return null;
-        return JSON.parse(rawValue);
+        return this.getItem(key);
     }
 
     private getKey(settingName: string, roomId: string): string {
diff --git a/src/shouldHideEvent.ts b/src/shouldHideEvent.ts
index 5ca9d00e69b..8fef94ac9d3 100644
--- a/src/shouldHideEvent.ts
+++ b/src/shouldHideEvent.ts
@@ -15,6 +15,7 @@
  */
 
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 
 import SettingsStore from "./settings/SettingsStore";
 import { IRoomState } from "./components/structures/RoomView";
@@ -29,7 +30,7 @@ interface IDiff {
 
 function memberEventDiff(ev: MatrixEvent): IDiff {
     const diff: IDiff = {
-        isMemberEvent: ev.getType() === 'm.room.member',
+        isMemberEvent: ev.getType() === EventType.RoomMember,
     };
 
     // If is not a Member Event then the other checks do not apply, so bail early.
@@ -67,7 +68,7 @@ export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): bool
     if (ev.isRedacted() && !isEnabled('showRedactions') && !ev.getThread()) return true;
 
     // Hide replacement events since they update the original tile (if enabled)
-    if (ev.isRelation("m.replace")) return true;
+    if (ev.isRelation(RelationType.Replace)) return true;
 
     const eventDiff = memberEventDiff(ev);
 
diff --git a/src/stores/ActiveWidgetStore.ts b/src/stores/ActiveWidgetStore.ts
index 492332d3db2..410bedcf7ee 100644
--- a/src/stores/ActiveWidgetStore.ts
+++ b/src/stores/ActiveWidgetStore.ts
@@ -16,25 +16,32 @@ limitations under the License.
 
 import EventEmitter from 'events';
 import { MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
 
 import { MatrixClientPeg } from '../MatrixClientPeg';
+import WidgetUtils from "../utils/WidgetUtils";
 import { WidgetMessagingStore } from "./widgets/WidgetMessagingStore";
 
 export enum ActiveWidgetStoreEvent {
-    Update = "update",
+    // Indicates a change in the currently persistent widget
+    Persistence = "persistence",
+    // Indicate changes in the currently docked widgets
+    Dock = "dock",
+    Undock = "undock",
 }
 
 /**
  * Stores information about the widgets active in the app right now:
  *  * What widget is set to remain always-on-screen, if any
  *    Only one widget may be 'always on screen' at any one time.
- *  * Negotiated capabilities for active apps
+ *  * Reference counts to keep track of whether a widget is kept docked or alive
+ *    by any components
  */
 export default class ActiveWidgetStore extends EventEmitter {
     private static internalInstance: ActiveWidgetStore;
     private persistentWidgetId: string;
-    // What room ID each widget is associated with (if it's a room widget)
-    private roomIdByWidgetId = new Map<string, string>();
+    private persistentRoomId: string;
+    private dockedWidgetsByUid = new Map<string, number>();
 
     public static get instance(): ActiveWidgetStore {
         if (!ActiveWidgetStore.internalInstance) {
@@ -48,64 +55,77 @@ export default class ActiveWidgetStore extends EventEmitter {
     }
 
     public stop(): void {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
-        }
-        this.roomIdByWidgetId.clear();
+        MatrixClientPeg.get()?.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
     }
 
-    private onRoomStateEvents = (ev: MatrixEvent): void => {
+    private onRoomStateEvents = (ev: MatrixEvent, { roomId }: RoomState): void => {
         // XXX: This listens for state events in order to remove the active widget.
         // Everything else relies on views listening for events and calling setters
         // on this class which is terrible. This store should just listen for events
         // and keep itself up to date.
         // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-        if (ev.getType() !== 'im.vector.modular.widgets') return;
-
-        if (ev.getStateKey() === this.persistentWidgetId) {
-            this.destroyPersistentWidget(this.persistentWidgetId);
+        if (ev.getType() === "im.vector.modular.widgets") {
+            this.destroyPersistentWidget(ev.getStateKey(), roomId);
         }
     };
 
-    public destroyPersistentWidget(id: string): void {
-        if (id !== this.persistentWidgetId) return;
-        const toDeleteId = this.persistentWidgetId;
-
-        WidgetMessagingStore.instance.stopMessagingById(id);
-
-        this.setWidgetPersistence(toDeleteId, false);
-        this.delRoomId(toDeleteId);
+    public destroyPersistentWidget(widgetId: string, roomId: string): void {
+        if (!this.getWidgetPersistence(widgetId, roomId)) return;
+        WidgetMessagingStore.instance.stopMessagingByUid(WidgetUtils.calcWidgetUid(widgetId, roomId));
+        this.setWidgetPersistence(widgetId, roomId, false);
     }
 
-    public setWidgetPersistence(widgetId: string, val: boolean): void {
-        if (this.persistentWidgetId === widgetId && !val) {
+    public setWidgetPersistence(widgetId: string, roomId: string, val: boolean): void {
+        const isPersisted = this.getWidgetPersistence(widgetId, roomId);
+
+        if (isPersisted && !val) {
             this.persistentWidgetId = null;
-        } else if (this.persistentWidgetId !== widgetId && val) {
+            this.persistentRoomId = null;
+        } else if (!isPersisted && val) {
             this.persistentWidgetId = widgetId;
+            this.persistentRoomId = roomId;
         }
-        this.emit(ActiveWidgetStoreEvent.Update);
+        this.emit(ActiveWidgetStoreEvent.Persistence);
     }
 
-    public getWidgetPersistence(widgetId: string): boolean {
-        return this.persistentWidgetId === widgetId;
+    public getWidgetPersistence(widgetId: string, roomId: string): boolean {
+        return this.persistentWidgetId === widgetId && this.persistentRoomId === roomId;
     }
 
     public getPersistentWidgetId(): string {
         return this.persistentWidgetId;
     }
 
-    public getRoomId(widgetId: string): string {
-        return this.roomIdByWidgetId.get(widgetId);
+    public getPersistentRoomId(): string {
+        return this.persistentRoomId;
+    }
+
+    // Registers the given widget as being docked somewhere in the UI (not a PiP),
+    // to allow its lifecycle to be tracked.
+    public dockWidget(widgetId: string, roomId: string): void {
+        const uid = WidgetUtils.calcWidgetUid(widgetId, roomId);
+        const refs = this.dockedWidgetsByUid.get(uid) ?? 0;
+        this.dockedWidgetsByUid.set(uid, refs + 1);
+        if (refs === 0) this.emit(ActiveWidgetStoreEvent.Dock);
+    }
+
+    public undockWidget(widgetId: string, roomId: string): void {
+        const uid = WidgetUtils.calcWidgetUid(widgetId, roomId);
+        const refs = this.dockedWidgetsByUid.get(uid);
+        if (refs) this.dockedWidgetsByUid.set(uid, refs - 1);
+        if (refs === 1) this.emit(ActiveWidgetStoreEvent.Undock);
     }
 
-    public setRoomId(widgetId: string, roomId: string): void {
-        this.roomIdByWidgetId.set(widgetId, roomId);
-        this.emit(ActiveWidgetStoreEvent.Update);
+    // Determines whether the given widget is docked anywhere in the UI (not a PiP)
+    public isDocked(widgetId: string, roomId: string): boolean {
+        const uid = WidgetUtils.calcWidgetUid(widgetId, roomId);
+        const refs = this.dockedWidgetsByUid.get(uid) ?? 0;
+        return refs > 0;
     }
 
-    public delRoomId(widgetId: string): void {
-        this.roomIdByWidgetId.delete(widgetId);
-        this.emit(ActiveWidgetStoreEvent.Update);
+    // Determines whether the given widget is being kept alive in the UI, including PiPs
+    public isLive(widgetId: string, roomId: string): boolean {
+        return this.isDocked(widgetId, roomId) || this.getWidgetPersistence(widgetId, roomId);
     }
 }
 
diff --git a/src/stores/CommunityPrototypeStore.ts b/src/stores/CommunityPrototypeStore.ts
deleted file mode 100644
index 4d4dc661fd2..00000000000
--- a/src/stores/CommunityPrototypeStore.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { Room } from "matrix-js-sdk/src/models/room";
-import * as utils from "matrix-js-sdk/src/utils";
-import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import { logger } from "matrix-js-sdk/src/logger";
-import { Method } from "matrix-js-sdk/src/http-api";
-
-import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
-import defaultDispatcher from "../dispatcher/dispatcher";
-import { ActionPayload } from "../dispatcher/payloads";
-import { Action } from "../dispatcher/actions";
-import { EffectiveMembership, getEffectiveMembership } from "../utils/membership";
-import SettingsStore from "../settings/SettingsStore";
-import { UPDATE_EVENT } from "./AsyncStore";
-import FlairStore from "./FlairStore";
-import GroupFilterOrderStore from "./GroupFilterOrderStore";
-import GroupStore from "./GroupStore";
-import dis from "../dispatcher/dispatcher";
-import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
-
-interface IState {
-    // nothing of value - we use account data
-}
-
-export interface IRoomProfile {
-    displayName: string;
-    avatarMxc: string;
-}
-
-export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
-    private static internalInstance = new CommunityPrototypeStore();
-
-    private constructor() {
-        super(defaultDispatcher, {});
-    }
-
-    public static get instance(): CommunityPrototypeStore {
-        return CommunityPrototypeStore.internalInstance;
-    }
-
-    public static getUpdateEventName(roomId: string): string {
-        return `${UPDATE_EVENT}:${roomId}`;
-    }
-
-    public getSelectedCommunityId(): string {
-        if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
-            return GroupFilterOrderStore.getSelectedTags()[0];
-        }
-        return null; // no selection as far as this function is concerned
-    }
-
-    public getSelectedCommunityName(): string {
-        return CommunityPrototypeStore.instance.getCommunityName(this.getSelectedCommunityId());
-    }
-
-    public getSelectedCommunityGeneralChat(): Room {
-        const communityId = this.getSelectedCommunityId();
-        if (communityId) {
-            return this.getGeneralChat(communityId);
-        }
-    }
-
-    public getCommunityName(communityId: string): string {
-        const profile = FlairStore.getGroupProfileCachedFast(this.matrixClient, communityId);
-        return profile?.name || communityId;
-    }
-
-    public getCommunityProfile(communityId: string): { name?: string, avatarUrl?: string } {
-        return FlairStore.getGroupProfileCachedFast(this.matrixClient, communityId);
-    }
-
-    public getGeneralChat(communityId: string): Room {
-        const rooms = GroupStore.getGroupRooms(communityId)
-            .map(r => this.matrixClient.getRoom(r.roomId))
-            .filter(r => !!r);
-        let chat = rooms.find(r => {
-            const idState = r.currentState.getStateEvents("im.vector.general_chat", "");
-            if (!idState || idState.getContent()['groupId'] !== communityId) return false;
-            return true;
-        });
-        if (!chat) chat = rooms[0];
-        return chat; // can be null
-    }
-
-    public isAdminOf(communityId: string): boolean {
-        const members = GroupStore.getGroupMembers(communityId);
-        const myMember = members.find(m => m.userId === this.matrixClient.getUserId());
-        return myMember?.isPrivileged;
-    }
-
-    public canInviteTo(communityId: string): boolean {
-        const generalChat = this.getGeneralChat(communityId);
-        if (!generalChat) return this.isAdminOf(communityId);
-
-        const myMember = generalChat.getMember(this.matrixClient.getUserId());
-        if (!myMember) return this.isAdminOf(communityId);
-
-        const pl = generalChat.currentState.getStateEvents("m.room.power_levels", "");
-        if (!pl) return this.isAdminOf(communityId);
-        const plContent = pl.getContent();
-
-        const invitePl = isNullOrUndefined(plContent.invite) ? 50 : Number(plContent.invite);
-        return invitePl <= myMember.powerLevel;
-    }
-
-    protected async onAction(payload: ActionPayload): Promise<any> {
-        if (!this.matrixClient || !SettingsStore.getValue("feature_communities_v2_prototypes")) {
-            return;
-        }
-
-        if (payload.action === "MatrixActions.Room.myMembership") {
-            const room: Room = payload.room;
-            const membership = getEffectiveMembership(payload.membership);
-            const oldMembership = getEffectiveMembership(payload.oldMembership);
-            if (membership === oldMembership) return;
-
-            if (membership === EffectiveMembership.Invite) {
-                try {
-                    const path = utils.encodeUri("/rooms/$roomId/group_info", { $roomId: room.roomId });
-                    const profile = await this.matrixClient.http.authedRequest(
-                        undefined, Method.Get, path,
-                        undefined, undefined,
-                        { prefix: "/_matrix/client/unstable/im.vector.custom" });
-                    // we use global account data because per-room account data on invites is unreliable
-                    await this.matrixClient.setAccountData("im.vector.group_info." + room.roomId, profile);
-                } catch (e) {
-                    logger.warn("Non-fatal error getting group information for invite:", e);
-                }
-            }
-        } else if (payload.action === "MatrixActions.accountData") {
-            if (payload.event_type.startsWith("im.vector.group_info.")) {
-                const roomId = payload.event_type.substring("im.vector.group_info.".length);
-                this.emit(CommunityPrototypeStore.getUpdateEventName(roomId), roomId);
-            }
-        } else if (payload.action === "select_tag") {
-            // Automatically select the general chat when switching communities
-            const chat = this.getGeneralChat(payload.tag);
-            if (chat) {
-                dis.dispatch<ViewRoomPayload>({
-                    action: Action.ViewRoom,
-                    room_id: chat.roomId,
-                    metricsTrigger: undefined, // Deprecated groups
-                });
-            }
-        }
-    }
-
-    public getInviteProfile(roomId: string): IRoomProfile {
-        if (!this.matrixClient) return { displayName: null, avatarMxc: null };
-        const room = this.matrixClient.getRoom(roomId);
-        if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
-            const data = this.matrixClient.getAccountData("im.vector.group_info." + roomId);
-            if (data && data.getContent()) {
-                return {
-                    displayName: data.getContent().name,
-                    avatarMxc: data.getContent().avatar_url,
-                };
-            }
-        }
-        return {
-            displayName: room.name,
-            avatarMxc: room.getMxcAvatarUrl(),
-        };
-    }
-
-    protected async onReady(): Promise<any> {
-        for (const room of this.matrixClient.getRooms()) {
-            const myMember = room.currentState.getMembers().find(m => m.userId === this.matrixClient.getUserId());
-            if (!myMember) continue;
-            if (getEffectiveMembership(myMember.membership) === EffectiveMembership.Invite) {
-                // Fake an update for anything that might have started listening before the invite
-                // data was available (eg: RoomPreviewBar after a refresh)
-                this.emit(CommunityPrototypeStore.getUpdateEventName(room.roomId), room.roomId);
-            }
-        }
-    }
-}
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
deleted file mode 100644
index da8a89f6c63..00000000000
--- a/src/stores/CustomRoomTagStore.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EventEmitter from 'events';
-import { throttle } from "lodash";
-
-import dis from '../dispatcher/dispatcher';
-import SettingsStore from "../settings/SettingsStore";
-import RoomListStore, { LISTS_UPDATE_EVENT } from "./room-list/RoomListStore";
-import { RoomNotificationStateStore } from "./notifications/RoomNotificationStateStore";
-import { isCustomTag } from "./room-list/models";
-import { objectHasDiff } from "../utils/objects";
-
-function commonPrefix(a, b) {
-    const len = Math.min(a.length, b.length);
-    let prefix;
-    for (let i = 0; i < len; ++i) {
-        if (a.charAt(i) !== b.charAt(i)) {
-            prefix = a.substr(0, i);
-            break;
-        }
-    }
-    if (prefix === undefined) {
-        prefix = a.substr(0, len);
-    }
-    const spaceIdx = prefix.indexOf(' ');
-    if (spaceIdx !== -1) {
-        prefix = prefix.substr(0, spaceIdx + 1);
-    }
-    if (prefix.length >= 2) {
-        return prefix;
-    }
-    return "";
-}
-/**
- * A class for storing application state for ordering tags in the GroupFilterPanel.
- */
-class CustomRoomTagStore extends EventEmitter {
-    constructor() {
-        super();
-        // Initialise state
-        this._state = { tags: {} };
-
-        // as RoomListStore gets updated by every timeline event
-        // throttle this to only run every 500ms
-        this._getUpdatedTags = throttle(
-            this._getUpdatedTags, 500, {
-                leading: true,
-                trailing: true,
-            },
-        );
-        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this._onListsUpdated);
-        dis.register(payload => this._onDispatch(payload));
-    }
-
-    getTags() {
-        return this._state.tags;
-    }
-
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
-        this.emit("change");
-    }
-
-    addListener(callback) {
-        this.on("change", callback);
-        return {
-            remove: () => {
-                this.removeListener("change", callback);
-            },
-        };
-    }
-
-    getSortedTags() {
-        const tagNames = Object.keys(this._state.tags).sort();
-        const prefixes = tagNames.map((name, i) => {
-            const isFirst = i === 0;
-            const isLast = i === tagNames.length - 1;
-            const backwardsPrefix = !isFirst ? commonPrefix(name, tagNames[i - 1]) : "";
-            const forwardsPrefix = !isLast ? commonPrefix(name, tagNames[i + 1]) : "";
-            const longestPrefix = backwardsPrefix.length > forwardsPrefix.length ?
-                backwardsPrefix : forwardsPrefix;
-            return longestPrefix;
-        });
-        return tagNames.map((name, i) => {
-            const notifs = RoomNotificationStateStore.instance.getListState(name);
-            let badgeNotifState;
-            if (notifs.hasUnreadCount) {
-                badgeNotifState = notifs;
-            }
-            const avatarLetter = name.substr(prefixes[i].length, 1);
-            const selected = this._state.tags[name];
-            return { name, avatarLetter, badgeNotifState, selected };
-        });
-    }
-
-    _onListsUpdated = () => {
-        const newTags = this._getUpdatedTags();
-        if (!this._state.tags || objectHasDiff(this._state.tags, newTags)) {
-            this._setState({ tags: newTags });
-        }
-    };
-
-    _onDispatch(payload) {
-        switch (payload.action) {
-            case 'select_custom_room_tag': {
-                const oldTags = this._state.tags;
-                if (oldTags.hasOwnProperty(payload.tag)) {
-                    const tag = {};
-                    tag[payload.tag] = !oldTags[payload.tag];
-                    const tags = Object.assign({}, oldTags, tag);
-                    this._setState({ tags });
-                }
-                break;
-            }
-            case 'on_client_not_viable':
-            case 'on_logged_out': {
-                // we assume to always have a tags object in the state
-                this._state = { tags: {} };
-                RoomListStore.instance.off(LISTS_UPDATE_EVENT, this._onListsUpdated);
-                break;
-            }
-        }
-    }
-
-    _getUpdatedTags() {
-        if (!SettingsStore.getValue("feature_custom_tags")) {
-            return {}; // none
-        }
-
-        const newTagNames = Object.keys(RoomListStore.instance.orderedLists).filter(t => isCustomTag(t)).sort();
-        const prevTags = this._state && this._state.tags;
-        return newTagNames.reduce((c, tagName) => {
-            c[tagName] = (prevTags && prevTags[tagName]) || false;
-            return c;
-        }, {});
-    }
-}
-
-if (global.singletonCustomRoomTagStore === undefined) {
-    global.singletonCustomRoomTagStore = new CustomRoomTagStore();
-}
-export default global.singletonCustomRoomTagStore;
diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
deleted file mode 100644
index edea6498145..00000000000
--- a/src/stores/FlairStore.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EventEmitter from 'events';
-import { logger } from "matrix-js-sdk/src/logger";
-
-const BULK_REQUEST_DEBOUNCE_MS = 200;
-
-// Does the server support groups? Assume yes until we receive M_UNRECOGNIZED.
-// If true, flair can function and we should keep sending requests for groups and avatars.
-let groupSupport = true;
-
-const USER_GROUPS_CACHE_BUST_MS = 1800000; // 30 mins
-const GROUP_PROFILES_CACHE_BUST_MS = 1800000; // 30 mins
-
-/**
- * Stores data used by <Flair/>
- */
-class FlairStore extends EventEmitter {
-    constructor(matrixClient) {
-        super();
-        this._matrixClient = matrixClient;
-        this._userGroups = {
-            // $userId: ['+group1:domain', '+group2:domain', ...]
-        };
-        this._groupProfiles = {
-            //  $groupId: {
-            //      avatar_url: 'mxc://...'
-            //  }
-        };
-        this._groupProfilesPromise = {
-            //  $groupId: Promise
-        };
-        this._usersPending = {
-            //  $userId: {
-            //      prom: Promise
-            //      resolve: () => {}
-            //      reject: () => {}
-            //  }
-        };
-        this._usersInFlight = {
-            // This has the same schema as _usersPending
-        };
-
-        this._debounceTimeoutID = null;
-    }
-
-    groupSupport() {
-        return groupSupport;
-    }
-
-    invalidatePublicisedGroups(userId) {
-        delete this._userGroups[userId];
-    }
-
-    cachedPublicisedGroups(userId) {
-        return this._userGroups[userId];
-    }
-
-    getPublicisedGroupsCached(matrixClient, userId) {
-        if (this._userGroups[userId]) {
-            return Promise.resolve(this._userGroups[userId]);
-        }
-
-        // Bulk lookup ongoing, return promise to resolve/reject
-        if (this._usersPending[userId]) {
-            return this._usersPending[userId].prom;
-        }
-        // User has been moved from pending to in-flight
-        if (this._usersInFlight[userId]) {
-            return this._usersInFlight[userId].prom;
-        }
-
-        this._usersPending[userId] = {};
-        this._usersPending[userId].prom = new Promise((resolve, reject) => {
-            this._usersPending[userId].resolve = resolve;
-            this._usersPending[userId].reject = reject;
-        }).then((groups) => {
-            this._userGroups[userId] = groups;
-            setTimeout(() => {
-                delete this._userGroups[userId];
-            }, USER_GROUPS_CACHE_BUST_MS);
-            return this._userGroups[userId];
-        }).catch((err) => {
-            // Indicate whether the homeserver supports groups
-            if (err.errcode === 'M_UNRECOGNIZED') {
-                logger.warn('Cannot display flair, server does not support groups');
-                groupSupport = false;
-                // Return silently to avoid spamming for non-supporting servers
-                return;
-            }
-            logger.error('Could not get groups for user', userId, err);
-            throw err;
-        }).finally(() => {
-            delete this._usersInFlight[userId];
-        });
-
-        // This debounce will allow consecutive requests for the public groups of users that
-        // are sent in intervals of < BULK_REQUEST_DEBOUNCE_MS to be batched and only requested
-        // when no more requests are received within the next BULK_REQUEST_DEBOUNCE_MS. The naive
-        // implementation would do a request that only requested the groups for `userId`, leading
-        // to a worst and best case of 1 user per request. This implementation's worst is still
-        // 1 user per request but only if the requests are > BULK_REQUEST_DEBOUNCE_MS apart and the
-        // best case is N users per request.
-        //
-        // This is to reduce the number of requests made whilst trading off latency when viewing
-        // a Flair component.
-        if (this._debounceTimeoutID) clearTimeout(this._debounceTimeoutID);
-        this._debounceTimeoutID = setTimeout(() => {
-            this._batchedGetPublicGroups(matrixClient);
-        }, BULK_REQUEST_DEBOUNCE_MS);
-
-        return this._usersPending[userId].prom;
-    }
-
-    async _batchedGetPublicGroups(matrixClient) {
-        // Move users pending to users in flight
-        this._usersInFlight = this._usersPending;
-        this._usersPending = {};
-
-        let resp = {
-            users: [],
-        };
-        try {
-            resp = await matrixClient.getPublicisedGroups(Object.keys(this._usersInFlight));
-        } catch (err) {
-            // Propagate the same error to all usersInFlight
-            Object.keys(this._usersInFlight).forEach((userId) => {
-                // The promise should always exist for userId, but do a null-check anyway
-                if (!this._usersInFlight[userId]) return;
-                this._usersInFlight[userId].reject(err);
-            });
-            return;
-        }
-        const updatedUserGroups = resp.users;
-        Object.keys(this._usersInFlight).forEach((userId) => {
-            // The promise should always exist for userId, but do a null-check anyway
-            if (!this._usersInFlight[userId]) return;
-            this._usersInFlight[userId].resolve(updatedUserGroups[userId] || []);
-        });
-    }
-
-    /**
-     * Gets the profile for the given group if known, otherwise returns null.
-     * This triggers `getGroupProfileCached` if needed, though the result of the
-     * call will not be returned by this function.
-     * @param {MatrixClient} matrixClient The matrix client to use to fetch the profile, if needed.
-     * @param {string} groupId The group ID to get the profile for.
-     * @returns {*} The profile if known, otherwise null.
-     */
-    getGroupProfileCachedFast(matrixClient, groupId) {
-        if (!matrixClient || !groupId) return null;
-        if (this._groupProfiles[groupId]) {
-            return this._groupProfiles[groupId];
-        }
-        this.getGroupProfileCached(matrixClient, groupId);
-        return null;
-    }
-
-    async getGroupProfileCached(matrixClient, groupId) {
-        if (this._groupProfiles[groupId]) {
-            return this._groupProfiles[groupId];
-        }
-
-        // A request is ongoing, wait for it to complete and return the group profile.
-        if (this._groupProfilesPromise[groupId]) {
-            try {
-                await this._groupProfilesPromise[groupId];
-            } catch (e) {
-                // Don't log the error; this is done below
-                return null;
-            }
-            return this._groupProfiles[groupId];
-        }
-
-        // No request yet, start one
-        logger.log('FlairStore: Request group profile of ' + groupId);
-        this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
-
-        let profile;
-        try {
-            profile = await this._groupProfilesPromise[groupId];
-        } catch (e) {
-            logger.log('FlairStore: Failed to get group profile for ' + groupId, e);
-            // Don't retry, but allow a retry when the profile is next requested
-            delete this._groupProfilesPromise[groupId];
-            return null;
-        }
-
-        this._groupProfiles[groupId] = {
-            groupId,
-            avatarUrl: profile.avatar_url,
-            name: profile.name,
-            shortDescription: profile.short_description,
-        };
-        delete this._groupProfilesPromise[groupId];
-
-        /// XXX: This is verging on recreating a third "Flux"-looking Store. We really
-        /// should replace FlairStore with a Flux store and some async actions.
-        logger.log('FlairStore: Emit updateGroupProfile for ' + groupId);
-        this.emit('updateGroupProfile');
-
-        setTimeout(() => {
-            this.refreshGroupProfile(matrixClient, groupId);
-        }, GROUP_PROFILES_CACHE_BUST_MS);
-
-        return this._groupProfiles[groupId];
-    }
-
-    refreshGroupProfile(matrixClient, groupId) {
-        // Invalidate the cache
-        delete this._groupProfiles[groupId];
-        // Fetch new profile data, and cache it
-        return this.getGroupProfileCached(matrixClient, groupId);
-    }
-}
-
-if (global.singletonFlairStore === undefined) {
-    global.singletonFlairStore = new FlairStore();
-}
-export default global.singletonFlairStore;
diff --git a/src/stores/GroupFilterOrderStore.js b/src/stores/GroupFilterOrderStore.js
deleted file mode 100644
index 51b0ebee637..00000000000
--- a/src/stores/GroupFilterOrderStore.js
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import { Store } from 'flux/utils';
-import { EventType } from "matrix-js-sdk/src/@types/event";
-
-import dis from '../dispatcher/dispatcher';
-import { Action } from '../dispatcher/actions';
-import GroupStore from './GroupStore';
-import Analytics from '../Analytics';
-import * as RoomNotifs from "../RoomNotifs";
-import { MatrixClientPeg } from '../MatrixClientPeg';
-import SettingsStore from "../settings/SettingsStore";
-import { CreateEventField } from "../@types/groups";
-
-const INITIAL_STATE = {
-    orderedTags: null,
-    orderedTagsAccountData: null,
-    hasSynced: false,
-    joinedGroupIds: null,
-
-    selectedTags: [],
-    // Last selected tag when shift was not being pressed
-    anchorTag: null,
-};
-
-/**
- * A class for storing application state for ordering tags in the GroupFilterPanel.
- */
-class GroupFilterOrderStore extends Store {
-    constructor() {
-        super(dis);
-
-        // Initialise state
-        this._state = Object.assign({}, INITIAL_STATE);
-        SettingsStore.monitorSetting("TagPanel.enableTagPanel", null);
-    }
-
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
-        this.__emitChange();
-    }
-
-    __onDispatch(payload) { // eslint-disable-line @typescript-eslint/naming-convention
-        switch (payload.action) {
-            // Initialise state after initial sync
-            case Action.ViewRoom: {
-                const relatedGroupIds = GroupStore.getGroupIdsForRoomId(payload.room_id);
-                this._updateBadges(relatedGroupIds);
-                break;
-            }
-            case 'MatrixActions.sync': {
-                if (payload.state === 'SYNCING' || payload.state === 'PREPARED') {
-                    this._updateBadges();
-                }
-                if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
-                    break;
-                }
-                const tagOrderingEvent = payload.matrixClient.getAccountData('im.vector.web.tag_ordering');
-                const tagOrderingEventContent = tagOrderingEvent ? tagOrderingEvent.getContent() : {};
-                this._setState({
-                    orderedTagsAccountData: tagOrderingEventContent.tags || null,
-                    removedTagsAccountData: tagOrderingEventContent.removedTags || null,
-                    hasSynced: true,
-                });
-                this._updateOrderedTags();
-                break;
-            }
-            // Get ordering from account data
-            case 'MatrixActions.accountData': {
-                if (payload.event_type !== 'im.vector.web.tag_ordering') break;
-
-                // Ignore remote echos caused by this store so as to avoid setting
-                // state back to old state.
-                if (payload.event_content._storeId === this.getStoreId()) break;
-
-                this._setState({
-                    orderedTagsAccountData: payload.event_content ? payload.event_content.tags : null,
-                    removedTagsAccountData: payload.event_content ? payload.event_content.removedTags : null,
-                });
-                this._updateOrderedTags();
-                break;
-            }
-            // Initialise the state such that if account data is unset, default to joined groups
-            case 'GroupActions.fetchJoinedGroups.success': {
-                this._setState({
-                    joinedGroupIds: payload.result.groups.sort(), // Sort lexically
-                    hasFetchedJoinedGroups: true,
-                });
-                this._updateOrderedTags();
-                break;
-            }
-            case 'TagOrderActions.moveTag.pending': {
-                // Optimistic update of a moved tag
-                this._setState({
-                    orderedTags: payload.request.tags,
-                    removedTagsAccountData: payload.request.removedTags,
-                });
-                break;
-            }
-            case 'TagOrderActions.removeTag.pending': {
-                // Optimistic update of a removed tag
-                this._setState({
-                    removedTagsAccountData: payload.request.removedTags,
-                });
-                this._updateOrderedTags();
-                break;
-            }
-            case 'select_tag': {
-                const allowMultiple = !SettingsStore.getValue("feature_communities_v2_prototypes");
-
-                let newTags = [];
-                // Shift-click semantics
-                if (payload.shiftKey && allowMultiple) {
-                    // Select range of tags
-                    let start = this._state.orderedTags.indexOf(this._state.anchorTag);
-                    let end = this._state.orderedTags.indexOf(payload.tag);
-
-                    if (start === -1) {
-                        start = end;
-                    }
-                    if (start > end) {
-                        const temp = start;
-                        start = end;
-                        end = temp;
-                    }
-                    newTags = payload.ctrlOrCmdKey ? this._state.selectedTags : [];
-                    newTags = [...new Set(
-                        this._state.orderedTags.slice(start, end + 1).concat(newTags),
-                    )];
-                } else {
-                    if (payload.ctrlOrCmdKey && allowMultiple) {
-                        // Toggle individual tag
-                        if (this._state.selectedTags.includes(payload.tag)) {
-                            newTags = this._state.selectedTags.filter((t) => t !== payload.tag);
-                        } else {
-                            newTags = [...this._state.selectedTags, payload.tag];
-                        }
-                    } else {
-                        if (this._state.selectedTags.length === 1 && this._state.selectedTags.includes(payload.tag)) {
-                            // Existing (only) selected tag is being normally clicked again, clear tags
-                            newTags = [];
-                        } else {
-                            // Select individual tag
-                            newTags = [payload.tag];
-                        }
-                    }
-                    // Only set the anchor tag if the tag was previously unselected, otherwise
-                    // the next range starts with an unselected tag.
-                    if (!this._state.selectedTags.includes(payload.tag)) {
-                        this._setState({
-                            anchorTag: payload.tag,
-                        });
-                    }
-                }
-
-                this._setState({
-                    selectedTags: newTags,
-                });
-
-                Analytics.trackEvent('FilterStore', 'select_tag');
-            }
-                break;
-            case 'deselect_tags':
-                if (payload.tag) {
-                    // if a tag is passed, only deselect that tag
-                    this._setState({
-                        selectedTags: this._state.selectedTags.filter(tag => tag !== payload.tag),
-                    });
-                } else {
-                    this._setState({
-                        selectedTags: [],
-                    });
-                }
-                Analytics.trackEvent('FilterStore', 'deselect_tags');
-                break;
-            case 'on_client_not_viable':
-            case 'on_logged_out': {
-                // Reset state without pushing an update to the view, which generally assumes that
-                // the matrix client isn't `null` and so causing a re-render will cause NPEs.
-                this._state = Object.assign({}, INITIAL_STATE);
-                break;
-            }
-            case 'setting_updated':
-                if (payload.settingName === 'TagPanel.enableTagPanel' && !payload.newValue) {
-                    this._setState({
-                        selectedTags: [],
-                    });
-                    Analytics.trackEvent('FilterStore', 'disable_tags');
-                }
-                break;
-        }
-    }
-
-    _updateBadges(groupIds = this._state.joinedGroupIds) {
-        if (groupIds && groupIds.length) {
-            const client = MatrixClientPeg.get();
-            const changedBadges = {};
-            groupIds.forEach(groupId => {
-                const rooms =
-                    GroupStore.getGroupRooms(groupId)
-                        .map(r => client.getRoom(r.roomId)) // to Room objects
-                        .filter(r => r !== null && r !== undefined);   // filter out rooms we haven't joined from the group
-                const badge = rooms && RoomNotifs.aggregateNotificationCount(rooms);
-                changedBadges[groupId] = (badge && badge.count !== 0) ? badge : undefined;
-            });
-            const newBadges = Object.assign({}, this._state.badges, changedBadges);
-            this._setState({ badges: newBadges });
-        }
-    }
-
-    _updateOrderedTags() {
-        this._setState({
-            orderedTags:
-                this._state.hasSynced &&
-                this._state.hasFetchedJoinedGroups ?
-                    this._mergeGroupsAndTags() : null,
-        });
-    }
-
-    _mergeGroupsAndTags() {
-        const groupIds = this._state.joinedGroupIds || [];
-        const tags = this._state.orderedTagsAccountData || [];
-        const removedTags = new Set(this._state.removedTagsAccountData || []);
-
-        const tagsToKeep = tags.filter(
-            (t) => (t[0] !== '+' || groupIds.includes(t)) && !removedTags.has(t),
-        );
-
-        const cli = MatrixClientPeg.get();
-        const migratedCommunities = new Set(cli.getRooms().map(r => {
-            return r.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent()[CreateEventField];
-        }).filter(Boolean));
-        const groupIdsToAdd = groupIds.filter(
-            (groupId) => !tags.includes(groupId) && !removedTags.has(groupId) && !migratedCommunities.has(groupId),
-        );
-
-        return tagsToKeep.concat(groupIdsToAdd);
-    }
-
-    getGroupBadge(groupId) {
-        const badges = this._state.badges;
-        return badges && badges[groupId];
-    }
-
-    getOrderedTags() {
-        return this._state.orderedTags;
-    }
-
-    getRemovedTagsAccountData() {
-        return this._state.removedTagsAccountData;
-    }
-
-    getStoreId() {
-        // Generate a random ID to prevent this store from clobbering its
-        // state with redundant remote echos.
-        if (!this._id) this._id = Math.random().toString(16).slice(2, 10);
-        return this._id;
-    }
-
-    getSelectedTags() {
-        return this._state.selectedTags;
-    }
-}
-
-if (global.singletonGroupFilterOrderStore === undefined) {
-    global.singletonGroupFilterOrderStore = new GroupFilterOrderStore();
-}
-export default global.singletonGroupFilterOrderStore;
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
deleted file mode 100644
index f51a94bd1a2..00000000000
--- a/src/stores/GroupStore.js
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import EventEmitter from 'events';
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
-import FlairStore from './FlairStore';
-import { MatrixClientPeg } from '../MatrixClientPeg';
-import dis from '../dispatcher/dispatcher';
-
-export function parseMembersResponse(response) {
-    return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
-}
-
-export function parseRoomsResponse(response) {
-    return response.chunk.map((apiRoom) => groupRoomFromApiObject(apiRoom));
-}
-
-// The number of ongoing group requests
-let ongoingRequestCount = 0;
-
-// This has arbitrarily been set to a small number to lower the priority
-// of doing group-related requests because we care about other important
-// requests like hitting /sync.
-const LIMIT = 3; // Maximum number of ongoing group requests
-
-// FIFO queue of functions to call in the backlog
-const backlogQueue = [
-    // () => {...}
-];
-
-// Pull from the FIFO queue
-function checkBacklog() {
-    const item = backlogQueue.shift();
-    if (typeof item === 'function') item();
-}
-
-// Limit the maximum number of ongoing promises returned by fn to LIMIT and
-// use a FIFO queue to handle the backlog.
-async function limitConcurrency(fn) {
-    if (ongoingRequestCount >= LIMIT) {
-        // Enqueue this request for later execution
-        await new Promise((resolve, reject) => {
-            backlogQueue.push(resolve);
-        });
-    }
-
-    ongoingRequestCount++;
-    try {
-        return await fn();
-    } catch (err) {
-        // We explicitly do not handle the error here, but let it propogate.
-        throw err;
-    } finally {
-        ongoingRequestCount--;
-        checkBacklog();
-    }
-}
-
-/**
- * Global store for tracking group summary, members, invited members and rooms.
- */
-class GroupStore extends EventEmitter {
-    STATE_KEY = {
-        GroupMembers: 'GroupMembers',
-        GroupInvitedMembers: 'GroupInvitedMembers',
-        Summary: 'Summary',
-        GroupRooms: 'GroupRooms',
-    };
-
-    constructor() {
-        super();
-        this._state = {};
-        this._state[this.STATE_KEY.Summary] = {};
-        this._state[this.STATE_KEY.GroupRooms] = {};
-        this._state[this.STATE_KEY.GroupMembers] = {};
-        this._state[this.STATE_KEY.GroupInvitedMembers] = {};
-
-        this._ready = {};
-        this._ready[this.STATE_KEY.Summary] = {};
-        this._ready[this.STATE_KEY.GroupRooms] = {};
-        this._ready[this.STATE_KEY.GroupMembers] = {};
-        this._ready[this.STATE_KEY.GroupInvitedMembers] = {};
-
-        this._fetchResourcePromise = {
-            [this.STATE_KEY.Summary]: {},
-            [this.STATE_KEY.GroupRooms]: {},
-            [this.STATE_KEY.GroupMembers]: {},
-            [this.STATE_KEY.GroupInvitedMembers]: {},
-        };
-
-        this._resourceFetcher = {
-            [this.STATE_KEY.Summary]: (groupId) => {
-                return limitConcurrency(
-                    () => MatrixClientPeg.get().getGroupSummary(groupId),
-                );
-            },
-            [this.STATE_KEY.GroupRooms]: (groupId) => {
-                return limitConcurrency(
-                    () => MatrixClientPeg.get().getGroupRooms(groupId).then(parseRoomsResponse),
-                );
-            },
-            [this.STATE_KEY.GroupMembers]: (groupId) => {
-                return limitConcurrency(
-                    () => MatrixClientPeg.get().getGroupUsers(groupId).then(parseMembersResponse),
-                );
-            },
-            [this.STATE_KEY.GroupInvitedMembers]: (groupId) => {
-                return limitConcurrency(
-                    () => MatrixClientPeg.get().getGroupInvitedUsers(groupId).then(parseMembersResponse),
-                );
-            },
-        };
-    }
-
-    _fetchResource(stateKey, groupId) {
-        // Ongoing request, ignore
-        if (this._fetchResourcePromise[stateKey][groupId]) return;
-
-        const clientPromise = this._resourceFetcher[stateKey](groupId);
-
-        // Indicate ongoing request
-        this._fetchResourcePromise[stateKey][groupId] = clientPromise;
-
-        clientPromise.then((result) => {
-            this._state[stateKey][groupId] = result;
-            this._ready[stateKey][groupId] = true;
-            this._notifyListeners();
-        }).catch((err) => {
-            // Invited users not visible to non-members
-            if (stateKey === this.STATE_KEY.GroupInvitedMembers && err.httpStatus === 403) {
-                return;
-            }
-
-            logger.error(`Failed to get resource ${stateKey} for ${groupId}`, err);
-            this.emit('error', err, groupId, stateKey);
-        }).finally(() => {
-            // Indicate finished request, allow for future fetches
-            delete this._fetchResourcePromise[stateKey][groupId];
-        });
-
-        return clientPromise;
-    }
-
-    _notifyListeners() {
-        this.emit('update');
-    }
-
-    /**
-     * Register a listener to recieve updates from the store. This also
-     * immediately triggers an update to send the current state of the
-     * store (which could be the initial state).
-     *
-     * If a group ID is specified, this also causes a fetch of all data
-     * of the specified group, which might cause 4 separate HTTP
-     * requests, but only if said requests aren't already ongoing.
-     *
-     * @param {string?} groupId the ID of the group to fetch data for.
-     *                          Optional.
-     * @param {function} fn the function to call when the store updates.
-     * @return {Object} tok a registration "token" with a single
-     *                      property `unregister`, a function that can
-     *                      be called to unregister the listener such
-     *                      that it won't be called any more.
-     */
-    registerListener(groupId, fn) {
-        this.on('update', fn);
-        // Call to set initial state (before fetching starts)
-        this.emit('update');
-
-        if (groupId) {
-            this._fetchResource(this.STATE_KEY.Summary, groupId);
-            this._fetchResource(this.STATE_KEY.GroupRooms, groupId);
-            this._fetchResource(this.STATE_KEY.GroupMembers, groupId);
-            this._fetchResource(this.STATE_KEY.GroupInvitedMembers, groupId);
-        }
-
-        // Similar to the Store of flux/utils, we return a "token" that
-        // can be used to unregister the listener.
-        return {
-            unregister: () => {
-                this.unregisterListener(fn);
-            },
-        };
-    }
-
-    unregisterListener(fn) {
-        this.removeListener('update', fn);
-    }
-
-    isStateReady(groupId, id) {
-        return this._ready[id][groupId];
-    }
-
-    getGroupIdsForRoomId(roomId) {
-        const groupIds = Object.keys(this._state[this.STATE_KEY.GroupRooms]);
-        return groupIds.filter(groupId => {
-            const rooms = this._state[this.STATE_KEY.GroupRooms][groupId] || [];
-            return rooms.some(room => room.roomId === roomId);
-        });
-    }
-
-    getSummary(groupId) {
-        return this._state[this.STATE_KEY.Summary][groupId] || {};
-    }
-
-    getGroupRooms(groupId) {
-        return this._state[this.STATE_KEY.GroupRooms][groupId] || [];
-    }
-
-    getGroupMembers(groupId) {
-        return this._state[this.STATE_KEY.GroupMembers][groupId] || [];
-    }
-
-    getGroupInvitedMembers(groupId) {
-        return this._state[this.STATE_KEY.GroupInvitedMembers][groupId] || [];
-    }
-
-    getGroupPublicity(groupId) {
-        return (this._state[this.STATE_KEY.Summary][groupId] || {}).user ?
-            (this._state[this.STATE_KEY.Summary][groupId] || {}).user.is_publicised : null;
-    }
-
-    isUserPrivileged(groupId) {
-        return (this._state[this.STATE_KEY.Summary][groupId] || {}).user ?
-            (this._state[this.STATE_KEY.Summary][groupId] || {}).user.is_privileged : null;
-    }
-
-    refreshGroupRooms(groupId) {
-        return this._fetchResource(this.STATE_KEY.GroupRooms, groupId);
-    }
-
-    refreshGroupMembers(groupId) {
-        return this._fetchResource(this.STATE_KEY.GroupMembers, groupId);
-    }
-
-    addRoomToGroup(groupId, roomId, isPublic) {
-        return MatrixClientPeg.get()
-            .addRoomToGroup(groupId, roomId, isPublic)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId));
-    }
-
-    updateGroupRoomVisibility(groupId, roomId, isPublic) {
-        return MatrixClientPeg.get()
-            .updateGroupRoomVisibility(groupId, roomId, isPublic)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId));
-    }
-
-    removeRoomFromGroup(groupId, roomId) {
-        return MatrixClientPeg.get()
-            .removeRoomFromGroup(groupId, roomId)
-            // Room might be in the summary, refresh just in case
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId));
-    }
-
-    inviteUserToGroup(groupId, userId) {
-        return MatrixClientPeg.get().inviteUserToGroup(groupId, userId)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupInvitedMembers, groupId));
-    }
-
-    acceptGroupInvite(groupId) {
-        return MatrixClientPeg.get().acceptGroupInvite(groupId)
-            // The user should now be able to access (personal) group settings
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
-            // The user might be able to see more rooms now
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId))
-            // The user should now appear as a member
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupMembers, groupId))
-            // The user should now not appear as an invited member
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupInvitedMembers, groupId));
-    }
-
-    joinGroup(groupId) {
-        return MatrixClientPeg.get().joinGroup(groupId)
-            // The user should now be able to access (personal) group settings
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
-            // The user might be able to see more rooms now
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId))
-            // The user should now appear as a member
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupMembers, groupId))
-            // The user should now not appear as an invited member
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupInvitedMembers, groupId));
-    }
-
-    leaveGroup(groupId) {
-        // ensure the tag panel filter is cleared if the group was selected
-        dis.dispatch({
-            action: "deselect_tags",
-            tag: groupId,
-        });
-        return MatrixClientPeg.get().leaveGroup(groupId)
-            // The user should now not be able to access group settings
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
-            // The user might only be able to see a subset of rooms now
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupRooms, groupId))
-            // The user should now not appear as a member
-            .then(this._fetchResource.bind(this, this.STATE_KEY.GroupMembers, groupId));
-    }
-
-    addRoomToGroupSummary(groupId, roomId, categoryId) {
-        return MatrixClientPeg.get()
-            .addRoomToGroupSummary(groupId, roomId, categoryId)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId));
-    }
-
-    addUserToGroupSummary(groupId, userId, roleId) {
-        return MatrixClientPeg.get()
-            .addUserToGroupSummary(groupId, userId, roleId)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId));
-    }
-
-    removeRoomFromGroupSummary(groupId, roomId) {
-        return MatrixClientPeg.get()
-            .removeRoomFromGroupSummary(groupId, roomId)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId));
-    }
-
-    removeUserFromGroupSummary(groupId, userId) {
-        return MatrixClientPeg.get()
-            .removeUserFromGroupSummary(groupId, userId)
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId));
-    }
-
-    setGroupPublicity(groupId, isPublished) {
-        return MatrixClientPeg.get()
-            .setGroupPublicity(groupId, isPublished)
-            .then(() => { FlairStore.invalidatePublicisedGroups(MatrixClientPeg.get().credentials.userId); })
-            .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId));
-    }
-}
-
-let singletonGroupStore = null;
-if (!singletonGroupStore) {
-    singletonGroupStore = new GroupStore();
-}
-export default singletonGroupStore;
diff --git a/src/stores/ModalWidgetStore.ts b/src/stores/ModalWidgetStore.ts
index 5bfb0a51a53..9c38b3f3a92 100644
--- a/src/stores/ModalWidgetStore.ts
+++ b/src/stores/ModalWidgetStore.ts
@@ -33,6 +33,7 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
     private static internalInstance = new ModalWidgetStore();
     private modalInstance: IHandle<void[]> = null;
     private openSourceWidgetId: string = null;
+    private openSourceWidgetRoomId: string = null;
 
     private constructor() {
         super(defaultDispatcher, {});
@@ -57,31 +58,38 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
     ) => {
         if (this.modalInstance) return;
         this.openSourceWidgetId = sourceWidget.id;
+        this.openSourceWidgetRoomId = widgetRoomId;
         this.modalInstance = Modal.createTrackedDialog('Modal Widget', '', ModalWidgetDialog, {
             widgetDefinition: { ...requestData },
             widgetRoomId,
             sourceWidgetId: sourceWidget.id,
             onFinished: (success: boolean, data?: IModalWidgetReturnData) => {
                 if (!success) {
-                    this.closeModalWidget(sourceWidget, { "m.exited": true });
+                    this.closeModalWidget(sourceWidget, widgetRoomId, { "m.exited": true });
                 } else {
-                    this.closeModalWidget(sourceWidget, data);
+                    this.closeModalWidget(sourceWidget, widgetRoomId, data);
                 }
 
                 this.openSourceWidgetId = null;
+                this.openSourceWidgetRoomId = null;
                 this.modalInstance = null;
             },
         }, null, /* priority = */ false, /* static = */ true);
     };
 
-    public closeModalWidget = (sourceWidget: Widget, data?: IModalWidgetReturnData) => {
+    public closeModalWidget = (
+        sourceWidget: Widget,
+        widgetRoomId?: string,
+        data?: IModalWidgetReturnData,
+    ) => {
         if (!this.modalInstance) return;
-        if (this.openSourceWidgetId === sourceWidget.id) {
+        if (this.openSourceWidgetId === sourceWidget.id && this.openSourceWidgetRoomId === widgetRoomId) {
             this.openSourceWidgetId = null;
+            this.openSourceWidgetRoomId = null;
             this.modalInstance.close();
             this.modalInstance = null;
 
-            const sourceMessaging = WidgetMessagingStore.instance.getMessaging(sourceWidget);
+            const sourceMessaging = WidgetMessagingStore.instance.getMessaging(sourceWidget, widgetRoomId);
             if (!sourceMessaging) {
                 logger.error("No source widget messaging for modal widget");
                 return;
diff --git a/src/stores/OwnBeaconStore.ts b/src/stores/OwnBeaconStore.ts
new file mode 100644
index 00000000000..609b85fae25
--- /dev/null
+++ b/src/stores/OwnBeaconStore.ts
@@ -0,0 +1,592 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { debounce } from "lodash";
+import {
+    Beacon,
+    BeaconIdentifier,
+    BeaconEvent,
+    MatrixEvent,
+    Room,
+    RoomMember,
+    RoomState,
+    RoomStateEvent,
+} from "matrix-js-sdk/src/matrix";
+import {
+    BeaconInfoState, makeBeaconContent, makeBeaconInfoContent,
+} from "matrix-js-sdk/src/content-helpers";
+import { MBeaconInfoEventContent, M_BEACON } from "matrix-js-sdk/src/@types/beacon";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import { arrayDiff } from "../utils/arrays";
+import {
+    ClearWatchCallback,
+    GeolocationError,
+    mapGeolocationPositionToTimedGeo,
+    sortBeaconsByLatestCreation,
+    TimedGeoUri,
+    watchPosition,
+} from "../utils/beacon";
+import { getCurrentPosition } from "../utils/beacon/geolocation";
+
+const isOwnBeacon = (beacon: Beacon, userId: string): boolean => beacon.beaconInfoOwner === userId;
+
+export enum OwnBeaconStoreEvent {
+    LivenessChange = 'OwnBeaconStore.LivenessChange',
+    MonitoringLivePosition = 'OwnBeaconStore.MonitoringLivePosition',
+    LocationPublishError = 'LocationPublishError',
+    BeaconUpdateError = 'BeaconUpdateError',
+}
+
+const MOVING_UPDATE_INTERVAL = 2000;
+const STATIC_UPDATE_INTERVAL = 30000;
+
+const BAIL_AFTER_CONSECUTIVE_ERROR_COUNT = 2;
+
+type OwnBeaconStoreState = {
+    beacons: Map<BeaconIdentifier, Beacon>;
+    beaconLocationPublishErrorCounts: Map<BeaconIdentifier, number>;
+    beaconUpdateErrors: Map<BeaconIdentifier, Error>;
+    beaconsByRoomId: Map<Room['roomId'], Set<BeaconIdentifier>>;
+    liveBeaconIds: BeaconIdentifier[];
+};
+
+const CREATED_BEACONS_KEY = 'mx_live_beacon_created_id';
+const removeLocallyCreateBeaconEventId = (eventId: string): void => {
+    const ids = getLocallyCreatedBeaconEventIds();
+    window.localStorage.setItem(CREATED_BEACONS_KEY, JSON.stringify(ids.filter(id => id !== eventId)));
+};
+const storeLocallyCreateBeaconEventId = (eventId: string): void => {
+    const ids = getLocallyCreatedBeaconEventIds();
+    window.localStorage.setItem(CREATED_BEACONS_KEY, JSON.stringify([...ids, eventId]));
+};
+
+const getLocallyCreatedBeaconEventIds = (): string[] => {
+    let ids: string[];
+    try {
+        ids = JSON.parse(window.localStorage.getItem(CREATED_BEACONS_KEY) ?? '[]');
+        if (!Array.isArray(ids)) {
+            throw new Error('Invalid stored value');
+        }
+    } catch (error) {
+        logger.error('Failed to retrieve locally created beacon event ids', error);
+        ids = [];
+    }
+    return ids;
+};
+export class OwnBeaconStore extends AsyncStoreWithClient<OwnBeaconStoreState> {
+    private static internalInstance = new OwnBeaconStore();
+    // users beacons, keyed by event type
+    public readonly beacons = new Map<BeaconIdentifier, Beacon>();
+    public readonly beaconsByRoomId = new Map<Room['roomId'], Set<BeaconIdentifier>>();
+    /**
+     * Track over the wire errors for published positions
+     * Counts consecutive wire errors per beacon
+     * Reset on successful publish of location
+     */
+    public readonly beaconLocationPublishErrorCounts = new Map<BeaconIdentifier, number>();
+    public readonly beaconUpdateErrors = new Map<BeaconIdentifier, Error>();
+    /**
+     * ids of live beacons
+     * ordered by creation time descending
+     */
+    private liveBeaconIds = [];
+    private locationInterval: number;
+    private geolocationError: GeolocationError | undefined;
+    private clearPositionWatch: ClearWatchCallback | undefined;
+    /**
+     * Track when the last position was published
+     * So we can manually get position on slow interval
+     * when the target is stationary
+     */
+    private lastPublishedPositionTimestamp: number | undefined;
+
+    public constructor() {
+        super(defaultDispatcher);
+    }
+
+    public static get instance(): OwnBeaconStore {
+        return OwnBeaconStore.internalInstance;
+    }
+
+    /**
+     * True when we have live beacons
+     * and geolocation.watchPosition is active
+     */
+    public get isMonitoringLiveLocation(): boolean {
+        return !!this.clearPositionWatch;
+    }
+
+    protected async onNotReady() {
+        this.matrixClient.removeListener(BeaconEvent.LivenessChange, this.onBeaconLiveness);
+        this.matrixClient.removeListener(BeaconEvent.New, this.onNewBeacon);
+        this.matrixClient.removeListener(BeaconEvent.Update, this.onUpdateBeacon);
+        this.matrixClient.removeListener(BeaconEvent.Destroy, this.onDestroyBeacon);
+        this.matrixClient.removeListener(RoomStateEvent.Members, this.onRoomStateMembers);
+
+        this.beacons.forEach(beacon => beacon.destroy());
+
+        this.stopPollingLocation();
+        this.beacons.clear();
+        this.beaconsByRoomId.clear();
+        this.liveBeaconIds = [];
+        this.beaconLocationPublishErrorCounts.clear();
+        this.beaconUpdateErrors.clear();
+    }
+
+    protected async onReady(): Promise<void> {
+        this.matrixClient.on(BeaconEvent.LivenessChange, this.onBeaconLiveness);
+        this.matrixClient.on(BeaconEvent.New, this.onNewBeacon);
+        this.matrixClient.on(BeaconEvent.Update, this.onUpdateBeacon);
+        this.matrixClient.on(BeaconEvent.Destroy, this.onDestroyBeacon);
+        this.matrixClient.on(RoomStateEvent.Members, this.onRoomStateMembers);
+
+        this.initialiseBeaconState();
+    }
+
+    protected async onAction(payload: ActionPayload): Promise<void> {
+        // we don't actually do anything here
+    }
+
+    public hasLiveBeacons = (roomId?: string): boolean => {
+        return !!this.getLiveBeaconIds(roomId).length;
+    };
+
+    /**
+     * Some live beacon has a wire error
+     * Optionally filter by room
+     */
+    public hasLocationPublishErrors = (roomId?: string): boolean => {
+        return this.getLiveBeaconIds(roomId).some(this.beaconHasLocationPublishError);
+    };
+
+    /**
+     * If a beacon has failed to publish position
+     * past the allowed consecutive failure count (BAIL_AFTER_CONSECUTIVE_ERROR_COUNT)
+     * Then consider it to have an error
+     */
+    public beaconHasLocationPublishError = (beaconId: string): boolean => {
+        return this.beaconLocationPublishErrorCounts.get(beaconId) >= BAIL_AFTER_CONSECUTIVE_ERROR_COUNT;
+    };
+
+    public resetLocationPublishError = (beaconId: string): void => {
+        this.incrementBeaconLocationPublishErrorCount(beaconId, false);
+
+        // always publish to all live beacons together
+        // instead of just one that was changed
+        // to keep lastPublishedTimestamp simple
+        // and extra published locations don't hurt
+        this.publishCurrentLocationToBeacons();
+    };
+
+    public getLiveBeaconIds = (roomId?: string): string[] => {
+        if (!roomId) {
+            return this.liveBeaconIds;
+        }
+        return this.liveBeaconIds.filter(beaconId => this.beaconsByRoomId.get(roomId)?.has(beaconId));
+    };
+
+    public getLiveBeaconIdsWithLocationPublishError = (roomId?: string): string[] => {
+        return this.getLiveBeaconIds(roomId).filter(this.beaconHasLocationPublishError);
+    };
+
+    public getBeaconById = (beaconId: string): Beacon | undefined => {
+        return this.beacons.get(beaconId);
+    };
+
+    public stopBeacon = async (beaconIdentifier: string): Promise<void> => {
+        const beacon = this.beacons.get(beaconIdentifier);
+        // if no beacon, or beacon is already explicitly set isLive: false
+        // do nothing
+        if (!beacon?.beaconInfo?.live) {
+            return;
+        }
+
+        await this.updateBeaconEvent(beacon, { live: false });
+        // prune from local store
+        removeLocallyCreateBeaconEventId(beacon.beaconInfoId);
+    };
+
+    /**
+     * Listeners
+     */
+
+    private onNewBeacon = (_event: MatrixEvent, beacon: Beacon): void => {
+        if (!isOwnBeacon(beacon, this.matrixClient.getUserId())) {
+            return;
+        }
+        this.addBeacon(beacon);
+        this.checkLiveness();
+    };
+
+    /**
+     * This will be called when a beacon is replaced
+     */
+    private onUpdateBeacon = (_event: MatrixEvent, beacon: Beacon): void => {
+        if (!isOwnBeacon(beacon, this.matrixClient.getUserId())) {
+            return;
+        }
+
+        this.checkLiveness();
+        beacon.monitorLiveness();
+    };
+
+    private onDestroyBeacon = (beaconIdentifier: BeaconIdentifier): void => {
+        // check if we care about this beacon
+        if (!this.beacons.has(beaconIdentifier)) {
+            return;
+        }
+
+        this.checkLiveness();
+    };
+
+    private onBeaconLiveness = (isLive: boolean, beacon: Beacon): void => {
+        // check if we care about this beacon
+        if (!this.beacons.has(beacon.identifier)) {
+            return;
+        }
+
+        // beacon expired, update beacon to un-alive state
+        if (!isLive) {
+            this.stopBeacon(beacon.identifier);
+        }
+
+        this.checkLiveness();
+
+        this.emit(OwnBeaconStoreEvent.LivenessChange, this.getLiveBeaconIds());
+    };
+
+    /**
+     * Check for changes in membership in rooms with beacons
+     * and stop monitoring beacons in rooms user is no longer member of
+     */
+    private onRoomStateMembers = (_event: MatrixEvent, roomState: RoomState, member: RoomMember): void => {
+        // no beacons for this room, ignore
+        if (
+            !this.beaconsByRoomId.has(roomState.roomId) ||
+            member.userId !== this.matrixClient.getUserId()
+        ) {
+            return;
+        }
+
+        // TODO check powerlevels here
+        // in PSF-797
+
+        // stop watching beacons in rooms where user is no longer a member
+        if (member.membership === 'leave' || member.membership === 'ban') {
+            this.beaconsByRoomId.get(roomState.roomId)?.forEach(this.removeBeacon);
+            this.beaconsByRoomId.delete(roomState.roomId);
+        }
+    };
+
+    /**
+     * State management
+     */
+
+    /**
+     * Live beacon ids that do not have wire errors
+     */
+    private get healthyLiveBeaconIds() {
+        return this.liveBeaconIds.filter(beaconId =>
+            !this.beaconHasLocationPublishError(beaconId) &&
+            !this.beaconUpdateErrors.has(beaconId),
+        );
+    }
+
+    private initialiseBeaconState = () => {
+        const userId = this.matrixClient.getUserId();
+        const visibleRooms = this.matrixClient.getVisibleRooms();
+
+        visibleRooms
+            .forEach(room => {
+                const roomState = room.currentState;
+                const beacons = roomState.beacons;
+                const ownBeaconsArray = [...beacons.values()].filter(beacon => isOwnBeacon(beacon, userId));
+                ownBeaconsArray.forEach(beacon => this.addBeacon(beacon));
+            });
+
+        this.checkLiveness();
+    };
+
+    private addBeacon = (beacon: Beacon): void => {
+        this.beacons.set(beacon.identifier, beacon);
+
+        if (!this.beaconsByRoomId.has(beacon.roomId)) {
+            this.beaconsByRoomId.set(beacon.roomId, new Set<string>());
+        }
+
+        this.beaconsByRoomId.get(beacon.roomId).add(beacon.identifier);
+
+        beacon.monitorLiveness();
+    };
+
+    /**
+     * Remove listeners for a given beacon
+     * remove from state
+     * and update liveness if changed
+     */
+    private removeBeacon = (beaconId: string): void => {
+        if (!this.beacons.has(beaconId)) {
+            return;
+        }
+        this.beacons.get(beaconId).destroy();
+        this.beacons.delete(beaconId);
+
+        this.checkLiveness();
+    };
+
+    private checkLiveness = (): void => {
+        const locallyCreatedBeaconEventIds = getLocallyCreatedBeaconEventIds();
+        const prevLiveBeaconIds = this.getLiveBeaconIds();
+        this.liveBeaconIds = [...this.beacons.values()]
+            .filter(beacon =>
+                beacon.isLive &&
+                // only beacons created on this device should be shared to
+                locallyCreatedBeaconEventIds.includes(beacon.beaconInfoId),
+            )
+            .sort(sortBeaconsByLatestCreation)
+            .map(beacon => beacon.identifier);
+
+        const diff = arrayDiff(prevLiveBeaconIds, this.liveBeaconIds);
+
+        if (diff.added.length || diff.removed.length) {
+            this.emit(OwnBeaconStoreEvent.LivenessChange, this.liveBeaconIds);
+        }
+
+        // publish current location immediately
+        // when there are new live beacons
+        // and we already have a live monitor
+        // so first position is published quickly
+        // even when target is stationary
+        //
+        // when there is no existing live monitor
+        // it will be created below by togglePollingLocation
+        // and publish first position quickly
+        if (diff.added.length && this.isMonitoringLiveLocation) {
+            this.publishCurrentLocationToBeacons();
+        }
+
+        // if overall liveness changed
+        if (!!prevLiveBeaconIds?.length !== !!this.liveBeaconIds.length) {
+            this.togglePollingLocation();
+        }
+    };
+
+    public createLiveBeacon = async (
+        roomId: Room['roomId'],
+        beaconInfoContent: MBeaconInfoEventContent,
+    ): Promise<void> => {
+        // eslint-disable-next-line camelcase
+        const { event_id } = await this.matrixClient.unstable_createLiveBeacon(
+            roomId,
+            beaconInfoContent,
+        );
+
+        storeLocallyCreateBeaconEventId(event_id);
+    };
+
+    /**
+     * Geolocation
+     */
+
+    private togglePollingLocation = () => {
+        if (!!this.liveBeaconIds.length) {
+            this.startPollingLocation();
+        } else {
+            this.stopPollingLocation();
+        }
+    };
+
+    private startPollingLocation = async () => {
+        // clear any existing interval
+        this.stopPollingLocation();
+
+        try {
+            this.clearPositionWatch = await watchPosition(
+                this.onWatchedPosition,
+                this.onGeolocationError,
+            );
+        } catch (error) {
+            this.onGeolocationError(error?.message);
+            // don't set locationInterval if geolocation failed to setup
+            return;
+        }
+
+        this.locationInterval = setInterval(() => {
+            if (!this.lastPublishedPositionTimestamp) {
+                return;
+            }
+            // if position was last updated STATIC_UPDATE_INTERVAL ms ago or more
+            // get our position and publish it
+            if (this.lastPublishedPositionTimestamp <= Date.now() - STATIC_UPDATE_INTERVAL) {
+                this.publishCurrentLocationToBeacons();
+            }
+        }, STATIC_UPDATE_INTERVAL);
+
+        this.emit(OwnBeaconStoreEvent.MonitoringLivePosition);
+    };
+
+    private stopPollingLocation = () => {
+        clearInterval(this.locationInterval);
+        this.locationInterval = undefined;
+        this.lastPublishedPositionTimestamp = undefined;
+        this.geolocationError = undefined;
+
+        if (this.clearPositionWatch) {
+            this.clearPositionWatch();
+            this.clearPositionWatch = undefined;
+        }
+
+        this.emit(OwnBeaconStoreEvent.MonitoringLivePosition);
+    };
+
+    private onWatchedPosition = (position: GeolocationPosition) => {
+        const timedGeoPosition = mapGeolocationPositionToTimedGeo(position);
+
+        // if this is our first position, publish immediateley
+        if (!this.lastPublishedPositionTimestamp) {
+            this.publishLocationToBeacons(timedGeoPosition);
+        } else {
+            this.debouncedPublishLocationToBeacons(timedGeoPosition);
+        }
+    };
+
+    private onGeolocationError = async (error: GeolocationError): Promise<void> => {
+        this.geolocationError = error;
+        logger.error('Geolocation failed', this.geolocationError);
+
+        // other errors are considered non-fatal
+        // and self recovering
+        if (![
+            GeolocationError.Unavailable,
+            GeolocationError.PermissionDenied,
+        ].includes(error)) {
+            return;
+        }
+
+        this.stopPollingLocation();
+        // kill live beacons when location permissions are revoked
+        await Promise.all(this.liveBeaconIds.map(this.stopBeacon));
+    };
+
+    /**
+     * Gets the current location
+     * (as opposed to using watched location)
+     * and publishes it to all live beacons
+     */
+    private publishCurrentLocationToBeacons = async () => {
+        try {
+            const position = await getCurrentPosition();
+            this.publishLocationToBeacons(mapGeolocationPositionToTimedGeo(position));
+        } catch (error) {
+            this.onGeolocationError(error?.message);
+        }
+    };
+
+    /**
+     * MatrixClient api
+     */
+
+    /**
+     * Updates beacon with provided content update
+     * Records error in beaconUpdateErrors
+     * rethrows
+     */
+    private updateBeaconEvent = async (beacon: Beacon, update: Partial<BeaconInfoState>): Promise<void> => {
+        const { description, timeout, timestamp, live, assetType } = {
+            ...beacon.beaconInfo,
+            ...update,
+        };
+
+        const updateContent = makeBeaconInfoContent(timeout,
+            live,
+            description,
+            assetType,
+            timestamp,
+        );
+
+        try {
+            await this.matrixClient.unstable_setLiveBeacon(beacon.roomId, updateContent);
+            // cleanup any errors
+            const hadError = this.beaconUpdateErrors.has(beacon.identifier);
+            if (hadError) {
+                this.beaconUpdateErrors.delete(beacon.identifier);
+                this.emit(OwnBeaconStoreEvent.BeaconUpdateError, beacon.identifier, false);
+            }
+        } catch (error) {
+            logger.error('Failed to update beacon', error);
+            this.beaconUpdateErrors.set(beacon.identifier, error);
+            this.emit(OwnBeaconStoreEvent.BeaconUpdateError, beacon.identifier, true);
+
+            throw error;
+        }
+    };
+
+    /**
+     * Sends m.location events to all live beacons
+     * Sets last published beacon
+     */
+    private publishLocationToBeacons = async (position: TimedGeoUri) => {
+        this.lastPublishedPositionTimestamp = Date.now();
+        await Promise.all(this.healthyLiveBeaconIds.map(beaconId =>
+            this.sendLocationToBeacon(this.beacons.get(beaconId), position)),
+        );
+    };
+
+    private debouncedPublishLocationToBeacons = debounce(this.publishLocationToBeacons, MOVING_UPDATE_INTERVAL);
+
+    /**
+     * Sends m.location event to referencing given beacon
+     */
+    private sendLocationToBeacon = async (beacon: Beacon, { geoUri, timestamp }: TimedGeoUri) => {
+        const content = makeBeaconContent(geoUri, timestamp, beacon.beaconInfoId);
+        try {
+            await this.matrixClient.sendEvent(beacon.roomId, M_BEACON.name, content);
+            this.incrementBeaconLocationPublishErrorCount(beacon.identifier, false);
+        } catch (error) {
+            logger.error(error);
+            this.incrementBeaconLocationPublishErrorCount(beacon.identifier, true);
+        }
+    };
+
+    /**
+     * Manage beacon wire error count
+     * - clear count for beacon when not error
+     * - increment count for beacon when is error
+     * - emit if beacon error count crossed threshold
+     */
+    private incrementBeaconLocationPublishErrorCount = (beaconId: string, isError: boolean): void => {
+        const hadError = this.beaconHasLocationPublishError(beaconId);
+
+        if (isError) {
+            // increment error count
+            this.beaconLocationPublishErrorCounts.set(
+                beaconId,
+                (this.beaconLocationPublishErrorCounts.get(beaconId) ?? 0) + 1,
+            );
+        } else {
+            // clear any error count
+            this.beaconLocationPublishErrorCounts.delete(beaconId);
+        }
+
+        if (this.beaconHasLocationPublishError(beaconId) !== hadError) {
+            this.emit(OwnBeaconStoreEvent.LocationPublishError, beaconId);
+        }
+    };
+}
diff --git a/src/stores/ReadyWatchingStore.ts b/src/stores/ReadyWatchingStore.ts
index 4d03a482b5e..c44664a08e7 100644
--- a/src/stores/ReadyWatchingStore.ts
+++ b/src/stores/ReadyWatchingStore.ts
@@ -60,7 +60,13 @@ export abstract class ReadyWatchingStore extends EventEmitter implements IDestro
         // Default implementation is to do nothing.
     }
 
+    protected onDispatcherAction(payload: ActionPayload) {
+        // Default implementation is to do nothing.
+    }
+
     private onAction = async (payload: ActionPayload) => {
+        this.onDispatcherAction(payload);
+
         if (payload.action === 'MatrixActions.sync') {
             // Only set the client on the transition into the PREPARED state.
             // Everything after this is unnecessary (we only need to know once we have a client)
diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 66d045d11d0..77909ae6129 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import { ClientEvent } from "matrix-js-sdk/src/client";
 
 import dis from '../dispatcher/dispatcher';
 import { MatrixClientPeg } from '../MatrixClientPeg';
-import * as sdk from '../index';
 import Modal from '../Modal';
 import { _t } from '../languageHandler';
 import { getCachedRoomIDForAlias, storeRoomAliasInCache } from '../RoomAliasCache';
@@ -45,6 +44,8 @@ import { JoinRoomPayload } from "../dispatcher/payloads/JoinRoomPayload";
 import { JoinRoomReadyPayload } from "../dispatcher/payloads/JoinRoomReadyPayload";
 import { JoinRoomErrorPayload } from "../dispatcher/payloads/JoinRoomErrorPayload";
 import { ViewRoomErrorPayload } from "../dispatcher/payloads/ViewRoomErrorPayload";
+import ErrorDialog from "../components/views/dialogs/ErrorDialog";
+import { ActiveRoomChangedPayload } from "../dispatcher/payloads/ActiveRoomChangedPayload";
 
 const NUM_JOIN_RETRY = 5;
 
@@ -61,6 +62,8 @@ const INITIAL_STATE = {
     initialEventPixelOffset: null,
     // Whether to highlight the initial event
     isInitialEventHighlighted: false,
+    // whether to scroll `event_id` into view
+    initialEventScrollIntoView: true,
 
     // The room alias of the room (or null if not originally specified in view_room)
     roomAlias: null,
@@ -69,8 +72,6 @@ const INITIAL_STATE = {
     // Any error that has occurred during loading
     roomLoadError: null,
 
-    quotingEvent: null,
-
     replyingToEvent: null,
 
     shouldPeek: false,
@@ -80,19 +81,53 @@ const INITIAL_STATE = {
     wasContextSwitch: false,
 };
 
+type Listener = (isActive: boolean) => void;
+
 /**
  * A class for storing application state for RoomView. This is the RoomView's interface
 *  with a subset of the js-sdk.
  *  ```
  */
-class RoomViewStore extends Store<ActionPayload> {
+export class RoomViewStore extends Store<ActionPayload> {
+    // Important: This cannot be a dynamic getter (lazily-constructed instance) because
+    // otherwise we'll miss view_room dispatches during startup, breaking relaunches of
+    // the app. We need to eagerly create the instance.
+    public static readonly instance = new RoomViewStore();
+
     private state = INITIAL_STATE; // initialize state
 
-    constructor() {
+    // Keep these out of state to avoid causing excessive/recursive updates
+    private roomIdActivityListeners: Record<string, Listener[]> = {};
+
+    public constructor() {
         super(dis);
     }
 
-    setState(newState: Partial<typeof INITIAL_STATE>) {
+    public addRoomListener(roomId: string, fn: Listener) {
+        if (!this.roomIdActivityListeners[roomId]) this.roomIdActivityListeners[roomId] = [];
+        this.roomIdActivityListeners[roomId].push(fn);
+    }
+
+    public removeRoomListener(roomId: string, fn: Listener) {
+        if (this.roomIdActivityListeners[roomId]) {
+            const i = this.roomIdActivityListeners[roomId].indexOf(fn);
+            if (i > -1) {
+                this.roomIdActivityListeners[roomId].splice(i, 1);
+            }
+        } else {
+            logger.warn("Unregistering unrecognised listener (roomId=" + roomId + ")");
+        }
+    }
+
+    private emitForRoom(roomId: string, isActive: boolean) {
+        if (!this.roomIdActivityListeners[roomId]) return;
+
+        for (const fn of this.roomIdActivityListeners[roomId]) {
+            fn.call(null, isActive);
+        }
+    }
+
+    private setState(newState: Partial<typeof INITIAL_STATE>) {
         // If values haven't changed, there's nothing to do.
         // This only tries a shallow comparison, so unchanged objects will slip
         // through, but that's probably okay for now.
@@ -107,11 +142,25 @@ class RoomViewStore extends Store<ActionPayload> {
             return;
         }
 
+        const lastRoomId = this.state.roomId;
         this.state = Object.assign(this.state, newState);
+        if (lastRoomId !== this.state.roomId) {
+            if (lastRoomId) this.emitForRoom(lastRoomId, false);
+            if (this.state.roomId) this.emitForRoom(this.state.roomId, true);
+
+            // Fired so we can reduce dependency on event emitters to this store, which is relatively
+            // central to the application and can easily cause import cycles.
+            dis.dispatch<ActiveRoomChangedPayload>({
+                action: Action.ActiveRoomChanged,
+                oldRoomId: lastRoomId,
+                newRoomId: this.state.roomId,
+            });
+        }
+
         this.__emitChange();
     }
 
-    __onDispatch(payload) { // eslint-disable-line @typescript-eslint/naming-convention
+    protected __onDispatch(payload) { // eslint-disable-line @typescript-eslint/naming-convention
         switch (payload.action) {
             // view_room:
             //      - room_alias:   '#somealias:matrix.org'
@@ -123,11 +172,8 @@ class RoomViewStore extends Store<ActionPayload> {
                 this.viewRoom(payload);
                 break;
             // for these events blank out the roomId as we are no longer in the RoomView
-            case 'view_create_group':
             case 'view_welcome_page':
             case Action.ViewHomePage:
-            case 'view_my_groups':
-            case 'view_group':
                 this.setState({
                     roomId: null,
                     roomAlias: null,
@@ -198,10 +244,10 @@ class RoomViewStore extends Store<ActionPayload> {
                 break;
             case 'reply_to_event':
                 // If currently viewed room does not match the room in which we wish to reply then change rooms
-                // this can happen when performing a search across all rooms
-                if (payload.context === TimelineRenderingType.Room) {
-                    if (payload.event
-                        && payload.event.getRoomId() !== this.state.roomId) {
+                // this can happen when performing a search across all rooms. Persist the data from this event for
+                // both room and search timeline rendering types, search will get auto-closed by RoomView at this time.
+                if ([TimelineRenderingType.Room, TimelineRenderingType.Search].includes(payload.context)) {
+                    if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
                         dis.dispatch<ViewRoomPayload>({
                             action: Action.ViewRoom,
                             room_id: payload.event.getRoomId(),
@@ -215,15 +261,6 @@ class RoomViewStore extends Store<ActionPayload> {
                     }
                 }
                 break;
-            case 'open_room_settings': {
-                // FIXME: Using an import will result in test failures
-                const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
-                Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
-                    roomId: payload.room_id || this.state.roomId,
-                    initialTabId: payload.initial_tab_id,
-                }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-                break;
-            }
         }
     }
 
@@ -256,6 +293,7 @@ class RoomViewStore extends Store<ActionPayload> {
                 roomAlias: payload.room_alias,
                 initialEventId: payload.event_id,
                 isInitialEventHighlighted: payload.highlighted,
+                initialEventScrollIntoView: payload.scroll_into_view ?? true,
                 roomLoading: false,
                 roomLoadError: null,
                 // should peek by default
@@ -264,8 +302,6 @@ class RoomViewStore extends Store<ActionPayload> {
                 joining: payload.joining || false,
                 // Reset replyingToEvent because we don't want cross-room because bad UX
                 replyingToEvent: null,
-                // pull the user out of Room Settings
-                isEditingSettings: false,
                 viaServers: payload.via_servers,
                 wasContextSwitch: payload.context_switch,
             };
@@ -273,6 +309,9 @@ class RoomViewStore extends Store<ActionPayload> {
             // Allow being given an event to be replied to when switching rooms but sanity check its for this room
             if (payload.replyingToEvent?.getRoomId() === payload.room_id) {
                 newState.replyingToEvent = payload.replyingToEvent;
+            } else if (this.state.roomId === payload.room_id) {
+                // if the room isn't being changed, e.g visiting a permalink then maintain replyingToEvent
+                newState.replyingToEvent = this.state.replyingToEvent;
             }
 
             this.setState(newState);
@@ -297,6 +336,7 @@ class RoomViewStore extends Store<ActionPayload> {
                     initialEventId: null,
                     initialEventPixelOffset: null,
                     isInitialEventHighlighted: null,
+                    initialEventScrollIntoView: true,
                     roomAlias: payload.room_alias,
                     roomLoading: true,
                     roomLoadError: null,
@@ -372,7 +412,7 @@ class RoomViewStore extends Store<ActionPayload> {
         }
     }
 
-    private static getInvitingUserId(roomId: string): string {
+    private getInvitingUserId(roomId: string): string {
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(roomId);
         if (room && room.getMyMembership() === "invite") {
@@ -383,34 +423,32 @@ class RoomViewStore extends Store<ActionPayload> {
     }
 
     public showJoinRoomError(err: MatrixError, roomId: string) {
-        let msg: ReactNode = err.message ? err.message : JSON.stringify(err);
-        logger.log("Failed to join room:", msg);
+        let description: ReactNode = err.message ? err.message : JSON.stringify(err);
+        logger.log("Failed to join room:", description);
 
         if (err.name === "ConnectionError") {
-            msg = _t("There was an error joining the room");
+            description = _t("There was an error joining.");
         } else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
-            msg = <div>
-                { _t("Sorry, your homeserver is too old to participate in this room.") }<br />
+            description = <div>
+                { _t("Sorry, your homeserver is too old to participate here.") }<br />
                 { _t("Please contact your homeserver administrator.") }
             </div>;
         } else if (err.httpStatus === 404) {
-            const invitingUserId = RoomViewStore.getInvitingUserId(roomId);
+            const invitingUserId = this.getInvitingUserId(roomId);
             // only provide a better error message for invites
             if (invitingUserId) {
                 // if the inviting user is on the same HS, there can only be one cause: they left.
                 if (invitingUserId.endsWith(`:${MatrixClientPeg.get().getDomain()}`)) {
-                    msg = _t("The person who invited you already left the room.");
+                    description = _t("The person who invited you has already left.");
                 } else {
-                    msg = _t("The person who invited you already left the room, or their server is offline.");
+                    description = _t("The person who invited you has already left, or their server is offline.");
                 }
             }
         }
 
-        // FIXME: Using an import will result in test failures
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
-            title: _t("Failed to join room"),
-            description: msg,
+            title: _t("Failed to join"),
+            description,
         });
     }
 
@@ -441,6 +479,11 @@ class RoomViewStore extends Store<ActionPayload> {
         return this.state.isInitialEventHighlighted;
     }
 
+    // Whether to avoid jumping to the initial event
+    public initialEventScrollIntoView() {
+        return this.state.initialEventScrollIntoView;
+    }
+
     // The room alias of the room (or null if not originally specified in view_room)
     public getRoomAlias() {
         return this.state.roomAlias;
@@ -473,7 +516,7 @@ class RoomViewStore extends Store<ActionPayload> {
     //         // Not joined
     //     }
     // } else {
-    //     if (RoomViewStore.isJoining()) {
+    //     if (RoomViewStore.instance.isJoining()) {
     //         // show spinner
     //     } else {
     //         // show join prompt
@@ -501,9 +544,3 @@ class RoomViewStore extends Store<ActionPayload> {
         return this.state.wasContextSwitch;
     }
 }
-
-let singletonRoomViewStore: RoomViewStore = null;
-if (!singletonRoomViewStore) {
-    singletonRoomViewStore = new RoomViewStore();
-}
-export default singletonRoomViewStore;
diff --git a/src/stores/VideoChannelStore.ts b/src/stores/VideoChannelStore.ts
new file mode 100644
index 00000000000..d32f748fb7f
--- /dev/null
+++ b/src/stores/VideoChannelStore.ts
@@ -0,0 +1,283 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from "events";
+import { ClientWidgetApi, IWidgetApiRequest } from "matrix-widget-api";
+
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { ActionPayload } from "../dispatcher/payloads";
+import { ElementWidgetActions } from "./widgets/ElementWidgetActions";
+import { WidgetMessagingStore, WidgetMessagingStoreEvent } from "./widgets/WidgetMessagingStore";
+import {
+    VIDEO_CHANNEL_MEMBER,
+    IVideoChannelMemberContent,
+    getVideoChannel,
+} from "../utils/VideoChannelUtils";
+import { timeout } from "../utils/promise";
+import WidgetUtils from "../utils/WidgetUtils";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+
+export enum VideoChannelEvent {
+    StartConnect = "start_connect",
+    Connect = "connect",
+    Disconnect = "disconnect",
+    Participants = "participants",
+}
+
+export interface IJitsiParticipant {
+    avatarURL: string;
+    displayName: string;
+    formattedDisplayName: string;
+    participantId: string;
+}
+
+const TIMEOUT_MS = 16000;
+
+// Wait until an event is emitted satisfying the given predicate
+const waitForEvent = async (emitter: EventEmitter, event: string, pred: (...args) => boolean = () => true) => {
+    let listener;
+    const wait = new Promise<void>(resolve => {
+        listener = (...args) => { if (pred(...args)) resolve(); };
+        emitter.on(event, listener);
+    });
+
+    const timedOut = await timeout(wait, false, TIMEOUT_MS) === false;
+    emitter.off(event, listener);
+    if (timedOut) throw new Error("Timed out");
+};
+
+/*
+ * Holds information about the currently active video channel.
+ */
+export default class VideoChannelStore extends AsyncStoreWithClient<null> {
+    private static _instance: VideoChannelStore;
+
+    public static get instance(): VideoChannelStore {
+        if (!VideoChannelStore._instance) {
+            VideoChannelStore._instance = new VideoChannelStore();
+        }
+        return VideoChannelStore._instance;
+    }
+
+    private constructor() {
+        super(defaultDispatcher);
+    }
+
+    protected async onAction(payload: ActionPayload): Promise<void> {
+        // nothing to do
+    }
+
+    private activeChannel: ClientWidgetApi;
+
+    private _roomId: string;
+    public get roomId(): string { return this._roomId; }
+    private set roomId(value: string) { this._roomId = value; }
+
+    private _connected = false;
+    public get connected(): boolean { return this._connected; }
+    private set connected(value: boolean) { this._connected = value; }
+
+    private _participants: IJitsiParticipant[] = [];
+    public get participants(): IJitsiParticipant[] { return this._participants; }
+    private set participants(value: IJitsiParticipant[]) { this._participants = value; }
+
+    private _audioMuted = localStorage.getItem("mx_audioMuted") === "true";
+    public get audioMuted(): boolean { return this._audioMuted; }
+    public set audioMuted(value: boolean) {
+        this._audioMuted = value;
+        localStorage.setItem("mx_audioMuted", value.toString());
+    }
+
+    private _videoMuted = localStorage.getItem("mx_videoMuted") === "true";
+    public get videoMuted(): boolean { return this._videoMuted; }
+    public set videoMuted(value: boolean) {
+        this._videoMuted = value;
+        localStorage.setItem("mx_videoMuted", value.toString());
+    }
+
+    public connect = async (roomId: string, audioDevice: MediaDeviceInfo, videoDevice: MediaDeviceInfo) => {
+        if (this.activeChannel) await this.disconnect();
+
+        const jitsi = getVideoChannel(roomId);
+        if (!jitsi) throw new Error(`No video channel in room ${roomId}`);
+
+        const jitsiUid = WidgetUtils.getWidgetUid(jitsi);
+        const messagingStore = WidgetMessagingStore.instance;
+
+        let messaging = messagingStore.getMessagingForUid(jitsiUid);
+        if (!messaging) {
+            // The widget might still be initializing, so wait for it
+            try {
+                await waitForEvent(
+                    messagingStore,
+                    WidgetMessagingStoreEvent.StoreMessaging,
+                    (uid: string, widgetApi: ClientWidgetApi) => {
+                        if (uid === jitsiUid) {
+                            messaging = widgetApi;
+                            return true;
+                        }
+                        return false;
+                    },
+                );
+            } catch (e) {
+                throw new Error(`Failed to bind video channel in room ${roomId}: ${e}`);
+            }
+        }
+
+        if (!messagingStore.isWidgetReady(jitsiUid)) {
+            // Wait for the widget to be ready to receive our join event
+            try {
+                await waitForEvent(
+                    messagingStore,
+                    WidgetMessagingStoreEvent.WidgetReady,
+                    (uid: string) => uid === jitsiUid,
+                );
+            } catch (e) {
+                throw new Error(`Video channel in room ${roomId} never became ready: ${e}`);
+            }
+        }
+
+        // Participant data and mute state will come down the event pipeline quickly, so prepare in advance
+        this.activeChannel = messaging;
+        this.roomId = roomId;
+        messaging.on(`action:${ElementWidgetActions.CallParticipants}`, this.onParticipants);
+        messaging.on(`action:${ElementWidgetActions.MuteAudio}`, this.onMuteAudio);
+        messaging.on(`action:${ElementWidgetActions.UnmuteAudio}`, this.onUnmuteAudio);
+        messaging.on(`action:${ElementWidgetActions.MuteVideo}`, this.onMuteVideo);
+        messaging.on(`action:${ElementWidgetActions.UnmuteVideo}`, this.onUnmuteVideo);
+
+        this.emit(VideoChannelEvent.StartConnect, roomId);
+
+        // Actually perform the join
+        const waitForJoin = waitForEvent(
+            messaging,
+            `action:${ElementWidgetActions.JoinCall}`,
+            (ev: CustomEvent<IWidgetApiRequest>) => {
+                this.ack(ev);
+                return true;
+            },
+        );
+        messaging.transport.send(ElementWidgetActions.JoinCall, {
+            audioDevice: audioDevice?.label,
+            videoDevice: videoDevice?.label,
+        });
+        try {
+            await waitForJoin;
+        } catch (e) {
+            // If it timed out, clean up our advance preparations
+            this.activeChannel = null;
+            this.roomId = null;
+            messaging.off(`action:${ElementWidgetActions.CallParticipants}`, this.onParticipants);
+            messaging.off(`action:${ElementWidgetActions.MuteAudio}`, this.onMuteAudio);
+            messaging.off(`action:${ElementWidgetActions.UnmuteAudio}`, this.onUnmuteAudio);
+            messaging.off(`action:${ElementWidgetActions.MuteVideo}`, this.onMuteVideo);
+            messaging.off(`action:${ElementWidgetActions.UnmuteVideo}`, this.onUnmuteVideo);
+
+            this.emit(VideoChannelEvent.Disconnect, roomId);
+
+            throw new Error(`Failed to join call in room ${roomId}: ${e}`);
+        }
+
+        this.connected = true;
+        messaging.once(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
+        window.addEventListener("beforeunload", this.setDisconnected);
+
+        this.emit(VideoChannelEvent.Connect, roomId);
+
+        // Tell others that we're connected, by adding our device to room state
+        this.updateDevices(roomId, devices => Array.from(new Set(devices).add(this.matrixClient.getDeviceId())));
+    };
+
+    public disconnect = async () => {
+        if (!this.activeChannel) throw new Error("Not connected to any video channel");
+
+        const waitForDisconnect = waitForEvent(this, VideoChannelEvent.Disconnect);
+        this.activeChannel.transport.send(ElementWidgetActions.HangupCall, {});
+        try {
+            await waitForDisconnect; // onHangup cleans up for us
+        } catch (e) {
+            throw new Error(`Failed to hangup call in room ${this.roomId}: ${e}`);
+        }
+    };
+
+    public setDisconnected = async () => {
+        this.activeChannel.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
+        this.activeChannel.off(`action:${ElementWidgetActions.CallParticipants}`, this.onParticipants);
+        window.removeEventListener("beforeunload", this.setDisconnected);
+
+        const roomId = this.roomId;
+        this.activeChannel = null;
+        this.roomId = null;
+        this.connected = false;
+        this.participants = [];
+
+        this.emit(VideoChannelEvent.Disconnect, roomId);
+
+        // Tell others that we're disconnected, by removing our device from room state
+        await this.updateDevices(roomId, devices => {
+            const devicesSet = new Set(devices);
+            devicesSet.delete(this.matrixClient.getDeviceId());
+            return Array.from(devicesSet);
+        });
+    };
+
+    private ack = (ev: CustomEvent<IWidgetApiRequest>) => {
+        // Even if we don't have a reply to a given widget action, we still need
+        // to give the widget API something to acknowledge receipt
+        this.activeChannel.transport.reply(ev.detail, {});
+    };
+
+    private updateDevices = async (roomId: string, fn: (devices: string[]) => string[]) => {
+        const room = this.matrixClient.getRoom(roomId);
+        const devicesState = room.currentState.getStateEvents(VIDEO_CHANNEL_MEMBER, this.matrixClient.getUserId());
+        const devices = devicesState?.getContent<IVideoChannelMemberContent>()?.devices ?? [];
+
+        await this.matrixClient.sendStateEvent(
+            roomId, VIDEO_CHANNEL_MEMBER, { devices: fn(devices) }, this.matrixClient.getUserId(),
+        );
+    };
+
+    private onHangup = async (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.ack(ev);
+        await this.setDisconnected();
+    };
+
+    private onParticipants = (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.participants = ev.detail.data.participants as IJitsiParticipant[];
+        this.emit(VideoChannelEvent.Participants, this.roomId, ev.detail.data.participants);
+        this.ack(ev);
+    };
+
+    private onMuteAudio = (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.audioMuted = true;
+        this.ack(ev);
+    };
+
+    private onUnmuteAudio = (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.audioMuted = false;
+        this.ack(ev);
+    };
+
+    private onMuteVideo = (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.videoMuted = true;
+        this.ack(ev);
+    };
+
+    private onUnmuteVideo = (ev: CustomEvent<IWidgetApiRequest>) => {
+        this.videoMuted = false;
+        this.ack(ev);
+    };
+}
diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts
index adec53d9caa..0d6ecb52526 100644
--- a/src/stores/WidgetStore.ts
+++ b/src/stores/WidgetStore.ts
@@ -29,7 +29,6 @@ import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import WidgetUtils from "../utils/WidgetUtils";
 import { WidgetType } from "../widgets/WidgetType";
 import { UPDATE_EVENT } from "./AsyncStore";
-import { MatrixClientPeg } from "../MatrixClientPeg";
 
 interface IState {}
 
@@ -44,10 +43,6 @@ interface IRoomWidgets {
     widgets: IApp[];
 }
 
-function widgetUid(app: IApp): string {
-    return `${app.roomId ?? MatrixClientPeg.get().getUserId()}::${app.id}`;
-}
-
 // TODO consolidate WidgetEchoStore into this
 // TODO consolidate ActiveWidgetStore into this
 export default class WidgetStore extends AsyncStoreWithClient<IState> {
@@ -119,13 +114,13 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
         // otherwise we are out of sync with the rest of the app with stale widget events during removal
         Array.from(this.widgetMap.values()).forEach(app => {
             if (app.roomId !== room.roomId) return; // skip - wrong room
-            this.widgetMap.delete(widgetUid(app));
+            this.widgetMap.delete(WidgetUtils.getWidgetUid(app));
         });
 
         let edited = false;
         this.generateApps(room).forEach(app => {
             // Sanity check for https://github.com/vector-im/element-web/issues/15705
-            const existingApp = this.widgetMap.get(widgetUid(app));
+            const existingApp = this.widgetMap.get(WidgetUtils.getWidgetUid(app));
             if (existingApp) {
                 logger.warn(
                     `Possible widget ID conflict for ${app.id} - wants to store in room ${app.roomId} ` +
@@ -133,7 +128,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
                 );
             }
 
-            this.widgetMap.set(widgetUid(app), app);
+            this.widgetMap.set(WidgetUtils.getWidgetUid(app), app);
             roomInfo.widgets.push(app);
             edited = true;
         });
@@ -144,14 +139,13 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
         // If a persistent widget is active, check to see if it's just been removed.
         // If it has, it needs to destroyed otherwise unmounting the node won't kill it
         const persistentWidgetId = ActiveWidgetStore.instance.getPersistentWidgetId();
-        if (persistentWidgetId) {
-            if (
-                ActiveWidgetStore.instance.getRoomId(persistentWidgetId) === room.roomId &&
-                !roomInfo.widgets.some(w => w.id === persistentWidgetId)
-            ) {
-                logger.log(`Persistent widget ${persistentWidgetId} removed from room ${room.roomId}: destroying.`);
-                ActiveWidgetStore.instance.destroyPersistentWidget(persistentWidgetId);
-            }
+        if (
+            persistentWidgetId &&
+            ActiveWidgetStore.instance.getPersistentRoomId() === room.roomId &&
+            !roomInfo.widgets.some(w => w.id === persistentWidgetId)
+        ) {
+            logger.log(`Persistent widget ${persistentWidgetId} removed from room ${room.roomId}: destroying.`);
+            ActiveWidgetStore.instance.destroyPersistentWidget(persistentWidgetId, room.roomId);
         }
 
         this.emit(room.roomId);
@@ -196,7 +190,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
 
         // A persistent conference widget indicates that we're participating
         const widgets = roomInfo.widgets.filter(w => WidgetType.JITSI.matches(w.type));
-        return widgets.some(w => ActiveWidgetStore.instance.getWidgetPersistence(w.id));
+        return widgets.some(w => ActiveWidgetStore.instance.getWidgetPersistence(w.id, room.roomId));
     }
 }
 
diff --git a/src/stores/notifications/ListNotificationState.ts b/src/stores/notifications/ListNotificationState.ts
index 4e12fbbf26d..56af3be178d 100644
--- a/src/stores/notifications/ListNotificationState.ts
+++ b/src/stores/notifications/ListNotificationState.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ limitations under the License.
 import { Room } from "matrix-js-sdk/src/models/room";
 
 import { NotificationColor } from "./NotificationColor";
-import { TagID } from "../room-list/models";
 import { arrayDiff } from "../../utils/arrays";
 import { RoomNotificationState } from "./RoomNotificationState";
 import { NotificationState, NotificationStateEvents } from "./NotificationState";
@@ -28,7 +27,7 @@ export class ListNotificationState extends NotificationState {
     private rooms: Room[] = [];
     private states: { [roomId: string]: RoomNotificationState } = {};
 
-    constructor(private byTileCount = false, private tagId: TagID, private getRoomFn: FetchRoomFn) {
+    constructor(private byTileCount = false, private getRoomFn: FetchRoomFn) {
         super();
     }
 
diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts
index 517a23fa97b..c4c803483df 100644
--- a/src/stores/notifications/RoomNotificationState.ts
+++ b/src/stores/notifications/RoomNotificationState.ts
@@ -25,17 +25,21 @@ import { EffectiveMembership, getEffectiveMembership } from "../../utils/members
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import * as RoomNotifs from '../../RoomNotifs';
 import * as Unread from '../../Unread';
-import { NotificationState } from "./NotificationState";
+import { NotificationState, NotificationStateEvents } from "./NotificationState";
 import { getUnsentMessages } from "../../components/structures/RoomStatusBar";
+import { ThreadsRoomNotificationState } from "./ThreadsRoomNotificationState";
 
 export class RoomNotificationState extends NotificationState implements IDestroyable {
-    constructor(public readonly room: Room) {
+    constructor(public readonly room: Room, private readonly threadsState?: ThreadsRoomNotificationState) {
         super();
         this.room.on(RoomEvent.Receipt, this.handleReadReceipt);
         this.room.on(RoomEvent.Timeline, this.handleRoomEventUpdate);
         this.room.on(RoomEvent.Redaction, this.handleRoomEventUpdate);
         this.room.on(RoomEvent.MyMembership, this.handleMembershipUpdate);
         this.room.on(RoomEvent.LocalEchoUpdated, this.handleLocalEchoUpdated);
+        if (threadsState) {
+            threadsState.on(NotificationStateEvents.Update, this.handleThreadsUpdate);
+        }
         MatrixClientPeg.get().on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         MatrixClientPeg.get().on(ClientEvent.AccountData, this.handleAccountDataUpdate);
         this.updateNotificationState();
@@ -52,12 +56,19 @@ export class RoomNotificationState extends NotificationState implements IDestroy
         this.room.removeListener(RoomEvent.Redaction, this.handleRoomEventUpdate);
         this.room.removeListener(RoomEvent.MyMembership, this.handleMembershipUpdate);
         this.room.removeListener(RoomEvent.LocalEchoUpdated, this.handleLocalEchoUpdated);
+        if (this.threadsState) {
+            this.threadsState.removeListener(NotificationStateEvents.Update, this.handleThreadsUpdate);
+        }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener(MatrixEventEvent.Decrypted, this.onEventDecrypted);
             MatrixClientPeg.get().removeListener(ClientEvent.AccountData, this.handleAccountDataUpdate);
         }
     }
 
+    private handleThreadsUpdate = () => {
+        this.updateNotificationState();
+    };
+
     private handleLocalEchoUpdated = () => {
         this.updateNotificationState();
     };
diff --git a/src/stores/notifications/RoomNotificationStateStore.ts b/src/stores/notifications/RoomNotificationStateStore.ts
index 638b7df096a..887e1a7332c 100644
--- a/src/stores/notifications/RoomNotificationStateStore.ts
+++ b/src/stores/notifications/RoomNotificationStateStore.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
         const getRoomFn: FetchRoomFn = (room: Room) => {
             return this.getRoomState(room);
         };
-        const state = new ListNotificationState(useTileCount, tagId, getRoomFn);
+        const state = new ListNotificationState(useTileCount, getRoomFn);
         this.listMap.set(tagId, state);
         return state;
     }
@@ -82,12 +82,13 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
      */
     public getRoomState(room: Room): RoomNotificationState {
         if (!this.roomMap.has(room)) {
-            this.roomMap.set(room, new RoomNotificationState(room));
             // Not very elegant, but that way we ensure that we start tracking
             // threads notification at the same time at rooms.
             // There are multiple entry points, and it's unclear which one gets
             // called first
-            this.roomThreadsMap.set(room, new ThreadsRoomNotificationState(room));
+            const threadState = new ThreadsRoomNotificationState(room);
+            this.roomThreadsMap.set(room, threadState);
+            this.roomMap.set(room, new RoomNotificationState(room, threadState));
         }
         return this.roomMap.get(room);
     }
diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts
index e5acf7e9494..db21e635b49 100644
--- a/src/stores/notifications/SpaceNotificationState.ts
+++ b/src/stores/notifications/SpaceNotificationState.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ export class SpaceNotificationState extends NotificationState {
     public rooms: Room[] = []; // exposed only for tests
     private states: { [spaceId: string]: RoomNotificationState } = {};
 
-    constructor(private spaceId: string | symbol, private getRoomFn: FetchRoomFn) {
+    constructor(private getRoomFn: FetchRoomFn) {
         super();
     }
 
diff --git a/src/stores/notifications/ThreadNotificationState.ts b/src/stores/notifications/ThreadNotificationState.ts
index 70209d398d7..2b2bcf175ce 100644
--- a/src/stores/notifications/ThreadNotificationState.ts
+++ b/src/stores/notifications/ThreadNotificationState.ts
@@ -31,6 +31,10 @@ export class ThreadNotificationState extends NotificationState implements IDestr
         super();
         this.thread.on(ThreadEvent.NewReply, this.handleNewThreadReply);
         this.thread.on(ThreadEvent.ViewThread, this.resetThreadNotification);
+        if (this.thread.replyToEvent) {
+            // Process the current tip event
+            this.handleNewThreadReply(this.thread, this.thread.replyToEvent);
+        }
     }
 
     public destroy(): void {
diff --git a/src/stores/right-panel/RightPanelStore.ts b/src/stores/right-panel/RightPanelStore.ts
index 3ea50ec0bb3..bb4ddc4fcbf 100644
--- a/src/stores/right-panel/RightPanelStore.ts
+++ b/src/stores/right-panel/RightPanelStore.ts
@@ -14,15 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EventSubscription } from 'fbemitter';
 import { logger } from "matrix-js-sdk/src/logger";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
+import { Optional } from "matrix-events-sdk";
 
 import defaultDispatcher from '../../dispatcher/dispatcher';
 import { pendingVerificationRequestForUser } from '../../verification';
 import SettingsStore from "../../settings/SettingsStore";
 import { RightPanelPhases } from "./RightPanelStorePhases";
-import { ActionPayload } from "../../dispatcher/payloads";
 import { SettingLevel } from "../../settings/SettingLevel";
 import { UPDATE_EVENT } from '../AsyncStore';
 import { ReadyWatchingStore } from '../ReadyWatchingStore';
@@ -32,61 +31,46 @@ import {
     IRightPanelCard,
     IRightPanelForRoom,
 } from './RightPanelStoreIPanelState';
-import RoomViewStore from '../RoomViewStore';
-
-const GROUP_PHASES = [
-    RightPanelPhases.GroupMemberList,
-    RightPanelPhases.GroupRoomList,
-    RightPanelPhases.GroupRoomInfo,
-    RightPanelPhases.GroupMemberInfo,
-];
+import { ActionPayload } from "../../dispatcher/payloads";
+import { Action } from "../../dispatcher/actions";
+import { ActiveRoomChangedPayload } from "../../dispatcher/payloads/ActiveRoomChangedPayload";
+import { RoomViewStore } from "../RoomViewStore";
 
 /**
  * A class for tracking the state of the right panel between layouts and
  * sessions. This state includes a history for each room. Each history element
  * contains the phase (e.g. RightPanelPhase.RoomMemberInfo) and the state (e.g.
  * the member) associated with it.
- * Groups are treated the same as rooms (they are also stored in the byRoom
- * object). This is possible since the store keeps track of the opened
- * room/group -> the store will provide the correct history for that group/room.
 */
 export default class RightPanelStore extends ReadyWatchingStore {
     private static internalInstance: RightPanelStore;
-    private readonly dispatcherRefRightPanelStore: string;
-    private viewedRoomId: string;
-    private isReady = false;
 
     private global?: IRightPanelForRoom = null;
     private byRoom: {
         [roomId: string]: IRightPanelForRoom;
     } = {};
-
-    private roomStoreToken: EventSubscription;
+    private viewedRoomId: Optional<string>;
 
     private constructor() {
         super(defaultDispatcher);
-        this.dispatcherRefRightPanelStore = defaultDispatcher.register(this.onDispatch);
     }
 
     protected async onReady(): Promise<any> {
-        this.isReady = true;
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.viewedRoomId = RoomViewStore.instance.getRoomId();
         this.matrixClient.on(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate);
-        this.viewedRoomId = RoomViewStore.getRoomId();
         this.loadCacheFromSettings();
         this.emitAndUpdateSettings();
     }
-    public destroy() {
-        if (this.dispatcherRefRightPanelStore) {
-            defaultDispatcher.unregister(this.dispatcherRefRightPanelStore);
-        }
-        super.destroy();
-    }
 
     protected async onNotReady(): Promise<any> {
-        this.isReady = false;
         this.matrixClient.off(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate);
-        this.roomStoreToken.remove();
+    }
+
+    protected onDispatcherAction(payload: ActionPayload) {
+        if (payload.action !== Action.ActiveRoomChanged) return;
+
+        const changePayload = <ActiveRoomChangedPayload>payload;
+        this.handleViewedRoomChange(changePayload.oldRoomId, changePayload.newRoomId);
     }
 
     // Getters
@@ -138,12 +122,6 @@ export default class RightPanelStore extends ReadyWatchingStore {
         return { state: {}, phase: null };
     }
 
-    // The Group associated getters are just for backwards compatibility. Can be removed when deprecating groups.
-    public get isOpenForGroup(): boolean { return this.isOpen; }
-    public get groupPhaseHistory(): Array<IRightPanelCard> { return this.roomPhaseHistory; }
-    public get currentGroup(): IRightPanelCard { return this.currentCard; }
-    public get previousGroup(): IRightPanelCard { return this.previousCard; }
-
     // Setters
     public setCard(card: IRightPanelCard, allowClose = true, roomId?: string) {
         const rId = roomId ?? this.viewedRoomId;
@@ -159,7 +137,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
         if (!this.isPhaseValid(targetPhase)) return;
 
         if ((targetPhase === this.currentCardForRoom(rId)?.phase && !!cardState)) {
-            // Update state: set right panel with a new state but keep the phase (dont know it this is ever needed...)
+            // Update state: set right panel with a new state but keep the phase (don't know it this is ever needed...)
             const hist = this.byRoom[rId]?.history ?? [];
             hist[hist.length - 1].state = cardState;
             this.emitAndUpdateSettings();
@@ -251,8 +229,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
             this.byRoom[this.viewedRoomId] = this.byRoom[this.viewedRoomId] ??
                 convertToStatePanel(SettingsStore.getValue("RightPanel.phases", this.viewedRoomId), room);
         } else {
-            console.warn("Could not restore the right panel after load because there was no associated room object. " +
-                "The right panel can only be restored for rooms and spaces but not for groups.");
+            console.warn("Could not restore the right panel after load because there was no associated room object.");
         }
     }
 
@@ -278,6 +255,9 @@ export default class RightPanelStore extends ReadyWatchingStore {
     private filterValidCards(rightPanelForRoom?: IRightPanelForRoom) {
         if (!rightPanelForRoom?.history) return;
         rightPanelForRoom.history = rightPanelForRoom.history.filter((card) => this.isCardStateValid(card));
+        if (!rightPanelForRoom.history.length) {
+            rightPanelForRoom.isOpen = false;
+        }
     }
 
     private isCardStateValid(card: IRightPanelCard) {
@@ -288,7 +268,11 @@ export default class RightPanelStore extends ReadyWatchingStore {
         // or potentially other errors.
         // (A nicer fix could be to indicate, that the right panel is loading if there is missing state data and re-emit if the data is available)
         switch (card.phase) {
+            case RightPanelPhases.ThreadPanel:
+                if (!SettingsStore.getValue("feature_thread")) return false;
+                break;
             case RightPanelPhases.ThreadView:
+                if (!SettingsStore.getValue("feature_thread")) return false;
                 if (!card.state.threadHeadEvent) {
                     console.warn("removed card from right panel because of missing threadHeadEvent in card state");
                 }
@@ -296,7 +280,6 @@ export default class RightPanelStore extends ReadyWatchingStore {
             case RightPanelPhases.RoomMemberInfo:
             case RightPanelPhases.SpaceMemberInfo:
             case RightPanelPhases.EncryptionPanel:
-            case RightPanelPhases.GroupMemberInfo:
                 if (!card.state.member) {
                     console.warn("removed card from right panel because of missing member in card state");
                 }
@@ -307,11 +290,6 @@ export default class RightPanelStore extends ReadyWatchingStore {
                     console.warn("removed card from right panel because of missing memberInfoEvent in card state");
                 }
                 return !!card.state.memberInfoEvent;
-            case RightPanelPhases.GroupRoomInfo:
-                if (!card.state.groupRoomId) {
-                    console.warn("removed card from right panel because of missing groupRoomId in card state");
-                }
-                return !!card.state.groupRoomId;
             case RightPanelPhases.Widget:
                 if (!card.state.widgetId) {
                     console.warn("removed card from right panel because of missing widgetId in card state");
@@ -350,13 +328,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
             logger.warn(`Tried to switch right panel to unknown phase: ${targetPhase}`);
             return false;
         }
-        if (GROUP_PHASES.includes(targetPhase) && isViewingRoom) {
-            logger.warn(
-                `Tried to switch right panel to a group phase: ${targetPhase}, ` +
-                `but we are currently not viewing a group`,
-            );
-            return false;
-        } else if (!GROUP_PHASES.includes(targetPhase) && !isViewingRoom) {
+        if (!isViewingRoom) {
             logger.warn(
                 `Tried to switch right panel to a room phase: ${targetPhase}, ` +
                 `but we are currently not viewing a room`,
@@ -367,6 +339,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
     }
 
     private onVerificationRequestUpdate = () => {
+        if (!this.currentCard?.state) return;
         const { member } = this.currentCard.state;
         if (!member) return;
         const pendingRequest = pendingVerificationRequestForUser(member);
@@ -376,11 +349,24 @@ export default class RightPanelStore extends ReadyWatchingStore {
         }
     };
 
-    private onRoomViewStoreUpdate = () => {
-        // TODO: only use this function instead of the onDispatch (the whole onDispatch can get removed!) as soon groups are removed
-        this.viewedRoomId = RoomViewStore.getRoomId();
+    private handleViewedRoomChange(oldRoomId: Optional<string>, newRoomId: Optional<string>) {
+        if (!this.mxClient) return; // not ready, onReady will handle the first room
+        this.viewedRoomId = newRoomId;
         // load values from byRoomCache with the viewedRoomId.
         this.loadCacheFromSettings();
+
+        // when we're switching to a room, clear out any stale MemberInfo cards
+        // in order to fix https://github.com/vector-im/element-web/issues/21487
+        if (this.currentCard?.phase !== RightPanelPhases.EncryptionPanel) {
+            const panel = this.byRoom[this.viewedRoomId];
+            if (panel?.history) {
+                panel.history = panel.history.filter(
+                    (card) => card.phase != RightPanelPhases.RoomMemberInfo &&
+                        card.phase != RightPanelPhases.Room3pidMemberInfo,
+                );
+            }
+        }
+
         // If the right panel stays open mode is used, and the panel was either
         // closed or never shown for that room, then force it open and display
         // the room member list.
@@ -399,43 +385,12 @@ export default class RightPanelStore extends ReadyWatchingStore {
             };
         }
         this.emitAndUpdateSettings();
-    };
+    }
 
     private get isViewingRoom(): boolean {
         return !!this.viewedRoomId;
     }
 
-    private onDispatch = (payload: ActionPayload) => {
-        switch (payload.action) {
-            case 'view_group': {
-                // Put group in the same/similar view to what was open from the previously viewed room
-                // Is contradictory to the new "per room" philosophy but it is the legacy behavior for groups.
-
-                if (
-                    this.currentCard?.phase === RightPanelPhases.GroupMemberInfo
-                ) {
-                    // switch from room to group
-                    this.setRightPanelCache({ phase: RightPanelPhases.GroupMemberList, state: {} });
-                }
-
-                // The right panel store always will return the state for the current room.
-                this.viewedRoomId = null; // a group is not a room
-                // load values from byRoomCache with the viewedRoomId.
-                if (this.isReady) {
-                    // we need the client to be ready to get the events form the ids of the settings
-                    // the loading will be done in the onReady function (to catch up with the changes done here before it was ready)
-                    // all the logic in this case is not necessary anymore as soon as groups are dropped and we use: onRoomViewStoreUpdate
-                    this.loadCacheFromSettings();
-
-                    // DO NOT EMIT. Emitting breaks iframe refs by triggering a render
-                    // for the room view and calling the iframe ref changed function
-                    // this.emitAndUpdateSettings();
-                }
-                break;
-            }
-        }
-    };
-
     public static get instance(): RightPanelStore {
         if (!RightPanelStore.internalInstance) {
             RightPanelStore.internalInstance = new RightPanelStore();
diff --git a/src/stores/right-panel/RightPanelStoreIPanelState.ts b/src/stores/right-panel/RightPanelStoreIPanelState.ts
index 34fecf018d3..0e580ed077e 100644
--- a/src/stores/right-panel/RightPanelStoreIPanelState.ts
+++ b/src/stores/right-panel/RightPanelStoreIPanelState.ts
@@ -20,16 +20,12 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
-import { GroupMember } from "../../components/views/right_panel/UserInfo";
 import { RightPanelPhases } from "./RightPanelStorePhases";
 
 export interface IRightPanelCardState {
-    member?: RoomMember | User | GroupMember;
+    member?: RoomMember | User;
     verificationRequest?: VerificationRequest;
     verificationRequestPromise?: Promise<VerificationRequest>;
-    // group
-    groupId?: string;
-    groupRoomId?: string;
     widgetId?: string;
     spaceId?: string;
     // Room3pidMemberInfo, Space3pidMemberInfo,
@@ -38,14 +34,12 @@ export interface IRightPanelCardState {
     threadHeadEvent?: MatrixEvent;
     initialEvent?: MatrixEvent;
     isInitialEventHighlighted?: boolean;
+    initialEventScrollIntoView?: boolean;
 }
 
 export interface IRightPanelCardStateStored {
     memberId?: string;
     // we do not store the things associated with verification
-    // group
-    groupId?: string;
-    groupRoomId?: string;
     widgetId?: string;
     spaceId?: string;
     // 3pidMemberInfo
@@ -54,6 +48,7 @@ export interface IRightPanelCardStateStored {
     threadHeadEventId?: string;
     initialEventId?: string;
     isInitialEventHighlighted?: boolean;
+    initialEventScrollIntoView?: boolean;
 }
 
 export interface IRightPanelCard {
@@ -91,11 +86,10 @@ export function convertToStatePanel(storeRoom: IRightPanelForRoomStored, room: R
 export function convertCardToStore(panelState: IRightPanelCard): IRightPanelCardStored {
     const state = panelState.state ?? {};
     const stateStored: IRightPanelCardStateStored = {
-        groupId: state.groupId,
-        groupRoomId: state.groupRoomId,
         widgetId: state.widgetId,
         spaceId: state.spaceId,
         isInitialEventHighlighted: state.isInitialEventHighlighted,
+        initialEventScrollIntoView: state.initialEventScrollIntoView,
         threadHeadEventId: !!state?.threadHeadEvent?.getId() ?
             panelState.state.threadHeadEvent.getId() : undefined,
         memberInfoEventId: !!state?.memberInfoEvent?.getId() ?
@@ -112,11 +106,10 @@ export function convertCardToStore(panelState: IRightPanelCard): IRightPanelCard
 function convertStoreToCard(panelStateStore: IRightPanelCardStored, room: Room): IRightPanelCard {
     const stateStored = panelStateStore.state ?? {};
     const state: IRightPanelCardState = {
-        groupId: stateStored.groupId,
-        groupRoomId: stateStored.groupRoomId,
         widgetId: stateStored.widgetId,
         spaceId: stateStored.spaceId,
         isInitialEventHighlighted: stateStored.isInitialEventHighlighted,
+        initialEventScrollIntoView: stateStored.initialEventScrollIntoView,
         threadHeadEvent: !!stateStored?.threadHeadEventId ?
             room.findEventById(stateStored.threadHeadEventId) : undefined,
         memberInfoEvent: !!stateStored?.memberInfoEventId ?
diff --git a/src/stores/right-panel/RightPanelStorePhases.ts b/src/stores/right-panel/RightPanelStorePhases.ts
index 59d5a2f73a6..b090119bd99 100644
--- a/src/stores/right-panel/RightPanelStorePhases.ts
+++ b/src/stores/right-panel/RightPanelStorePhases.ts
@@ -30,11 +30,6 @@ export enum RightPanelPhases {
     Timeline = "Timeline",
 
     Room3pidMemberInfo = 'Room3pidMemberInfo',
-    // Group stuff
-    GroupMemberList = 'GroupMemberList',
-    GroupRoomList = 'GroupRoomList',
-    GroupRoomInfo = 'GroupRoomInfo',
-    GroupMemberInfo = 'GroupMemberInfo',
 
     // Space stuff
     SpaceMemberList = "SpaceMemberList",
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 2142efa098d..dc7f405c62d 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2018-2021 The Matrix.org Foundation C.I.C.
+Copyright 2018 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import SettingsStore from "../../settings/SettingsStore";
-import { DefaultTagID, isCustomTag, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
+import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
 import { IListOrderingMap, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
 import { ActionPayload } from "../../dispatcher/payloads";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./filters/IFilterCondition";
-import { TagWatcher } from "./TagWatcher";
-import RoomViewStore from "../RoomViewStore";
+import { RoomViewStore } from "../RoomViewStore";
 import { Algorithm, LIST_UPDATED_EVENT } from "./algorithms/Algorithm";
 import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
 import RoomListLayoutStore from "./RoomListLayoutStore";
@@ -38,13 +37,10 @@ import { NameFilterCondition } from "./filters/NameFilterCondition";
 import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
 import { VisibilityProvider } from "./filters/VisibilityProvider";
 import { SpaceWatcher } from "./SpaceWatcher";
-import SpaceStore from "../spaces/SpaceStore";
-import { Action } from "../../dispatcher/actions";
-import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
 import { IRoomTimelineActionPayload } from "../../actions/MatrixActionCreators";
 
 interface IState {
-    tagsEnabled?: boolean;
+    // state is tracked in underlying classes
 }
 
 /**
@@ -64,8 +60,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     private algorithm = new Algorithm();
     private filterConditions: IFilterCondition[] = [];
     private prefilterConditions: IFilterCondition[] = [];
-    private tagWatcher: TagWatcher;
-    private spaceWatcher: SpaceWatcher;
     private updateFn = new MarkedExecution(() => {
         for (const tagId of Object.keys(this.orderedLists)) {
             RoomNotificationStateStore.instance.getListState(tagId).setRooms(this.orderedLists[tagId]);
@@ -73,21 +67,15 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         this.emit(LISTS_UPDATE_EVENT);
     });
 
-    private readonly watchedSettings = [
-        'feature_custom_tags',
-    ];
-
     constructor() {
         super(defaultDispatcher);
-        this.setMaxListeners(20); // CustomRoomTagStore + RoomList + LeftPanel + 8xRoomSubList + spares
+        this.setMaxListeners(20); // RoomList + LeftPanel + 8xRoomSubList + spares
+        this.algorithm.start();
     }
 
     private setupWatchers() {
-        if (SpaceStore.spacesEnabled) {
-            this.spaceWatcher = new SpaceWatcher(this);
-        } else {
-            this.tagWatcher = new TagWatcher(this);
-        }
+        // TODO: Maybe destroy this if this class supports destruction
+        new SpaceWatcher(this);
     }
 
     public get unfilteredLists(): ITagMap {
@@ -106,10 +94,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         this.filterConditions = [];
         this.prefilterConditions = [];
         this.initialListsGenerated = false;
-        this.setupWatchers();
 
         this.algorithm.off(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
         this.algorithm.off(FILTER_CHANGED, this.onAlgorithmListUpdated);
+        this.algorithm.stop();
         this.algorithm = new Algorithm();
         this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
         this.algorithm.on(FILTER_CHANGED, this.onAlgorithmListUpdated);
@@ -125,16 +113,14 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             this.readyStore.useUnitTestClient(forcedClient);
         }
 
-        for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
-        RoomViewStore.addListener(() => this.handleRVSUpdate({}));
+        RoomViewStore.instance.addListener(() => this.handleRVSUpdate({}));
         this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
         this.algorithm.on(FILTER_CHANGED, this.onAlgorithmFilterUpdated);
         this.setupWatchers();
 
-        // Update any settings here, as some may have happened before we were logically ready.
         // Update any settings here, as some may have happened before we were logically ready.
         logger.log("Regenerating room lists: Startup");
-        await this.readAndCacheSettingsFromStore();
+        this.updateAlgorithmInstances();
         this.regenerateAllLists({ trigger: false });
         this.handleRVSUpdate({ trigger: false }); // fake an RVS update to adjust sticky room, if needed
 
@@ -142,14 +128,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         this.updateFn.trigger();
     }
 
-    private async readAndCacheSettingsFromStore() {
-        const tagsEnabled = SettingsStore.getValue("feature_custom_tags");
-        await this.updateState({
-            tagsEnabled,
-        });
-        this.updateAlgorithmInstances();
-    }
-
     /**
      * Handles suspected RoomViewStore changes.
      * @param trigger Set to false to prevent a list update from being sent. Should only
@@ -158,7 +136,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     private handleRVSUpdate({ trigger = true }) {
         if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
 
-        const activeRoomId = RoomViewStore.getRoomId();
+        const activeRoomId = RoomViewStore.instance.getRoomId();
         if (!activeRoomId && this.algorithm.stickyRoom) {
             this.algorithm.setStickyRoom(null);
         } else if (activeRoomId) {
@@ -206,17 +184,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         const logicallyReady = this.matrixClient && this.initialListsGenerated;
         if (!logicallyReady) return;
 
-        if (payload.action === Action.SettingUpdated) {
-            const settingUpdatedPayload = payload as SettingUpdatedPayload;
-            if (this.watchedSettings.includes(settingUpdatedPayload.settingName)) {
-                logger.log("Regenerating room lists: Settings changed");
-                await this.readAndCacheSettingsFromStore();
-
-                this.regenerateAllLists({ trigger: false }); // regenerate the lists now
-                this.updateFn.trigger();
-            }
-        }
-
         if (!this.algorithm) {
             // This shouldn't happen because `initialListsGenerated` implies we have an algorithm.
             throw new Error("Room list store has no algorithm to process dispatcher update with");
@@ -514,8 +481,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         }
     }
 
-    private onAlgorithmListUpdated = () => {
+    private onAlgorithmListUpdated = (forceUpdate: boolean) => {
         this.updateFn.mark();
+        if (forceUpdate) this.updateFn.trigger();
     };
 
     private onAlgorithmFilterUpdated = () => {
@@ -536,7 +504,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
         // if spaces are enabled only consider the prefilter conditions when there are no runtime conditions
         // for the search all spaces feature
-        if (this.prefilterConditions.length > 0 && (!SpaceStore.spacesEnabled || !this.filterConditions.length)) {
+        if (this.prefilterConditions.length > 0 && !this.filterConditions.length) {
             rooms = rooms.filter(r => {
                 for (const filter of this.prefilterConditions) {
                     if (!filter.isVisible(r)) {
@@ -563,18 +531,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
         const rooms = this.getPlausibleRooms();
 
-        const customTags = new Set<TagID>();
-        if (this.state.tagsEnabled) {
-            for (const room of rooms) {
-                if (!room.tags) continue;
-                const tags = Object.keys(room.tags).filter(t => isCustomTag(t));
-                tags.forEach(t => customTags.add(t));
-            }
-        }
-
         const sorts: ITagSortingMap = {};
         const orders: IListOrderingMap = {};
-        const allTags = [...OrderedDefaultTagIDs, ...Array.from(customTags)];
+        const allTags = [...OrderedDefaultTagIDs];
         for (const tagId of allTags) {
             sorts[tagId] = this.calculateTagSorting(tagId);
             orders[tagId] = this.calculateListOrder(tagId);
@@ -603,12 +562,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
             promise = this.recalculatePrefiltering();
         } else {
             this.filterConditions.push(filter);
-            // Runtime filters with spaces disable prefiltering for the search all spaces feature
-            if (SpaceStore.spacesEnabled) {
-                // this has to be awaited so that `setKnownRooms` is called in time for the `addFilterCondition` below
-                // this way the runtime filters are only evaluated on one dataset and not both.
-                await this.recalculatePrefiltering();
-            }
+            // Runtime filters with spaces disable prefiltering for the search all spaces feature.
+            // this has to be awaited so that `setKnownRooms` is called in time for the `addFilterCondition` below
+            // this way the runtime filters are only evaluated on one dataset and not both.
+            await this.recalculatePrefiltering();
             if (this.algorithm) {
                 this.algorithm.addFilterCondition(filter);
             }
@@ -634,9 +591,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
                 this.algorithm.removeFilterCondition(filter);
             }
             // Runtime filters with spaces disable prefiltering for the search all spaces feature
-            if (SpaceStore.spacesEnabled) {
-                promise = this.recalculatePrefiltering();
-            }
+            promise = this.recalculatePrefiltering();
             removed = true;
         }
 
diff --git a/src/stores/room-list/TagWatcher.ts b/src/stores/room-list/TagWatcher.ts
deleted file mode 100644
index a0bcf76bf69..00000000000
--- a/src/stores/room-list/TagWatcher.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { RoomListStoreClass } from "./RoomListStore";
-import GroupFilterOrderStore from "../GroupFilterOrderStore";
-import { CommunityFilterCondition } from "./filters/CommunityFilterCondition";
-import { arrayDiff, arrayHasDiff } from "../../utils/arrays";
-
-/**
- * Watches for changes in groups to manage filters on the provided RoomListStore
- */
-export class TagWatcher {
-    private filters = new Map<string, CommunityFilterCondition>();
-
-    constructor(private store: RoomListStoreClass) {
-        GroupFilterOrderStore.addListener(this.onTagsUpdated);
-    }
-
-    private onTagsUpdated = () => {
-        const lastTags = Array.from(this.filters.keys());
-        const newTags = GroupFilterOrderStore.getSelectedTags();
-
-        if (arrayHasDiff(lastTags, newTags)) {
-            // Selected tags changed, do some filtering
-
-            if (!this.store.matrixClient) {
-                logger.warn("Tag update without an associated matrix client - ignoring");
-                return;
-            }
-
-            const newFilters = new Map<string, CommunityFilterCondition>();
-            const filterableTags = newTags.filter(t => t.startsWith("+"));
-
-            for (const tag of filterableTags) {
-                const group = this.store.matrixClient.getGroup(tag);
-                if (!group) {
-                    logger.warn(`Group selected with no group object available: ${tag}`);
-                    continue;
-                }
-
-                let filter = this.filters.get(tag);
-                if (!filter) {
-                    filter = new CommunityFilterCondition(group);
-                }
-                newFilters.set(tag, filter);
-            }
-
-            // Update the room list store's filters
-            const diff = arrayDiff(lastTags, newTags);
-            for (const tag of diff.added) {
-                const filter = newFilters.get(tag);
-                if (!filter) continue;
-
-                this.store.addFilter(filter);
-            }
-            for (const tag of diff.removed) {
-                // TODO: Remove this check when custom tags are supported (as we shouldn't be losing filters)
-                const filter = this.filters.get(tag);
-                if (!filter) continue;
-
-                this.store.removeFilter(filter);
-                filter.destroy();
-            }
-
-            this.filters = newFilters;
-        }
-    };
-}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 0c17452c0ca..edd406fd07b 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -35,7 +35,7 @@ import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } f
 import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
 import { getListAlgorithmInstance } from "./list-ordering";
 import { VisibilityProvider } from "../filters/VisibilityProvider";
-import SpaceStore from "../../spaces/SpaceStore";
+import VideoChannelStore, { VideoChannelEvent } from "../../VideoChannelStore";
 
 /**
  * Fired when the Algorithm has determined a list has been updated.
@@ -85,8 +85,14 @@ export class Algorithm extends EventEmitter {
      */
     public updatesInhibited = false;
 
-    public constructor() {
-        super();
+    public start() {
+        VideoChannelStore.instance.on(VideoChannelEvent.Connect, this.updateVideoRoom);
+        VideoChannelStore.instance.on(VideoChannelEvent.Disconnect, this.updateVideoRoom);
+    }
+
+    public stop() {
+        VideoChannelStore.instance.off(VideoChannelEvent.Connect, this.updateVideoRoom);
+        VideoChannelStore.instance.off(VideoChannelEvent.Disconnect, this.updateVideoRoom);
     }
 
     public get stickyRoom(): Room {
@@ -109,6 +115,7 @@ export class Algorithm extends EventEmitter {
         this._cachedRooms = val;
         this.recalculateFilteredRooms();
         this.recalculateStickyRoom();
+        this.recalculateVideoRoom();
     }
 
     protected get cachedRooms(): ITagMap {
@@ -146,6 +153,7 @@ export class Algorithm extends EventEmitter {
         this._cachedRooms[tagId] = algorithm.orderedRooms;
         this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
         this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
+        this.recalculateVideoRoom(tagId);
     }
 
     public getListOrdering(tagId: TagID): ListAlgorithm {
@@ -165,6 +173,7 @@ export class Algorithm extends EventEmitter {
         this._cachedRooms[tagId] = algorithm.orderedRooms;
         this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
         this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
+        this.recalculateVideoRoom(tagId);
     }
 
     public addFilterCondition(filterCondition: IFilterCondition): void {
@@ -202,7 +211,7 @@ export class Algorithm extends EventEmitter {
     }
 
     private doUpdateStickyRoom(val: Room) {
-        if (SpaceStore.spacesEnabled && val?.isSpaceRoom() && val.getMyMembership() !== "invite") {
+        if (val?.isSpaceRoom() && val.getMyMembership() !== "invite") {
             // no-op sticky rooms for spaces - they're effectively virtual rooms
             val = null;
         }
@@ -312,12 +321,30 @@ export class Algorithm extends EventEmitter {
         this.recalculateFilteredRoomsForTag(tag);
         if (lastStickyRoom && lastStickyRoom.tag !== tag) this.recalculateFilteredRoomsForTag(lastStickyRoom.tag);
         this.recalculateStickyRoom();
+        this.recalculateVideoRoom(tag);
+        if (lastStickyRoom && lastStickyRoom.tag !== tag) this.recalculateVideoRoom(lastStickyRoom.tag);
 
         // Finally, trigger an update
         if (this.updatesInhibited) return;
         this.emit(LIST_UPDATED_EVENT);
     }
 
+    /**
+     * Update the stickiness of video rooms.
+     */
+    public updateVideoRoom = () => {
+        // In case we're unsticking a video room, sort it back into natural order
+        this.recalculateFilteredRooms();
+        this.recalculateStickyRoom();
+
+        this.recalculateVideoRoom();
+
+        if (this.updatesInhibited) return;
+        // This isn't in response to any particular RoomListStore update,
+        // so notify the store that it needs to force-update
+        this.emit(LIST_UPDATED_EVENT, true);
+    };
+
     protected recalculateFilteredRooms() {
         if (!this.hasFilters) {
             return;
@@ -375,6 +402,13 @@ export class Algorithm extends EventEmitter {
         }
     }
 
+    private initCachedStickyRooms() {
+        this._cachedStickyRooms = {};
+        for (const tagId of Object.keys(this.cachedRooms)) {
+            this._cachedStickyRooms[tagId] = [...this.cachedRooms[tagId]]; // shallow clone
+        }
+    }
+
     /**
      * Recalculate the sticky room position. If this is being called in relation to
      * a specific tag being updated, it should be given to this function to optimize
@@ -401,17 +435,13 @@ export class Algorithm extends EventEmitter {
         }
 
         if (!this._cachedStickyRooms || !updatedTag) {
-            const stickiedTagMap: ITagMap = {};
-            for (const tagId of Object.keys(this.cachedRooms)) {
-                stickiedTagMap[tagId] = this.cachedRooms[tagId].map(r => r); // shallow clone
-            }
-            this._cachedStickyRooms = stickiedTagMap;
+            this.initCachedStickyRooms();
         }
 
         if (updatedTag) {
             // Update the tag indicated by the caller, if possible. This is mostly to ensure
             // our cache is up to date.
-            this._cachedStickyRooms[updatedTag] = this.cachedRooms[updatedTag].map(r => r); // shallow clone
+            this._cachedStickyRooms[updatedTag] = [...this.cachedRooms[updatedTag]]; // shallow clone
         }
 
         // Now try to insert the sticky room, if we need to.
@@ -427,6 +457,46 @@ export class Algorithm extends EventEmitter {
         this.emit(LIST_UPDATED_EVENT);
     }
 
+    /**
+     * Recalculate the position of any video rooms. If this is being called in relation to
+     * a specific tag being updated, it should be given to this function to optimize
+     * the call.
+     *
+     * This expects to be called *after* the sticky rooms are updated, and sticks the
+     * currently connected video room to the top of its tag.
+     *
+     * @param updatedTag The tag that was updated, if possible.
+     */
+    protected recalculateVideoRoom(updatedTag: TagID = null): void {
+        if (!updatedTag) {
+            // Assume all tags need updating
+            // We're not modifying the map here, so can safely rely on the cached values
+            // rather than the explicitly sticky map.
+            for (const tagId of Object.keys(this.cachedRooms)) {
+                if (!tagId) {
+                    throw new Error("Unexpected recursion: falsy tag");
+                }
+                this.recalculateVideoRoom(tagId);
+            }
+            return;
+        }
+
+        const videoRoomId = VideoChannelStore.instance.connected ? VideoChannelStore.instance.roomId : null;
+
+        if (videoRoomId) {
+            // We operate directly on the sticky rooms map
+            if (!this._cachedStickyRooms) this.initCachedStickyRooms();
+            const rooms = this._cachedStickyRooms[updatedTag];
+            const videoRoomIdxInTag = rooms.findIndex(r => r.roomId === videoRoomId);
+            if (videoRoomIdxInTag < 0) return; // no-op
+
+            const videoRoom = rooms[videoRoomIdxInTag];
+            rooms.splice(videoRoomIdxInTag, 1);
+            rooms.unshift(videoRoom);
+            this._cachedStickyRooms[updatedTag] = rooms; // re-set because references aren't always safe
+        }
+    }
+
     /**
      * Asks the Algorithm to regenerate all lists, using the tags given
      * as reference for which lists to generate and which way to generate
@@ -707,6 +777,7 @@ export class Algorithm extends EventEmitter {
                     this._cachedRooms[rmTag] = algorithm.orderedRooms;
                     this.recalculateFilteredRoomsForTag(rmTag); // update filter to re-sort the list
                     this.recalculateStickyRoom(rmTag); // update sticky room to make sure it moves if needed
+                    this.recalculateVideoRoom(rmTag);
                 }
                 for (const addTag of diff.added) {
                     const algorithm: OrderingAlgorithm = this.algorithms[addTag];
@@ -783,6 +854,7 @@ export class Algorithm extends EventEmitter {
             // Flag that we've done something
             this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
             this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
+            this.recalculateVideoRoom(tag);
             changed = true;
         }
 
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
deleted file mode 100644
index a1b3da5be25..00000000000
--- a/src/stores/room-list/filters/CommunityFilterCondition.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { Room } from "matrix-js-sdk/src/models/room";
-import { Group } from "matrix-js-sdk/src/models/group";
-import { EventEmitter } from "events";
-
-import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./IFilterCondition";
-import GroupStore from "../../GroupStore";
-import { IDestroyable } from "../../../utils/IDestroyable";
-import DMRoomMap from "../../../utils/DMRoomMap";
-import { setHasDiff } from "../../../utils/sets";
-
-/**
- * A filter condition for the room list which reveals rooms which
- * are a member of a given community.
- */
-export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
-    private roomIds = new Set<string>();
-    private userIds = new Set<string>();
-
-    constructor(private community: Group) {
-        super();
-        GroupStore.on("update", this.onStoreUpdate);
-
-        // noinspection JSIgnoredPromiseFromCall
-        this.onStoreUpdate(); // trigger a false update to seed the store
-    }
-
-    public get kind(): FilterKind {
-        return FilterKind.Prefilter;
-    }
-
-    public isVisible(room: Room): boolean {
-        return this.roomIds.has(room.roomId) || this.userIds.has(DMRoomMap.shared().getUserIdForRoomId(room.roomId));
-    }
-
-    private onStoreUpdate = async (): Promise<any> => {
-        // We don't actually know if the room list changed for the community, so just check it again.
-        const beforeRoomIds = this.roomIds;
-        this.roomIds = new Set((await GroupStore.getGroupRooms(this.community.groupId)).map(r => r.roomId));
-
-        const beforeUserIds = this.userIds;
-        this.userIds = new Set((await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId));
-
-        if (setHasDiff(beforeRoomIds, this.roomIds) || setHasDiff(beforeUserIds, this.userIds)) {
-            this.emit(FILTER_CHANGED);
-        }
-    };
-
-    public destroy(): void {
-        GroupStore.off("update", this.onStoreUpdate);
-    }
-}
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
index c851121c00f..24f49ccf92c 100644
--- a/src/stores/room-list/filters/VisibilityProvider.ts
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -19,7 +19,6 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import CallHandler from "../../../CallHandler";
 import { RoomListCustomisations } from "../../../customisations/RoomList";
 import VoipUserMapper from "../../../VoipUserMapper";
-import SpaceStore from "../../spaces/SpaceStore";
 
 export class VisibilityProvider {
     private static internalInstance: VisibilityProvider;
@@ -51,7 +50,7 @@ export class VisibilityProvider {
         }
 
         // hide space rooms as they'll be shown in the SpacePanel
-        if (SpaceStore.spacesEnabled && room.isSpaceRoom()) {
+        if (room.isSpaceRoom()) {
             return false;
         }
 
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 54d49ea18a2..8224dd64792 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { isEnumValue } from "../../utils/enums";
-
 export enum DefaultTagID {
     Invite = "im.vector.fake.invite",
     Untagged = "im.vector.fake.recent", // legacy: used to just be 'recent rooms' but now it's all untagged rooms
@@ -40,10 +38,6 @@ export const OrderedDefaultTagIDs = [
 
 export type TagID = string | DefaultTagID;
 
-export function isCustomTag(tagId: TagID): boolean {
-    return !isEnumValue(DefaultTagID, tagId);
-}
-
 export enum RoomUpdateCause {
     Timeline = "TIMELINE",
     PossibleTagChange = "POSSIBLE_TAG_CHANGE",
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 9f32816fbd3..42e1bf01bf1 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import { RoomNotificationStateStore } from "../notifications/RoomNotificationSta
 import { DefaultTagID } from "../room-list/models";
 import { EnhancedMap, mapDiff } from "../../utils/maps";
 import { setDiff, setHasDiff } from "../../utils/sets";
-import RoomViewStore from "../RoomViewStore";
+import { RoomViewStore } from "../RoomViewStore";
 import { Action } from "../../dispatcher/actions";
 import { arrayHasDiff, arrayHasOrderChange } from "../../utils/arrays";
 import { reorderLexicographically } from "../../utils/stringOrderField";
@@ -73,9 +73,6 @@ const metaSpaceOrder: MetaSpace[] = [MetaSpace.Home, MetaSpace.Favourites, MetaS
 
 const MAX_SUGGESTED_ROOMS = 20;
 
-// This setting causes the page to reload and can be costly if read frequently, so read it here only
-const spacesEnabled = !SettingsStore.getValue("showCommunitiesInsteadOfSpaces");
-
 const getSpaceContextKey = (space: SpaceKey) => `mx_space_context_${space}`;
 
 const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
@@ -807,7 +804,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     };
 
     private switchSpaceIfNeeded = () => {
-        const roomId = RoomViewStore.getRoomId();
+        const roomId = RoomViewStore.instance.getRoomId();
         if (!this.isRoomInSpace(this.activeSpace, roomId) && !this.matrixClient.getRoom(roomId)?.isSpaceRoom()) {
             this.switchToRelatedSpace(roomId);
         }
@@ -858,7 +855,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                 }
 
                 // if the room currently being viewed was just joined then switch to its related space
-                if (newMembership === "join" && room.roomId === RoomViewStore.getRoomId()) {
+                if (newMembership === "join" && room.roomId === RoomViewStore.instance.getRoomId()) {
                     this.switchToRelatedSpace(room.roomId);
                 }
             }
@@ -885,7 +882,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             this.emit(room.roomId);
         }
 
-        if (membership === "join" && room.roomId === RoomViewStore.getRoomId()) {
+        if (membership === "join" && room.roomId === RoomViewStore.instance.getRoomId()) {
             // if the user was looking at the space and then joined: select that space
             this.setActiveSpace(room.roomId, false);
         } else if (membership === "leave" && room.roomId === this.activeSpace) {
@@ -1054,7 +1051,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onNotReady() {
-        if (!SpaceStore.spacesEnabled) return;
         if (this.matrixClient) {
             this.matrixClient.removeListener(ClientEvent.Room, this.onRoom);
             this.matrixClient.removeListener(RoomEvent.MyMembership, this.onRoom);
@@ -1067,7 +1063,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onReady() {
-        if (!spacesEnabled) return;
         this.matrixClient.on(ClientEvent.Room, this.onRoom);
         this.matrixClient.on(RoomEvent.MyMembership, this.onRoom);
         this.matrixClient.on(RoomEvent.AccountData, this.onRoomAccountData);
@@ -1115,13 +1110,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onAction(payload: SpaceStoreActions) {
-        if (!spacesEnabled || !this.matrixClient) return;
+        if (!this.matrixClient) return;
 
         switch (payload.action) {
             case Action.ViewRoom: {
                 // Don't auto-switch rooms when reacting to a context-switch or for new rooms being created
                 // as this is not helpful and can create loops of rooms/space switching
-                if (payload.context_switch || payload.justCreatedOpts) break;
+                const isSpace = payload.justCreatedOpts?.roomType === RoomType.Space;
+                if (payload.context_switch || (payload.justCreatedOpts && !isSpace)) break;
                 let roomId = payload.room_id;
 
                 if (payload.room_alias && !roomId) {
@@ -1236,7 +1232,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             return this.notificationStateMap.get(key);
         }
 
-        const state = new SpaceNotificationState(key, getRoomFn);
+        const state = new SpaceNotificationState(getRoomFn);
         this.notificationStateMap.set(key, state);
         return state;
     }
@@ -1297,8 +1293,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 }
 
 export default class SpaceStore {
-    public static spacesEnabled = spacesEnabled;
-
     private static internalInstance = new SpaceStoreClass();
 
     public static get instance(): SpaceStoreClass {
diff --git a/src/stores/widgets/ElementWidgetActions.ts b/src/stores/widgets/ElementWidgetActions.ts
index cd591a6fb43..117c4b47f3a 100644
--- a/src/stores/widgets/ElementWidgetActions.ts
+++ b/src/stores/widgets/ElementWidgetActions.ts
@@ -18,7 +18,14 @@ import { IWidgetApiRequest } from "matrix-widget-api";
 
 export enum ElementWidgetActions {
     ClientReady = "im.vector.ready",
+    WidgetReady = "io.element.widget_ready",
+    JoinCall = "io.element.join",
     HangupCall = "im.vector.hangup",
+    CallParticipants = "io.element.participants",
+    MuteAudio = "io.element.mute_audio",
+    UnmuteAudio = "io.element.unmute_audio",
+    MuteVideo = "io.element.mute_video",
+    UnmuteVideo = "io.element.unmute_video",
     StartLiveStream = "im.vector.start_live_stream",
     OpenIntegrationManager = "integration_manager_open",
 
diff --git a/src/stores/widgets/ElementWidgetCapabilities.ts b/src/stores/widgets/ElementWidgetCapabilities.ts
index e493d5618f6..fd6653294c5 100644
--- a/src/stores/widgets/ElementWidgetCapabilities.ts
+++ b/src/stores/widgets/ElementWidgetCapabilities.ts
@@ -19,4 +19,9 @@ export enum ElementWidgetCapabilities {
      * @deprecated Use MSC2931 instead.
      */
     CanChangeViewedRoom = "io.element.view_room",
+    /**
+     * Ask Element to not give the option to move the widget into a separate tab.
+     * This replaces RequiresClient in MatrixCapabilities.
+     */
+    RequiresClient = "io.element.requires_client",
 }
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index c0ea8a71199..0d9a0bc66e2 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
+ * Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import { ClientEvent } from "matrix-js-sdk/src/client";
 
 import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
 import { WidgetMessagingStore } from "./WidgetMessagingStore";
-import RoomViewStore from "../RoomViewStore";
+import { RoomViewStore } from "../RoomViewStore";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import { OwnProfileStore } from "../OwnProfileStore";
 import WidgetUtils from '../../utils/WidgetUtils';
@@ -115,7 +115,7 @@ export class ElementWidget extends Widget {
 
         let theme = new ThemeWatcher().getEffectiveTheme();
         if (theme.startsWith("custom-")) {
-            const customTheme = getCustomTheme(theme.substr(7));
+            const customTheme = getCustomTheme(theme.slice(7));
             // Jitsi only understands light/dark
             theme = customTheme.is_dark ? "dark" : "light";
         }
@@ -175,7 +175,7 @@ export class StopGapWidget extends EventEmitter {
 
         if (this.roomId) return this.roomId;
 
-        return RoomViewStore.getRoomId();
+        return RoomViewStore.instance.getRoomId();
     }
 
     public get widgetApi(): ClientWidgetApi {
@@ -238,14 +238,10 @@ export class StopGapWidget extends EventEmitter {
         return !!this.messaging;
     }
 
-    private get widgetId() {
-        return this.messaging.widget.id;
-    }
-
     private onOpenModal = async (ev: CustomEvent<IModalWidgetOpenRequest>) => {
         ev.preventDefault();
         if (ModalWidgetStore.instance.canOpenModalWidget()) {
-            ModalWidgetStore.instance.openModalWidget(ev.detail.data, this.mockWidget);
+            ModalWidgetStore.instance.openModalWidget(ev.detail.data, this.mockWidget, this.roomId);
             this.messaging.transport.reply(ev.detail, {}); // ack
         } else {
             this.messaging.transport.reply(ev.detail, {
@@ -268,11 +264,7 @@ export class StopGapWidget extends EventEmitter {
         this.messaging.on("ready", () => this.emit("ready"));
         this.messaging.on("capabilitiesNotified", () => this.emit("capabilitiesNotified"));
         this.messaging.on(`action:${WidgetApiFromWidgetAction.OpenModalWidget}`, this.onOpenModal);
-        WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.messaging);
-
-        if (!this.appTileProps.userWidget && this.appTileProps.room) {
-            ActiveWidgetStore.instance.setRoomId(this.mockWidget.id, this.appTileProps.room.roomId);
-        }
+        WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.roomId, this.messaging);
 
         // Always attach a handler for ViewRoom, but permission check it internally
         this.messaging.on(`action:${ElementWidgetActions.ViewRoom}`, (ev: CustomEvent<IViewRoomApiRequest>) => {
@@ -322,7 +314,9 @@ export class StopGapWidget extends EventEmitter {
         this.messaging.on(`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`,
             (ev: CustomEvent<IStickyActionRequest>) => {
                 if (this.messaging.hasCapability(MatrixCapabilities.AlwaysOnScreen)) {
-                    ActiveWidgetStore.instance.setWidgetPersistence(this.mockWidget.id, ev.detail.data.value);
+                    ActiveWidgetStore.instance.setWidgetPersistence(
+                        this.mockWidget.id, this.roomId, ev.detail.data.value,
+                    );
                     ev.preventDefault();
                     this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{}); // ack
                 }
@@ -367,13 +361,13 @@ export class StopGapWidget extends EventEmitter {
                     // TODO: Open the right integration manager for the widget
                     if (SettingsStore.getValue("feature_many_integration_managers")) {
                         IntegrationManagers.sharedInstance().openAll(
-                            MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()),
+                            MatrixClientPeg.get().getRoom(RoomViewStore.instance.getRoomId()),
                             `type_${integType}`,
                             integId,
                         );
                     } else {
                         IntegrationManagers.sharedInstance().getPrimaryManager().open(
-                            MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()),
+                            MatrixClientPeg.get().getRoom(RoomViewStore.instance.getRoomId()),
                             `type_${integType}`,
                             integId,
                         );
@@ -388,7 +382,7 @@ export class StopGapWidget extends EventEmitter {
         await (WidgetVariableCustomisations?.isReady?.() ?? Promise.resolve());
 
         if (this.scalarToken) return;
-        const existingMessaging = WidgetMessagingStore.instance.getMessaging(this.mockWidget);
+        const existingMessaging = WidgetMessagingStore.instance.getMessaging(this.mockWidget, this.roomId);
         if (existingMessaging) this.messaging = existingMessaging;
         try {
             if (WidgetUtils.isScalarUrl(this.mockWidget.templateUrl)) {
@@ -414,13 +408,12 @@ export class StopGapWidget extends EventEmitter {
      * @param opts
      */
     public stopMessaging(opts = { forceDestroy: false }) {
-        if (!opts?.forceDestroy && ActiveWidgetStore.instance.getPersistentWidgetId() === this.mockWidget.id) {
+        if (!opts?.forceDestroy && ActiveWidgetStore.instance.getWidgetPersistence(this.mockWidget.id, this.roomId)) {
             logger.log("Skipping destroy - persistent widget");
             return;
         }
         if (!this.started) return;
-        WidgetMessagingStore.instance.stopMessaging(this.mockWidget);
-        ActiveWidgetStore.instance.delRoomId(this.mockWidget.id);
+        WidgetMessagingStore.instance.stopMessaging(this.mockWidget, this.roomId);
         this.messaging = null;
 
         if (MatrixClientPeg.get()) {
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index f2f42d5cbfe..6591a2c793f 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -29,14 +29,14 @@ import {
     WidgetEventCapability,
     WidgetKind,
 } from "matrix-widget-api";
-import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 import { IContent, IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { logger } from "matrix-js-sdk/src/logger";
+import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { iterableDiff, iterableIntersection } from "../../utils/iterables";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
-import ActiveRoomObserver from "../../ActiveRoomObserver";
 import Modal from "../../Modal";
 import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
 import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
@@ -48,6 +48,8 @@ import { containsEmoji } from "../../effects/utils";
 import dis from "../../dispatcher/dispatcher";
 import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks";
 import SettingsStore from "../../settings/SettingsStore";
+import { RoomViewStore } from "../RoomViewStore";
+import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
 
 // TODO: Purge this from the universe
 
@@ -76,7 +78,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
         // button if the widget says it supports screenshots.
         this.allowedCapabilities = new Set([...allowedCapabilities,
             MatrixCapabilities.Screenshots,
-            MatrixCapabilities.RequiresClient]);
+            ElementWidgetCapabilities.RequiresClient]);
 
         // Grant the permissions that are specific to given widget types
         if (WidgetType.JITSI.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Room) {
@@ -149,7 +151,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
         targetRoomId: string = null,
     ): Promise<ISendEventDetails> {
         const client = MatrixClientPeg.get();
-        const roomId = targetRoomId || ActiveRoomObserver.activeRoomId;
+        const roomId = targetRoomId || RoomViewStore.instance.getRoomId();
 
         if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
 
@@ -169,7 +171,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
                     if (containsEmoji(content, effect.emojis)) {
                         // For initial threads launch, chat effects are disabled
                         // see #19731
-                        const isNotThread = content["m.relates_to"].rel_type !== RelationType.Thread;
+                        const isNotThread = content["m.relates_to"].rel_type !== THREAD_RELATION_TYPE.name;
                         if (!SettingsStore.getValue("feature_thread") || isNotThread) {
                             dis.dispatch({ action: `effects.${effect.command}` });
                         }
@@ -187,7 +189,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
 
         const targetRooms = roomIds
             ? (roomIds.includes(Symbols.AnyRoom) ? client.getVisibleRooms() : roomIds.map(r => client.getRoom(r)))
-            : [client.getRoom(ActiveRoomObserver.activeRoomId)];
+            : [client.getRoom(RoomViewStore.instance.getRoomId())];
         return targetRooms.filter(r => !!r);
     }
 
diff --git a/src/stores/widgets/WidgetMessagingStore.ts b/src/stores/widgets/WidgetMessagingStore.ts
index 044832997eb..d954af6d609 100644
--- a/src/stores/widgets/WidgetMessagingStore.ts
+++ b/src/stores/widgets/WidgetMessagingStore.ts
@@ -14,12 +14,19 @@
  * limitations under the License.
  */
 
-import { ClientWidgetApi, Widget } from "matrix-widget-api";
+import { ClientWidgetApi, Widget, IWidgetApiRequest } from "matrix-widget-api";
 
+import { ElementWidgetActions } from "./ElementWidgetActions";
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 import { ActionPayload } from "../../dispatcher/payloads";
 import { EnhancedMap } from "../../utils/maps";
+import WidgetUtils from "../../utils/WidgetUtils";
+
+export enum WidgetMessagingStoreEvent {
+    StoreMessaging = "store_messaging",
+    WidgetReady = "widget_ready",
+}
 
 /**
  * Temporary holding store for widget messaging instances. This is eventually
@@ -29,8 +36,8 @@ import { EnhancedMap } from "../../utils/maps";
 export class WidgetMessagingStore extends AsyncStoreWithClient<unknown> {
     private static internalInstance = new WidgetMessagingStore();
 
-    // TODO: Fix uniqueness problem (widget IDs are not unique across the whole app)
-    private widgetMap = new EnhancedMap<string, ClientWidgetApi>(); // <widget ID, ClientWidgetAPi>
+    private widgetMap = new EnhancedMap<string, ClientWidgetApi>(); // <widget UID, ClientWidgetAPi>
+    private readyWidgets = new Set<string>(); // widgets that have sent a WidgetReady event
 
     public constructor() {
         super(defaultDispatcher);
@@ -49,35 +56,52 @@ export class WidgetMessagingStore extends AsyncStoreWithClient<unknown> {
         this.widgetMap.clear();
     }
 
-    public storeMessaging(widget: Widget, widgetApi: ClientWidgetApi) {
-        this.stopMessaging(widget);
-        this.widgetMap.set(widget.id, widgetApi);
+    public storeMessaging(widget: Widget, roomId: string, widgetApi: ClientWidgetApi) {
+        this.stopMessaging(widget, roomId);
+        const uid = WidgetUtils.calcWidgetUid(widget.id, roomId);
+        this.widgetMap.set(uid, widgetApi);
+
+        widgetApi.once(`action:${ElementWidgetActions.WidgetReady}`, (ev: CustomEvent<IWidgetApiRequest>) => {
+            this.readyWidgets.add(uid);
+            this.emit(WidgetMessagingStoreEvent.WidgetReady, uid);
+            widgetApi.transport.reply(ev.detail, {}); // ack
+        });
+
+        this.emit(WidgetMessagingStoreEvent.StoreMessaging, uid, widgetApi);
     }
 
-    public stopMessaging(widget: Widget) {
-        this.widgetMap.remove(widget.id)?.stop();
+    public stopMessaging(widget: Widget, roomId: string) {
+        const uid = WidgetUtils.calcWidgetUid(widget.id, roomId);
+        this.widgetMap.remove(uid)?.stop();
+        this.readyWidgets.delete(uid);
     }
 
-    public getMessaging(widget: Widget): ClientWidgetApi {
-        return this.widgetMap.get(widget.id);
+    public getMessaging(widget: Widget, roomId: string): ClientWidgetApi {
+        return this.widgetMap.get(WidgetUtils.calcWidgetUid(widget.id, roomId));
     }
 
     /**
-     * Stops the widget messaging instance for a given widget ID.
-     * @param {string} widgetId The widget ID.
-     * @deprecated Widget IDs are not globally unique.
+     * Stops the widget messaging instance for a given widget UID.
+     * @param {string} widgetUid The widget UID.
      */
-    public stopMessagingById(widgetId: string) {
-        this.widgetMap.remove(widgetId)?.stop();
+    public stopMessagingByUid(widgetUid: string) {
+        this.widgetMap.remove(widgetUid)?.stop();
     }
 
     /**
-     * Gets the widget messaging class for a given widget ID.
-     * @param {string} widgetId The widget ID.
+     * Gets the widget messaging class for a given widget UID.
+     * @param {string} widgetUid The widget UID.
      * @returns {ClientWidgetApi} The widget API, or a falsey value if not found.
-     * @deprecated Widget IDs are not globally unique.
      */
-    public getMessagingForId(widgetId: string): ClientWidgetApi {
-        return this.widgetMap.get(widgetId);
+    public getMessagingForUid(widgetUid: string): ClientWidgetApi {
+        return this.widgetMap.get(widgetUid);
+    }
+
+    /**
+     * @param {string} widgetUid The widget UID.
+     * @returns {boolean} Whether the widget has issued an ElementWidgetActions.WidgetReady event.
+     */
+    public isWidgetReady(widgetUid: string): boolean {
+        return this.readyWidgets.has(widgetUid);
     }
 }
diff --git a/src/theme.ts b/src/theme.ts
index ca846cae5b1..54bc42f8071 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -230,7 +230,7 @@ export async function setTheme(theme?: string): Promise<void> {
     clearCustomTheme();
     let stylesheetName = theme;
     if (theme.startsWith("custom-")) {
-        const customTheme = getCustomTheme(theme.substr(7));
+        const customTheme = getCustomTheme(theme.slice(7));
         stylesheetName = customTheme.is_dark ? "dark-custom" : "light-custom";
         setCustomThemeVars(customTheme);
     }
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index 1072ae2907f..39f1ef252f3 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
+import { Optional } from "matrix-events-sdk";
 
 import { _t } from "../languageHandler";
 import SdkConfig from "../SdkConfig";
@@ -28,6 +29,8 @@ import {
     showDialog as showAnalyticsLearnMoreDialog,
 } from "../components/views/dialogs/AnalyticsLearnMoreDialog";
 import { Action } from "../dispatcher/actions";
+import { SnakedObject } from "../utils/SnakedObject";
+import { IConfigOptions } from "../IConfigOptions";
 
 const onAccept = () => {
     dis.dispatch({
@@ -81,7 +84,12 @@ const TOAST_KEY = "analytics";
 const getAnonymousDescription = (): ReactNode => {
     // get toast description for anonymous tracking (the previous scheme pre-posthog)
     const brand = SdkConfig.get().brand;
-    const cookiePolicyUrl = SdkConfig.get().piwik?.policyUrl;
+    const piwikConfig = SdkConfig.get("piwik");
+    let piwik: Optional<SnakedObject<Extract<IConfigOptions["piwik"], object>>>;
+    if (typeof piwikConfig === 'object') {
+        piwik = new SnakedObject(piwikConfig);
+    }
+    const cookiePolicyUrl = piwik?.get("policy_url");
     return _t(
         "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. " +
         "This will use a <PolicyLink>cookie</PolicyLink>.",
@@ -100,7 +108,7 @@ const getAnonymousDescription = (): ReactNode => {
 };
 
 const showToast = (props: Omit<React.ComponentProps<typeof GenericToast>, "toastKey">) => {
-    const analyticsOwner = SdkConfig.get().analyticsOwner ?? SdkConfig.get().brand;
+    const analyticsOwner = SdkConfig.get("analytics_owner") ?? SdkConfig.get().brand;
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
         title: _t("Help improve %(analyticsOwner)s", { analyticsOwner }),
diff --git a/src/toasts/BulkUnverifiedSessionsToast.ts b/src/toasts/BulkUnverifiedSessionsToast.ts
index 0a35a913456..6ddb0d7db57 100644
--- a/src/toasts/BulkUnverifiedSessionsToast.ts
+++ b/src/toasts/BulkUnverifiedSessionsToast.ts
@@ -20,7 +20,7 @@ import DeviceListener from '../DeviceListener';
 import GenericToast from "../components/views/toasts/GenericToast";
 import ToastStore from "../stores/ToastStore";
 import { Action } from "../dispatcher/actions";
-import { UserTab } from "../components/views/dialogs/UserSettingsDialog";
+import { UserTab } from "../components/views/dialogs/UserTab";
 
 const TOAST_KEY = "reviewsessions";
 
diff --git a/src/toasts/IncomingCallToast.tsx b/src/toasts/IncomingCallToast.tsx
index 555a14653e2..7b27744c95f 100644
--- a/src/toasts/IncomingCallToast.tsx
+++ b/src/toasts/IncomingCallToast.tsx
@@ -21,7 +21,6 @@ import React from 'react';
 import { CallType, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import classNames from 'classnames';
 
-import { replaceableComponent } from '../utils/replaceableComponent';
 import CallHandler, { CallHandlerEvent } from '../CallHandler';
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import { _t } from '../languageHandler';
@@ -39,7 +38,6 @@ interface IState {
     silenced: boolean;
 }
 
-@replaceableComponent("views.voip.IncomingCallToast")
 export default class IncomingCallToast extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/toasts/MobileGuideToast.ts b/src/toasts/MobileGuideToast.ts
index 5d872192c83..2d180693893 100644
--- a/src/toasts/MobileGuideToast.ts
+++ b/src/toasts/MobileGuideToast.ts
@@ -17,6 +17,7 @@ limitations under the License.
 import { _t } from "../languageHandler";
 import GenericToast from "../components/views/toasts/GenericToast";
 import ToastStore from "../stores/ToastStore";
+import SdkConfig from "../SdkConfig";
 
 const onAccept = () => {
     window.location.href = "mobile_guide/";
@@ -32,6 +33,7 @@ const TOAST_KEY = "mobileguide";
 export const showToast = () => {
     const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
     const isAndroid = /Android/.test(navigator.userAgent);
+    const brand = SdkConfig.get().brand;
     if (!isIos && !isAndroid) {
         return;
     }
@@ -43,8 +45,8 @@ export const showToast = () => {
         title: _t("Use app for a better experience"),
         props: {
             description: _t(
-                "Element Web is experimental on mobile. " +
-                "For a better experience and the latest features, use our free native app.",
+                "%(brand)s is experimental on a mobile web browser. " +
+                "For a better experience and the latest features, use our free native app.", { brand },
             ),
             acceptLabel: _t("Use app"),
             onAccept,
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
index 05425b93c0e..d0db97cd08f 100644
--- a/src/toasts/UnverifiedSessionToast.ts
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -21,7 +21,7 @@ import DeviceListener from '../DeviceListener';
 import ToastStore from "../stores/ToastStore";
 import GenericToast from "../components/views/toasts/GenericToast";
 import { Action } from "../dispatcher/actions";
-import { UserTab } from "../components/views/dialogs/UserSettingsDialog";
+import { UserTab } from "../components/views/dialogs/UserTab";
 
 function toastKey(deviceId: string) {
     return "unverified_session_" + deviceId;
diff --git a/src/utils/AutoDiscoveryUtils.tsx b/src/utils/AutoDiscoveryUtils.tsx
index 8860a5104fc..101648569aa 100644
--- a/src/utils/AutoDiscoveryUtils.tsx
+++ b/src/utils/AutoDiscoveryUtils.tsx
@@ -207,7 +207,7 @@ export default class AutoDiscoveryUtils {
         const hsResult = discoveryResult['m.homeserver'];
         const isResult = discoveryResult['m.identity_server'];
 
-        const defaultConfig = SdkConfig.get()["validated_server_config"];
+        const defaultConfig = SdkConfig.get("validated_server_config");
 
         // Validate the identity server first because an invalid identity server causes
         // an invalid homeserver, which may not be picked up correctly.
diff --git a/src/utils/BrowserWorkarounds.ts b/src/utils/BrowserWorkarounds.ts
new file mode 100644
index 00000000000..ea8ea2a04f9
--- /dev/null
+++ b/src/utils/BrowserWorkarounds.ts
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MouseEvent } from "react";
+
+export function chromeFileInputFix(event: MouseEvent<HTMLInputElement>): void {
+    // Workaround for Chromium Bug
+    // Chrome does not fire onChange events if the same file is selected twice
+    // Only required on Chromium-based browsers (Electron, Chrome, Edge, Opera, Vivaldi, etc)
+    event.currentTarget.value = '';
+}
diff --git a/src/utils/DecryptFile.ts b/src/utils/DecryptFile.ts
index d7ac3d4f564..7e8bcf1a997 100644
--- a/src/utils/DecryptFile.ts
+++ b/src/utils/DecryptFile.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Pull in the encryption lib so that we can decrypt attachments.
-import encrypt from 'browser-encrypt-attachment';
+import encrypt from 'matrix-encrypt-attachment';
 
 import { mediaFromContent } from "../customisations/Media";
 import { IEncryptedFile, IMediaEventInfo } from "../customisations/models/IMediaEventContent";
@@ -24,7 +24,7 @@ import { getBlobSafeMimeType } from "./blobs";
 /**
  * Decrypt a file attached to a matrix event.
  * @param {IEncryptedFile} file The encrypted file information taken from the matrix event.
- *   This passed to [link]{@link https://github.com/matrix-org/browser-encrypt-attachments}
+ *   This passed to [link]{@link https://github.com/matrix-org/matrix-encrypt-attachment}
  *   as the encryption info object, so will also have the those keys in addition to
  *   the keys below.
  * @param {IMediaEventInfo} info The info parameter taken from the matrix event.
diff --git a/src/utils/DialogOpener.ts b/src/utils/DialogOpener.ts
new file mode 100644
index 00000000000..dadce60ef6e
--- /dev/null
+++ b/src/utils/DialogOpener.ts
@@ -0,0 +1,133 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { ActionPayload } from "../dispatcher/payloads";
+import Modal from "../Modal";
+import RoomSettingsDialog from "../components/views/dialogs/RoomSettingsDialog";
+import { RoomViewStore } from "../stores/RoomViewStore";
+import ForwardDialog from "../components/views/dialogs/ForwardDialog";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { Action } from "../dispatcher/actions";
+import ReportEventDialog from "../components/views/dialogs/ReportEventDialog";
+import TabbedIntegrationManagerDialog from "../components/views/dialogs/TabbedIntegrationManagerDialog";
+import SpacePreferencesDialog from "../components/views/dialogs/SpacePreferencesDialog";
+import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
+import InviteDialog from "../components/views/dialogs/InviteDialog";
+import AddExistingToSpaceDialog from "../components/views/dialogs/AddExistingToSpaceDialog";
+import { ButtonEvent } from "../components/views/elements/AccessibleButton";
+import PosthogTrackers from "../PosthogTrackers";
+import { showAddExistingSubspace, showCreateNewRoom } from "./space";
+
+/**
+ * Auxiliary class to listen for dialog opening over the dispatcher and
+ * open the required dialogs. Not all dialogs run through here, but the
+ * ones which cause import cycles are good candidates.
+ */
+export class DialogOpener {
+    public static readonly instance = new DialogOpener();
+
+    private isRegistered = false;
+
+    private constructor() {
+    }
+
+    // We could do this in the constructor, but then we wouldn't have
+    // a function to call from Lifecycle to capture the class.
+    public prepare() {
+        if (this.isRegistered) return;
+        defaultDispatcher.register(this.onDispatch);
+        this.isRegistered = true;
+    }
+
+    private onDispatch = (payload: ActionPayload) => {
+        switch (payload.action) {
+            case 'open_room_settings':
+                Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
+                    roomId: payload.room_id || RoomViewStore.instance.getRoomId(),
+                    initialTabId: payload.initial_tab_id,
+                }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+                break;
+            case Action.OpenForwardDialog:
+                Modal.createTrackedDialog('Forward Message', '', ForwardDialog, {
+                    matrixClient: MatrixClientPeg.get(),
+                    event: payload.event,
+                    permalinkCreator: payload.permalinkCreator,
+                });
+                break;
+            case Action.OpenReportEventDialog:
+                Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
+                    mxEvent: payload.event,
+                }, 'mx_Dialog_reportEvent');
+                break;
+            case Action.OpenTabbedIntegrationManagerDialog:
+                Modal.createTrackedDialog(
+                    'Tabbed Integration Manager', '', TabbedIntegrationManagerDialog,
+                    {
+                        room: payload.room,
+                        screen: payload.screen,
+                        integrationId: payload.integrationId,
+                    },
+                    'mx_TabbedIntegrationManagerDialog',
+                );
+                break;
+            case Action.OpenSpacePreferences:
+                Modal.createTrackedDialog("Space preferences", "", SpacePreferencesDialog, {
+                    initialTabId: payload.initalTabId,
+                    space: payload.space,
+                }, null, false, true);
+                break;
+            case Action.OpenSpaceSettings:
+                Modal.createTrackedDialog("Space Settings", "", SpaceSettingsDialog, {
+                    matrixClient: payload.space.client,
+                    space: payload.space,
+                }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+                break;
+            case Action.OpenInviteDialog:
+                Modal.createTrackedDialog(payload.analyticsName, '', InviteDialog, {
+                    kind: payload.kind,
+                    call: payload.call,
+                    roomId: payload.roomId,
+                }, payload.className, false, true).finished.then((results) => {
+                    payload.onFinishedCallback?.(results);
+                });
+                break;
+            case Action.OpenAddToExistingSpaceDialog: {
+                const space = payload.space;
+                Modal.createTrackedDialog(
+                    "Space Landing",
+                    "Add Existing",
+                    AddExistingToSpaceDialog,
+                    {
+                        onCreateRoomClick: (ev: ButtonEvent) => {
+                            showCreateNewRoom(space);
+                            PosthogTrackers.trackInteraction("WebAddExistingToSpaceDialogCreateRoomButton", ev);
+                        },
+                        onAddSubspaceClick: () => showAddExistingSubspace(space),
+                        space,
+                        onFinished: (added: boolean) => {
+                            if (added && RoomViewStore.instance.getRoomId() === space.roomId) {
+                                defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                            }
+                        },
+                    },
+                    "mx_AddExistingToSpaceDialog_wrapper",
+                );
+                break;
+            }
+        }
+    };
+}
diff --git a/src/utils/DirectoryUtils.ts b/src/utils/DirectoryUtils.ts
index 89e719f320b..f8b9e858d12 100644
--- a/src/utils/DirectoryUtils.ts
+++ b/src/utils/DirectoryUtils.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Matrix.org Foundation C.I.C.
+Copyright 2018, 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,9 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IInstance } from "matrix-js-sdk/src/client";
+import { IInstance, IProtocol } from "matrix-js-sdk/src/client";
 
-import { Protocols } from "../components/views/directory/NetworkDropdown";
+// XXX: We would ideally use a symbol here but we can't since we save this value to localStorage
+export const ALL_ROOMS = "ALL_ROOMS";
+
+export type Protocols = Record<string, IProtocol>;
 
 // Find a protocol 'instance' with a given instance_id
 // in the supplied protocols dict
diff --git a/src/utils/EventRenderingUtils.ts b/src/utils/EventRenderingUtils.ts
new file mode 100644
index 00000000000..a44db854fe2
--- /dev/null
+++ b/src/utils/EventRenderingUtils.ts
@@ -0,0 +1,115 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import { M_POLL_START } from "matrix-events-sdk";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
+import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+
+import SettingsStore from "../settings/SettingsStore";
+import { haveRendererForEvent, JitsiEventFactory, JSONEventFactory, pickFactory } from "../events/EventTileFactory";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { getMessageModerationState, MessageModerationState } from "./EventUtils";
+
+export function getEventDisplayInfo(mxEvent: MatrixEvent, showHiddenEvents: boolean, hideEvent?: boolean): {
+    isInfoMessage: boolean;
+    hasRenderer: boolean;
+    isBubbleMessage: boolean;
+    isLeftAlignedBubbleMessage: boolean;
+    noBubbleEvent: boolean;
+    isSeeingThroughMessageHiddenForModeration: boolean;
+} {
+    const content = mxEvent.getContent();
+    const msgtype = content.msgtype;
+    const eventType = mxEvent.getType();
+
+    let isSeeingThroughMessageHiddenForModeration = false;
+    if (SettingsStore.getValue("feature_msc3531_hide_messages_pending_moderation")) {
+        switch (getMessageModerationState(mxEvent)) {
+            case MessageModerationState.VISIBLE_FOR_ALL:
+            case MessageModerationState.HIDDEN_TO_CURRENT_USER:
+                // Nothing specific to do here
+                break;
+            case MessageModerationState.SEE_THROUGH_FOR_CURRENT_USER:
+                // Show message with a marker.
+                isSeeingThroughMessageHiddenForModeration = true;
+                break;
+        }
+    }
+
+    // TODO: Thread a MatrixClient through to here
+    let factory = pickFactory(mxEvent, MatrixClientPeg.get(), showHiddenEvents);
+
+    // Info messages are basically information about commands processed on a room
+    let isBubbleMessage = (
+        eventType.startsWith("m.key.verification") ||
+        (eventType === EventType.RoomMessage && msgtype?.startsWith("m.key.verification")) ||
+        (eventType === EventType.RoomCreate) ||
+        (eventType === EventType.RoomEncryption) ||
+        (factory === JitsiEventFactory)
+    );
+    const isLeftAlignedBubbleMessage = (
+        !isBubbleMessage &&
+        eventType === EventType.CallInvite
+    );
+    let isInfoMessage = (
+        !isBubbleMessage &&
+        !isLeftAlignedBubbleMessage &&
+        eventType !== EventType.RoomMessage &&
+        eventType !== EventType.RoomMessageEncrypted &&
+        eventType !== EventType.Sticker &&
+        eventType !== EventType.RoomCreate &&
+        !M_POLL_START.matches(eventType) &&
+        !M_BEACON_INFO.matches(eventType)
+    );
+    // Some non-info messages want to be rendered in the appropriate bubble column but without the bubble background
+    const noBubbleEvent = (
+        (eventType === EventType.RoomMessage && msgtype === MsgType.Emote) ||
+        M_POLL_START.matches(eventType) ||
+        M_LOCATION.matches(eventType) ||
+        M_BEACON_INFO.matches(eventType) ||
+        (
+            eventType === EventType.RoomMessage &&
+            M_LOCATION.matches(msgtype)
+        )
+    );
+
+    // If we're showing hidden events in the timeline, we should use the
+    // source tile when there's no regular tile for an event and also for
+    // replace relations (which otherwise would display as a confusing
+    // duplicate of the thing they are replacing).
+    if (hideEvent || !haveRendererForEvent(mxEvent, showHiddenEvents)) {
+        // forcefully ask for a factory for a hidden event (hidden event
+        // setting is checked internally)
+        // TODO: Thread a MatrixClient through to here
+        factory = pickFactory(mxEvent, MatrixClientPeg.get(), showHiddenEvents, true);
+        if (factory === JSONEventFactory) {
+            isBubbleMessage = false;
+            // Reuse info message avatar and sender profile styling
+            isInfoMessage = true;
+        }
+    }
+
+    return {
+        hasRenderer: !!factory,
+        isInfoMessage,
+        isBubbleMessage,
+        isLeftAlignedBubbleMessage,
+        noBubbleEvent,
+        isSeeingThroughMessageHiddenForModeration,
+    };
+}
diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts
index 85bf88cf679..0a860ccf013 100644
--- a/src/utils/EventUtils.ts
+++ b/src/utils/EventUtils.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@ import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { EventType, EVENT_VISIBILITY_CHANGE_TYPE, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { logger } from 'matrix-js-sdk/src/logger';
-import { LOCATION_EVENT_TYPE } from 'matrix-js-sdk/src/@types/location';
 import { M_POLL_START } from "matrix-events-sdk";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import shouldHideEvent from "../shouldHideEvent";
-import { getHandlerTile, GetRelationsForEvent, haveTileForEvent } from "../components/views/rooms/EventTile";
+import { GetRelationsForEvent } from "../components/views/rooms/EventTile";
 import SettingsStore from "../settings/SettingsStore";
 import defaultDispatcher from "../dispatcher/dispatcher";
 import { TimelineRenderingType } from "../contexts/RoomContext";
@@ -82,7 +82,7 @@ export function canEditContent(mxEvent: MatrixEvent): boolean {
         M_POLL_START.matches(mxEvent.getType()) ||
         (
             (msgtype === MsgType.Text || msgtype === MsgType.Emote) &&
-            body &&
+            !!body &&
             typeof body === 'string'
         )
     );
@@ -134,7 +134,7 @@ export function findEditableEvent({
 /**
  * How we should render a message depending on its moderation state.
  */
-enum MessageModerationState {
+export enum MessageModerationState {
     /**
      * The message is visible to all.
      */
@@ -152,14 +152,26 @@ enum MessageModerationState {
     SEE_THROUGH_FOR_CURRENT_USER = "SEE_THROUGH_FOR_CURRENT_USER",
 }
 
+// This is lazily initialized and cached since getMessageModerationState needs it,
+// and is called on timeline rendering hot-paths
+let msc3531Enabled: boolean | null = null;
+const getMsc3531Enabled = (): boolean => {
+    if (msc3531Enabled === null) {
+        msc3531Enabled = SettingsStore.getValue("feature_msc3531_hide_messages_pending_moderation");
+    }
+    return msc3531Enabled;
+};
+
 /**
  * Determine whether a message should be displayed as hidden pending moderation.
  *
  * If MSC3531 is deactivated in settings, all messages are considered visible
  * to all.
  */
-export function getMessageModerationState(mxEvent: MatrixEvent): MessageModerationState {
-    if (!SettingsStore.getValue("feature_msc3531_hide_messages_pending_moderation")) {
+export function getMessageModerationState(mxEvent: MatrixEvent, client?: MatrixClient): MessageModerationState {
+    client = client ?? MatrixClientPeg.get(); // because param defaults don't do the correct thing
+
+    if (!getMsc3531Enabled()) {
         return MessageModerationState.VISIBLE_FOR_ALL;
     }
     const visibility = mxEvent.messageVisibility();
@@ -171,7 +183,6 @@ export function getMessageModerationState(mxEvent: MatrixEvent): MessageModerati
     // pending moderation. However, if we're the author or a moderator,
     // we still need to display it.
 
-    const client = MatrixClientPeg.get();
     if (mxEvent.sender?.userId === client.getUserId()) {
         // We're the author, show the message.
         return MessageModerationState.SEE_THROUGH_FOR_CURRENT_USER;
@@ -194,92 +205,6 @@ export function getMessageModerationState(mxEvent: MatrixEvent): MessageModerati
     return MessageModerationState.HIDDEN_TO_CURRENT_USER;
 }
 
-export function getEventDisplayInfo(mxEvent: MatrixEvent, hideEvent?: boolean): {
-    isInfoMessage: boolean;
-    tileHandler: string;
-    isBubbleMessage: boolean;
-    isLeftAlignedBubbleMessage: boolean;
-    noBubbleEvent: boolean;
-    isSeeingThroughMessageHiddenForModeration: boolean;
-} {
-    const content = mxEvent.getContent();
-    const msgtype = content.msgtype;
-    const eventType = mxEvent.getType();
-
-    let isSeeingThroughMessageHiddenForModeration = false;
-    let tileHandler;
-    if (SettingsStore.getValue("feature_msc3531_hide_messages_pending_moderation")) {
-        switch (getMessageModerationState(mxEvent)) {
-            case MessageModerationState.VISIBLE_FOR_ALL:
-                // Default behavior, nothing to do.
-                break;
-            case MessageModerationState.HIDDEN_TO_CURRENT_USER:
-                // Hide message.
-                tileHandler = "messages.HiddenBody";
-                break;
-            case MessageModerationState.SEE_THROUGH_FOR_CURRENT_USER:
-                // Show message with a marker.
-                isSeeingThroughMessageHiddenForModeration = true;
-                break;
-        }
-    }
-    if (!tileHandler) {
-        tileHandler = getHandlerTile(mxEvent);
-    }
-
-    // Info messages are basically information about commands processed on a room
-    let isBubbleMessage = (
-        eventType.startsWith("m.key.verification") ||
-        (eventType === EventType.RoomMessage && msgtype?.startsWith("m.key.verification")) ||
-        (eventType === EventType.RoomCreate) ||
-        (eventType === EventType.RoomEncryption) ||
-        (tileHandler === "messages.MJitsiWidgetEvent")
-    );
-    const isLeftAlignedBubbleMessage = (
-        !isBubbleMessage &&
-        eventType === EventType.CallInvite
-    );
-    let isInfoMessage = (
-        !isBubbleMessage &&
-        !isLeftAlignedBubbleMessage &&
-        eventType !== EventType.RoomMessage &&
-        eventType !== EventType.RoomMessageEncrypted &&
-        eventType !== EventType.Sticker &&
-        eventType !== EventType.RoomCreate &&
-        !M_POLL_START.matches(eventType)
-    );
-    // Some non-info messages want to be rendered in the appropriate bubble column but without the bubble background
-    const noBubbleEvent = (
-        (eventType === EventType.RoomMessage && msgtype === MsgType.Emote) ||
-        M_POLL_START.matches(eventType) ||
-        LOCATION_EVENT_TYPE.matches(eventType) ||
-        (
-            eventType === EventType.RoomMessage &&
-            LOCATION_EVENT_TYPE.matches(msgtype)
-        )
-    );
-
-    // If we're showing hidden events in the timeline, we should use the
-    // source tile when there's no regular tile for an event and also for
-    // replace relations (which otherwise would display as a confusing
-    // duplicate of the thing they are replacing).
-    if ((hideEvent || !haveTileForEvent(mxEvent)) && SettingsStore.getValue("showHiddenEventsInTimeline")) {
-        tileHandler = "messages.ViewSourceEvent";
-        isBubbleMessage = false;
-        // Reuse info message avatar and sender profile styling
-        isInfoMessage = true;
-    }
-
-    return {
-        tileHandler,
-        isInfoMessage,
-        isBubbleMessage,
-        isLeftAlignedBubbleMessage,
-        noBubbleEvent,
-        isSeeingThroughMessageHiddenForModeration,
-    };
-}
-
 export function isVoiceMessage(mxEvent: MatrixEvent): boolean {
     const content = mxEvent.getContent();
     // MSC2516 is a legacy identifier. See https://github.com/matrix-org/matrix-doc/pull/3245
@@ -303,12 +228,12 @@ export async function fetchInitialEvent(
         initialEvent = null;
     }
 
-    if (initialEvent?.isThreadRelation) {
+    if (initialEvent?.isThreadRelation && client.supportsExperimentalThreads()) {
         try {
             const rootEventData = await client.fetchRoomEvent(roomId, initialEvent.threadRootId);
             const rootEvent = new MatrixEvent(rootEventData);
             const room = client.getRoom(roomId);
-            room.createThread(rootEvent);
+            room.createThread(rootEvent, [rootEvent], true);
         } catch (e) {
             logger.warn("Could not find root event: " + initialEvent.threadRootId);
         }
@@ -334,3 +259,25 @@ export function editEvent(
         });
     }
 }
+
+export function canCancel(status: EventStatus): boolean {
+    return status === EventStatus.QUEUED || status === EventStatus.NOT_SENT || status === EventStatus.ENCRYPTING;
+}
+
+export const isLocationEvent = (event: MatrixEvent): boolean => {
+    const eventType = event.getType();
+    return (
+        M_LOCATION.matches(eventType) ||
+        (
+            eventType === EventType.RoomMessage &&
+            M_LOCATION.matches(event.getContent().msgtype)
+        )
+    );
+};
+
+export function canForward(event: MatrixEvent): boolean {
+    return !(
+        isLocationEvent(event) ||
+        M_POLL_START.matches(event.getType())
+    );
+}
diff --git a/src/utils/IdentityServerUtils.ts b/src/utils/IdentityServerUtils.ts
index e760dd5b45a..e58750d8df6 100644
--- a/src/utils/IdentityServerUtils.ts
+++ b/src/utils/IdentityServerUtils.ts
@@ -21,7 +21,7 @@ import SdkConfig from '../SdkConfig';
 import { MatrixClientPeg } from '../MatrixClientPeg';
 
 export function getDefaultIdentityServerUrl(): string {
-    return SdkConfig.get()['validated_server_config']['isUrl'];
+    return SdkConfig.get("validated_server_config").isUrl;
 }
 
 export function useDefaultIdentityServer(): void {
diff --git a/src/utils/Image.ts b/src/utils/Image.ts
new file mode 100644
index 00000000000..66d43b1ca48
--- /dev/null
+++ b/src/utils/Image.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { arrayHasDiff } from "./arrays";
+
+export function mayBeAnimated(mimeType: string): boolean {
+    // AVIF animation support at the time of writing is only available in Chrome hence not having `blobIsAnimated` check
+    return ["image/gif", "image/webp", "image/png", "image/apng", "image/avif"].includes(mimeType);
+}
+
+function arrayBufferRead(arr: ArrayBuffer, start: number, len: number): Uint8Array {
+    return new Uint8Array(arr.slice(start, start + len));
+}
+
+function arrayBufferReadInt(arr: ArrayBuffer, start: number): number {
+    const dv = new DataView(arr, start, 4);
+    return dv.getUint32(0);
+}
+
+function arrayBufferReadStr(arr: ArrayBuffer, start: number, len: number): string {
+    return String.fromCharCode.apply(null, arrayBufferRead(arr, start, len));
+}
+
+export async function blobIsAnimated(mimeType: string, blob: Blob): Promise<boolean> {
+    switch (mimeType) {
+        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();
+            if (
+                arrayBufferReadStr(arr, 0, 4) === "RIFF" &&
+                arrayBufferReadStr(arr, 8, 4) === "WEBP" &&
+                arrayBufferReadStr(arr, 12, 4) === "VP8X"
+            ) {
+                const [flags] = arrayBufferRead(arr, 16, 1);
+                // Flags: R R I L E X _A_ R (reversed)
+                const animationFlagMask = 1 << 1;
+                return (flags & animationFlagMask) != 0;
+            }
+            break;
+        }
+
+        case "image/gif": {
+            // Based on https://gist.github.com/zakirt/faa4a58cec5a7505b10e3686a226f285
+            // More info at http://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
+            const dv = new DataView(await blob.arrayBuffer(), 10);
+
+            const globalColorTable = dv.getUint8(0);
+            let globalColorTableSize = 0;
+            // check first bit, if 0, then we don't have a Global Color Table
+            if (globalColorTable & 0x80) {
+                // grab the last 3 bits, to calculate the global color table size -> RGB * 2^(N+1)
+                // N is the value in the last 3 bits.
+                globalColorTableSize = 3 * Math.pow(2, (globalColorTable & 0x7) + 1);
+            }
+
+            // move on to the Graphics Control Extension
+            const offset = 3 + globalColorTableSize;
+
+            const extensionIntroducer = dv.getUint8(offset);
+            const graphicsControlLabel = dv.getUint8(offset + 1);
+            let delayTime = 0;
+
+            // Graphics Control Extension section is where GIF animation data is stored
+            // First 2 bytes must be 0x21 and 0xF9
+            if ((extensionIntroducer & 0x21) && (graphicsControlLabel & 0xF9)) {
+                // skip to the 2 bytes with the delay time
+                delayTime = dv.getUint16(offset + 4);
+            }
+
+            return !!delayTime;
+        }
+
+        case "image/png":
+        case "image/apng": {
+            // Based on https://stackoverflow.com/a/68618296
+            const arr = await blob.arrayBuffer();
+            if (arrayHasDiff([
+                0x89,
+                0x50, 0x4E, 0x47,
+                0x0D, 0x0A,
+                0x1A,
+                0x0A,
+            ], Array.from(arrayBufferRead(arr, 0, 8)))) {
+                return false;
+            }
+
+            for (let i = 8; i < blob.size;) {
+                const length = arrayBufferReadInt(arr, i);
+                i += 4;
+                const type = arrayBufferReadStr(arr, i, 4);
+                i += 4;
+
+                switch (type) {
+                    case "acTL":
+                        return true;
+                    case "IDAT":
+                        return false;
+                }
+                i += length + 4;
+            }
+            break;
+        }
+    }
+
+    return false;
+}
diff --git a/src/utils/MultiInviter.ts b/src/utils/MultiInviter.ts
index f94f0a09bd2..9916916f8c7 100644
--- a/src/utils/MultiInviter.ts
+++ b/src/utils/MultiInviter.ts
@@ -23,7 +23,6 @@ import { HistoryVisibility } from "matrix-js-sdk/src/@types/partials";
 
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import { AddressType, getAddressType } from '../UserAddress';
-import GroupStore from '../stores/GroupStore';
 import { _t } from "../languageHandler";
 import Modal from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
@@ -47,11 +46,9 @@ const USER_ALREADY_JOINED = "IO.ELEMENT.ALREADY_JOINED";
 const USER_ALREADY_INVITED = "IO.ELEMENT.ALREADY_INVITED";
 
 /**
- * Invites multiple addresses to a room or group, handling rate limiting from the server
+ * Invites multiple addresses to a room, handling rate limiting from the server
  */
 export default class MultiInviter {
-    private readonly roomId?: string;
-    private readonly groupId?: string;
     private readonly matrixClient: MatrixClient;
 
     private canceled = false;
@@ -64,18 +61,10 @@ export default class MultiInviter {
     private reason: string = null;
 
     /**
-     * @param {string} targetId The ID of the room or group to invite to
+     * @param {string} roomId The ID of the room to invite to
      * @param {function} progressCallback optional callback, fired after each invite.
      */
-    constructor(targetId: string, private readonly progressCallback?: () => void) {
-        if (targetId[0] === '+') {
-            this.roomId = null;
-            this.groupId = targetId;
-        } else {
-            this.roomId = targetId;
-            this.groupId = null;
-        }
-
+    constructor(private roomId: string, private readonly progressCallback?: () => void) {
         this.matrixClient = MatrixClientPeg.get();
     }
 
@@ -130,8 +119,9 @@ export default class MultiInviter {
                     invitedUsers.push(addr);
                 }
             }
+
             logger.log("Sharing history with", invitedUsers);
-            await this.matrixClient.sendSharedHistoryKeys(this.roomId, invitedUsers);
+            this.matrixClient.sendSharedHistoryKeys(this.roomId, invitedUsers); // do this in the background
 
             return states;
         });
@@ -195,13 +185,7 @@ export default class MultiInviter {
         return new Promise<void>((resolve, reject) => {
             logger.log(`Inviting ${address}`);
 
-            let doInvite;
-            if (this.groupId !== null) {
-                doInvite = GroupStore.inviteUserToGroup(this.groupId, address);
-            } else {
-                doInvite = this.inviteToRoom(this.roomId, address, ignoreProfile);
-            }
-
+            const doInvite = this.inviteToRoom(this.roomId, address, ignoreProfile);
             doInvite.then(() => {
                 if (this.canceled) {
                     return;
@@ -219,18 +203,32 @@ export default class MultiInviter {
 
                 logger.error(err);
 
-                let errorText;
+                const isSpace = this.roomId && this.matrixClient.getRoom(this.roomId)?.isSpaceRoom();
+
+                let errorText: string;
                 let fatal = false;
                 switch (err.errcode) {
                     case "M_FORBIDDEN":
-                        errorText = _t('You do not have permission to invite people to this room.');
+                        if (isSpace) {
+                            errorText = _t('You do not have permission to invite people to this space.');
+                        } else {
+                            errorText = _t('You do not have permission to invite people to this room.');
+                        }
                         fatal = true;
                         break;
                     case USER_ALREADY_INVITED:
-                        errorText = _t("User %(userId)s is already invited to the room", { userId: address });
+                        if (isSpace) {
+                            errorText = _t("User is already invited to the space");
+                        } else {
+                            errorText = _t("User is already invited to the room");
+                        }
                         break;
                     case USER_ALREADY_JOINED:
-                        errorText = _t("User %(userId)s is already in the room", { userId: address });
+                        if (isSpace) {
+                            errorText = _t("User is already in the space");
+                        } else {
+                            errorText = _t("User is already in the room");
+                        }
                         break;
                     case "M_LIMIT_EXCEEDED":
                         // we're being throttled so wait a bit & try again
@@ -240,10 +238,10 @@ export default class MultiInviter {
                         return;
                     case "M_NOT_FOUND":
                     case "M_USER_NOT_FOUND":
-                        errorText = _t("User %(user_id)s does not exist", { user_id: address });
+                        errorText = _t("User does not exist");
                         break;
                     case "M_PROFILE_UNDISCLOSED":
-                        errorText = _t("User %(user_id)s may or may not exist", { user_id: address });
+                        errorText = _t("User may or may not exist");
                         break;
                     case "M_PROFILE_NOT_FOUND":
                         if (!ignoreProfile) {
@@ -257,7 +255,11 @@ export default class MultiInviter {
                         errorText = _t("The user must be unbanned before they can be invited.");
                         break;
                     case "M_UNSUPPORTED_ROOM_VERSION":
-                        errorText = _t("The user's homeserver does not support the version of the room.");
+                        if (isSpace) {
+                            errorText = _t("The user's homeserver does not support the version of the space.");
+                        } else {
+                            errorText = _t("The user's homeserver does not support the version of the room.");
+                        }
                         break;
                 }
 
@@ -287,7 +289,7 @@ export default class MultiInviter {
 
         if (nextIndex === this.addresses.length) {
             this.busy = false;
-            if (Object.keys(this.errors).length > 0 && !this.groupId) {
+            if (Object.keys(this.errors).length > 0) {
                 // There were problems inviting some people - see if we can invite them
                 // without caring if they exist or not.
                 const unknownProfileUsers = Object.keys(this.errors)
diff --git a/src/utils/Reply.ts b/src/utils/Reply.ts
index 0eccc356dfc..87cec553737 100644
--- a/src/utils/Reply.ts
+++ b/src/utils/Reply.ts
@@ -14,15 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { RelationType } from "matrix-js-sdk/src/@types/event";
+import { IContent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import sanitizeHtml from "sanitize-html";
 import escapeHtml from "escape-html";
+import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
+import { MsgType } from "matrix-js-sdk/src/@types/event";
 
 import { PERMITTED_URL_SCHEMES } from "../HtmlUtils";
 import { makeUserPermalink, RoomPermalinkCreator } from "./permalinks/Permalinks";
+import SettingsStore from "../settings/SettingsStore";
 
-export function getParentEventId(ev: MatrixEvent): string | undefined {
+export function getParentEventId(ev?: MatrixEvent): string | undefined {
     if (!ev || ev.isRedacted()) return;
     if (ev.replyEventId) {
         return ev.replyEventId;
@@ -68,7 +70,7 @@ export function getNestedReplyText(
 ): { body: string, html: string } | null {
     if (!ev) return null;
 
-    let { body, formatted_body: html } = ev.getContent();
+    let { body, formatted_body: html, msgtype } = ev.getContent();
     if (getParentEventId(ev)) {
         if (body) body = stripPlainReply(body);
     }
@@ -92,9 +94,9 @@ export function getNestedReplyText(
     const mxid = ev.getSender();
 
     // This fallback contains text that is explicitly EN.
-    switch (ev.getContent().msgtype) {
-        case 'm.text':
-        case 'm.notice': {
+    switch (msgtype) {
+        case MsgType.Text:
+        case MsgType.Notice: {
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
                 + `<br>${html}</blockquote></mx-reply>`;
             const lines = body.trim().split('\n');
@@ -104,27 +106,27 @@ export function getNestedReplyText(
             }
             break;
         }
-        case 'm.image':
+        case MsgType.Image:
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
                 + `<br>sent an image.</blockquote></mx-reply>`;
             body = `> <${mxid}> sent an image.\n\n`;
             break;
-        case 'm.video':
+        case MsgType.Video:
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
                 + `<br>sent a video.</blockquote></mx-reply>`;
             body = `> <${mxid}> sent a video.\n\n`;
             break;
-        case 'm.audio':
+        case MsgType.Audio:
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
                 + `<br>sent an audio file.</blockquote></mx-reply>`;
             body = `> <${mxid}> sent an audio file.\n\n`;
             break;
-        case 'm.file':
+        case MsgType.File:
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
                 + `<br>sent a file.</blockquote></mx-reply>`;
             body = `> <${mxid}> sent a file.\n\n`;
             break;
-        case 'm.emote': {
+        case MsgType.Emote: {
             html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> * `
                 + `<a href="${userLink}">${mxid}</a><br>${html}</blockquote></mx-reply>`;
             const lines = body.trim().split('\n');
@@ -141,51 +143,68 @@ export function getNestedReplyText(
     return { body, html };
 }
 
-export function makeReplyMixIn(ev: MatrixEvent, renderIn?: string[]) {
+export function makeReplyMixIn(ev?: MatrixEvent): IEventRelation {
     if (!ev) return {};
 
-    const mixin: any = {
-        'm.relates_to': {
-            'm.in_reply_to': {
-                'event_id': ev.getId(),
-            },
+    const mixin: IEventRelation = {
+        'm.in_reply_to': {
+            'event_id': ev.getId(),
         },
     };
 
-    if (renderIn) {
-        mixin['m.relates_to']['m.in_reply_to']['m.render_in'] = renderIn;
-    }
-
-    /**
-     * If the event replied is part of a thread
-     * Add the `m.thread` relation so that clients
-     * that know how to handle that relation will
-     * be able to render them more accurately
-     */
-    if (ev.isThreadRelation) {
-        mixin['m.relates_to'] = {
-            ...mixin['m.relates_to'],
-            rel_type: RelationType.Thread,
-            event_id: ev.threadRootId,
-        };
+    if (SettingsStore.getValue("feature_thread") && ev.threadRootId) {
+        mixin.is_falling_back = false;
     }
 
     return mixin;
 }
 
-export function shouldDisplayReply(event: MatrixEvent, renderTarget?: string): boolean {
-    const parentExist = Boolean(getParentEventId(event));
+export function shouldDisplayReply(event: MatrixEvent): boolean {
+    if (event.isRedacted()) {
+        return false;
+    }
 
-    const relations = event.getRelation();
-    const renderIn = relations?.["m.in_reply_to"]?.["m.render_in"] ?? [];
+    const inReplyTo = event.getWireContent()?.["m.relates_to"]?.["m.in_reply_to"];
+    if (!inReplyTo) {
+        return false;
+    }
 
-    const shouldRenderInTarget = !renderTarget || (renderIn.includes(renderTarget));
+    const relation = event.getRelation();
+    if (SettingsStore.getValue("feature_thread") &&
+        relation?.rel_type === THREAD_RELATION_TYPE.name &&
+        relation?.is_falling_back
+    ) {
+        return false;
+    }
 
-    return parentExist && shouldRenderInTarget;
+    return !!inReplyTo.event_id;
 }
 
-export function getRenderInMixin(relation?: IEventRelation): string[] | undefined {
-    if (relation?.rel_type === RelationType.Thread) {
-        return [RelationType.Thread];
+interface IAddReplyOpts {
+    permalinkCreator?: RoomPermalinkCreator;
+    includeLegacyFallback?: boolean;
+}
+
+export function addReplyToMessageContent(
+    content: IContent,
+    replyToEvent: MatrixEvent,
+    opts: IAddReplyOpts = {
+        includeLegacyFallback: true,
+    },
+): void {
+    content["m.relates_to"] = {
+        ...(content["m.relates_to"] || {}),
+        ...makeReplyMixIn(replyToEvent),
+    };
+
+    if (opts.includeLegacyFallback) {
+        // Part of Replies fallback support - prepend the text we're sending with the text we're replying to
+        const nestedReply = getNestedReplyText(replyToEvent, opts.permalinkCreator);
+        if (nestedReply) {
+            if (content.formatted_body) {
+                content.formatted_body = nestedReply.html + content.formatted_body;
+            }
+            content.body = nestedReply.body + content.body;
+        }
     }
 }
diff --git a/src/utils/SnakedObject.ts b/src/utils/SnakedObject.ts
new file mode 100644
index 00000000000..bce02512c05
--- /dev/null
+++ b/src/utils/SnakedObject.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export function snakeToCamel(s: string): string {
+    return s.replace(/._./g, v => `${v[0]}${v[2].toUpperCase()}`);
+}
+
+export class SnakedObject<T = Record<string, any>> {
+    public constructor(private obj: T) {
+    }
+
+    public get<K extends string & keyof T>(key: K, altCaseName?: string): T[K] {
+        const val = this.obj[key];
+        if (val !== undefined) return val;
+
+        return this.obj[altCaseName ?? snakeToCamel(key)];
+    }
+
+    // Make JSON.stringify() pretend that everything is fine
+    public toJSON() {
+        return this.obj;
+    }
+}
diff --git a/src/utils/VideoChannelUtils.ts b/src/utils/VideoChannelUtils.ts
new file mode 100644
index 00000000000..cc3c99d980c
--- /dev/null
+++ b/src/utils/VideoChannelUtils.ts
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useState } from "react";
+import { throttle } from "lodash";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
+import { useTypedEventEmitter } from "../hooks/useEventEmitter";
+import WidgetStore, { IApp } from "../stores/WidgetStore";
+import { WidgetType } from "../widgets/WidgetType";
+import WidgetUtils from "./WidgetUtils";
+
+export const VIDEO_CHANNEL = "io.element.video";
+export const VIDEO_CHANNEL_MEMBER = "io.element.video.member";
+
+export interface IVideoChannelMemberContent {
+    // Connected device IDs
+    devices: string[];
+}
+
+export const getVideoChannel = (roomId: string): IApp => {
+    const apps = WidgetStore.instance.getApps(roomId);
+    return apps.find(app => WidgetType.JITSI.matches(app.type) && app.id === VIDEO_CHANNEL);
+};
+
+export const addVideoChannel = async (roomId: string, roomName: string) => {
+    await WidgetUtils.addJitsiWidget(roomId, CallType.Video, "Video channel", VIDEO_CHANNEL, roomName);
+};
+
+export const getConnectedMembers = (room: Room, connectedLocalEcho: boolean): Set<RoomMember> => {
+    const members = new Set<RoomMember>();
+
+    for (const e of room.currentState.getStateEvents(VIDEO_CHANNEL_MEMBER)) {
+        const member = room.getMember(e.getStateKey());
+        let devices = e.getContent<IVideoChannelMemberContent>()?.devices ?? [];
+
+        // Apply local echo for the disconnected case
+        if (!connectedLocalEcho && member?.userId === room.client.getUserId()) {
+            devices = devices.filter(d => d !== room.client.getDeviceId());
+        }
+        // Must have a device connected and still be joined to the room
+        if (devices.length && member?.membership === "join") members.add(member);
+    }
+
+    // Apply local echo for the connected case
+    if (connectedLocalEcho) members.add(room.getMember(room.client.getUserId()));
+    return members;
+};
+
+export const useConnectedMembers = (
+    room: Room, connectedLocalEcho: boolean, throttleMs = 100,
+): Set<RoomMember> => {
+    const [members, setMembers] = useState<Set<RoomMember>>(getConnectedMembers(room, connectedLocalEcho));
+    useTypedEventEmitter(room.currentState, RoomStateEvent.Update, throttle(() => {
+        setMembers(getConnectedMembers(room, connectedLocalEcho));
+    }, throttleMs, { leading: true, trailing: true }));
+    return members;
+};
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
index cb3e92a7bde..e41adabb903 100644
--- a/src/utils/WellKnownUtils.ts
+++ b/src/utils/WellKnownUtils.ts
@@ -22,7 +22,7 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
 const CALL_BEHAVIOUR_WK_KEY = "io.element.call_behaviour";
 const E2EE_WK_KEY = "io.element.e2ee";
 const E2EE_WK_KEY_DEPRECATED = "im.vector.riot.e2ee";
-const TILE_SERVER_WK_KEY = new UnstableValue(
+export const TILE_SERVER_WK_KEY = new UnstableValue(
     "m.tile_server", "org.matrix.msc3488.tile_server");
 
 /* eslint-disable camelcase */
diff --git a/src/utils/WidgetUtils.ts b/src/utils/WidgetUtils.ts
index c1d50cf0b77..8537e035837 100644
--- a/src/utils/WidgetUtils.ts
+++ b/src/utils/WidgetUtils.ts
@@ -16,11 +16,14 @@ limitations under the License.
 */
 
 import * as url from "url";
+import { base32 } from "rfc4648";
 import { Capability, IWidget, IWidgetData, MatrixCapabilities } from "matrix-widget-api";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { logger } from "matrix-js-sdk/src/logger";
 import { ClientEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { CallType } from "matrix-js-sdk/src/webrtc/call";
+import { randomLowercaseString, randomUppercaseString } from "matrix-js-sdk/src/randomstring";
 
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
@@ -29,9 +32,11 @@ import WidgetEchoStore from '../stores/WidgetEchoStore';
 import SettingsStore from "../settings/SettingsStore";
 import { IntegrationManagers } from "../integrations/IntegrationManagers";
 import { WidgetType } from "../widgets/WidgetType";
+import { Jitsi } from "../widgets/Jitsi";
 import { objectClone } from "./objects";
 import { _t } from "../languageHandler";
 import { IApp } from "../stores/WidgetStore";
+import { VIDEO_CHANNEL } from "./VideoChannelUtils";
 
 // How long we wait for the state event echo to come back from the server
 // before waitFor[Room/User]Widget rejects its promise
@@ -434,6 +439,43 @@ export default class WidgetUtils {
         await client.setAccountData('m.widgets', userWidgets);
     }
 
+    static async addJitsiWidget(
+        roomId: string,
+        type: CallType,
+        name: string,
+        widgetId: string,
+        oobRoomName?: string,
+    ): Promise<void> {
+        const domain = Jitsi.getInstance().preferredDomain;
+        const auth = await Jitsi.getInstance().getJitsiAuth();
+
+        let confId;
+        if (auth === 'openidtoken-jwt') {
+            // Create conference ID from room ID
+            // For compatibility with Jitsi, use base32 without padding.
+            // More details here:
+            // https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
+            confId = base32.stringify(Buffer.from(roomId), { pad: false });
+        } else {
+            // Create a random conference ID
+            confId = `Jitsi${randomUppercaseString(1)}${randomLowercaseString(23)}`;
+        }
+
+        // TODO: Remove URL hacks when the mobile clients eventually support v2 widgets
+        const widgetUrl = new URL(WidgetUtils.getLocalJitsiWrapperUrl({ auth }));
+        widgetUrl.search = ''; // Causes the URL class use searchParams instead
+        widgetUrl.searchParams.set('confId', confId);
+
+        await WidgetUtils.setRoomWidget(roomId, widgetId, WidgetType.JITSI, widgetUrl.toString(), name, {
+            conferenceId: confId,
+            roomName: oobRoomName ?? MatrixClientPeg.get().getRoom(roomId)?.name,
+            isAudioOnly: type === CallType.Voice,
+            isVideoChannel: widgetId === VIDEO_CHANNEL,
+            domain,
+            auth,
+        });
+    }
+
     static makeAppConfig(
         appId: string,
         app: Partial<IApp>,
@@ -475,6 +517,7 @@ export default class WidgetUtils {
             'conferenceDomain=$domain',
             'conferenceId=$conferenceId',
             'isAudioOnly=$isAudioOnly',
+            'isVideoChannel=$isVideoChannel',
             'displayName=$matrix_display_name',
             'avatarUrl=$matrix_avatar_url',
             'userId=$matrix_user_id',
@@ -508,6 +551,14 @@ export default class WidgetUtils {
         return app?.data?.title?.trim() || "";
     }
 
+    static getWidgetUid(app?: IApp): string {
+        return app ? WidgetUtils.calcWidgetUid(app.id, app.roomId) : "";
+    }
+
+    static calcWidgetUid(widgetId: string, roomId?: string): string {
+        return roomId ? `room_${roomId}_${widgetId}` : `user_${widgetId}`;
+    }
+
     static editWidget(room: Room, app: IApp): void {
         // TODO: Open the right manager for the widget
         if (SettingsStore.getValue("feature_many_integration_managers")) {
diff --git a/src/utils/beacon/bounds.ts b/src/utils/beacon/bounds.ts
new file mode 100644
index 00000000000..43c063b1c55
--- /dev/null
+++ b/src/utils/beacon/bounds.ts
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Beacon } from "matrix-js-sdk/src/matrix";
+
+import { parseGeoUri } from "../location";
+
+export type Bounds = {
+    north: number;
+    east: number;
+    west: number;
+    south: number;
+};
+
+/**
+ * Get the geo bounds of given list of beacons
+ *
+ * Latitude:
+ * equator: 0, North pole: 90, South pole -90
+ * Longitude:
+ * Prime Meridian (Greenwich): 0
+ * east of Greenwich has a positive longitude, max 180
+ * west of Greenwich has a negative longitude, min -180
+ */
+export const getBeaconBounds = (beacons: Beacon[]): Bounds | undefined => {
+    const coords = beacons.filter(beacon => !!beacon.latestLocationState)
+        .map(beacon => parseGeoUri(beacon.latestLocationState.uri));
+
+    if (!coords.length) {
+        return;
+    }
+
+    // sort descending
+    const sortedByLat = [...coords].sort((left, right) => right.latitude - left.latitude);
+    const sortedByLong = [...coords].sort((left, right) => right.longitude - left.longitude);
+
+    return {
+        north: sortedByLat[0].latitude,
+        south: sortedByLat[sortedByLat.length - 1].latitude,
+        east: sortedByLong[0].longitude,
+        west: sortedByLong[sortedByLong.length -1].longitude,
+    };
+};
diff --git a/src/utils/beacon/duration.ts b/src/utils/beacon/duration.ts
new file mode 100644
index 00000000000..c49eef1bd55
--- /dev/null
+++ b/src/utils/beacon/duration.ts
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { BeaconInfoState } from "matrix-js-sdk/src/content-helpers";
+import { Beacon } from "matrix-js-sdk/src/matrix";
+
+/**
+ * Get ms until expiry
+ * Returns 0 when expiry is already passed
+ * @param startTimestamp
+ * @param durationMs
+ * @returns remainingMs
+ */
+export const msUntilExpiry = (startTimestamp: number, durationMs: number): number =>
+    Math.max(0, (startTimestamp + durationMs) - Date.now());
+
+export const getBeaconMsUntilExpiry = (beaconInfo: BeaconInfoState): number =>
+    msUntilExpiry(beaconInfo.timestamp, beaconInfo.timeout);
+
+export const getBeaconExpiryTimestamp = (beacon: Beacon): number =>
+    beacon.beaconInfo.timestamp + beacon.beaconInfo.timeout;
+
+export const sortBeaconsByLatestExpiry = (left: Beacon, right: Beacon): number =>
+    getBeaconExpiryTimestamp(right) - getBeaconExpiryTimestamp(left);
+
+// aka sort by timestamp descending
+export const sortBeaconsByLatestCreation = (left: Beacon, right: Beacon): number =>
+    right.beaconInfo.timestamp - left.beaconInfo.timestamp;
diff --git a/src/utils/beacon/geolocation.ts b/src/utils/beacon/geolocation.ts
new file mode 100644
index 00000000000..efc3a9b44c3
--- /dev/null
+++ b/src/utils/beacon/geolocation.ts
@@ -0,0 +1,150 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+// map GeolocationPositionError codes
+// https://developer.mozilla.org/en-US/docs/Web/API/GeolocationPositionError
+export enum GeolocationError {
+    // no navigator.geolocation
+    Unavailable = 'Unavailable',
+    // The acquisition of the geolocation information failed because the page didn't have the permission to do it.
+    PermissionDenied = 'PermissionDenied',
+    // The acquisition of the geolocation failed because at least one internal source of position returned an internal error.
+    PositionUnavailable = 'PositionUnavailable',
+    // The time allowed to acquire the geolocation was reached before the information was obtained.
+    Timeout = 'Timeout',
+    // other unexpected failure
+    Default = 'Default'
+}
+
+const GeolocationOptions = {
+    timeout: 10000,
+    maximumAge: 60000,
+};
+
+const isGeolocationPositionError = (error: unknown): error is GeolocationPositionError =>
+    typeof error === 'object' && !!error['PERMISSION_DENIED'];
+/**
+ * Maps GeolocationPositionError to our GeolocationError enum
+ */
+export const mapGeolocationError = (error: GeolocationPositionError | Error): GeolocationError => {
+    logger.error('Geolocation failed', error?.message ?? error);
+
+    if (isGeolocationPositionError(error)) {
+        switch (error?.code) {
+            case error.PERMISSION_DENIED:
+                return GeolocationError.PermissionDenied;
+            case error.POSITION_UNAVAILABLE:
+                return GeolocationError.PositionUnavailable;
+            case error.TIMEOUT:
+                return GeolocationError.Timeout;
+            default:
+                return GeolocationError.Default;
+        }
+    } else if (error.message === GeolocationError.Unavailable) {
+        return GeolocationError.Unavailable;
+    } else {
+        return GeolocationError.Default;
+    }
+};
+
+const getGeolocation = (): Geolocation => {
+    if (!navigator.geolocation) {
+        throw new Error(GeolocationError.Unavailable);
+    }
+    return navigator.geolocation;
+};
+
+export type GenericPosition = {
+    latitude: number;
+    longitude: number;
+    altitude?: number;
+    accuracy?: number;
+    timestamp: number;
+};
+
+export type TimedGeoUri = {
+    geoUri: string;
+    timestamp: number;
+};
+
+export const genericPositionFromGeolocation = (geoPosition: GeolocationPosition): GenericPosition => {
+    const {
+        latitude, longitude, altitude, accuracy,
+    } = geoPosition.coords;
+
+    return {
+        // safari reports geolocation timestamps as Apple Cocoa Core Data timestamp
+        // or ms since 1/1/2001 instead of the regular epoch
+        // they also use local time, not utc
+        // to simplify, just use Date.now()
+        timestamp: Date.now(),
+        latitude, longitude, altitude, accuracy,
+    };
+};
+
+export const getGeoUri = (position: GenericPosition): string => {
+    const lat = position.latitude;
+    const lon = position.longitude;
+    const alt = (
+        Number.isFinite(position.altitude)
+            ? `,${position.altitude}`
+            : ""
+    );
+    const acc = (
+        Number.isFinite(position.accuracy)
+            ? `;u=${position.accuracy}`
+            : ""
+    );
+    return `geo:${lat},${lon}${alt}${acc}`;
+};
+
+export const mapGeolocationPositionToTimedGeo = (position: GeolocationPosition): TimedGeoUri => {
+    const genericPosition = genericPositionFromGeolocation(position);
+    return { timestamp: genericPosition.timestamp, geoUri: getGeoUri(genericPosition) };
+};
+
+/**
+ * Gets current position, returns a promise
+ * @returns Promise<GeolocationPosition>
+ */
+export const getCurrentPosition = async (): Promise<GeolocationPosition> => {
+    try {
+        const position = await new Promise((resolve: PositionCallback, reject) => {
+            getGeolocation().getCurrentPosition(resolve, reject, GeolocationOptions);
+        });
+        return position;
+    } catch (error) {
+        throw new Error(mapGeolocationError(error));
+    }
+};
+
+export type ClearWatchCallback = () => void;
+export const watchPosition = (
+    onWatchPosition: PositionCallback,
+    onWatchPositionError: (error: GeolocationError) => void): ClearWatchCallback => {
+    try {
+        const onError = (error) => onWatchPositionError(mapGeolocationError(error));
+        const watchId = getGeolocation().watchPosition(onWatchPosition, onError, GeolocationOptions);
+        const clearWatch = () => {
+            getGeolocation().clearWatch(watchId);
+        };
+        return clearWatch;
+    } catch (error) {
+        throw new Error(mapGeolocationError(error));
+    }
+};
diff --git a/src/utils/beacon/index.ts b/src/utils/beacon/index.ts
new file mode 100644
index 00000000000..3da707b6036
--- /dev/null
+++ b/src/utils/beacon/index.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export * from './duration';
+export * from './geolocation';
+export * from './useBeacon';
+export * from './useOwnLiveBeacons';
diff --git a/src/utils/beacon/timeline.ts b/src/utils/beacon/timeline.ts
new file mode 100644
index 00000000000..d00872f8651
--- /dev/null
+++ b/src/utils/beacon/timeline.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+
+/**
+ * beacon_info events without live property set to true
+ * should be displayed in the timeline
+ */
+export const shouldDisplayAsBeaconTile = (event: MatrixEvent): boolean => (
+    M_BEACON_INFO.matches(event.getType()) &&
+    !!event.getContent()?.live
+);
diff --git a/src/utils/beacon/useBeacon.ts b/src/utils/beacon/useBeacon.ts
new file mode 100644
index 00000000000..91b00104a17
--- /dev/null
+++ b/src/utils/beacon/useBeacon.ts
@@ -0,0 +1,78 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useContext, useEffect, useState } from "react";
+import {
+    Beacon,
+    BeaconEvent,
+    MatrixEvent,
+    getBeaconInfoIdentifier,
+} from "matrix-js-sdk/src/matrix";
+
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { useEventEmitterState } from "../../hooks/useEventEmitter";
+
+export const useBeacon = (beaconInfoEvent: MatrixEvent): Beacon | undefined => {
+    const matrixClient = useContext(MatrixClientContext);
+    const [beacon, setBeacon] = useState<Beacon>();
+
+    useEffect(() => {
+        const roomId = beaconInfoEvent.getRoomId();
+        const beaconIdentifier = getBeaconInfoIdentifier(beaconInfoEvent);
+
+        const room = matrixClient.getRoom(roomId);
+        const beaconInstance = room.currentState.beacons.get(beaconIdentifier);
+
+        // TODO could this be less stupid?
+
+        // Beacons are identified by their `state_key`,
+        // where `state_key` is always owner mxid for access control.
+        // Thus, only one beacon is allowed per-user per-room.
+        // See https://github.com/matrix-org/matrix-spec-proposals/pull/3672
+        // When a user creates a new beacon any previous
+        // beacon is replaced and should assume a 'stopped' state
+        // Here we check that this event is the latest beacon for this user
+        // If it is not the beacon instance is set to undefined.
+        // Retired beacons don't get a beacon instance.
+        if (beaconInstance?.beaconInfoId === beaconInfoEvent.getId()) {
+            setBeacon(beaconInstance);
+        } else {
+            setBeacon(undefined);
+        }
+    }, [beaconInfoEvent, matrixClient]);
+
+    // beacon update will fire when this beacon is superceded
+    // check the updated event id for equality to the matrix event
+    const beaconInstanceEventId = useEventEmitterState(
+        beacon,
+        BeaconEvent.Update,
+        () => beacon?.beaconInfoId,
+    );
+
+    useEffect(() => {
+        if (beaconInstanceEventId && beaconInstanceEventId !== beaconInfoEvent.getId()) {
+            setBeacon(undefined);
+        }
+    }, [beaconInstanceEventId, beaconInfoEvent]);
+
+    useEffect(() => {
+        if (beacon) {
+            beacon.monitorLiveness();
+        }
+    }, [beacon]);
+
+    return beacon;
+};
diff --git a/src/utils/beacon/useLiveBeacons.ts b/src/utils/beacon/useLiveBeacons.ts
new file mode 100644
index 00000000000..cbde1a40e76
--- /dev/null
+++ b/src/utils/beacon/useLiveBeacons.ts
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+    Beacon,
+    Room,
+    RoomStateEvent,
+    MatrixClient,
+} from "matrix-js-sdk/src/matrix";
+
+import { useEventEmitterState } from "../../hooks/useEventEmitter";
+
+/**
+ * Returns an array of all live beacon ids for a given room
+ *
+ * Beacons are removed from array when they become inactive
+ */
+export const useLiveBeacons = (roomId: Room['roomId'], matrixClient: MatrixClient): Beacon[] => {
+    const room = matrixClient.getRoom(roomId);
+
+    const liveBeacons = useEventEmitterState(
+        room.currentState,
+        RoomStateEvent.BeaconLiveness,
+        () => room.currentState?.liveBeaconIds.map(beaconIdentifier => room.currentState.beacons.get(beaconIdentifier)),
+    );
+
+    return liveBeacons;
+};
diff --git a/src/utils/beacon/useOwnLiveBeacons.ts b/src/utils/beacon/useOwnLiveBeacons.ts
new file mode 100644
index 00000000000..1eb892f0c33
--- /dev/null
+++ b/src/utils/beacon/useOwnLiveBeacons.ts
@@ -0,0 +1,94 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useEffect, useState } from "react";
+import { Beacon, BeaconIdentifier } from "matrix-js-sdk/src/matrix";
+
+import { useEventEmitterState } from "../../hooks/useEventEmitter";
+import { OwnBeaconStore, OwnBeaconStoreEvent } from "../../stores/OwnBeaconStore";
+import { sortBeaconsByLatestExpiry } from "./duration";
+
+type LiveBeaconsState = {
+    beacon?: Beacon;
+    onStopSharing?: () => void;
+    onResetLocationPublishError?: () => void;
+    stoppingInProgress?: boolean;
+    hasStopSharingError?: boolean;
+    hasLocationPublishError?: boolean;
+};
+
+/**
+ * Monitor the current users own beacons
+ * While current implementation only allows one live beacon per user per room
+ * In future it will be possible to have multiple live beacons in one room
+ * Select the latest expiry to display,
+ * and kill all beacons on stop sharing
+ */
+export const useOwnLiveBeacons = (liveBeaconIds: BeaconIdentifier[]): LiveBeaconsState => {
+    const [stoppingInProgress, setStoppingInProgress] = useState(false);
+
+    const hasLocationPublishError = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.LocationPublishError,
+        () =>
+            liveBeaconIds.some(OwnBeaconStore.instance.beaconHasLocationPublishError),
+    );
+
+    const hasStopSharingError = useEventEmitterState(
+        OwnBeaconStore.instance,
+        OwnBeaconStoreEvent.BeaconUpdateError,
+        () =>
+            liveBeaconIds.some(id => OwnBeaconStore.instance.beaconUpdateErrors.has(id)),
+    );
+
+    useEffect(() => {
+        if (hasStopSharingError) {
+            setStoppingInProgress(false);
+        }
+    }, [hasStopSharingError]);
+
+    // reset stopping in progress on change in live ids
+    useEffect(() => {
+        setStoppingInProgress(false);
+    }, [liveBeaconIds]);
+
+    // select the beacon with latest expiry to display expiry time
+    const beacon = liveBeaconIds.map(beaconId => OwnBeaconStore.instance.getBeaconById(beaconId))
+        .sort(sortBeaconsByLatestExpiry)
+        .shift();
+
+    const onStopSharing = async () => {
+        setStoppingInProgress(true);
+        try {
+            await Promise.all(liveBeaconIds.map(beaconId => OwnBeaconStore.instance.stopBeacon(beaconId)));
+        } catch (error) {
+            setStoppingInProgress(false);
+        }
+    };
+
+    const onResetLocationPublishError = () => {
+        liveBeaconIds.map(beaconId => OwnBeaconStore.instance.resetLocationPublishError(beaconId));
+    };
+
+    return {
+        onStopSharing,
+        onResetLocationPublishError,
+        beacon,
+        stoppingInProgress,
+        hasLocationPublishError,
+        hasStopSharingError,
+    };
+};
diff --git a/src/utils/blobs.ts b/src/utils/blobs.ts
index 4e073a39365..9dea3d226c7 100644
--- a/src/utils/blobs.ts
+++ b/src/utils/blobs.ts
@@ -52,10 +52,14 @@ const ALLOWED_BLOB_MIMETYPES = [
     'image/jpeg',
     'image/gif',
     'image/png',
+    'image/apng',
+    'image/webp',
+    'image/avif',
 
     'video/mp4',
     'video/webm',
     'video/ogg',
+    'video/quicktime',
 
     'audio/mp4',
     'audio/webm',
diff --git a/src/utils/colour.ts b/src/utils/colour.ts
index 10c18dbfe76..96eabd4eb40 100644
--- a/src/utils/colour.ts
+++ b/src/utils/colour.ts
@@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { split } from 'lodash';
+
 export function textToHtmlRainbow(str: string): string {
     const frequency = (2 * Math.PI) / str.length;
 
-    return Array.from(str)
+    return split(str, '')
         .map((c, i) => {
             if (c === " ") {
                 return c;
diff --git a/src/utils/direct-messages.ts b/src/utils/direct-messages.ts
new file mode 100644
index 00000000000..0932cc9aaf1
--- /dev/null
+++ b/src/utils/direct-messages.ts
@@ -0,0 +1,202 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { IInvite3PID } from "matrix-js-sdk/src/@types/requests";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import createRoom, { canEncryptToAllUsers } from "../createRoom";
+import { Action } from "../dispatcher/actions";
+import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
+import { getAddressType } from "../UserAddress";
+import DMRoomMap from "./DMRoomMap";
+import { isJoinedOrNearlyJoined } from "./membership";
+import dis from "../dispatcher/dispatcher";
+import { privateShouldBeEncrypted } from "./rooms";
+
+export function findDMForUser(client: MatrixClient, userId: string): Room {
+    const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
+    const rooms = roomIds.map(id => client.getRoom(id));
+    const suitableDMRooms = rooms.filter(r => {
+        // Validate that we are joined and the other person is also joined. We'll also make sure
+        // that the room also looks like a DM (until we have canonical DMs to tell us). For now,
+        // a DM is a room of two people that contains those two people exactly. This does mean
+        // that bots, assistants, etc will ruin a room's DM-ness, though this is a problem for
+        // canonical DMs to solve.
+        if (r && r.getMyMembership() === "join") {
+            const members = r.currentState.getMembers();
+            const joinedMembers = members.filter(m => isJoinedOrNearlyJoined(m.membership));
+            const otherMember = joinedMembers.find(m => m.userId === userId);
+            return otherMember && joinedMembers.length === 2;
+        }
+        return false;
+    }).sort((r1, r2) => {
+        return r2.getLastActiveTimestamp() -
+            r1.getLastActiveTimestamp();
+    });
+    if (suitableDMRooms.length) {
+        return suitableDMRooms[0];
+    }
+}
+
+export async function startDm(client: MatrixClient, targets: Member[]): Promise<void> {
+    const targetIds = targets.map(t => t.userId);
+
+    // Check if there is already a DM with these people and reuse it if possible.
+    let existingRoom: Room;
+    if (targetIds.length === 1) {
+        existingRoom = findDMForUser(client, targetIds[0]);
+    } else {
+        existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+    }
+    if (existingRoom) {
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: existingRoom.roomId,
+            should_peek: false,
+            joining: false,
+            metricsTrigger: "MessageUser",
+        });
+        return;
+    }
+
+    const createRoomOptions = { inlineErrors: true } as any; // XXX: Type out `createRoomOptions`
+
+    if (privateShouldBeEncrypted()) {
+        // Check whether all users have uploaded device keys before.
+        // If so, enable encryption in the new room.
+        const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
+        if (!has3PidMembers) {
+            const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
+            if (allHaveDeviceKeys) {
+                createRoomOptions.encryption = true;
+            }
+        }
+    }
+
+    // Check if it's a traditional DM and create the room if required.
+    // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
+    const isSelf = targetIds.length === 1 && targetIds[0] === client.getUserId();
+    if (targetIds.length === 1 && !isSelf) {
+        createRoomOptions.dmUserId = targetIds[0];
+    }
+
+    if (targetIds.length > 1) {
+        createRoomOptions.createOpts = targetIds.reduce(
+            (roomOptions, address) => {
+                const type = getAddressType(address);
+                if (type === 'email') {
+                    const invite: IInvite3PID = {
+                        id_server: client.getIdentityServerUrl(true),
+                        medium: 'email',
+                        address,
+                    };
+                    roomOptions.invite_3pid.push(invite);
+                } else if (type === 'mx-user-id') {
+                    roomOptions.invite.push(address);
+                }
+                return roomOptions;
+            },
+            { invite: [], invite_3pid: [] },
+        );
+    }
+
+    await createRoom(createRoomOptions);
+}
+
+// This is the interface that is expected by various components in the Invite Dialog and RoomInvite.
+// It is a bit awkward because it also matches the RoomMember class from the js-sdk with some extra support
+// for 3PIDs/email addresses.
+export abstract class Member {
+    /**
+     * The display name of this Member. For users this should be their profile's display
+     * name or user ID if none set. For 3PIDs this should be the 3PID address (email).
+     */
+    public abstract get name(): string;
+
+    /**
+     * The ID of this Member. For users this should be their user ID. For 3PIDs this should
+     * be the 3PID address (email).
+     */
+    public abstract get userId(): string;
+
+    /**
+     * Gets the MXC URL of this Member's avatar. For users this should be their profile's
+     * avatar MXC URL or null if none set. For 3PIDs this should always be null.
+     */
+    public abstract getMxcAvatarUrl(): string;
+}
+
+export class DirectoryMember extends Member {
+    private readonly _userId: string;
+    private readonly displayName?: string;
+    private readonly avatarUrl?: string;
+
+    // eslint-disable-next-line camelcase
+    constructor(userDirResult: { user_id: string, display_name?: string, avatar_url?: string }) {
+        super();
+        this._userId = userDirResult.user_id;
+        this.displayName = userDirResult.display_name;
+        this.avatarUrl = userDirResult.avatar_url;
+    }
+
+    // These next class members are for the Member interface
+    get name(): string {
+        return this.displayName || this._userId;
+    }
+
+    get userId(): string {
+        return this._userId;
+    }
+
+    getMxcAvatarUrl(): string {
+        return this.avatarUrl;
+    }
+}
+
+export class ThreepidMember extends Member {
+    private readonly id: string;
+
+    constructor(id: string) {
+        super();
+        this.id = id;
+    }
+
+    // This is a getter that would be falsey on all other implementations. Until we have
+    // better type support in the react-sdk we can use this trick to determine the kind
+    // of 3PID we're dealing with, if any.
+    get isEmail(): boolean {
+        return this.id.includes('@');
+    }
+
+    // These next class members are for the Member interface
+    get name(): string {
+        return this.id;
+    }
+
+    get userId(): string {
+        return this.id;
+    }
+
+    getMxcAvatarUrl(): string {
+        return null;
+    }
+}
+
+export interface IDMUserTileProps {
+    member: Member;
+    onRemove(member: Member): void;
+}
diff --git a/res/css/views/groups/_GroupRoomList.scss b/src/utils/error.ts
similarity index 68%
rename from res/css/views/groups/_GroupRoomList.scss
rename to src/utils/error.ts
index 2f6559f7c4a..8dec29e7f06 100644
--- a/res/css/views/groups/_GroupRoomList.scss
+++ b/src/utils/error.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,14 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GroupRoomTile {
-    position: relative;
-    color: $primary-content;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-}
-
-.mx_GroupRoomList_wrapper {
-    padding: 10px;
+export class GenericError extends Error {
+    constructor(
+        public readonly message: string,
+        public readonly description?: string | undefined,
+    ) {
+        super(message);
+    }
 }
diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx
index 83dc5b03ddf..59d864b6c72 100644
--- a/src/utils/exportUtils/HtmlExport.tsx
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -23,6 +23,7 @@ import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import Exporter from "./Exporter";
+import SettingsStore from "../../settings/SettingsStore";
 import { mediaFromMxc } from "../../customisations/Media";
 import { Layout } from "../../settings/enums/Layout";
 import { shouldFormContinuation } from "../../components/structures/MessagePanel";
@@ -30,7 +31,7 @@ import { formatFullDateNoDayNoTime, wantsDateSeparator } from "../../DateUtils";
 import { RoomPermalinkCreator } from "../permalinks/Permalinks";
 import { _t } from "../../languageHandler";
 import * as Avatar from "../../Avatar";
-import EventTile, { haveTileForEvent } from "../../components/views/rooms/EventTile";
+import EventTile from "../../components/views/rooms/EventTile";
 import DateSeparator from "../../components/views/messages/DateSeparator";
 import BaseAvatar from "../../components/views/avatars/BaseAvatar";
 import { ExportType } from "./exportUtils";
@@ -38,6 +39,7 @@ import { IExportOptions } from "./exportUtils";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import getExportCSS from "./exportCSS";
 import { textForEvent } from "../../TextForEvent";
+import { haveRendererForEvent } from "../../events/EventTileFactory";
 
 import exportJS from "!!raw-loader!./exportJS";
 
@@ -46,6 +48,7 @@ export default class HTMLExporter extends Exporter {
     protected permalinkCreator: RoomPermalinkCreator;
     protected totalSize: number;
     protected mediaOmitText: string;
+    private threadsEnabled: boolean;
 
     constructor(
         room: Room,
@@ -60,6 +63,7 @@ export default class HTMLExporter extends Exporter {
         this.mediaOmitText = !this.exportOptions.attachmentsIncluded
             ? _t("Media omitted")
             : _t("Media omitted - file size limit exceeded");
+        this.threadsEnabled = SettingsStore.getValue("feature_thread");
     }
 
     protected async getRoomAvatar() {
@@ -284,7 +288,6 @@ export default class HTMLExporter extends Exporter {
                     getRelationsForEvent={null}
                     showReactions={false}
                     layout={Layout.Group}
-                    enableFlair={false}
                     showReadReceipts={false}
                 />
             </MatrixClientContext.Provider>
@@ -404,11 +407,11 @@ export default class HTMLExporter extends Exporter {
                 total: events.length,
             }), false, true);
             if (this.cancelled) return this.cleanUp();
-            if (!haveTileForEvent(event)) continue;
+            if (!haveRendererForEvent(event, false)) continue;
 
             content += this.needsDateSeparator(event, prevEvent) ? this.getDateSeparator(event) : "";
-            const shouldBeJoined = !this.needsDateSeparator(event, prevEvent)
-                                       && shouldFormContinuation(prevEvent, event, false);
+            const shouldBeJoined = !this.needsDateSeparator(event, prevEvent) &&
+                shouldFormContinuation(prevEvent, event, false, this.threadsEnabled);
             const body = await this.createMessageBody(event, shouldBeJoined);
             this.totalSize += Buffer.byteLength(body);
             content += body;
diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts
index 27fdb5a8478..b0b4b330b06 100644
--- a/src/utils/exportUtils/JSONExport.ts
+++ b/src/utils/exportUtils/JSONExport.ts
@@ -21,9 +21,9 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import Exporter from "./Exporter";
 import { formatFullDateNoDay, formatFullDateNoDayNoTime } from "../../DateUtils";
-import { haveTileForEvent } from "../../components/views/rooms/EventTile";
 import { ExportType, IExportOptions } from "./exportUtils";
 import { _t } from "../../languageHandler";
+import { haveRendererForEvent } from "../../events/EventTileFactory";
 
 export default class JSONExporter extends Exporter {
     protected totalSize = 0;
@@ -85,7 +85,7 @@ export default class JSONExporter extends Exporter {
                 total: events.length,
             }), false, true);
             if (this.cancelled) return this.cleanUp();
-            if (!haveTileForEvent(event)) continue;
+            if (!haveRendererForEvent(event, false)) continue;
             this.messages.push(await this.getJSONString(event));
         }
         return this.createJSONString();
diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts
index edabb80fe02..e86c56e9f4c 100644
--- a/src/utils/exportUtils/PlainTextExport.ts
+++ b/src/utils/exportUtils/PlainTextExport.ts
@@ -21,9 +21,9 @@ import { logger } from "matrix-js-sdk/src/logger";
 import Exporter from "./Exporter";
 import { formatFullDateNoDay } from "../../DateUtils";
 import { _t } from "../../languageHandler";
-import { haveTileForEvent } from "../../components/views/rooms/EventTile";
 import { ExportType, IExportOptions } from "./exportUtils";
 import { textForEvent } from "../../TextForEvent";
+import { haveRendererForEvent } from "../../events/EventTileFactory";
 
 export default class PlainTextExporter extends Exporter {
     protected totalSize: number;
@@ -112,7 +112,7 @@ export default class PlainTextExporter extends Exporter {
                 total: events.length,
             }), false, true);
             if (this.cancelled) return this.cleanUp();
-            if (!haveTileForEvent(event)) continue;
+            if (!haveRendererForEvent(event, false)) continue;
             const textForEvent = await this.plainTextForEvent(event);
             content += textForEvent && `${new Date(event.getTs()).toLocaleString()} - ${textForEvent}\n`;
         }
diff --git a/src/utils/humanize.ts b/src/utils/humanize.ts
index 978d17424b3..47e2d83e8a0 100644
--- a/src/utils/humanize.ts
+++ b/src/utils/humanize.ts
@@ -30,7 +30,7 @@ const HOURS_1_DAY = 26;
  * @returns {string} The humanized time.
  */
 export function humanizeTime(timeMillis: number): string {
-    const now = (new Date()).getTime();
+    const now = Date.now();
     let msAgo = now - timeMillis;
     const minutes = Math.abs(Math.ceil(msAgo / 60000));
     const hours = Math.ceil(minutes / 60);
diff --git a/src/utils/i18n-helpers.ts b/src/utils/i18n-helpers.ts
new file mode 100644
index 00000000000..ce1d04f9f41
--- /dev/null
+++ b/src/utils/i18n-helpers.ts
@@ -0,0 +1,66 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import SpaceStore from "../stores/spaces/SpaceStore";
+import { _t } from "../languageHandler";
+import DMRoomMap from "./DMRoomMap";
+
+export function spaceContextDetailsText(space: Room): string {
+    if (!space.isSpaceRoom()) return undefined;
+
+    const [parent, secondParent, ...otherParents] = SpaceStore.instance.getKnownParents(space.roomId);
+    if (secondParent && !otherParents?.length) {
+        // exactly 2 edge case for improved i18n
+        return _t("%(space1Name)s and %(space2Name)s", {
+            space1Name: space.client.getRoom(parent)?.name,
+            space2Name: space.client.getRoom(secondParent)?.name,
+        });
+    } else if (parent) {
+        return _t("%(spaceName)s and %(count)s others", {
+            spaceName: space.client.getRoom(parent)?.name,
+            count: otherParents.length,
+        });
+    }
+
+    return space.getCanonicalAlias();
+}
+
+export function roomContextDetailsText(room: Room): string {
+    if (room.isSpaceRoom()) return undefined;
+
+    const dmPartner = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+    if (dmPartner) {
+        return dmPartner;
+    }
+
+    const [parent, secondParent, ...otherParents] = SpaceStore.instance.getKnownParents(room.roomId);
+    if (secondParent && !otherParents?.length) {
+        // exactly 2 edge case for improved i18n
+        return _t("%(space1Name)s and %(space2Name)s", {
+            space1Name: room.client.getRoom(parent)?.name,
+            space2Name: room.client.getRoom(secondParent)?.name,
+        });
+    } else if (parent) {
+        return _t("%(spaceName)s and %(count)s others", {
+            spaceName: room.client.getRoom(parent)?.name,
+            count: otherParents.length,
+        });
+    }
+
+    return room.getCanonicalAlias();
+}
diff --git a/src/utils/image-media.ts b/src/utils/image-media.ts
new file mode 100644
index 00000000000..a57e4b841ab
--- /dev/null
+++ b/src/utils/image-media.ts
@@ -0,0 +1,121 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { BlurhashEncoder } from "../BlurhashEncoder";
+
+type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
+
+interface IThumbnail {
+    info: {
+        // eslint-disable-next-line camelcase
+        thumbnail_info: {
+            w: number;
+            h: number;
+            mimetype: string;
+            size: number;
+        };
+        w: number;
+        h: number;
+        [BLURHASH_FIELD]: string;
+    };
+    thumbnail: Blob;
+}
+
+export const BLURHASH_FIELD = "xyz.amorgan.blurhash"; // MSC2448
+
+const MAX_WIDTH = 800;
+const MAX_HEIGHT = 600;
+
+/**
+ * Create a thumbnail for a image DOM element.
+ * The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
+ * The thumbnail will have the same aspect ratio as the original.
+ * Draws the element into a canvas using CanvasRenderingContext2D.drawImage
+ * Then calls Canvas.toBlob to get a blob object for the image data.
+ *
+ * Since it needs to calculate the dimensions of the source image and the
+ * thumbnailed image it returns an info object filled out with information
+ * about the original image and the thumbnail.
+ *
+ * @param {HTMLElement} element The element to thumbnail.
+ * @param {number} inputWidth The width of the image in the input element.
+ * @param {number} inputHeight the width of the image in the input element.
+ * @param {string} mimeType The mimeType to save the blob as.
+ * @param {boolean} calculateBlurhash Whether to calculate a blurhash of the given image too.
+ * @return {Promise} A promise that resolves with an object with an info key
+ *  and a thumbnail key.
+ */
+export async function createThumbnail(
+    element: ThumbnailableElement,
+    inputWidth: number,
+    inputHeight: number,
+    mimeType: string,
+    calculateBlurhash = true,
+): Promise<IThumbnail> {
+    let targetWidth = inputWidth;
+    let targetHeight = inputHeight;
+    if (targetHeight > MAX_HEIGHT) {
+        targetWidth = Math.floor(targetWidth * (MAX_HEIGHT / targetHeight));
+        targetHeight = MAX_HEIGHT;
+    }
+    if (targetWidth > MAX_WIDTH) {
+        targetHeight = Math.floor(targetHeight * (MAX_WIDTH / targetWidth));
+        targetWidth = MAX_WIDTH;
+    }
+
+    let canvas: HTMLCanvasElement | OffscreenCanvas;
+    let context: CanvasRenderingContext2D;
+    try {
+        canvas = new window.OffscreenCanvas(targetWidth, targetHeight);
+        context = canvas.getContext("2d");
+    } catch (e) {
+        // Fallback support for other browsers (Safari and Firefox for now)
+        canvas = document.createElement("canvas");
+        (canvas as HTMLCanvasElement).width = targetWidth;
+        (canvas as HTMLCanvasElement).height = targetHeight;
+        context = canvas.getContext("2d");
+    }
+
+    context.drawImage(element, 0, 0, targetWidth, targetHeight);
+
+    let thumbnailPromise: Promise<Blob>;
+
+    if (window.OffscreenCanvas) {
+        thumbnailPromise = (canvas as OffscreenCanvas).convertToBlob({ type: mimeType });
+    } else {
+        thumbnailPromise = new Promise<Blob>(resolve => (canvas as HTMLCanvasElement).toBlob(resolve, mimeType));
+    }
+
+    const imageData = context.getImageData(0, 0, targetWidth, targetHeight);
+    // thumbnailPromise and blurhash promise are being awaited concurrently
+    const blurhash = calculateBlurhash ? await BlurhashEncoder.instance.getBlurhash(imageData) : undefined;
+    const thumbnail = await thumbnailPromise;
+
+    return {
+        info: {
+            thumbnail_info: {
+                w: targetWidth,
+                h: targetHeight,
+                mimetype: thumbnail.type,
+                size: thumbnail.size,
+            },
+            w: inputWidth,
+            h: inputHeight,
+            [BLURHASH_FIELD]: blurhash,
+        },
+        thumbnail,
+    };
+}
diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts
new file mode 100644
index 00000000000..2d87e4d4dd0
--- /dev/null
+++ b/src/utils/leave-behaviour.ts
@@ -0,0 +1,158 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { sleep } from "matrix-js-sdk/src/utils";
+import React from "react";
+import { EventStatus } from "matrix-js-sdk/src/models/event-status";
+import { MatrixEventEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import Modal, { IHandle } from "../Modal";
+import Spinner from "../components/views/elements/Spinner";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { _t } from "../languageHandler";
+import ErrorDialog from "../components/views/dialogs/ErrorDialog";
+import { isMetaSpace } from "../stores/spaces";
+import SpaceStore from "../stores/spaces/SpaceStore";
+import { RoomViewStore } from "../stores/RoomViewStore";
+import dis from "../dispatcher/dispatcher";
+import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
+import { Action } from "../dispatcher/actions";
+import { ViewHomePagePayload } from "../dispatcher/payloads/ViewHomePagePayload";
+import LeaveSpaceDialog from "../components/views/dialogs/LeaveSpaceDialog";
+import { AfterLeaveRoomPayload } from "../dispatcher/payloads/AfterLeaveRoomPayload";
+import { bulkSpaceBehaviour } from "./space";
+
+export async function leaveRoomBehaviour(roomId: string, retry = true, spinner = true) {
+    let spinnerModal: IHandle<any>;
+    if (spinner) {
+        spinnerModal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
+    }
+
+    const cli = MatrixClientPeg.get();
+    let leavingAllVersions = true;
+    const history = cli.getRoomUpgradeHistory(roomId);
+    if (history && history.length > 0) {
+        const currentRoom = history[history.length - 1];
+        if (currentRoom.roomId !== roomId) {
+            // The user is trying to leave an older version of the room. Let them through
+            // without making them leave the current version of the room.
+            leavingAllVersions = false;
+        }
+    }
+
+    const room = cli.getRoom(roomId);
+    // await any queued messages being sent so that they do not fail
+    await Promise.all(room.getPendingEvents().filter(ev => {
+        return [EventStatus.QUEUED, EventStatus.ENCRYPTING, EventStatus.SENDING].includes(ev.status);
+    }).map(ev => new Promise<void>((resolve, reject) => {
+        const handler = () => {
+            if (ev.status === EventStatus.NOT_SENT) {
+                spinnerModal?.close();
+                reject(ev.error);
+            }
+
+            if (!ev.status || ev.status === EventStatus.SENT) {
+                ev.off(MatrixEventEvent.Status, handler);
+                resolve();
+            }
+        };
+
+        ev.on(MatrixEventEvent.Status, handler);
+    })));
+
+    let results: { [roomId: string]: Error & { errcode?: string, message: string, data?: Record<string, any> } } = {};
+    if (!leavingAllVersions) {
+        try {
+            await cli.leave(roomId);
+        } catch (e) {
+            if (e?.data?.errcode) {
+                const message = e.data.error || _t("Unexpected server error trying to leave the room");
+                results[roomId] = Object.assign(new Error(message), { errcode: e.data.errcode, data: e.data });
+            } else {
+                results[roomId] = e || new Error("Failed to leave room for unknown causes");
+            }
+        }
+    } else {
+        results = await cli.leaveRoomChain(roomId, retry);
+    }
+
+    if (retry) {
+        const limitExceededError = Object.values(results).find(e => e?.errcode === "M_LIMIT_EXCEEDED");
+        if (limitExceededError) {
+            await sleep(limitExceededError.data.retry_after_ms ?? 100);
+            return leaveRoomBehaviour(roomId, false, false);
+        }
+    }
+
+    spinnerModal?.close();
+
+    const errors = Object.entries(results).filter(r => !!r[1]);
+    if (errors.length > 0) {
+        const messages = [];
+        for (const roomErr of errors) {
+            const err = roomErr[1]; // [0] is the roomId
+            let message = _t("Unexpected server error trying to leave the room");
+            if (err.errcode && err.message) {
+                if (err.errcode === 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
+                    Modal.createTrackedDialog('Error Leaving Room', '', ErrorDialog, {
+                        title: _t("Can't leave Server Notices room"),
+                        description: _t(
+                            "This room is used for important messages from the Homeserver, " +
+                            "so you cannot leave it.",
+                        ),
+                    });
+                    return;
+                }
+                message = results[roomId].message;
+            }
+            messages.push(message, React.createElement('BR')); // createElement to avoid using a tsx file in utils
+        }
+        Modal.createTrackedDialog('Error Leaving Room', '', ErrorDialog, {
+            title: _t("Error leaving room"),
+            description: messages,
+        });
+        return;
+    }
+
+    if (!isMetaSpace(SpaceStore.instance.activeSpace) &&
+        SpaceStore.instance.activeSpace !== roomId &&
+        RoomViewStore.instance.getRoomId() === roomId
+    ) {
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: SpaceStore.instance.activeSpace,
+            metricsTrigger: undefined, // other
+        });
+    } else {
+        dis.dispatch<ViewHomePagePayload>({ action: Action.ViewHomePage });
+    }
+}
+
+export const leaveSpace = (space: Room) => {
+    Modal.createTrackedDialog("Leave Space", "", LeaveSpaceDialog, {
+        space,
+        onFinished: async (leave: boolean, rooms: Room[]) => {
+            if (!leave) return;
+            await bulkSpaceBehaviour(space, rooms, room => leaveRoomBehaviour(room.roomId));
+
+            dis.dispatch<AfterLeaveRoomPayload>({
+                action: Action.AfterLeaveRoom,
+                room_id: space.roomId,
+            });
+        },
+    }, "mx_LeaveSpaceDialog_wrapper");
+};
diff --git a/src/utils/location/LocationShareErrors.ts b/src/utils/location/LocationShareErrors.ts
new file mode 100644
index 00000000000..81d4e50d314
--- /dev/null
+++ b/src/utils/location/LocationShareErrors.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { _t } from "../../languageHandler";
+
+export enum LocationShareError {
+    MapStyleUrlNotConfigured = 'MapStyleUrlNotConfigured',
+    MapStyleUrlNotReachable = 'MapStyleUrlNotReachable',
+    Default = 'Default'
+}
+
+export const getLocationShareErrorMessage = (errorType?: LocationShareError): string => {
+    switch (errorType) {
+        case LocationShareError.MapStyleUrlNotConfigured:
+            return _t('This homeserver is not configured to display maps.');
+        case LocationShareError.MapStyleUrlNotReachable:
+        default:
+            return _t(`This homeserver is not configured correctly to display maps, `
+                + `or the configured map server may be unreachable.`);
+    }
+};
diff --git a/src/utils/location/findMapStyleUrl.ts b/src/utils/location/findMapStyleUrl.ts
new file mode 100644
index 00000000000..9eb9a6d3079
--- /dev/null
+++ b/src/utils/location/findMapStyleUrl.ts
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+import SdkConfig from "../../SdkConfig";
+import { getTileServerWellKnown } from "../WellKnownUtils";
+import { LocationShareError } from "./LocationShareErrors";
+
+/**
+ * Look up what map tile server style URL was provided in the homeserver's
+ * .well-known location, or, failing that, in our local config, or, failing
+ * that, defaults to the same tile server listed by matrix.org.
+ */
+export function findMapStyleUrl(): string {
+    const mapStyleUrl = (
+        getTileServerWellKnown()?.map_style_url ??
+        SdkConfig.get().map_style_url
+    );
+
+    if (!mapStyleUrl) {
+        logger.error("'map_style_url' missing from homeserver .well-known area, and " +
+            "missing from from config.json.");
+        throw new Error(LocationShareError.MapStyleUrlNotConfigured);
+    }
+
+    return mapStyleUrl;
+}
diff --git a/src/utils/location/index.ts b/src/utils/location/index.ts
new file mode 100644
index 00000000000..a6aeaa65d67
--- /dev/null
+++ b/src/utils/location/index.ts
@@ -0,0 +1,22 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export * from './findMapStyleUrl';
+export * from './isSelfLocation';
+export * from './locationEventGeoUri';
+export * from './LocationShareErrors';
+export * from './map';
+export * from './parseGeoUri';
diff --git a/src/utils/location/isSelfLocation.ts b/src/utils/location/isSelfLocation.ts
new file mode 100644
index 00000000000..d1e656e1a04
--- /dev/null
+++ b/src/utils/location/isSelfLocation.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ILocationContent, LocationAssetType, M_ASSET } from "matrix-js-sdk/src/@types/location";
+
+export const isSelfLocation = (locationContent: ILocationContent): boolean => {
+    const asset = M_ASSET.findIn(locationContent) as { type: string };
+    const assetType = asset?.type ?? LocationAssetType.Self;
+    return assetType == LocationAssetType.Self;
+};
diff --git a/src/utils/location/locationEventGeoUri.ts b/src/utils/location/locationEventGeoUri.ts
new file mode 100644
index 00000000000..eb81ac87c0b
--- /dev/null
+++ b/src/utils/location/locationEventGeoUri.ts
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
+
+/**
+ * Find the geo-URI contained within a location event.
+ */
+export const locationEventGeoUri = (mxEvent: MatrixEvent): string => {
+    // unfortunately we're stuck supporting legacy `content.geo_uri`
+    // events until the end of days, or until we figure out mutable
+    // events - so folks can read their old chat history correctly.
+    // https://github.com/matrix-org/matrix-doc/issues/3516
+    const content = mxEvent.getContent();
+    const loc = M_LOCATION.findIn(content) as { uri?: string };
+    return loc ? loc.uri : content['geo_uri'];
+};
diff --git a/src/utils/location/map.ts b/src/utils/location/map.ts
new file mode 100644
index 00000000000..5627bf5c0ed
--- /dev/null
+++ b/src/utils/location/map.ts
@@ -0,0 +1,123 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import maplibregl from "maplibre-gl";
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { parseGeoUri } from "./parseGeoUri";
+import { findMapStyleUrl } from "./findMapStyleUrl";
+import { LocationShareError } from "./LocationShareErrors";
+
+export const createMap = (
+    interactive: boolean,
+    bodyId: string,
+    onError: (error: Error) => void,
+): maplibregl.Map => {
+    try {
+        const styleUrl = findMapStyleUrl();
+
+        const map = new maplibregl.Map({
+            container: bodyId,
+            style: styleUrl,
+            zoom: 15,
+            interactive,
+        });
+
+        map.on('error', (e) => {
+            logger.error(
+                "Failed to load map: check map_style_url in config.json has a "
+                + "valid URL and API key",
+                e.error,
+            );
+            onError(new Error(LocationShareError.MapStyleUrlNotReachable));
+        });
+
+        return map;
+    } catch (e) {
+        logger.error("Failed to render map", e);
+        throw e;
+    }
+};
+
+export const createMarker = (coords: GeolocationCoordinates, element: HTMLElement): maplibregl.Marker => {
+    const marker = new maplibregl.Marker({
+        element,
+        anchor: 'bottom',
+        offset: [0, -1],
+    }).setLngLat({ lon: coords.longitude, lat: coords.latitude });
+    return marker;
+};
+
+export const createMapWithCoords = (
+    coords: GeolocationCoordinates,
+    interactive: boolean,
+    bodyId: string,
+    markerId: string,
+    onError: (error: Error) => void,
+): maplibregl.Map => {
+    try {
+        const map = createMap(interactive, bodyId, onError);
+
+        const coordinates = new maplibregl.LngLat(coords.longitude, coords.latitude);
+        // center on coordinates
+        map.setCenter(coordinates);
+
+        const marker = createMarker(coords, document.getElementById(markerId));
+        marker.addTo(map);
+
+        map.on('error', (e) => {
+            logger.error(
+                "Failed to load map: check map_style_url in config.json has a "
+                + "valid URL and API key",
+                e.error,
+            );
+            onError(new Error(LocationShareError.MapStyleUrlNotReachable));
+        });
+
+        return map;
+    } catch (e) {
+        logger.error("Failed to render map", e);
+        onError(e);
+    }
+};
+
+const makeLink = (coords: GeolocationCoordinates): string => {
+    return (
+        "https://www.openstreetmap.org/" +
+        `?mlat=${coords.latitude}` +
+        `&mlon=${coords.longitude}` +
+        `#map=16/${coords.latitude}/${coords.longitude}`
+    );
+};
+
+export const createMapSiteLink = (event: MatrixEvent): string => {
+    const content: Object = event.getContent();
+    const mLocation = content[M_LOCATION.name];
+    if (mLocation !== undefined) {
+        const uri = mLocation["uri"];
+        if (uri !== undefined) {
+            return makeLink(parseGeoUri(uri));
+        }
+    } else {
+        const geoUri = content["geo_uri"];
+        if (geoUri) {
+            return makeLink(parseGeoUri(geoUri));
+        }
+    }
+    return null;
+};
diff --git a/src/utils/location/parseGeoUri.ts b/src/utils/location/parseGeoUri.ts
new file mode 100644
index 00000000000..4c7291cd3e8
--- /dev/null
+++ b/src/utils/location/parseGeoUri.ts
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export const parseGeoUri = (uri: string): GeolocationCoordinates => {
+    function parse(s: string): number {
+        const ret = parseFloat(s);
+        if (Number.isNaN(ret)) {
+            return undefined;
+        } else {
+            return ret;
+        }
+    }
+
+    const m = uri.match(/^\s*geo:(.*?)\s*$/);
+    if (!m) return;
+    const parts = m[1].split(';');
+    const coords = parts[0].split(',');
+    let uncertainty: number;
+    for (const param of parts.slice(1)) {
+        const m = param.match(/u=(.*)/);
+        if (m) uncertainty = parse(m[1]);
+    }
+    return {
+        latitude: parse(coords[0]),
+        longitude: parse(coords[1]),
+        altitude: parse(coords[2]),
+        accuracy: uncertainty,
+        altitudeAccuracy: undefined,
+        heading: undefined,
+        speed: undefined,
+    };
+};
diff --git a/src/utils/location/useMap.ts b/src/utils/location/useMap.ts
new file mode 100644
index 00000000000..d4083629506
--- /dev/null
+++ b/src/utils/location/useMap.ts
@@ -0,0 +1,62 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useEffect, useState } from 'react';
+import { Map as MapLibreMap } from 'maplibre-gl';
+
+import { createMap } from "./map";
+
+interface UseMapProps {
+    bodyId: string;
+    onError: (error: Error) => void;
+    interactive?: boolean;
+}
+
+/**
+ * Create a map instance
+ * Add listeners for errors
+ * Make sure `onError` has a stable reference
+ * As map is recreated on changes to it
+ */
+export const useMap = ({
+    interactive,
+    bodyId,
+    onError,
+}: UseMapProps): MapLibreMap => {
+    const [map, setMap] = useState<MapLibreMap>();
+
+    useEffect(
+        () => {
+            try {
+                setMap(createMap(interactive, bodyId, onError));
+            } catch (error) {
+                onError(error);
+            }
+            return () => {
+                if (map) {
+                    map.remove();
+                    setMap(undefined);
+                }
+            };
+        },
+        // map is excluded as a dependency
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [interactive, bodyId, onError],
+    );
+
+    return map;
+};
+
diff --git a/src/utils/login.ts b/src/utils/login.ts
new file mode 100644
index 00000000000..8e669099525
--- /dev/null
+++ b/src/utils/login.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import type MatrixChat from "../components/structures/MatrixChat";
+import Views from "../Views";
+
+export function isLoggedIn(): boolean {
+    // JRS: Maybe we should move the step that writes this to the window out of
+    // `element-web` and into this file? Better yet, we should probably create a
+    // store to hold this state.
+    // See also https://github.com/vector-im/element-web/issues/15034.
+    const app = window.matrixChat;
+    return app && (app as MatrixChat).state.view === Views.LOGGED_IN;
+}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 6c2fe4f7691..1a48f1261c5 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,22 +15,9 @@ limitations under the License.
 */
 
 import { Room } from "matrix-js-sdk/src/models/room";
-import { sleep } from "matrix-js-sdk/src/utils";
-import { EventStatus, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
-import React from "react";
-
-import { MatrixClientPeg } from "../MatrixClientPeg";
-import { _t } from "../languageHandler";
-import Modal, { IHandle } from "../Modal";
-import ErrorDialog from "../components/views/dialogs/ErrorDialog";
-import dis from "../dispatcher/dispatcher";
-import RoomViewStore from "../stores/RoomViewStore";
-import Spinner from "../components/views/elements/Spinner";
-import { isMetaSpace } from "../stores/spaces";
-import SpaceStore from "../stores/spaces/SpaceStore";
-import { Action } from "../dispatcher/actions";
-import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
-import { ViewHomePagePayload } from "../dispatcher/payloads/ViewHomePagePayload";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 
 /**
  * Approximation of a membership status for a given room.
@@ -92,109 +79,26 @@ export function isJoinedOrNearlyJoined(membership: string): boolean {
     return effective === EffectiveMembership.Join || effective === EffectiveMembership.Invite;
 }
 
-export async function leaveRoomBehaviour(roomId: string, retry = true, spinner = true) {
-    let spinnerModal: IHandle<any>;
-    if (spinner) {
-        spinnerModal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
-    }
-
-    const cli = MatrixClientPeg.get();
-    let leavingAllVersions = true;
-    const history = cli.getRoomUpgradeHistory(roomId);
-    if (history && history.length > 0) {
-        const currentRoom = history[history.length - 1];
-        if (currentRoom.roomId !== roomId) {
-            // The user is trying to leave an older version of the room. Let them through
-            // without making them leave the current version of the room.
-            leavingAllVersions = false;
-        }
-    }
-
-    const room = cli.getRoom(roomId);
-    // await any queued messages being sent so that they do not fail
-    await Promise.all(room.getPendingEvents().filter(ev => {
-        return [EventStatus.QUEUED, EventStatus.ENCRYPTING, EventStatus.SENDING].includes(ev.status);
-    }).map(ev => new Promise<void>((resolve, reject) => {
-        const handler = () => {
-            if (ev.status === EventStatus.NOT_SENT) {
-                spinnerModal?.close();
-                reject(ev.error);
-            }
-
-            if (!ev.status || ev.status === EventStatus.SENT) {
-                ev.off(MatrixEventEvent.Status, handler);
-                resolve();
-            }
+/**
+ * Try to ensure the user is already in the megolm session before continuing
+ * NOTE: this assumes you've just created the room and there's not been an opportunity
+ * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
+ */
+export async function waitForMember(client: MatrixClient, roomId: string, userId: string, opts = { timeout: 1500 }) {
+    const { timeout } = opts;
+    let handler;
+    return new Promise((resolve) => {
+        handler = function(_, __, member: RoomMember) { // eslint-disable-line @typescript-eslint/naming-convention
+            if (member.userId !== userId) return;
+            if (member.roomId !== roomId) return;
+            resolve(true);
         };
-
-        ev.on(MatrixEventEvent.Status, handler);
-    })));
-
-    let results: { [roomId: string]: Error & { errcode?: string, message: string, data?: Record<string, any> } } = {};
-    if (!leavingAllVersions) {
-        try {
-            await cli.leave(roomId);
-        } catch (e) {
-            if (e?.data?.errcode) {
-                const message = e.data.error || _t("Unexpected server error trying to leave the room");
-                results[roomId] = Object.assign(new Error(message), { errcode: e.data.errcode, data: e.data });
-            } else {
-                results[roomId] = e || new Error("Failed to leave room for unknown causes");
-            }
-        }
-    } else {
-        results = await cli.leaveRoomChain(roomId, retry);
-    }
-
-    if (retry) {
-        const limitExceededError = Object.values(results).find(e => e?.errcode === "M_LIMIT_EXCEEDED");
-        if (limitExceededError) {
-            await sleep(limitExceededError.data.retry_after_ms ?? 100);
-            return leaveRoomBehaviour(roomId, false, false);
-        }
-    }
-
-    spinnerModal?.close();
-
-    const errors = Object.entries(results).filter(r => !!r[1]);
-    if (errors.length > 0) {
-        const messages = [];
-        for (const roomErr of errors) {
-            const err = roomErr[1]; // [0] is the roomId
-            let message = _t("Unexpected server error trying to leave the room");
-            if (err.errcode && err.message) {
-                if (err.errcode === 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM') {
-                    Modal.createTrackedDialog('Error Leaving Room', '', ErrorDialog, {
-                        title: _t("Can't leave Server Notices room"),
-                        description: _t(
-                            "This room is used for important messages from the Homeserver, " +
-                            "so you cannot leave it.",
-                        ),
-                    });
-                    return;
-                }
-                message = results[roomId].message;
-            }
-            messages.push(message, React.createElement('BR')); // createElement to avoid using a tsx file in utils
-        }
-        Modal.createTrackedDialog('Error Leaving Room', '', ErrorDialog, {
-            title: _t("Error leaving room"),
-            description: messages,
-        });
-        return;
-    }
-
-    if (SpaceStore.spacesEnabled &&
-        !isMetaSpace(SpaceStore.instance.activeSpace) &&
-        SpaceStore.instance.activeSpace !== roomId &&
-        RoomViewStore.getRoomId() === roomId
-    ) {
-        dis.dispatch<ViewRoomPayload>({
-            action: Action.ViewRoom,
-            room_id: SpaceStore.instance.activeSpace,
-            metricsTrigger: undefined, // other
-        });
-    } else {
-        dis.dispatch<ViewHomePagePayload>({ action: Action.ViewHomePage });
-    }
+        client.on(RoomStateEvent.NewMember, handler);
+
+        /* We don't want to hang if this goes wrong, so we proceed and hope the other
+           user is already in the megolm session */
+        setTimeout(resolve, timeout, false);
+    }).finally(() => {
+        client.removeListener(RoomStateEvent.NewMember, handler);
+    });
 }
diff --git a/src/utils/pages.ts b/src/utils/pages.ts
index bae76be29de..03bab1563b4 100644
--- a/src/utils/pages.ts
+++ b/src/utils/pages.ts
@@ -14,23 +14,37 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ConfigOptions } from "../SdkConfig";
+import { logger } from "matrix-js-sdk/src/logger";
 
-export function getHomePageUrl(appConfig: ConfigOptions): string | null {
-    const pagesConfig = appConfig.embeddedPages;
-    let pageUrl = pagesConfig?.homeUrl;
+import { IConfigOptions } from "../IConfigOptions";
+import { SnakedObject } from "./SnakedObject";
+
+export function getHomePageUrl(appConfig: IConfigOptions): string | null {
+    const config = new SnakedObject(appConfig);
+
+    const pagesConfig = config.get("embedded_pages");
+    let pageUrl = pagesConfig ? (new SnakedObject(pagesConfig).get("home_url")) : null;
 
     if (!pageUrl) {
         // This is a deprecated config option for the home page
         // (despite the name, given we also now have a welcome
         // page, which is not the same).
-        pageUrl = appConfig.welcomePageUrl;
+        pageUrl = (<any>appConfig).welcomePageUrl;
+        if (pageUrl) {
+            logger.warn(
+                "You are using a deprecated config option: `welcomePageUrl`. Please use " +
+                "`embedded_pages.home_url` instead, per https://github.com/vector-im/element-web/issues/21428",
+            );
+        }
     }
 
     return pageUrl;
 }
 
-export function shouldUseLoginForWelcome(appConfig: ConfigOptions): boolean {
-    const pagesConfig = appConfig.embeddedPages;
-    return pagesConfig?.loginForWelcome === true;
+export function shouldUseLoginForWelcome(appConfig: IConfigOptions): boolean {
+    const config = new SnakedObject(appConfig);
+    const pagesConfig = config.get("embedded_pages");
+    return pagesConfig
+        ? ((new SnakedObject(pagesConfig).get("login_for_welcome")) === true)
+        : false;
 }
diff --git a/src/utils/permalinks/ElementPermalinkConstructor.ts b/src/utils/permalinks/ElementPermalinkConstructor.ts
index 2068a905c3a..b901581ca62 100644
--- a/src/utils/permalinks/ElementPermalinkConstructor.ts
+++ b/src/utils/permalinks/ElementPermalinkConstructor.ts
@@ -80,8 +80,8 @@ export default class ElementPermalinkConstructor extends PermalinkConstructor {
     }
 
     /**
-     * Parses an app route (`(user|room|group)/identifer`) to a Matrix entity
-     * (room, user, group).
+     * Parses an app route (`(user|room)/identifer`) to a Matrix entity
+     * (room, user).
      * @param {string} route The app route
      * @returns {PermalinkParts}
      */
@@ -102,14 +102,13 @@ export default class ElementPermalinkConstructor extends PermalinkConstructor {
         if (entityType === 'user') {
             // Probably a user, no further parsing needed.
             return PermalinkParts.forUser(entity);
-        } else if (entityType === 'group') {
-            // Probably a group, no further parsing needed.
-            return PermalinkParts.forGroup(entity);
         } else if (entityType === 'room') {
             // Rejoin the rest because v3 events can have slashes (annoyingly)
             const eventId = parts.length > 2 ? parts.slice(2).join('/') : "";
             const via = query.split(/&?via=/).filter(p => !!p);
             return PermalinkParts.forEvent(entity, eventId, via);
+        } else if (entityType === 'group') {
+            return PermalinkParts.forGroup(entity);
         } else {
             throw new Error("Unknown entity type in permalink");
         }
diff --git a/src/utils/permalinks/MatrixToPermalinkConstructor.ts b/src/utils/permalinks/MatrixToPermalinkConstructor.ts
index 1782cc984db..ab2de5959a0 100644
--- a/src/utils/permalinks/MatrixToPermalinkConstructor.ts
+++ b/src/utils/permalinks/MatrixToPermalinkConstructor.ts
@@ -69,9 +69,6 @@ export default class MatrixToPermalinkConstructor extends PermalinkConstructor {
         if (entity[0] === '@') {
             // Probably a user, no further parsing needed.
             return PermalinkParts.forUser(entity);
-        } else if (entity[0] === '+') {
-            // Probably a group, no further parsing needed.
-            return PermalinkParts.forGroup(entity);
         } else if (entity[0] === '#' || entity[0] === '!') {
             if (parts.length === 1) { // room without event permalink
                 const [roomId, query=""] = entity.split("?");
@@ -85,6 +82,8 @@ export default class MatrixToPermalinkConstructor extends PermalinkConstructor {
             const via = query.split(/&?via=/g).filter(p => !!p);
 
             return PermalinkParts.forEvent(entity, eventId, via);
+        } else if (entity[0] === '+') {
+            return PermalinkParts.forGroup(entity);
         } else {
             throw new Error("Unknown entity type in permalink");
         }
diff --git a/src/utils/permalinks/PermalinkConstructor.ts b/src/utils/permalinks/PermalinkConstructor.ts
index 986d20d4d17..158df895e2e 100644
--- a/src/utils/permalinks/PermalinkConstructor.ts
+++ b/src/utils/permalinks/PermalinkConstructor.ts
@@ -54,14 +54,14 @@ export class PermalinkParts {
     roomIdOrAlias: string;
     eventId: string;
     userId: string;
-    groupId: string;
     viaServers: string[];
+    groupId: string;
 
     constructor(roomIdOrAlias: string, eventId: string, userId: string, groupId: string, viaServers: string[]) {
         this.roomIdOrAlias = roomIdOrAlias;
         this.eventId = eventId;
-        this.groupId = groupId;
         this.userId = userId;
+        this.groupId = groupId;
         this.viaServers = viaServers;
     }
 
@@ -82,7 +82,7 @@ export class PermalinkParts {
     }
 
     get primaryEntityId(): string {
-        return this.roomIdOrAlias || this.userId || this.groupId;
+        return this.roomIdOrAlias || this.userId;
     }
 
     get sigil(): string {
diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts
index 1958904f8ac..8c213a8cffc 100644
--- a/src/utils/permalinks/Permalinks.ts
+++ b/src/utils/permalinks/Permalinks.ts
@@ -166,9 +166,6 @@ export class RoomPermalinkCreator {
         // updates, but they were on member events which can be very numerous, so the incremental
         // updates ended up being much slower than a full update. We now have the batch state update
         // event, so we just update in full, but on each batch of updates.
-        // A full update takes about 120ms for me on Matrix HQ, which still feels like way too long
-        // to be spending worrying about how we might generate a permalink, but it's better than
-        // multiple seconds.
         this.updateAllowedServers();
         this.updateHighestPlUser();
         this.updatePopulationMap();
@@ -241,24 +238,27 @@ export class RoomPermalinkCreator {
     }
 
     private updateServerCandidates = () => {
-        let candidates = [];
+        const candidates = new Set<string>();
         if (this.highestPlUserId) {
-            candidates.push(getServerName(this.highestPlUserId));
+            candidates.add(getServerName(this.highestPlUserId));
         }
 
         const serversByPopulation = Object.keys(this.populationMap)
-            .sort((a, b) => this.populationMap[b] - this.populationMap[a])
-            .filter(a => {
-                return !candidates.includes(a) &&
-                    !isHostnameIpAddress(a) &&
-                    !isHostInRegex(a, this.bannedHostsRegexps) &&
-                    isHostInRegex(a, this.allowedHostsRegexps);
-            });
-
-        const remainingServers = serversByPopulation.slice(0, MAX_SERVER_CANDIDATES - candidates.length);
-        candidates = candidates.concat(remainingServers);
-
-        this._serverCandidates = candidates;
+            .sort((a, b) => this.populationMap[b] - this.populationMap[a]);
+
+        for (let i = 0; i < serversByPopulation.length && candidates.size < MAX_SERVER_CANDIDATES; i++) {
+            const server = serversByPopulation[i];
+            if (
+                !candidates.has(server) &&
+                !isHostnameIpAddress(server) &&
+                !isHostInRegex(server, this.bannedHostsRegexps) &&
+                isHostInRegex(server, this.allowedHostsRegexps)
+            ) {
+                candidates.add(server);
+            }
+        }
+
+        this._serverCandidates = [...candidates];
     };
 }
 
@@ -321,7 +321,7 @@ export function tryTransformEntityToPermalink(entity: string): string {
             if (permalinkParts) {
                 if (permalinkParts.roomIdOrAlias) {
                     const eventIdPart = permalinkParts.eventId ? `/${permalinkParts.eventId}` : '';
-                    let pl = matrixtoBaseUrl+`/#/${permalinkParts.roomIdOrAlias}${eventIdPart}`;
+                    let pl = matrixtoBaseUrl + `/#/${permalinkParts.roomIdOrAlias}${eventIdPart}`;
                     if (permalinkParts.viaServers.length > 0) {
                         pl += new MatrixToPermalinkConstructor().encodeServerCandidates(permalinkParts.viaServers);
                     }
@@ -373,10 +373,10 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
                 if (permalinkParts.viaServers.length > 0) {
                     permalink += new MatrixToPermalinkConstructor().encodeServerCandidates(permalinkParts.viaServers);
                 }
-            } else if (permalinkParts.groupId) {
-                permalink = `#/group/${permalinkParts.groupId}`;
             } else if (permalinkParts.userId) {
                 permalink = `#/user/${permalinkParts.userId}`;
+            } else if (permalinkParts.groupId) {
+                permalink = `#/group/${permalinkParts.groupId}`;
             } // else not a valid permalink for our purposes - do not handle
         }
     } catch (e) {
@@ -403,8 +403,8 @@ export function getPrimaryPermalinkEntity(permalink: string): string {
 
         if (!permalinkParts) return null; // not processable
         if (permalinkParts.userId) return permalinkParts.userId;
-        if (permalinkParts.groupId) return permalinkParts.groupId;
         if (permalinkParts.roomIdOrAlias) return permalinkParts.roomIdOrAlias;
+        if (permalinkParts.groupId) return permalinkParts.groupId;
     } catch (e) {
         // no entity - not a permalink
     }
@@ -413,7 +413,7 @@ export function getPrimaryPermalinkEntity(permalink: string): string {
 }
 
 function getPermalinkConstructor(): PermalinkConstructor {
-    const elementPrefix = SdkConfig.get()['permalinkPrefix'];
+    const elementPrefix = SdkConfig.get("permalink_prefix");
     if (elementPrefix && elementPrefix !== matrixtoBaseUrl) {
         return new ElementPermalinkConstructor(elementPrefix);
     }
@@ -423,7 +423,7 @@ function getPermalinkConstructor(): PermalinkConstructor {
 
 export function parsePermalink(fullUrl: string): PermalinkParts {
     try {
-        const elementPrefix = SdkConfig.get()['permalinkPrefix'];
+        const elementPrefix = SdkConfig.get("permalink_prefix");
         if (decodeURIComponent(fullUrl).startsWith(matrixtoBaseUrl)) {
             return new MatrixToPermalinkConstructor().parsePermalink(decodeURIComponent(fullUrl));
         } else if (fullUrl.startsWith("matrix:")) {
@@ -447,12 +447,12 @@ function getHostnameFromMatrixDomain(domain: string): string {
     return new URL(`https://${domain}`).hostname;
 }
 
-function isHostInRegex(hostname: string, regexps: RegExp[]) {
+function isHostInRegex(hostname: string, regexps: RegExp[]): boolean {
     hostname = getHostnameFromMatrixDomain(hostname);
     if (!hostname) return true; // assumed
     if (regexps.length > 0 && !regexps[0].test) throw new Error(regexps[0].toString());
 
-    return regexps.filter(h => h.test(hostname)).length > 0;
+    return regexps.some(h => h.test(hostname));
 }
 
 function isHostnameIpAddress(hostname: string): boolean {
diff --git a/src/utils/presence.ts b/src/utils/presence.ts
index f2c208265ef..a17503ed8e8 100644
--- a/src/utils/presence.ts
+++ b/src/utils/presence.ts
@@ -19,7 +19,7 @@ import SdkConfig from "../SdkConfig";
 
 export function isPresenceEnabled() {
     const hsUrl = MatrixClientPeg.get().baseUrl;
-    const urls = SdkConfig.get()['enable_presence_by_hs_url'];
+    const urls = SdkConfig.get("enable_presence_by_hs_url");
     if (!urls) return true;
     if (urls[hsUrl] || urls[hsUrl] === undefined) return true;
     return false;
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
deleted file mode 100644
index 3f085adbf01..00000000000
--- a/src/utils/replaceableComponent.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import * as React from 'react';
-
-import * as sdk from '../index';
-
-/**
- * Replaces a component with a skinned version if a skinned version exists.
- * This decorator should only be applied to components which can be skinned. For
- * the react-sdk this means all components should be decorated with this.
- *
- * The decoration works by assuming the skin has been loaded prior to the
- * decorator being called. If that's not the case, the developer will find
- * out quickly through various amounts of errors and explosions.
- *
- * For a bit more detail on how this works, see docs/skinning.md
- * @param {string} name The dot-path name of the component being replaced.
- * @param {React.Component} origComponent The component that can be replaced
- * with a skinned version. If no skinned version is available, this component
- * will be used. Note that this is automatically provided to the function and
- * thus is optional for purposes of types.
- * @returns {ClassDecorator} The decorator.
- */
-export function replaceableComponent(name: string, origComponent?: React.Component): ClassDecorator {
-    // Decorators return a function to override the class (origComponent). This
-    // ultimately assumes that `getComponent()` won't throw an error and instead
-    // return a falsey value like `null` when the skin doesn't have a component.
-    return () => sdk.getComponent(name) || origComponent;
-}
diff --git a/src/utils/rooms.ts b/src/utils/rooms.ts
new file mode 100644
index 00000000000..d9aa310ea4d
--- /dev/null
+++ b/src/utils/rooms.ts
@@ -0,0 +1,181 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { IInstance, IProtocol, IPublicRoomsChunkRoom, MatrixClient } from "matrix-js-sdk/src/client";
+import { ViewRoom as ViewRoomEvent } from "matrix-analytics-events/types/typescript/ViewRoom";
+
+import { Action } from "../dispatcher/actions";
+import { ViewRoomPayload } from "../dispatcher/payloads/ViewRoomPayload";
+import { getE2EEWellKnown } from "./WellKnownUtils";
+import dis from "../dispatcher/dispatcher";
+import { getDisplayAliasForAliasSet } from "../Rooms";
+import { _t } from "../languageHandler";
+import { instanceForInstanceId, protocolNameForInstanceId } from "./DirectoryUtils";
+import SdkConfig from "../SdkConfig";
+import { GenericError } from "./error";
+import { ALL_ROOMS, Protocols } from "./DirectoryUtils";
+
+export function privateShouldBeEncrypted(): boolean {
+    const e2eeWellKnown = getE2EEWellKnown();
+    if (e2eeWellKnown) {
+        const defaultDisabled = e2eeWellKnown["default"] === false;
+        return !defaultDisabled;
+    }
+    return true;
+}
+
+interface IShowRoomOpts {
+    roomAlias?: string;
+    autoJoin?: boolean;
+    shouldPeek?: boolean;
+    roomServer?: string;
+    metricsTrigger: ViewRoomEvent["trigger"];
+}
+
+export const showRoom = (
+    client: MatrixClient,
+    room: IPublicRoomsChunkRoom | null,
+    {
+        roomAlias,
+        autoJoin = false,
+        shouldPeek = false,
+        roomServer,
+    }: IShowRoomOpts,
+): void => {
+    const payload: ViewRoomPayload = {
+        action: Action.ViewRoom,
+        auto_join: autoJoin,
+        should_peek: shouldPeek,
+        metricsTrigger: "RoomDirectory",
+    };
+    if (room) {
+        // Don't let the user view a room they won't be able to either
+        // peek or join: fail earlier so they don't have to click back
+        // to the directory.
+        if (client.isGuest()) {
+            if (!room.world_readable && !room.guest_can_join) {
+                dis.dispatch({ action: 'require_registration' });
+                return;
+            }
+        }
+
+        if (!roomAlias) {
+            roomAlias = getDisplayAliasForAliasSet(room.canonical_alias, room.aliases);
+        }
+
+        payload.oob_data = {
+            avatarUrl: room.avatar_url,
+            // XXX: This logic is duplicated from the JS SDK which
+            // would normally decide what the name is.
+            name: room.name || roomAlias || _t('Unnamed room'),
+        };
+
+        if (roomServer) {
+            payload.via_servers = [roomServer];
+        }
+    }
+    // It's not really possible to join Matrix rooms by ID because the HS has no way to know
+    // which servers to start querying. However, there's no other way to join rooms in
+    // this list without aliases at present, so if roomAlias isn't set here we have no
+    // choice but to supply the ID.
+    if (roomAlias) {
+        payload.room_alias = roomAlias;
+    } else {
+        payload.room_id = room.room_id;
+    }
+    dis.dispatch(payload);
+};
+
+interface IJoinRoomByAliasOpts {
+    instanceId?: string;
+    roomServer?: string;
+    protocols: Protocols;
+    metricsTrigger: ViewRoomEvent["trigger"];
+}
+
+export function joinRoomByAlias(cli: MatrixClient, alias: string, {
+    instanceId,
+    roomServer,
+    protocols,
+    metricsTrigger,
+}: IJoinRoomByAliasOpts): void {
+    // If we don't have a particular instance id selected, just show that rooms alias
+    if (!instanceId || instanceId === ALL_ROOMS) {
+        // If the user specified an alias without a domain, add on whichever server is selected
+        // in the dropdown
+        if (!alias.includes(':')) {
+            alias = alias + ':' + roomServer;
+        }
+        showRoom(cli, null, {
+            roomAlias: alias,
+            autoJoin: true,
+            metricsTrigger,
+        });
+    } else {
+        // This is a 3rd party protocol. Let's see if we can join it
+        const protocolName = protocolNameForInstanceId(protocols, instanceId);
+        const instance = instanceForInstanceId(protocols, instanceId);
+        const fields = protocolName
+            ? getFieldsForThirdPartyLocation(alias, protocols[protocolName], instance)
+            : null;
+        if (!fields) {
+            const brand = SdkConfig.get().brand;
+            throw new GenericError(
+                _t('Unable to join network'),
+                _t('%(brand)s does not know how to join a room on this network', { brand }),
+            );
+        }
+        cli.getThirdpartyLocation(protocolName, fields).then((resp) => {
+            if (resp.length > 0 && resp[0].alias) {
+                showRoom(cli, null, {
+                    roomAlias: resp[0].alias,
+                    autoJoin: true,
+                    metricsTrigger,
+                });
+            } else {
+                throw new GenericError(
+                    _t('Room not found'),
+                    _t('Couldn\'t find a matching Matrix room'),
+                );
+            }
+        }, (e) => {
+            throw new GenericError(
+                _t('Fetching third party location failed'),
+                _t('Unable to look up room ID from server'),
+            );
+        });
+    }
+}
+
+export function getFieldsForThirdPartyLocation(
+    userInput: string,
+    protocol: IProtocol,
+    instance: IInstance,
+): { searchFields?: string[] } | null {
+    // make an object with the fields specified by that protocol. We
+    // require that the values of all but the last field come from the
+    // instance. The last is the user input.
+    const requiredFields = protocol.location_fields;
+    if (!requiredFields) return null;
+    const fields = {};
+    for (let i = 0; i < requiredFields.length - 1; ++i) {
+        const thisField = requiredFields[i];
+        if (instance.fields[thisField] === undefined) return null;
+        fields[thisField] = instance.fields[thisField];
+    }
+    fields[requiredFields[requiredFields.length - 1]] = userInput;
+    return fields;
+}
diff --git a/src/utils/space.tsx b/src/utils/space.tsx
index 078d7068b2d..33071c4811a 100644
--- a/src/utils/space.tsx
+++ b/src/utils/space.tsx
@@ -16,14 +16,12 @@ limitations under the License.
 
 import React from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
 import { EventType } from "matrix-js-sdk/src/@types/event";
-import { MatrixClient } from "matrix-js-sdk/src/client";
 import { JoinRule } from "matrix-js-sdk/src/@types/partials";
 
 import { calculateRoomVia } from "./permalinks/Permalinks";
 import Modal from "../Modal";
-import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
-import AddExistingToSpaceDialog from "../components/views/dialogs/AddExistingToSpaceDialog";
 import CreateRoomDialog from "../components/views/dialogs/CreateRoomDialog";
 import createRoom, { IOpts } from "../createRoom";
 import { _t } from "../languageHandler";
@@ -33,19 +31,15 @@ import { showRoomInviteDialog } from "../RoomInvite";
 import CreateSubspaceDialog from "../components/views/dialogs/CreateSubspaceDialog";
 import AddExistingSubspaceDialog from "../components/views/dialogs/AddExistingSubspaceDialog";
 import defaultDispatcher from "../dispatcher/dispatcher";
-import dis from "../dispatcher/dispatcher";
-import RoomViewStore from "../stores/RoomViewStore";
+import { RoomViewStore } from "../stores/RoomViewStore";
 import { Action } from "../dispatcher/actions";
-import { leaveRoomBehaviour } from "./membership";
 import Spinner from "../components/views/elements/Spinner";
-import LeaveSpaceDialog from "../components/views/dialogs/LeaveSpaceDialog";
-import CreateSpaceFromCommunityDialog from "../components/views/dialogs/CreateSpaceFromCommunityDialog";
-import SpacePreferencesDialog, { SpacePreferenceTab } from "../components/views/dialogs/SpacePreferencesDialog";
-import PosthogTrackers from "../PosthogTrackers";
-import { ButtonEvent } from "../components/views/elements/AccessibleButton";
-import { AfterLeaveRoomPayload } from "../dispatcher/payloads/AfterLeaveRoomPayload";
 import { shouldShowComponent } from "../customisations/helpers/UIComponents";
 import { UIComponent } from "../settings/UIFeature";
+import { OpenSpacePreferencesPayload, SpacePreferenceTab } from "../dispatcher/payloads/OpenSpacePreferencesPayload";
+import { OpenSpaceSettingsPayload } from "../dispatcher/payloads/OpenSpaceSettingsPayload";
+import dis from "../dispatcher/dispatcher";
+import { OpenAddExistingToSpaceDialogPayload } from "../dispatcher/payloads/OpenAddExistingToSpaceDialogPayload";
 
 export const shouldShowSpaceSettings = (space: Room) => {
     const userId = space.client.getUserId();
@@ -65,41 +59,27 @@ export const makeSpaceParentEvent = (room: Room, canonical = false) => ({
     state_key: room.roomId,
 });
 
-export const showSpaceSettings = (space: Room) => {
-    Modal.createTrackedDialog("Space Settings", "", SpaceSettingsDialog, {
-        matrixClient: space.client,
+export function showSpaceSettings(space: Room) {
+    dis.dispatch<OpenSpaceSettingsPayload>({
+        action: Action.OpenSpaceSettings,
         space,
-    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-};
+    });
+}
 
 export const showAddExistingRooms = (space: Room): void => {
-    Modal.createTrackedDialog(
-        "Space Landing",
-        "Add Existing",
-        AddExistingToSpaceDialog,
-        {
-            onCreateRoomClick: (ev: ButtonEvent) => {
-                showCreateNewRoom(space);
-                PosthogTrackers.trackInteraction("WebAddExistingToSpaceDialogCreateRoomButton", ev);
-            },
-            onAddSubspaceClick: () => showAddExistingSubspace(space),
-            space,
-            onFinished: (added: boolean) => {
-                if (added && RoomViewStore.getRoomId() === space.roomId) {
-                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
-                }
-            },
-        },
-        "mx_AddExistingToSpaceDialog_wrapper",
-    );
+    dis.dispatch<OpenAddExistingToSpaceDialogPayload>({
+        action: Action.OpenAddToExistingSpaceDialog,
+        space,
+    });
 };
 
-export const showCreateNewRoom = async (space: Room): Promise<boolean> => {
+export const showCreateNewRoom = async (space: Room, type?: RoomType): Promise<boolean> => {
     const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
         "Space Landing",
         "Create Room",
         CreateRoomDialog,
         {
+            type,
             defaultPublic: space.getJoinRule() === JoinRule.Public,
             parentSpace: space,
         },
@@ -144,7 +124,7 @@ export const showAddExistingSubspace = (space: Room): void => {
             space,
             onCreateSubspaceClick: () => showCreateNewSubspace(space),
             onFinished: (added: boolean) => {
-                if (added && RoomViewStore.getRoomId() === space.roomId) {
+                if (added && RoomViewStore.instance.getRoomId() === space.roomId) {
                     defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
                 }
             },
@@ -162,7 +142,7 @@ export const showCreateNewSubspace = (space: Room): void => {
             space,
             onAddExistingSpaceClick: () => showAddExistingSubspace(space),
             onFinished: (added: boolean) => {
-                if (added && RoomViewStore.getRoomId() === space.roomId) {
+                if (added && RoomViewStore.instance.getRoomId() === space.roomId) {
                     defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
                 }
             },
@@ -187,31 +167,10 @@ export const bulkSpaceBehaviour = async (
     }
 };
 
-export const leaveSpace = (space: Room) => {
-    Modal.createTrackedDialog("Leave Space", "", LeaveSpaceDialog, {
+export const showSpacePreferences = (space: Room, initialTabId?: SpacePreferenceTab) => {
+    dis.dispatch<OpenSpacePreferencesPayload>({
+        action: Action.OpenSpacePreferences,
         space,
-        onFinished: async (leave: boolean, rooms: Room[]) => {
-            if (!leave) return;
-            await bulkSpaceBehaviour(space, rooms, room => leaveRoomBehaviour(room.roomId));
-
-            dis.dispatch<AfterLeaveRoomPayload>({
-                action: Action.AfterLeaveRoom,
-                room_id: space.roomId,
-            });
-        },
-    }, "mx_LeaveSpaceDialog_wrapper");
-};
-
-export const createSpaceFromCommunity = (cli: MatrixClient, groupId: string): Promise<[string?]> => {
-    return Modal.createTrackedDialog('Create Space', 'from community', CreateSpaceFromCommunityDialog, {
-        matrixClient: cli,
-        groupId,
-    }, "mx_CreateSpaceFromCommunityDialog_wrapper").finished as Promise<[string?]>;
-};
-
-export const showSpacePreferences = (space: Room, initialTabId?: SpacePreferenceTab): Promise<unknown> => {
-    return Modal.createTrackedDialog("Space preferences", "", SpacePreferencesDialog, {
         initialTabId,
-        space,
-    }, null, false, true).finished;
+    });
 };
diff --git a/src/utils/strings.ts b/src/utils/strings.ts
index 1ca7aee6301..41f80ed1c53 100644
--- a/src/utils/strings.ts
+++ b/src/utils/strings.ts
@@ -84,3 +84,11 @@ const collator = new Intl.Collator();
 export function compare(a: string, b: string): number {
     return collator.compare(a, b);
 }
+
+/**
+ * Returns text which has been selected by the user
+ * @returns the selected text
+ */
+export function getSelectedText(): string {
+    return window.getSelection().toString();
+}
diff --git a/src/utils/useTooltip.tsx b/src/utils/useTooltip.tsx
new file mode 100644
index 00000000000..b40239001ba
--- /dev/null
+++ b/src/utils/useTooltip.tsx
@@ -0,0 +1,24 @@
+import React, { ComponentProps, useState } from "react";
+
+import Tooltip from "../components/views/elements/Tooltip";
+
+interface TooltipEvents {
+    showTooltip: () => void;
+    hideTooltip: () => void;
+}
+
+export function useTooltip(props: ComponentProps<typeof Tooltip>): [TooltipEvents, JSX.Element | null] {
+    const [isVisible, setIsVisible] = useState(false);
+
+    const showTooltip = () => setIsVisible(true);
+    const hideTooltip = () => setIsVisible(false);
+
+    // No need to fill up the DOM with hidden tooltip elements. Only add the
+    // tooltip when we're hovering over the item (performance)
+    const tooltip = <Tooltip
+        {...props}
+        visible={isVisible}
+    />;
+
+    return [{ showTooltip, hideTooltip }, tooltip];
+}
diff --git a/src/verification.ts b/src/verification.ts
index 619a674dceb..197ae051dd1 100644
--- a/src/verification.ts
+++ b/src/verification.ts
@@ -22,13 +22,13 @@ import { MatrixClientPeg } from './MatrixClientPeg';
 import dis from "./dispatcher/dispatcher";
 import Modal from './Modal';
 import { RightPanelPhases } from "./stores/right-panel/RightPanelStorePhases";
-import { findDMForUser } from './createRoom';
 import { accessSecretStorage } from './SecurityManager';
 import UntrustedDeviceDialog from "./components/views/dialogs/UntrustedDeviceDialog";
-import { GroupMember, IDevice } from "./components/views/right_panel/UserInfo";
+import { IDevice } from "./components/views/right_panel/UserInfo";
 import ManualDeviceKeyVerificationDialog from "./components/views/dialogs/ManualDeviceKeyVerificationDialog";
 import RightPanelStore from "./stores/right-panel/RightPanelStore";
 import { IRightPanelCardState } from "./stores/right-panel/RightPanelStoreIPanelState";
+import { findDMForUser } from "./utils/direct-messages";
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
@@ -124,7 +124,7 @@ function setRightPanel(state: IRightPanelCardState) {
     }
 }
 
-export function pendingVerificationRequestForUser(user: User | RoomMember | GroupMember) {
+export function pendingVerificationRequestForUser(user: User | RoomMember) {
     const cli = MatrixClientPeg.get();
     const dmRoom = findDMForUser(cli, user.userId);
     if (dmRoom) {
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
index 83be3e5dcfa..7d506ace129 100644
--- a/src/widgets/Jitsi.ts
+++ b/src/widgets/Jitsi.ts
@@ -70,7 +70,7 @@ export class Jitsi {
 
     private update = async (discoveryResponse: IClientWellKnown): Promise<any> => {
         // Start with a default of the config's domain
-        let domain = SdkConfig.get().jitsi?.preferredDomain || "meet.element.io";
+        let domain = SdkConfig.getObject("jitsi")?.get("preferred_domain") || "meet.element.io";
 
         logger.log("Attempting to get Jitsi conference information from homeserver");
         const wkPreferredDomain = discoveryResponse?.[JITSI_WK_PROPERTY]?.['preferredDomain'];
diff --git a/test/CallHandler-test.ts b/test/CallHandler-test.ts
index e0696fa287a..01c1085032e 100644
--- a/test/CallHandler-test.ts
+++ b/test/CallHandler-test.ts
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import './skinned-sdk';
-
 import { IProtocol } from 'matrix-js-sdk/src/matrix';
 import { CallEvent, CallState, CallType } from 'matrix-js-sdk/src/webrtc/call';
 import EventEmitter from 'events';
@@ -53,7 +51,7 @@ const VIRTUAL_ROOM_BOB = "$virtual_bob_room:example.org";
 const BOB_PHONE_NUMBER = "01818118181";
 
 function mkStubDM(roomId, userId) {
-    const room = mkStubRoom(roomId);
+    const room = mkStubRoom(roomId, 'room', MatrixClientPeg.get());
     room.getJoinedMembers = jest.fn().mockReturnValue([
         {
             userId: '@me:example.org',
@@ -312,9 +310,9 @@ describe('CallHandler', () => {
         fakeCall.emit(CallEvent.AssertedIdentityChanged);
 
         // Now set the config option
-        SdkConfig.put({
+        SdkConfig.add({
             voip: {
-                obeyAssertedIdentity: true,
+                obey_asserted_identity: true,
             },
         });
 
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index 430cb80e505..b0494f97aa6 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
 
-import './skinned-sdk'; // Must be first for skinning to work
 import { DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
 
 class MockDecryptionError extends Error {
diff --git a/test/DeviceListener-test.ts b/test/DeviceListener-test.ts
index 957e622b354..06405674416 100644
--- a/test/DeviceListener-test.ts
+++ b/test/DeviceListener-test.ts
@@ -19,7 +19,6 @@ import { EventEmitter } from "events";
 import { mocked } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
 
-import './skinned-sdk';
 import DeviceListener from "../src/DeviceListener";
 import { MatrixClientPeg } from "../src/MatrixClientPeg";
 import * as SetupEncryptionToast from "../src/toasts/SetupEncryptionToast";
diff --git a/test/Image-test.ts b/test/Image-test.ts
new file mode 100644
index 00000000000..6352cf8a183
--- /dev/null
+++ b/test/Image-test.ts
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import fs from "fs";
+import path from "path";
+
+import { blobIsAnimated, mayBeAnimated } from "../src/utils/Image";
+
+describe("Image", () => {
+    describe("mayBeAnimated", () => {
+        it("image/gif", async () => {
+            expect(mayBeAnimated("image/gif")).toBeTruthy();
+        });
+        it("image/webp", async () => {
+            expect(mayBeAnimated("image/webp")).toBeTruthy();
+        });
+        it("image/png", async () => {
+            expect(mayBeAnimated("image/png")).toBeTruthy();
+        });
+        it("image/apng", async () => {
+            expect(mayBeAnimated("image/apng")).toBeTruthy();
+        });
+        it("image/jpeg", async () => {
+            expect(mayBeAnimated("image/jpeg")).toBeFalsy();
+        });
+    });
+
+    describe("blobIsAnimated", () => {
+        it("Animated GIF", async () => {
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.gif"))]);
+            expect(await blobIsAnimated("image/gif", img)).toBeTruthy();
+        });
+
+        it("Static GIF", async () => {
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.gif"))]);
+            expect(await blobIsAnimated("image/gif", img)).toBeFalsy();
+        });
+
+        it("Animated WEBP", async () => {
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.webp"))]);
+            expect(await blobIsAnimated("image/webp", img)).toBeTruthy();
+        });
+
+        it("Static WEBP", async () => {
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.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();
+            expect(await blobIsAnimated("image/apng", img)).toBeTruthy();
+        });
+
+        it("Static PNG", async () => {
+            const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "static-logo.png"))]);
+            expect(await blobIsAnimated("image/png", img)).toBeFalsy();
+            expect(await blobIsAnimated("image/apng", img)).toBeFalsy();
+        });
+    });
+});
diff --git a/test/Markdown-test.ts b/test/Markdown-test.ts
index d5f38dbb9f9..c1b4b31a298 100644
--- a/test/Markdown-test.ts
+++ b/test/Markdown-test.ts
@@ -157,5 +157,12 @@ describe("Markdown parser test", () => {
             const md = new Markdown(testString);
             expect(md.toHTML()).toEqual(expectedResult);
         });
+
+        it('resumes applying formatting to the rest of a message after a link', () => {
+            const testString = 'http://google.com/_thing_ *does* __not__ exist';
+            const expectedResult = 'http://google.com/_thing_ <em>does</em> <strong>not</strong> exist';
+            const md = new Markdown(testString);
+            expect(md.toHTML()).toEqual(expectedResult);
+        });
     });
 });
diff --git a/test/MatrixClientPeg-test.ts b/test/MatrixClientPeg-test.ts
new file mode 100644
index 00000000000..13a298d5a56
--- /dev/null
+++ b/test/MatrixClientPeg-test.ts
@@ -0,0 +1,60 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { advanceDateAndTime, stubClient } from "./test-utils";
+import { MatrixClientPeg as peg } from "../src/MatrixClientPeg";
+
+jest.useFakeTimers();
+
+describe("MatrixClientPeg", () => {
+    afterEach(() => {
+        localStorage.clear();
+        jest.restoreAllMocks();
+    });
+
+    it("setJustRegisteredUserId", () => {
+        stubClient();
+        (peg as any).matrixClient = peg.get();
+        peg.setJustRegisteredUserId("@userId:matrix.rog");
+        expect(peg.get().credentials.userId).toBe("@userId:matrix.rog");
+        expect(peg.currentUserIsJustRegistered()).toBe(true);
+        expect(peg.userRegisteredWithinLastHours(0)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(1)).toBe(true);
+        expect(peg.userRegisteredWithinLastHours(24)).toBe(true);
+        advanceDateAndTime(1 * 60 * 60 * 1000 + 1);
+        expect(peg.userRegisteredWithinLastHours(0)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(1)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(24)).toBe(true);
+        advanceDateAndTime(24 * 60 * 60 * 1000);
+        expect(peg.userRegisteredWithinLastHours(0)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(1)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(24)).toBe(false);
+    });
+
+    it("setJustRegisteredUserId(null)", () => {
+        stubClient();
+        (peg as any).matrixClient = peg.get();
+        peg.setJustRegisteredUserId(null);
+        expect(peg.currentUserIsJustRegistered()).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(0)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(1)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(24)).toBe(false);
+        advanceDateAndTime(1 * 60 * 60 * 1000 + 1);
+        expect(peg.userRegisteredWithinLastHours(0)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(1)).toBe(false);
+        expect(peg.userRegisteredWithinLastHours(24)).toBe(false);
+    });
+});
diff --git a/test/PosthogAnalytics-test.ts b/test/PosthogAnalytics-test.ts
index 4f87957a450..2b0e650b716 100644
--- a/test/PosthogAnalytics-test.ts
+++ b/test/PosthogAnalytics-test.ts
@@ -14,37 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { mocked } from 'jest-mock';
+import { PostHog } from 'posthog-js';
+
 import {
     Anonymity,
+
     getRedactedCurrentLocation,
-    IEvent,
+    IPosthogEvent,
     PosthogAnalytics,
 } from '../src/PosthogAnalytics';
 import SdkConfig from '../src/SdkConfig';
+import { getMockClientWithEventEmitter } from './test-utils';
 
-class FakePosthog {
-    public capture;
-    public init;
-    public identify;
-    public reset;
-    public register;
-
-    constructor() {
-        this.capture = jest.fn();
-        this.init = jest.fn();
-        this.identify = jest.fn();
-        this.reset = jest.fn();
-        this.register = jest.fn();
-    }
-}
+const getFakePosthog = (): PostHog => ({
+    capture: jest.fn(),
+    init: jest.fn(),
+    identify: jest.fn(),
+    reset: jest.fn(),
+    register: jest.fn(),
+} as unknown as PostHog);
 
-export interface ITestEvent extends IEvent {
+export interface ITestEvent extends IPosthogEvent {
     eventName: "JestTestEvents";
     foo: string;
 }
 
 describe("PosthogAnalytics", () => {
-    let fakePosthog: FakePosthog;
+    let fakePosthog: PostHog;
     const shaHashes = {
         "42": "73475cb40a568e8da8a045ced110137e159f890ac4da883b6b17dc651b3a8049",
         "some": "a6b46dd0d1ae5e86cbc8f37e75ceeb6760230c1ca4ffbcb0c97b96dd7d9c464b",
@@ -53,7 +50,7 @@ describe("PosthogAnalytics", () => {
     };
 
     beforeEach(() => {
-        fakePosthog = new FakePosthog();
+        fakePosthog = getFakePosthog();
 
         window.crypto = {
             subtle: {
@@ -62,30 +59,33 @@ describe("PosthogAnalytics", () => {
                     const hexHash = shaHashes[message];
                     const bytes = [];
                     for (let c = 0; c < hexHash.length; c += 2) {
-                        bytes.push(parseInt(hexHash.substr(c, 2), 16));
+                        bytes.push(parseInt(hexHash.slice(c, c + 2), 16));
                     }
-                    return bytes;
+                    return bytes as unknown as ArrayBuffer;
                 },
-            },
-        };
+            } as unknown as SubtleCrypto,
+        } as unknown as Crypto;
     });
 
     afterEach(() => {
         window.crypto = null;
+        SdkConfig.unset(); // we touch the config, so clean up
     });
 
     describe("Initialisation", () => {
         it("Should not be enabled without config being set", () => {
-            jest.spyOn(SdkConfig, "get").mockReturnValue({});
+            // force empty/invalid state for posthog options
+            SdkConfig.put({ brand: "Testing" });
             const analytics = new PosthogAnalytics(fakePosthog);
             expect(analytics.isEnabled()).toBe(false);
         });
 
         it("Should be enabled if config is set", () => {
-            jest.spyOn(SdkConfig, "get").mockReturnValue({
+            SdkConfig.put({
+                brand: "Testing",
                 posthog: {
-                    projectApiKey: "foo",
-                    apiHost: "bar",
+                    project_api_key: "foo",
+                    api_host: "bar",
                 },
             });
             const analytics = new PosthogAnalytics(fakePosthog);
@@ -98,10 +98,11 @@ describe("PosthogAnalytics", () => {
         let analytics: PosthogAnalytics;
 
         beforeEach(() => {
-            jest.spyOn(SdkConfig, "get").mockReturnValue({
+            SdkConfig.put({
+                brand: "Testing",
                 posthog: {
-                    projectApiKey: "foo",
-                    apiHost: "bar",
+                    project_api_key: "foo",
+                    api_host: "bar",
                 },
             });
 
@@ -114,8 +115,8 @@ describe("PosthogAnalytics", () => {
                 eventName: "JestTestEvents",
                 foo: "bar",
             });
-            expect(fakePosthog.capture.mock.calls[0][0]).toBe("JestTestEvents");
-            expect(fakePosthog.capture.mock.calls[0][1]["foo"]).toEqual("bar");
+            expect(mocked(fakePosthog).capture.mock.calls[0][0]).toBe("JestTestEvents");
+            expect(mocked(fakePosthog).capture.mock.calls[0][1]["foo"]).toEqual("bar");
         });
 
         it("Should not track events if anonymous", async () => {
@@ -124,7 +125,7 @@ describe("PosthogAnalytics", () => {
                 eventName: "JestTestEvents",
                 foo: "bar",
             });
-            expect(fakePosthog.capture.mock.calls.length).toBe(0);
+            expect(fakePosthog.capture).not.toHaveBeenCalled();
         });
 
         it("Should not track any events if disabled", async () => {
@@ -133,7 +134,7 @@ describe("PosthogAnalytics", () => {
                 eventName: "JestTestEvents",
                 foo: "bar",
             });
-            expect(fakePosthog.capture.mock.calls.length).toBe(0);
+            expect(fakePosthog.capture).not.toHaveBeenCalled();
         });
 
         it("Should anonymise location of a known screen", async () => {
@@ -153,28 +154,30 @@ describe("PosthogAnalytics", () => {
 
         it("Should identify the user to posthog if pseudonymous", async () => {
             analytics.setAnonymity(Anonymity.Pseudonymous);
-            class FakeClient {
-                getAccountDataFromServer = jest.fn().mockResolvedValue(null);
-                setAccountData = jest.fn().mockResolvedValue({});
-            }
-            await analytics.identifyUser(new FakeClient(), () => "analytics_id");
-            expect(fakePosthog.identify.mock.calls[0][0]).toBe("analytics_id");
+            const client = getMockClientWithEventEmitter({
+                getAccountDataFromServer: jest.fn().mockResolvedValue(null),
+                setAccountData: jest.fn().mockResolvedValue({}),
+            });
+            await analytics.identifyUser(client, () => "analytics_id");
+            expect(mocked(fakePosthog).identify.mock.calls[0][0]).toBe("analytics_id");
         });
 
         it("Should not identify the user to posthog if anonymous", async () => {
             analytics.setAnonymity(Anonymity.Anonymous);
-            await analytics.identifyUser(null);
-            expect(fakePosthog.identify.mock.calls.length).toBe(0);
+            const client = getMockClientWithEventEmitter({});
+            await analytics.identifyUser(client, () => "analytics_id");
+            expect(mocked(fakePosthog).identify.mock.calls.length).toBe(0);
         });
 
         it("Should identify using the server's analytics id if present", async () => {
             analytics.setAnonymity(Anonymity.Pseudonymous);
-            class FakeClient {
-                getAccountDataFromServer = jest.fn().mockResolvedValue({ id: "existing_analytics_id" });
-                setAccountData = jest.fn().mockResolvedValue({});
-            }
-            await analytics.identifyUser(new FakeClient(), () => "new_analytics_id");
-            expect(fakePosthog.identify.mock.calls[0][0]).toBe("existing_analytics_id");
+
+            const client = getMockClientWithEventEmitter({
+                getAccountDataFromServer: jest.fn().mockResolvedValue({ id: "existing_analytics_id" }),
+                setAccountData: jest.fn().mockResolvedValue({}),
+            });
+            await analytics.identifyUser(client, () => "new_analytics_id");
+            expect(mocked(fakePosthog).identify.mock.calls[0][0]).toBe("existing_analytics_id");
         });
     });
 });
diff --git a/test/Reply-test.ts b/test/Reply-test.ts
new file mode 100644
index 00000000000..a485ee5ab05
--- /dev/null
+++ b/test/Reply-test.ts
@@ -0,0 +1,147 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+    getNestedReplyText,
+    getParentEventId,
+    shouldDisplayReply,
+    stripHTMLReply,
+    stripPlainReply,
+} from "../src/utils/Reply";
+import { mkEvent } from "./test-utils";
+import { RoomPermalinkCreator } from "../src/utils/permalinks/Permalinks";
+
+// don't litter test console with logs
+jest.mock("matrix-js-sdk/src/logger");
+
+describe("Reply", () => {
+    describe("getParentEventId", () => {
+        it("returns undefined if given a falsey value", async () => {
+            expect(getParentEventId()).toBeUndefined();
+        });
+        it("returns undefined if given a redacted event", async () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {},
+            });
+            event.makeRedacted(event);
+
+            expect(getParentEventId(event)).toBeUndefined();
+        });
+        it("returns undefined if the given event is not a reply", async () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {},
+            });
+
+            expect(getParentEventId(event)).toBeUndefined();
+        });
+        it("returns id of the event being replied to", async () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {
+                    "m.relates_to": {
+                        "m.in_reply_to": {
+                            "event_id": "$event1",
+                        },
+                    },
+                },
+            });
+
+            expect(getParentEventId(event)).toBe("$event1");
+        });
+    });
+
+    describe("stripPlainReply", () => {
+        it("Removes leading quotes until the first blank line", () => {
+            expect(stripPlainReply(`
+> This is part
+> of the quote
+
+But this is not
+            `.trim())).toBe("But this is not");
+        });
+    });
+
+    describe("stripHTMLReply", () => {
+        it("Removes <mx-reply> from the input", () => {
+            expect(stripHTMLReply(`
+                <mx-reply>
+                    This is part
+                    of the quote
+                </mx-reply>
+                But this is not
+            `).trim()).toBe("But this is not");
+        });
+    });
+
+    describe("getNestedReplyText", () => {
+        it("Returns valid reply fallback text for m.text msgtypes", () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {
+                    body: "body",
+                    msgtype: "m.text",
+                },
+            });
+
+            expect(getNestedReplyText(event, {
+                forEvent(eventId: string): string {
+                    return "$$permalink$$";
+                },
+            } as RoomPermalinkCreator)).toMatchSnapshot();
+        });
+    });
+
+    describe("shouldDisplayReply", () => {
+        it("Returns false for redacted events", () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {},
+            });
+            event.makeRedacted(event);
+
+            expect(shouldDisplayReply(event)).toBe(false);
+        });
+
+        it("Returns false for non-reply events", () => {
+            const event = mkEvent({
+                event: true,
+                type: "m.room.message",
+                user: "@user1:server",
+                room: "!room1:server",
+                content: {},
+            });
+
+            expect(shouldDisplayReply(event)).toBe(false);
+        });
+    });
+});
diff --git a/test/RoomNotifs-test.ts b/test/RoomNotifs-test.ts
index 95a8a18bdc7..703f681e329 100644
--- a/test/RoomNotifs-test.ts
+++ b/test/RoomNotifs-test.ts
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { mocked } from 'jest-mock';
 import { ConditionKind, PushRuleActionName, TweakName } from "matrix-js-sdk/src/@types/PushRules";
 
 import { stubClient } from "./test-utils";
@@ -26,7 +27,7 @@ describe("RoomNotifs test", () => {
     });
 
     it("getRoomNotifsState handles rules with no conditions", () => {
-        MatrixClientPeg.get().pushRules = {
+        mocked(MatrixClientPeg.get()).pushRules = {
             global: {
                 override: [{
                     rule_id: "!roomId:server",
@@ -40,7 +41,7 @@ describe("RoomNotifs test", () => {
     });
 
     it("getRoomNotifsState handles guest users", () => {
-        MatrixClientPeg.get().isGuest.mockReturnValue(true);
+        mocked(MatrixClientPeg.get()).isGuest.mockReturnValue(true);
         expect(getRoomNotifsState("!roomId:server")).toBe(RoomNotifState.AllMessages);
     });
 
diff --git a/test/TextForEvent-test.ts b/test/TextForEvent-test.ts
index 749dc8d1137..f9e4eba3240 100644
--- a/test/TextForEvent-test.ts
+++ b/test/TextForEvent-test.ts
@@ -1,7 +1,6 @@
-import './skinned-sdk';
-
 import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import TestRenderer from 'react-test-renderer';
+import { ReactElement } from "react";
 
 import { getSenderName, textForEvent } from "../src/TextForEvent";
 import SettingsStore from "../src/settings/SettingsStore";
@@ -82,7 +81,7 @@ describe('TextForEvent', () => {
         it("mentions message when a single message was pinned, with no previously pinned messages", () => {
             const event = mockPinnedEvent(['message-1']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
             expect(plainText).toBe(expectedText);
@@ -92,7 +91,7 @@ describe('TextForEvent', () => {
         it("mentions message when a single message was pinned, with multiple previously pinned messages", () => {
             const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1', 'message-2']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com pinned a message to this room. See all pinned messages.";
             expect(plainText).toBe(expectedText);
@@ -102,7 +101,7 @@ describe('TextForEvent', () => {
         it("mentions message when a single message was unpinned, with a single message previously pinned", () => {
             const event = mockPinnedEvent([], ['message-1']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
             expect(plainText).toBe(expectedText);
@@ -112,7 +111,7 @@ describe('TextForEvent', () => {
         it("mentions message when a single message was unpinned, with multiple previously pinned messages", () => {
             const event = mockPinnedEvent(['message-2'], ['message-1', 'message-2']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com unpinned a message from this room. See all pinned messages.";
             expect(plainText).toBe(expectedText);
@@ -122,7 +121,7 @@ describe('TextForEvent', () => {
         it("shows generic text when multiple messages were pinned", () => {
             const event = mockPinnedEvent(['message-1', 'message-2', 'message-3'], ['message-1']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com changed the pinned messages for the room.";
             expect(plainText).toBe(expectedText);
@@ -132,7 +131,7 @@ describe('TextForEvent', () => {
         it("shows generic text when multiple messages were unpinned", () => {
             const event = mockPinnedEvent(['message-3'], ['message-1', 'message-2', 'message-3']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com changed the pinned messages for the room.";
             expect(plainText).toBe(expectedText);
@@ -142,7 +141,7 @@ describe('TextForEvent', () => {
         it("shows generic text when one message was pinned, and another unpinned", () => {
             const event = mockPinnedEvent(['message-2'], ['message-1']);
             const plainText = textForEvent(event);
-            const component = TestRenderer.create(textForEvent(event, true));
+            const component = TestRenderer.create(textForEvent(event, true) as ReactElement);
 
             const expectedText = "@foo:example.com changed the pinned messages for the room.";
             expect(plainText).toBe(expectedText);
@@ -380,4 +379,64 @@ describe('TextForEvent', () => {
             expect(textForEvent(event)).toEqual(result);
         });
     });
+
+    describe("textForPollStartEvent()", () => {
+        let pollEvent;
+
+        beforeEach(() => {
+            pollEvent = new MatrixEvent({
+                type: 'org.matrix.msc3381.poll.start',
+                sender: '@a',
+                content: {
+                    'org.matrix.msc3381.poll.start': {
+                        answers: [
+                            { 'org.matrix.msc1767.text': 'option1' },
+                            { 'org.matrix.msc1767.text': 'option2' },
+                        ],
+                        question: {
+                            'body': 'Test poll name',
+                            'msgtype': 'm.text',
+                            'org.matrix.msc1767.text': 'Test poll name',
+                        },
+                    },
+                },
+            });
+        });
+
+        it("returns correct message for redacted poll start", () => {
+            pollEvent.makeRedacted(pollEvent);
+
+            expect(textForEvent(pollEvent)).toEqual('@a: Message deleted');
+        });
+
+        it("returns correct message for normal poll start", () => {
+            expect(textForEvent(pollEvent)).toEqual('@a has started a poll - ');
+        });
+    });
+
+    describe("textForMessageEvent()", () => {
+        let messageEvent;
+
+        beforeEach(() => {
+            messageEvent = new MatrixEvent({
+                type: 'm.room.message',
+                sender: '@a',
+                content: {
+                    'body': 'test message',
+                    'msgtype': 'm.text',
+                    'org.matrix.msc1767.text': 'test message',
+                },
+            });
+        });
+
+        it("returns correct message for redacted message", () => {
+            messageEvent.makeRedacted(messageEvent);
+
+            expect(textForEvent(messageEvent)).toEqual('@a: Message deleted');
+        });
+
+        it("returns correct message for normal message", () => {
+            expect(textForEvent(messageEvent)).toEqual('@a: test message');
+        });
+    });
 });
diff --git a/test/UserActivity-test.js b/test/UserActivity-test.ts
similarity index 100%
rename from test/UserActivity-test.js
rename to test/UserActivity-test.ts
diff --git a/test/__snapshots__/Reply-test.ts.snap b/test/__snapshots__/Reply-test.ts.snap
new file mode 100644
index 00000000000..df1a11eeb5b
--- /dev/null
+++ b/test/__snapshots__/Reply-test.ts.snap
@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Reply getNestedReplyText Returns valid reply fallback text for m.text msgtypes 1`] = `
+Object {
+  "body": "> <@user1:server> body
+
+",
+  "html": "<mx-reply><blockquote><a href=\\"$$permalink$$\\">In reply to</a> <a href=\\"https://matrix.to/#/@user1:server\\">@user1:server</a><br>body</blockquote></mx-reply>",
+}
+`;
diff --git a/test/accessibility/KeyboardShortcuts-test.ts b/test/accessibility/KeyboardShortcutUtils-test.ts
similarity index 78%
rename from test/accessibility/KeyboardShortcuts-test.ts
rename to test/accessibility/KeyboardShortcutUtils-test.ts
index b4da655f6fc..39f5bc3910c 100644
--- a/test/accessibility/KeyboardShortcuts-test.ts
+++ b/test/accessibility/KeyboardShortcutUtils-test.ts
@@ -15,14 +15,17 @@ limitations under the License.
 */
 
 import {
-    getKeyboardShortcutsForUI,
-    getKeyboardShortcuts,
     KEYBOARD_SHORTCUTS,
     mock,
 } from "../../src/accessibility/KeyboardShortcuts";
-import PlatformPeg from "../../src/PlatformPeg";
+import { getKeyboardShortcuts, getKeyboardShortcutsForUI } from "../../src/accessibility/KeyboardShortcutUtils";
+import { mockPlatformPeg, unmockPlatformPeg } from "../test-utils";
+
+describe("KeyboardShortcutUtils", () => {
+    afterEach(() => {
+        unmockPlatformPeg();
+    });
 
-describe("KeyboardShortcuts", () => {
     it("doesn't change KEYBOARD_SHORTCUTS when getting shortcuts", async () => {
         mock({
             keyboardShortcuts: {
@@ -32,7 +35,7 @@ describe("KeyboardShortcuts", () => {
             macOnlyShortcuts: ["Keybind1"],
             desktopShortcuts: ["Keybind2"],
         });
-        PlatformPeg.get = () => ({ overrideBrowserShortcuts: () => false });
+        mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
         const copyKeyboardShortcuts = Object.assign({}, KEYBOARD_SHORTCUTS);
 
         getKeyboardShortcuts();
@@ -53,7 +56,7 @@ describe("KeyboardShortcuts", () => {
             desktopShortcuts: ["Keybind2"],
 
         });
-        PlatformPeg.get = () => ({ overrideBrowserShortcuts: () => false });
+        mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
         expect(getKeyboardShortcuts()).toEqual({ "Keybind4": {} });
 
         mock({
@@ -64,8 +67,7 @@ describe("KeyboardShortcuts", () => {
             macOnlyShortcuts: undefined,
             desktopShortcuts: ["Keybind2"],
         });
-        PlatformPeg.get = () => ({ overrideBrowserShortcuts: () => true });
+        mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(true) });
         expect(getKeyboardShortcuts()).toEqual({ "Keybind1": {}, "Keybind2": {} });
-        jest.resetModules();
     });
 });
diff --git a/test/accessibility/RovingTabIndex-test.tsx b/test/accessibility/RovingTabIndex-test.tsx
index b819de7222b..fc1c48f0416 100644
--- a/test/accessibility/RovingTabIndex-test.tsx
+++ b/test/accessibility/RovingTabIndex-test.tsx
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../skinned-sdk'; // Must be first for skinning to work
 import * as React from "react";
 import { mount, ReactWrapper } from "enzyme";
 
@@ -108,7 +107,10 @@ describe("RovingTabIndex", () => {
                 { button2 }
                 <RovingTabIndexWrapper>
                     { ({ onFocus, isActive, ref }) =>
-                        <button onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref}>.</button>
+                        <button
+                            onFocus={onFocus}
+                            tabIndex={isActive ? 0 : -1}
+                            ref={ref as React.RefObject<HTMLButtonElement>}>.</button>
                     }
                 </RovingTabIndexWrapper>
             </React.Fragment> }
diff --git a/test/audio/Playback-test.ts b/test/audio/Playback-test.ts
index 7d9a7633b2b..a1637d75bee 100644
--- a/test/audio/Playback-test.ts
+++ b/test/audio/Playback-test.ts
@@ -17,8 +17,6 @@ limitations under the License.
 import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';
 
-import '../skinned-sdk'; // Must be first for skinning to work
-
 import { createAudioContext, decodeOgg } from '../../src/audio/compat';
 import { Playback, PlaybackState } from "../../src/audio/Playback";
 
diff --git a/test/autocomplete/EmojiProvider-test.ts b/test/autocomplete/EmojiProvider-test.ts
new file mode 100644
index 00000000000..a64312fa297
--- /dev/null
+++ b/test/autocomplete/EmojiProvider-test.ts
@@ -0,0 +1,67 @@
+/*
+Copyright 2022 Ryan Browne <code@commonlawfeature.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EmojiProvider from '../../src/autocomplete/EmojiProvider';
+import { mkStubRoom } from '../test-utils/test-utils';
+
+const EMOJI_SHORTCODES = [
+    ":+1",
+    ":heart",
+    ":grinning",
+    ":hand",
+    ":man",
+    ":sweat",
+    ":monkey",
+    ":boat",
+    ":mailbox",
+    ":cop",
+    ":bow",
+    ":kiss",
+    ":golf",
+];
+
+// Some emoji shortcodes are too short and do not actually trigger autocompletion until the ending `:`.
+// This means that we cannot compare their autocompletion before and after the ending `:` and have
+// to simply assert that the final completion with the colon is the exact emoji.
+const TOO_SHORT_EMOJI_SHORTCODE = [
+    { emojiShortcode: ":o", expectedEmoji: "⭕️" },
+];
+
+describe('EmojiProvider', function() {
+    const testRoom = mkStubRoom(undefined, undefined, undefined);
+
+    it.each(EMOJI_SHORTCODES)('Returns consistent results after final colon %s', async function(emojiShortcode) {
+        const ep = new EmojiProvider(testRoom);
+        const range = { "beginning": true, "start": 0, "end": 3 };
+        const completionsBeforeColon = await ep.getCompletions(emojiShortcode, range);
+        const completionsAfterColon = await ep.getCompletions(emojiShortcode + ':', range);
+
+        const firstCompletionWithoutColon = completionsBeforeColon[0].completion;
+        const firstCompletionWithColon = completionsAfterColon[0].completion;
+
+        expect(firstCompletionWithoutColon).toEqual(firstCompletionWithColon);
+    });
+
+    it.each(
+        TOO_SHORT_EMOJI_SHORTCODE,
+    )('Returns correct results after final colon $emojiShortcode', async ({ emojiShortcode, expectedEmoji }) => {
+        const ep = new EmojiProvider(testRoom);
+        const range = { "beginning": true, "start": 0, "end": 3 };
+        const completions = await ep.getCompletions(emojiShortcode + ':', range);
+
+        expect(completions[0].completion).toEqual(expectedEmoji);
+    });
+});
diff --git a/test/autocomplete/QueryMatcher-test.js b/test/autocomplete/QueryMatcher-test.ts
similarity index 100%
rename from test/autocomplete/QueryMatcher-test.js
rename to test/autocomplete/QueryMatcher-test.ts
diff --git a/test/components/structures/CallEventGrouper-test.ts b/test/components/structures/CallEventGrouper-test.ts
index 587a69e16c7..5cd3a273c6c 100644
--- a/test/components/structures/CallEventGrouper-test.ts
+++ b/test/components/structures/CallEventGrouper-test.ts
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../skinned-sdk";
-import { MatrixClient } from 'matrix-js-sdk/src/matrix';
+import { MatrixClient, MatrixEvent } from 'matrix-js-sdk/src/matrix';
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { CallState } from "matrix-js-sdk/src/webrtc/call";
 
@@ -52,7 +51,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouper.state).toBe(CustomCallState.Missed);
     });
@@ -73,7 +72,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: MY_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
         grouperHangup.add({
             getContent: () => {
                 return {
@@ -86,7 +85,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         grouperReject.add({
             getContent: () => {
@@ -100,7 +99,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: MY_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
         grouperReject.add({
             getContent: () => {
                 return {
@@ -113,7 +112,7 @@ describe('CallEventGrouper', () => {
             sender: {
                 userId: THEIR_USER_ID,
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouperHangup.state).toBe(CallState.Ended);
         expect(grouperReject.state).toBe(CallState.Ended);
@@ -134,7 +133,7 @@ describe('CallEventGrouper', () => {
             getType: () => {
                 return EventType.CallInvite;
             },
-        });
+        } as unknown as MatrixEvent);
 
         expect(grouper.isVoice).toBe(false);
     });
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
deleted file mode 100644
index 1b7c9185b52..00000000000
--- a/test/components/structures/GroupView-test.js
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import ReactTestUtils from 'react-dom/test-utils';
-import MockHttpBackend from 'matrix-mock-request';
-import * as Matrix from 'matrix-js-sdk/src/matrix';
-
-import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
-import sdk from '../../skinned-sdk';
-import * as TestUtils from '../../test-utils';
-
-const { waitForUpdate } = TestUtils;
-
-const GroupView = sdk.getComponent('structures.GroupView');
-const WrappedGroupView = TestUtils.wrapInMatrixClientContext(GroupView);
-
-const Spinner = sdk.getComponent('elements.Spinner');
-
-describe('GroupView', function() {
-    let root;
-    let rootElement;
-    let httpBackend;
-    let summaryResponse;
-    let summaryResponseWithComplicatedLongDesc;
-    let summaryResponseWithNoLongDesc;
-    let summaryResponseWithBadImg;
-    let groupId;
-    let groupIdEncoded;
-
-    // Summary response fields
-    const user = {
-        is_privileged: true, // can edit the group
-        is_public: true, // appear as a member to non-members
-        is_publicised: true, // display flair
-    };
-    const usersSection = {
-        roles: {},
-        total_user_count_estimate: 0,
-        users: [],
-    };
-    const roomsSection = {
-        categories: {},
-        rooms: [],
-        total_room_count_estimate: 0,
-    };
-
-    beforeEach(function() {
-        httpBackend = new MockHttpBackend();
-
-        Matrix.request(httpBackend.requestFn);
-
-        MatrixClientPeg.get = () => Matrix.createClient({
-            baseUrl: 'https://my.home.server',
-            userId: '@me:here',
-            accessToken: '123456789',
-        });
-
-        summaryResponse = {
-            profile: {
-                avatar_url: "mxc://someavatarurl",
-                is_openly_joinable: true,
-                is_public: true,
-                long_description: "This is a <b>LONG</b> description.",
-                name: "The name of a community",
-                short_description: "This is a community",
-            },
-            user,
-            users_section: usersSection,
-            rooms_section: roomsSection,
-        };
-        summaryResponseWithNoLongDesc = {
-            profile: {
-                avatar_url: "mxc://someavatarurl",
-                is_openly_joinable: true,
-                is_public: true,
-                long_description: null,
-                name: "The name of a community",
-                short_description: "This is a community",
-            },
-            user,
-            users_section: usersSection,
-            rooms_section: roomsSection,
-        };
-        summaryResponseWithComplicatedLongDesc = {
-            profile: {
-                avatar_url: "mxc://someavatarurl",
-                is_openly_joinable: true,
-                is_public: true,
-                long_description: `
-<h1>This is a more complicated group page</h1>
-<p>With paragraphs</p>
-<ul>
-    <li>And lists!</li>
-    <li>With list items.</li>
-</ul>
-<p>And also images: <img src="mxc://someimageurl"/></p>`,
-                name: "The name of a community",
-                short_description: "This is a community",
-            },
-            user,
-            users_section: usersSection,
-            rooms_section: roomsSection,
-        };
-
-        summaryResponseWithBadImg = {
-            profile: {
-                avatar_url: "mxc://someavatarurl",
-                is_openly_joinable: true,
-                is_public: true,
-                long_description: '<p>Evil image: <img src="http://evilimageurl"/></p>',
-                name: "The name of a community",
-                short_description: "This is a community",
-            },
-            user,
-            users_section: usersSection,
-            rooms_section: roomsSection,
-        };
-
-        groupId = "+" + Math.random().toString(16).slice(2) + ':domain';
-        groupIdEncoded = encodeURIComponent(groupId);
-
-        rootElement = document.createElement('div');
-        root = ReactDOM.render(<WrappedGroupView groupId={groupId} />, rootElement);
-    });
-
-    afterEach(function() {
-        ReactDOM.unmountComponentAtNode(rootElement);
-    });
-
-    it('should show a spinner when first displayed', function() {
-        ReactTestUtils.findRenderedComponentWithType(root, Spinner);
-
-        // If we don't respond here, the rate limiting done to ensure a maximum of
-        // 3 concurrent network requests for GroupStore will block subsequent requests
-        // in other tests.
-        //
-        // This is a good case for doing the rate limiting somewhere other than the module
-        // scope of GroupStore.js
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        return httpBackend.flush(undefined, undefined, 0);
-    });
-
-    it('should indicate failure after failed /summary', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_error');
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(500, {});
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a group avatar, name, id and short description after successful /summary', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView');
-
-            const avatar = ReactTestUtils.findRenderedComponentWithType(root, sdk.getComponent('avatars.GroupAvatar'));
-            const img = ReactTestUtils.findRenderedDOMComponentWithTag(avatar, 'img');
-            const avatarImgElement = ReactDOM.findDOMNode(img);
-            expect(avatarImgElement).toBeTruthy();
-            expect(avatarImgElement.src).toContain(
-                'https://my.home.server/_matrix/media/r0/thumbnail/' +
-                'someavatarurl?width=28&height=28&method=crop',
-            );
-
-            const name = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_name');
-            const nameElement = ReactDOM.findDOMNode(name);
-            expect(nameElement).toBeTruthy();
-            expect(nameElement.textContent).toContain('The name of a community');
-            expect(nameElement.textContent).toContain(groupId);
-
-            const shortDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_shortDesc');
-            const shortDescElement = ReactDOM.findDOMNode(shortDesc);
-            expect(shortDescElement).toBeTruthy();
-            expect(shortDescElement.textContent).toBe('This is a community');
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a simple long description after successful /summary', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView');
-
-            const longDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_groupDesc');
-            const longDescElement = ReactDOM.findDOMNode(longDesc);
-            expect(longDescElement).toBeTruthy();
-            expect(longDescElement.textContent).toBe('This is a LONG description.');
-            expect(longDescElement.innerHTML).toBe('<div dir="auto">This is a <b>LONG</b> description.</div>');
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a placeholder if a long description is not set', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            const placeholder = ReactTestUtils
-                .findRenderedDOMComponentWithClass(root, 'mx_GroupView_groupDesc_placeholder');
-            const placeholderElement = ReactDOM.findDOMNode(placeholder);
-            expect(placeholderElement).toBeTruthy();
-        });
-
-        httpBackend
-            .when('GET', '/groups/' + groupIdEncoded + '/summary')
-            .respond(200, summaryResponseWithNoLongDesc);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a complicated long description after successful /summary', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            const longDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_groupDesc');
-            const longDescElement = ReactDOM.findDOMNode(longDesc);
-            expect(longDescElement).toBeTruthy();
-
-            expect(longDescElement.innerHTML).toContain('<h1>This is a more complicated group page</h1>');
-            expect(longDescElement.innerHTML).toContain('<p>With paragraphs</p>');
-            expect(longDescElement.innerHTML).toContain('<ul>');
-            expect(longDescElement.innerHTML).toContain('<li>And lists!</li>');
-
-            const imgSrc = "https://my.home.server/_matrix/media/r0/thumbnail/someimageurl" +
-                "?width=800&amp;height=600&amp;method=scale";
-            expect(longDescElement.innerHTML).toContain('<img src="' + imgSrc + '" ' +
-                'style="max-width:800px;max-height:600px">');
-        });
-
-        httpBackend
-            .when('GET', '/groups/' + groupIdEncoded + '/summary')
-            .respond(200, summaryResponseWithComplicatedLongDesc);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should disallow images with non-mxc URLs', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            const longDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_groupDesc');
-            const longDescElement = ReactDOM.findDOMNode(longDesc);
-            expect(longDescElement).toBeTruthy();
-
-            // If this fails, the URL could be in an img `src`, which is what we care about but
-            // there's no harm in keeping this simple and checking the entire HTML string.
-            expect(longDescElement.innerHTML).not.toContain('evilimageurl');
-        });
-
-        httpBackend
-            .when('GET', '/groups/' + groupIdEncoded + '/summary')
-            .respond(200, summaryResponseWithBadImg);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a RoomDetailList after a successful /summary & /rooms (no rooms returned)', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList');
-            const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList);
-            expect(roomDetailListElement).toBeTruthy();
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a RoomDetailList after a successful /summary & /rooms (with a single room)', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
-            const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList');
-            const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList);
-            expect(roomDetailListElement).toBeTruthy();
-
-            const roomDetailListRoomName = ReactTestUtils.findRenderedDOMComponentWithClass(
-                root,
-                'mx_RoomDirectory_name',
-            );
-            const roomDetailListRoomNameElement = ReactDOM.findDOMNode(roomDetailListRoomName);
-
-            expect(roomDetailListRoomNameElement).toBeTruthy();
-            expect(roomDetailListRoomNameElement.textContent).toEqual('Some room name');
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [{
-            avatar_url: "mxc://someroomavatarurl",
-            canonical_alias: "#somealias:domain",
-            guest_can_join: true,
-            is_public: true,
-            name: "Some room name",
-            num_joined_members: 123,
-            room_id: "!someroomid",
-            topic: "some topic",
-            world_readable: true,
-        }] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it('should show a summary even if /users fails', function() {
-        const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-
-        // Only wait for 3 updates in this test since we don't change state for
-        // the /users error case.
-        const prom = waitForUpdate(groupView, 3).then(() => {
-            const shortDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_shortDesc');
-            const shortDescElement = ReactDOM.findDOMNode(shortDesc);
-            expect(shortDescElement).toBeTruthy();
-            expect(shortDescElement.textContent).toBe('This is a community');
-        });
-
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/users').respond(500, {});
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/invited_users').respond(200, { chunk: [] });
-        httpBackend.when('GET', '/groups/' + groupIdEncoded + '/rooms').respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-});
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 14ff34e3f97..4b2d5499361 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -21,21 +21,19 @@ import { EventEmitter } from "events";
 import * as Matrix from 'matrix-js-sdk/src/matrix';
 import FakeTimers from '@sinonjs/fake-timers';
 import { mount } from "enzyme";
+import * as TestUtils from "react-dom/test-utils";
 
 import { MatrixClientPeg } from '../../../src/MatrixClientPeg';
-import sdk from '../../skinned-sdk';
+import MessagePanel, { shouldFormContinuation } from "../../../src/components/structures/MessagePanel";
 import SettingsStore from "../../../src/settings/SettingsStore";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import RoomContext from "../../../src/contexts/RoomContext";
 import DMRoomMap from "../../../src/utils/DMRoomMap";
-import { upsertRoomStateEvents } from '../../test-utils';
-
-const TestUtils = require('react-dom/test-utils');
-const expect = require('expect');
-
-const MessagePanel = sdk.getComponent('structures.MessagePanel');
-
-const TestUtilsMatrix = require('../../test-utils');
+import { UnwrappedEventTile } from "../../../src/components/views/rooms/EventTile";
+import * as TestUtilsMatrix from "../../test-utils";
+import EventListSummary from "../../../src/components/views/elements/EventListSummary";
+import GenericEventListSummary from "../../../src/components/views/elements/GenericEventListSummary";
+import DateSeparator from "../../../src/components/views/messages/DateSeparator";
 
 let client;
 const room = new Matrix.Room("!roomId:server_name");
@@ -46,6 +44,8 @@ class WrappedMessagePanel extends React.Component {
     callEventGroupers = new Map();
 
     render() {
+        const { showHiddenEvents, ...props } = this.props;
+
         const roomContext = {
             room,
             roomId: room.roomId,
@@ -56,13 +56,14 @@ class WrappedMessagePanel extends React.Component {
             showJoinLeaves: false,
             showAvatarChanges: false,
             showDisplaynameChanges: true,
+            showHiddenEvents,
         };
 
         return <MatrixClientContext.Provider value={client}>
             <RoomContext.Provider value={roomContext}>
                 <MessagePanel
                     room={room}
-                    {...this.props}
+                    {...props}
                     resizeNotifier={this.resizeNotifier}
                     callEventGroupers={this.callEventGroupers}
                 />
@@ -278,6 +279,30 @@ describe('MessagePanel', function() {
             }),
         ];
     }
+
+    function mkMixedHiddenAndShownEvents() {
+        const roomId = "!room:id";
+        const userId = "@alice:example.org";
+        const ts0 = Date.now();
+
+        return [
+            TestUtilsMatrix.mkMessage({
+                event: true,
+                room: roomId,
+                user: userId,
+                ts: ts0,
+            }),
+            TestUtilsMatrix.mkEvent({
+                event: true,
+                type: "org.example.a_hidden_event",
+                room: roomId,
+                user: userId,
+                content: {},
+                ts: ts0 + 1,
+            }),
+        ];
+    }
+
     function isReadMarkerVisible(rmContainer) {
         return rmContainer && rmContainer.children.length > 0;
     }
@@ -288,8 +313,7 @@ describe('MessagePanel', function() {
         );
 
         // just check we have the right number of tiles for now
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'));
+        const tiles = TestUtils.scryRenderedComponentsWithType(res, UnwrappedEventTile);
         expect(tiles.length).toEqual(10);
     });
 
@@ -299,13 +323,11 @@ describe('MessagePanel', function() {
         );
 
         // just check we have the right number of tiles for now
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'),
-        );
+        const tiles = TestUtils.scryRenderedComponentsWithType(res, UnwrappedEventTile);
         expect(tiles.length).toEqual(2);
 
         const summaryTiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('elements.EventListSummary'),
+            res, EventListSummary,
         );
         expect(summaryTiles.length).toEqual(1);
     });
@@ -320,8 +342,7 @@ describe('MessagePanel', function() {
             />,
         );
 
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'));
+        const tiles = TestUtils.scryRenderedComponentsWithType(res, UnwrappedEventTile);
 
         // find the <li> which wraps the read marker
         const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
@@ -390,8 +411,7 @@ describe('MessagePanel', function() {
                 readMarkerVisible={true}
             />, parentDiv);
 
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            mp, sdk.getComponent('rooms.EventTile'));
+        const tiles = TestUtils.scryRenderedComponentsWithType(mp, UnwrappedEventTile);
         const tileContainers = tiles.map(function(t) {
             return ReactDOM.findDOMNode(t);
         });
@@ -437,7 +457,7 @@ describe('MessagePanel', function() {
 
     it('should collapse creation events', function() {
         const events = mkCreationEvents();
-        upsertRoomStateEvents(room, events);
+        TestUtilsMatrix.upsertRoomStateEvents(room, events);
         const res = mount(
             <WrappedMessagePanel className="cls" events={events} />,
         );
@@ -447,15 +467,15 @@ describe('MessagePanel', function() {
         //   should be outside of the room creation summary
         // - all other events should be inside the room creation summary
 
-        const tiles = res.find(sdk.getComponent('views.rooms.EventTile'));
+        const tiles = res.find(UnwrappedEventTile);
 
         expect(tiles.at(0).props().mxEvent.getType()).toEqual("m.room.create");
         expect(tiles.at(1).props().mxEvent.getType()).toEqual("m.room.encryption");
 
-        const summaryTiles = res.find(sdk.getComponent('views.elements.GenericEventListSummary'));
+        const summaryTiles = res.find(GenericEventListSummary);
         const summaryTile = summaryTiles.at(0);
 
-        const summaryEventTiles = summaryTile.find(sdk.getComponent('views.rooms.EventTile'));
+        const summaryEventTiles = summaryTile.find(UnwrappedEventTile);
         // every event except for the room creation, room encryption, and Bob's
         // invite event should be in the event summary
         expect(summaryEventTiles.length).toEqual(tiles.length - 3);
@@ -463,7 +483,7 @@ describe('MessagePanel', function() {
 
     it('should hide read-marker at the end of creation event summary', function() {
         const events = mkCreationEvents();
-        upsertRoomStateEvents(room, events);
+        TestUtilsMatrix.upsertRoomStateEvents(room, events);
         const res = mount(
             <WrappedMessagePanel
                 className="cls"
@@ -492,7 +512,7 @@ describe('MessagePanel', function() {
                 events={events}
             />,
         );
-        const Dates = res.find(sdk.getComponent('messages.DateSeparator'));
+        const Dates = res.find(DateSeparator);
 
         expect(Dates.length).toEqual(1);
     });
@@ -601,4 +621,90 @@ describe('MessagePanel', function() {
         expect(els.first().prop("events").length).toEqual(5);
         expect(els.last().prop("events").length).toEqual(5);
     });
+
+    // We test this because setting lookups can be *slow*, and we don't want
+    // them to happen in this code path
+    it("doesn't lookup showHiddenEventsInTimeline while rendering", () => {
+        // We're only interested in the setting lookups that happen on every render,
+        // rather than those happening on first mount, so let's get those out of the way
+        const res = mount(<WrappedMessagePanel events={[]} />);
+
+        // Set up our spy and re-render with new events
+        const settingsSpy = jest.spyOn(SettingsStore, "getValue").mockClear();
+        res.setProps({ events: mkMixedHiddenAndShownEvents() });
+
+        expect(settingsSpy).not.toHaveBeenCalledWith("showHiddenEventsInTimeline");
+        settingsSpy.mockRestore();
+    });
+
+    it("should group hidden event reactions into an event list summary", () => {
+        const events = [
+            TestUtilsMatrix.mkEvent({
+                event: true,
+                type: "m.reaction",
+                room: "!room:id",
+                user: "@user:id",
+                content: {},
+                ts: 1,
+            }),
+            TestUtilsMatrix.mkEvent({
+                event: true,
+                type: "m.reaction",
+                room: "!room:id",
+                user: "@user:id",
+                content: {},
+                ts: 2,
+            }),
+            TestUtilsMatrix.mkEvent({
+                event: true,
+                type: "m.reaction",
+                room: "!room:id",
+                user: "@user:id",
+                content: {},
+                ts: 3,
+            }),
+        ];
+        const res = mount(<WrappedMessagePanel showHiddenEvents={true} events={events} />);
+
+        const els = res.find("EventListSummary");
+        expect(els.length).toEqual(1);
+        expect(els.prop("events").length).toEqual(3);
+    });
+});
+
+describe("shouldFormContinuation", () => {
+    it("does not form continuations from thread roots", () => {
+        const message1 = TestUtilsMatrix.mkMessage({
+            event: true,
+            room: "!room:id",
+            user: "@user:id",
+            msg: "Here is a message in the main timeline",
+        });
+
+        const message2 = TestUtilsMatrix.mkMessage({
+            event: true,
+            room: "!room:id",
+            user: "@user:id",
+            msg: "And here's another message in the main timeline",
+        });
+
+        const threadRoot = TestUtilsMatrix.mkMessage({
+            event: true,
+            room: "!room:id",
+            user: "@user:id",
+            msg: "Here is a thread",
+        });
+        jest.spyOn(threadRoot, "isThreadRoot", "get").mockReturnValue(true);
+
+        const message3 = TestUtilsMatrix.mkMessage({
+            event: true,
+            room: "!room:id",
+            user: "@user:id",
+            msg: "And here's another message in the main timeline after the thread root",
+        });
+
+        expect(shouldFormContinuation(message1, message2, false, true)).toEqual(true);
+        expect(shouldFormContinuation(message2, threadRoot, false, true)).toEqual(false);
+        expect(shouldFormContinuation(threadRoot, message3, false, true)).toEqual(false);
+    });
 });
diff --git a/test/components/structures/RightPanel-test.tsx b/test/components/structures/RightPanel-test.tsx
index 4ae120978fc..7d68d1753db 100644
--- a/test/components/structures/RightPanel-test.tsx
+++ b/test/components/structures/RightPanel-test.tsx
@@ -19,8 +19,6 @@ import TestRenderer from "react-test-renderer";
 import { jest } from "@jest/globals";
 import { Room } from "matrix-js-sdk/src/models/room";
 
-// We can't use the usual `skinned-sdk`, as it stubs out the RightPanel
-import "../../minimal-sdk";
 import RightPanel from "../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import ResizeNotifier from "../../../src/utils/ResizeNotifier";
diff --git a/test/components/structures/RoomView-test.tsx b/test/components/structures/RoomView-test.tsx
new file mode 100644
index 00000000000..98677891b9f
--- /dev/null
+++ b/test/components/structures/RoomView-test.tsx
@@ -0,0 +1,115 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import TestRenderer from "react-test-renderer";
+import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
+import { stubClient } from "../../test-utils";
+import { Action } from "../../../src/dispatcher/actions";
+import dis from "../../../src/dispatcher/dispatcher";
+import { ViewRoomPayload } from "../../../src/dispatcher/payloads/ViewRoomPayload";
+import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
+import { RoomView } from "../../../src/components/structures/RoomView";
+import ResizeNotifier from "../../../src/utils/ResizeNotifier";
+import { RoomViewStore } from "../../../src/stores/RoomViewStore";
+import DMRoomMap from "../../../src/utils/DMRoomMap";
+
+describe("RoomView", () => {
+    it("updates url preview visibility on encryption state change", async () => {
+        stubClient();
+        const cli = MatrixClientPeg.get();
+        cli.hasLazyLoadMembersEnabled = () => false;
+        cli.isInitialSyncComplete = () => true;
+        cli.stopPeeking = () => undefined;
+
+        const r1 = new Room("r1", cli, "@name:example.com");
+        cli.getRoom = () => r1;
+        r1.getPendingEvents = () => [];
+
+        DMRoomMap.makeShared();
+
+        const switchRoomPromise = new Promise<void>(resolve => {
+            const subscription = RoomViewStore.instance.addListener(() => {
+                if (RoomViewStore.instance.getRoomId()) {
+                    subscription.remove();
+                    resolve();
+                }
+            });
+        });
+
+        dis.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: r1.roomId,
+            metricsTrigger: null,
+        });
+
+        await switchRoomPromise;
+
+        const renderer = TestRenderer.create(<MatrixClientContext.Provider value={cli}>
+            <RoomView mxClient={cli}
+                threepidInvite={null}
+                oobData={null}
+                resizeNotifier={new ResizeNotifier()}
+                justCreatedOpts={null}
+                forceTimeline={false}
+                onRegistered={null}
+            />
+        </MatrixClientContext.Provider>);
+
+        const roomViewInstance = renderer.root.findByType(RoomView).instance;
+
+        // in a default (non-encrypted room, it should start out with url previews enabled)
+        // This is a white-box test in that we're asserting things about the state, which
+        // is not ideal, but asserting that a URL preview just isn't there could risk the
+        // test being invalid because the previews just hasn't rendered yet. This feels
+        // like the safest way I think?
+        // This also relies on the default settings being URL previews on normally and
+        // off for e2e rooms because 1) it's probably useful to assert this and
+        // 2) SettingsStore is a static class and so very hard to mock out.
+        expect(roomViewInstance.state.showUrlPreview).toBe(true);
+
+        // now enable encryption (by mocking out the tests for whether a room is encrypted)
+        cli.isCryptoEnabled = () => true;
+        cli.isRoomEncrypted = () => true;
+
+        // and fake an encryption event into the room to prompt it to re-check
+        // wait until the event has been added
+        const eventAddedPromise = new Promise<void>(resolve => {
+            r1.once(RoomEvent.Timeline, (...args) => {
+                // we're also using mock client that doesn't re-emit, so
+                // we emit the event to client manually
+                cli.emit(RoomEvent.Timeline, ...args);
+                resolve();
+            });
+        });
+
+        r1.addLiveEvents([new MatrixEvent({
+            type: "m.room.encryption",
+            sender: cli.getUserId(),
+            content: {},
+            event_id: "someid",
+            room_id: r1.roomId,
+        })]);
+
+        await eventAddedPromise;
+
+        // URL previews should now be disabled
+        expect(roomViewInstance.state.showUrlPreview).toBe(false);
+    });
+});
diff --git a/test/components/structures/ThreadPanel-test.tsx b/test/components/structures/ThreadPanel-test.tsx
index 7f735171d7e..6a2a65a9eea 100644
--- a/test/components/structures/ThreadPanel-test.tsx
+++ b/test/components/structures/ThreadPanel-test.tsx
@@ -16,27 +16,16 @@ limitations under the License.
 
 import React from 'react';
 import { shallow, mount } from "enzyme";
-import {
-    MatrixClient,
-    RelationType,
-    Room,
-    UNSTABLE_FILTER_RELATED_BY_REL_TYPES,
-    UNSTABLE_FILTER_RELATED_BY_SENDERS,
-} from 'matrix-js-sdk/src/matrix';
-import { mocked } from 'jest-mock';
-import '../../skinned-sdk';
-import { Thread } from 'matrix-js-sdk/src/models/thread';
+import 'focus-visible'; // to fix context menus
 
 import {
     ThreadFilterType,
     ThreadPanelHeader,
     ThreadPanelHeaderFilterOptionItem,
-    getThreadTimelineSet,
 } from '../../../src/components/structures/ThreadPanel';
 import { ContextMenuButton } from '../../../src/accessibility/context_menu/ContextMenuButton';
 import ContextMenu from '../../../src/components/structures/ContextMenu';
 import { _t } from '../../../src/languageHandler';
-import { makeThread } from '../../test-utils/threads';
 
 describe('ThreadPanel', () => {
     describe('Header', () => {
@@ -90,109 +79,4 @@ describe('ThreadPanel', () => {
             expect(foundButton).toMatchSnapshot();
         });
     });
-
-    describe('getThreadTimelineSet()', () => {
-        const filterId = '123';
-        const client = {
-            getUserId: jest.fn(),
-            doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(false),
-            decryptEventIfNeeded: jest.fn().mockResolvedValue(undefined),
-            getOrCreateFilter: jest.fn().mockResolvedValue(filterId),
-            paginateEventTimeline: jest.fn().mockResolvedValue(undefined),
-        } as unknown as MatrixClient;
-
-        const aliceId = '@alice:server.org';
-        const bobId = '@bob:server.org';
-        const charlieId = '@charlie:server.org';
-        const room = new Room('!room1:server.org', client, aliceId);
-
-        const roomWithThreads = new Room('!room2:server.org', client, aliceId);
-        const aliceAndBobThread = makeThread(client, roomWithThreads, {
-            authorId: aliceId,
-            participantUserIds: [aliceId, bobId],
-            roomId: roomWithThreads.roomId,
-        });
-        const justBobThread = makeThread(client, roomWithThreads, {
-            authorId: bobId,
-            participantUserIds: [bobId],
-            roomId: roomWithThreads.roomId,
-        });
-        const everyoneThread = makeThread(client, roomWithThreads, {
-            authorId: charlieId,
-            participantUserIds: [aliceId, bobId, charlieId],
-            length: 5,
-            roomId: roomWithThreads.roomId,
-        });
-        roomWithThreads.threads.set(aliceAndBobThread.id, aliceAndBobThread);
-        roomWithThreads.threads.set(justBobThread.id, justBobThread);
-        roomWithThreads.threads.set(everyoneThread.id, everyoneThread);
-
-        beforeEach(() => {
-            mocked(client.getUserId).mockReturnValue(aliceId);
-            mocked(client.doesServerSupportUnstableFeature).mockResolvedValue(false);
-        });
-
-        describe('when extra capabilities are not enabled on server', () => {
-            it('returns an empty timelineset when room has no threads', async () => {
-                const result = await getThreadTimelineSet(client, room);
-
-                expect(result.getLiveTimeline().getEvents()).toEqual([]);
-            });
-
-            it('returns a timelineset with thread root events for room when filter is All', async () => {
-                const result = await getThreadTimelineSet(client, roomWithThreads);
-
-                const resultEvents = result.getLiveTimeline().getEvents();
-                expect(resultEvents.length).toEqual(3);
-                expect(resultEvents).toEqual(expect.arrayContaining([
-                    justBobThread.rootEvent,
-                    aliceAndBobThread.rootEvent,
-                    everyoneThread.rootEvent,
-                ]));
-            });
-
-            it('returns a timelineset with threads user has participated in when filter is My', async () => {
-                // current user is alice
-                mocked(client).getUserId.mockReturnValue(aliceId);
-
-                const result = await getThreadTimelineSet(client, roomWithThreads, ThreadFilterType.My);
-                const resultEvents = result.getLiveTimeline().getEvents();
-                expect(resultEvents).toEqual(expect.arrayContaining([
-                    // alice authored root event
-                    aliceAndBobThread.rootEvent,
-                    // alive replied to this thread
-                    everyoneThread.rootEvent,
-                ]));
-            });
-        });
-
-        describe('when extra capabilities are enabled on server', () => {
-            beforeEach(() => {
-                jest.clearAllMocks();
-                Thread.hasServerSideSupport = true;
-                mocked(client.doesServerSupportUnstableFeature).mockResolvedValue(true);
-            });
-
-            it('creates a filter with correct definition when filterType is All', async () => {
-                await getThreadTimelineSet(client, room);
-
-                const [filterKey, filter] = mocked(client).getOrCreateFilter.mock.calls[0];
-                expect(filterKey).toEqual(`THREAD_PANEL_${room.roomId}_${ThreadFilterType.All}`);
-                expect(filter.getDefinition().room.timeline).toEqual({
-                    [UNSTABLE_FILTER_RELATED_BY_REL_TYPES.name]: [RelationType.Thread],
-                });
-            });
-
-            it('creates a filter with correct definition when filterType is My', async () => {
-                await getThreadTimelineSet(client, room, ThreadFilterType.My);
-
-                const [filterKey, filter] = mocked(client).getOrCreateFilter.mock.calls[0];
-                expect(filterKey).toEqual(`THREAD_PANEL_${room.roomId}_${ThreadFilterType.My}`);
-                expect(filter.getDefinition().room.timeline).toEqual({
-                    [UNSTABLE_FILTER_RELATED_BY_REL_TYPES.name]: [RelationType.Thread],
-                    [UNSTABLE_FILTER_RELATED_BY_SENDERS.name]: [aliceId],
-                });
-            });
-        });
-    });
 });
diff --git a/test/components/structures/VideoRoomView-test.tsx b/test/components/structures/VideoRoomView-test.tsx
new file mode 100644
index 00000000000..11d747103d9
--- /dev/null
+++ b/test/components/structures/VideoRoomView-test.tsx
@@ -0,0 +1,78 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { mount } from "enzyme";
+import { act } from "react-dom/test-utils";
+import { MatrixWidgetType } from "matrix-widget-api";
+
+import { stubClient, stubVideoChannelStore, mkRoom, wrapInMatrixClientContext } from "../../test-utils";
+import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
+import { VIDEO_CHANNEL } from "../../../src/utils/VideoChannelUtils";
+import WidgetStore from "../../../src/stores/WidgetStore";
+import _VideoRoomView from "../../../src/components/structures/VideoRoomView";
+import VideoLobby from "../../../src/components/views/voip/VideoLobby";
+import AppTile from "../../../src/components/views/elements/AppTile";
+
+const VideoRoomView = wrapInMatrixClientContext(_VideoRoomView);
+
+describe("VideoRoomView", () => {
+    stubClient();
+    jest.spyOn(WidgetStore.instance, "getApps").mockReturnValue([{
+        id: VIDEO_CHANNEL,
+        eventId: "$1:example.org",
+        roomId: "!1:example.org",
+        type: MatrixWidgetType.JitsiMeet,
+        url: "https://example.org",
+        name: "Video channel",
+        creatorUserId: "@alice:example.org",
+        avatar_url: null,
+    }]);
+    Object.defineProperty(navigator, "mediaDevices", {
+        value: { enumerateDevices: () => [] },
+    });
+
+    const cli = MatrixClientPeg.get();
+    const room = mkRoom(cli, "!1:example.org");
+
+    let store;
+    beforeEach(() => {
+        store = stubVideoChannelStore();
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("shows lobby and keeps widget loaded when disconnected", async () => {
+        const view = mount(<VideoRoomView room={room} resizing={false} />);
+        // Wait for state to settle
+        await act(async () => Promise.resolve());
+
+        expect(view.find(VideoLobby).exists()).toEqual(true);
+        expect(view.find(AppTile).exists()).toEqual(true);
+    });
+
+    it("only shows widget when connected", async () => {
+        store.connect("!1:example.org");
+        const view = mount(<VideoRoomView room={room} resizing={false} />);
+        // Wait for state to settle
+        await act(async () => Promise.resolve());
+
+        expect(view.find(VideoLobby).exists()).toEqual(false);
+        expect(view.find(AppTile).exists()).toEqual(true);
+    });
+});
diff --git a/test/components/structures/auth/Login-test.tsx b/test/components/structures/auth/Login-test.tsx
index 741f4f5c561..af7e2599f0b 100644
--- a/test/components/structures/auth/Login-test.tsx
+++ b/test/components/structures/auth/Login-test.tsx
@@ -17,11 +17,13 @@ limitations under the License.
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import { createClient } from "matrix-js-sdk/src/matrix";
+import { mocked } from 'jest-mock';
+import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
 
-import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
 import { mkServerConfig } from "../../../test-utils";
+import Login from "../../../../src/components/structures/auth/Login";
+import PasswordLogin from "../../../../src/components/views/auth/PasswordLogin";
 
 jest.mock("matrix-js-sdk/src/matrix");
 
@@ -29,25 +31,21 @@ const flushPromises = async () => await new Promise(process.nextTick);
 
 jest.useRealTimers();
 
-const Login = sdk.getComponent(
-    'structures.auth.Login',
-);
-
 describe('Login', function() {
     let parentDiv;
-    const mockClient = {
+    const mockClient = mocked({
         login: jest.fn().mockResolvedValue({}),
         loginFlows: jest.fn(),
-    };
+    } as unknown as MatrixClient);
 
     beforeEach(function() {
-        jest.spyOn(SdkConfig, "get").mockReturnValue({
+        SdkConfig.put({
+            brand: "test-brand",
             disable_custom_urls: true,
-            brand: 'test-brand',
         });
         mockClient.login.mockClear().mockResolvedValue({});
         mockClient.loginFlows.mockClear().mockResolvedValue({ flows: [{ type: "m.login.password" }] });
-        createClient.mockReturnValue(mockClient);
+        mocked(createClient).mockReturnValue(mockClient);
 
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
@@ -56,6 +54,7 @@ describe('Login', function() {
     afterEach(function() {
         ReactDOM.unmountComponentAtNode(parentDiv);
         parentDiv.remove();
+        SdkConfig.unset(); // we touch the config, so clean up
     });
 
     function render() {
@@ -68,9 +67,9 @@ describe('Login', function() {
     }
 
     it('should show form with change server link', async () => {
-        jest.spyOn(SdkConfig, "get").mockReturnValue({
+        SdkConfig.put({
+            brand: "test-brand",
             disable_custom_urls: false,
-            brand: 'test',
         });
         const root = render();
 
@@ -78,7 +77,7 @@ describe('Login', function() {
 
         const form = ReactTestUtils.findRenderedComponentWithType(
             root,
-            sdk.getComponent('auth.PasswordLogin'),
+            PasswordLogin,
         );
         expect(form).toBeTruthy();
 
@@ -92,7 +91,7 @@ describe('Login', function() {
 
         const form = ReactTestUtils.findRenderedComponentWithType(
             root,
-            sdk.getComponent('auth.PasswordLogin'),
+            PasswordLogin,
         );
         expect(form).toBeTruthy();
 
@@ -101,7 +100,7 @@ describe('Login', function() {
     });
 
     it("should show SSO button if that flow is available", async () => {
-        mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.sso" }] });
+        mockClient.loginFlows.mockResolvedValue({ flows: [{ type: "m.login.sso" }] });
 
         const root = render();
         await flushPromises();
@@ -111,12 +110,12 @@ describe('Login', function() {
     });
 
     it("should show both SSO button and username+password if both are available", async () => {
-        mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }] });
+        mockClient.loginFlows.mockResolvedValue({ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }] });
 
         const root = render();
         await flushPromises();
 
-        const form = ReactTestUtils.findRenderedComponentWithType(root, sdk.getComponent('auth.PasswordLogin'));
+        const form = ReactTestUtils.findRenderedComponentWithType(root, PasswordLogin);
         expect(form).toBeTruthy();
 
         const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
@@ -124,7 +123,7 @@ describe('Login', function() {
     });
 
     it("should show multiple SSO buttons if multiple identity_providers are available", async () => {
-        mockClient.loginFlows.mockReturnValue({
+        mockClient.loginFlows.mockResolvedValue({
             flows: [{
                 "type": "m.login.sso",
                 "identity_providers": [{
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 144ff3ab4d9..7a6fb0c9762 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -19,22 +19,19 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import { createClient } from 'matrix-js-sdk/src/matrix';
 
-import sdk from '../../../skinned-sdk';
 import SdkConfig, { DEFAULTS } from '../../../../src/SdkConfig';
 import { createTestClient, mkServerConfig } from "../../../test-utils";
+import Registration from "../../../../src/components/structures/auth/Registration";
+import RegistrationForm from "../../../../src/components/views/auth/RegistrationForm";
 
 jest.mock('matrix-js-sdk/src/matrix');
 jest.useFakeTimers();
 
-const Registration = sdk.getComponent(
-    'structures.auth.Registration',
-);
-
 describe('Registration', function() {
     let parentDiv;
 
     beforeEach(function() {
-        jest.spyOn(SdkConfig, "get").mockReturnValue({
+        SdkConfig.put({
             ...DEFAULTS,
             disable_custom_urls: true,
         });
@@ -46,6 +43,7 @@ describe('Registration', function() {
     afterEach(function() {
         ReactDOM.unmountComponentAtNode(parentDiv);
         parentDiv.remove();
+        SdkConfig.unset(); // we touch the config, so clean up
     });
 
     function render() {
@@ -78,7 +76,7 @@ describe('Registration', function() {
 
         const form = ReactTestUtils.findRenderedComponentWithType(
             root,
-            sdk.getComponent('auth.RegistrationForm'),
+            RegistrationForm,
         );
         expect(form).toBeTruthy();
     });
diff --git a/test/components/views/audio_messages/RecordingPlayback-test.tsx b/test/components/views/audio_messages/RecordingPlayback-test.tsx
index f8a6c0ef922..931dca34d67 100644
--- a/test/components/views/audio_messages/RecordingPlayback-test.tsx
+++ b/test/components/views/audio_messages/RecordingPlayback-test.tsx
@@ -20,13 +20,13 @@ import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';
 import { act } from 'react-dom/test-utils';
 
-import '../../../skinned-sdk';
 import RecordingPlayback from '../../../../src/components/views/audio_messages/RecordingPlayback';
 import { Playback } from '../../../../src/audio/Playback';
 import RoomContext, { TimelineRenderingType } from '../../../../src/contexts/RoomContext';
 import { createAudioContext } from '../../../../src/audio/compat';
 import { findByTestId, flushPromises } from '../../../test-utils';
 import PlaybackWaveform from '../../../../src/components/views/audio_messages/PlaybackWaveform';
+import SeekBar from "../../../../src/components/views/audio_messages/SeekBar";
 
 jest.mock('../../../../src/audio/compat', () => ({
     createAudioContext: jest.fn(),
@@ -56,7 +56,7 @@ describe('<RecordingPlayback />', () => {
     const mockChannelData = new Float32Array();
 
     const defaultRoom = { roomId: '!room:server.org', timelineRenderingType: TimelineRenderingType.File };
-    const getComponent = (props: { playback: Playback }, room = defaultRoom) =>
+    const getComponent = (props: React.ComponentProps<typeof RecordingPlayback>, room = defaultRoom) =>
         mount(<RecordingPlayback {...props} />, {
             wrappingComponent: RoomContext.Provider,
             wrappingComponentProps: { value: room },
@@ -128,34 +128,19 @@ describe('<RecordingPlayback />', () => {
         expect(playback.toggle).toHaveBeenCalled();
     });
 
-    it.each([
-        [TimelineRenderingType.Notification],
-        [TimelineRenderingType.File],
-        [TimelineRenderingType.Pinned],
-    ])('does not render waveform when timeline rendering type for room is %s', (timelineRenderingType) => {
+    it('should render a seek bar by default', () => {
         const playback = new Playback(new ArrayBuffer(8));
-        const room = {
-            ...defaultRoom,
-            timelineRenderingType,
-        };
-        const component = getComponent({ playback }, room);
+        const component = getComponent({ playback });
 
         expect(component.find(PlaybackWaveform).length).toBeFalsy();
+        expect(component.find(SeekBar).length).toBeTruthy();
     });
 
-    it.each([
-        [TimelineRenderingType.Room],
-        [TimelineRenderingType.Thread],
-        [TimelineRenderingType.ThreadsList],
-        [TimelineRenderingType.Search],
-    ])('renders waveform when timeline rendering type for room is %s', (timelineRenderingType) => {
+    it('should render a waveform when requested', () => {
         const playback = new Playback(new ArrayBuffer(8));
-        const room = {
-            ...defaultRoom,
-            timelineRenderingType,
-        };
-        const component = getComponent({ playback }, room);
+        const component = getComponent({ playback, withWaveform: true });
 
         expect(component.find(PlaybackWaveform).length).toBeTruthy();
+        expect(component.find(SeekBar).length).toBeFalsy();
     });
 });
diff --git a/test/components/views/beacon/BeaconListItem-test.tsx b/test/components/views/beacon/BeaconListItem-test.tsx
new file mode 100644
index 00000000000..e7e9fbb7265
--- /dev/null
+++ b/test/components/views/beacon/BeaconListItem-test.tsx
@@ -0,0 +1,173 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import {
+    Beacon,
+    RoomMember,
+    MatrixEvent,
+} from 'matrix-js-sdk/src/matrix';
+import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+import { act } from 'react-dom/test-utils';
+
+import BeaconListItem from '../../../../src/components/views/beacon/BeaconListItem';
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import {
+    getMockClientWithEventEmitter,
+    makeBeaconEvent,
+    makeBeaconInfoEvent,
+    makeRoomWithBeacons,
+} from '../../../test-utils';
+
+describe('<BeaconListItem />', () => {
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    // go back in time to create beacons and locations in the past
+    jest.spyOn(global.Date, 'now').mockReturnValue(now - 600000);
+    const roomId = '!room:server';
+    const aliceId = '@alice:server';
+
+    const mockClient = getMockClientWithEventEmitter({
+        getUserId: jest.fn().mockReturnValue(aliceId),
+        getRoom: jest.fn(),
+        isGuest: jest.fn().mockReturnValue(false),
+    });
+
+    const aliceBeaconEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true },
+        '$alice-room1-1',
+    );
+    const alicePinBeaconEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true, assetType: LocationAssetType.Pin, description: "Alice's car" },
+        '$alice-room1-1',
+    );
+    const pinBeaconWithoutDescription = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true, assetType: LocationAssetType.Pin },
+        '$alice-room1-1',
+    );
+
+    const aliceLocation1 = makeBeaconEvent(
+        aliceId, { beaconInfoId: aliceBeaconEvent.getId(), geoUri: 'geo:51,41', timestamp: now - 1 },
+    );
+    const aliceLocation2 = makeBeaconEvent(
+        aliceId, { beaconInfoId: aliceBeaconEvent.getId(), geoUri: 'geo:52,42', timestamp: now - 500000 },
+    );
+
+    const defaultProps = {
+        beacon: new Beacon(aliceBeaconEvent),
+    };
+
+    const getComponent = (props = {}) =>
+        mount(<BeaconListItem {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
+
+    const setupRoomWithBeacons = (beaconInfoEvents: MatrixEvent[], locationEvents?: MatrixEvent[]): Beacon[] => {
+        const beacons = makeRoomWithBeacons(roomId, mockClient, beaconInfoEvents, locationEvents);
+
+        const member = new RoomMember(roomId, aliceId);
+        member.name = `Alice`;
+        const room = mockClient.getRoom(roomId);
+        jest.spyOn(room, 'getMember').mockReturnValue(member);
+
+        return beacons;
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.spyOn(Date, 'now').mockReturnValue(now);
+    });
+
+    it('renders null when beacon is not live', () => {
+        const notLiveBeacon = makeBeaconInfoEvent(aliceId,
+            roomId,
+            { isLive: false },
+        );
+        const [beacon] = setupRoomWithBeacons([notLiveBeacon]);
+        const component = getComponent({ beacon });
+        expect(component.html()).toBeNull();
+    });
+
+    it('renders null when beacon has no location', () => {
+        const [beacon] = setupRoomWithBeacons([aliceBeaconEvent]);
+        const component = getComponent({ beacon });
+        expect(component.html()).toBeNull();
+    });
+
+    describe('when a beacon is live and has locations', () => {
+        it('renders beacon info', () => {
+            const [beacon] = setupRoomWithBeacons([alicePinBeaconEvent], [aliceLocation1]);
+            const component = getComponent({ beacon });
+            expect(component.html()).toMatchSnapshot();
+        });
+
+        describe('non-self beacons', () => {
+            it('uses beacon description as beacon name', () => {
+                const [beacon] = setupRoomWithBeacons([alicePinBeaconEvent], [aliceLocation1]);
+                const component = getComponent({ beacon });
+                expect(component.find('BeaconStatus').props().label).toEqual("Alice's car");
+            });
+
+            it('uses beacon owner mxid as beacon name for a beacon without description', () => {
+                const [beacon] = setupRoomWithBeacons([pinBeaconWithoutDescription], [aliceLocation1]);
+                const component = getComponent({ beacon });
+                expect(component.find('BeaconStatus').props().label).toEqual(aliceId);
+            });
+
+            it('renders location icon', () => {
+                const [beacon] = setupRoomWithBeacons([alicePinBeaconEvent], [aliceLocation1]);
+                const component = getComponent({ beacon });
+                expect(component.find('StyledLiveBeaconIcon').length).toBeTruthy();
+            });
+        });
+
+        describe('self locations', () => {
+            it('renders beacon owner avatar', () => {
+                const [beacon] = setupRoomWithBeacons([aliceBeaconEvent], [aliceLocation1]);
+                const component = getComponent({ beacon });
+                expect(component.find('MemberAvatar').length).toBeTruthy();
+            });
+
+            it('uses beacon owner name as beacon name', () => {
+                const [beacon] = setupRoomWithBeacons([aliceBeaconEvent], [aliceLocation1]);
+                const component = getComponent({ beacon });
+                expect(component.find('BeaconStatus').props().label).toEqual('Alice');
+            });
+        });
+
+        describe('on location updates', () => {
+            it('updates last updated time on location updated', () => {
+                const [beacon] = setupRoomWithBeacons([aliceBeaconEvent], [aliceLocation2]);
+                const component = getComponent({ beacon });
+
+                expect(component.find('.mx_BeaconListItem_lastUpdated').text()).toEqual('Updated 9 minutes ago');
+
+                // update to a newer location
+                act(() => {
+                    beacon.addLocations([aliceLocation1]);
+                    component.setProps({});
+                });
+
+                expect(component.find('.mx_BeaconListItem_lastUpdated').text()).toEqual('Updated a few seconds ago');
+            });
+        });
+    });
+});
diff --git a/test/components/views/beacon/BeaconMarker-test.tsx b/test/components/views/beacon/BeaconMarker-test.tsx
new file mode 100644
index 00000000000..efc9c7d22c5
--- /dev/null
+++ b/test/components/views/beacon/BeaconMarker-test.tsx
@@ -0,0 +1,138 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import maplibregl from 'maplibre-gl';
+import { act } from 'react-dom/test-utils';
+import {
+    Beacon,
+    Room,
+    RoomMember,
+    MatrixEvent,
+    getBeaconInfoIdentifier,
+} from 'matrix-js-sdk/src/matrix';
+
+import BeaconMarker from '../../../../src/components/views/beacon/BeaconMarker';
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import {
+    getMockClientWithEventEmitter,
+    makeBeaconEvent,
+    makeBeaconInfoEvent,
+    makeRoomWithStateEvents,
+} from '../../../test-utils';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+
+describe('<BeaconMarker />', () => {
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    // stable date for snapshots
+    jest.spyOn(global.Date, 'now').mockReturnValue(now);
+    const roomId = '!room:server';
+    const aliceId = '@alice:server';
+
+    const aliceMember = new RoomMember(roomId, aliceId);
+
+    const mockMap = new maplibregl.Map();
+
+    const mockClient = getMockClientWithEventEmitter({
+        getClientWellKnown: jest.fn().mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        }),
+        getUserId: jest.fn().mockReturnValue(aliceId),
+        getRoom: jest.fn(),
+        isGuest: jest.fn().mockReturnValue(false),
+    });
+
+    // make fresh rooms every time
+    // as we update room state
+    const setupRoom = (stateEvents: MatrixEvent[] = []): Room => {
+        const room1 = makeRoomWithStateEvents(stateEvents, { roomId, mockClient });
+        jest.spyOn(room1, 'getMember').mockReturnValue(aliceMember);
+        return room1;
+    };
+
+    const defaultEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true },
+        '$alice-room1-1',
+    );
+    const notLiveEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: false },
+        '$alice-room1-2',
+    );
+
+    const location1 = makeBeaconEvent(
+        aliceId, { beaconInfoId: defaultEvent.getId(), geoUri: 'geo:51,41', timestamp: now + 1 },
+    );
+    const location2 = makeBeaconEvent(
+        aliceId, { beaconInfoId: defaultEvent.getId(), geoUri: 'geo:52,42', timestamp: now + 10000 },
+    );
+
+    const defaultProps = {
+        map: mockMap,
+        beacon: new Beacon(defaultEvent),
+    };
+
+    const getComponent = (props = {}) =>
+        mount(<BeaconMarker {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('renders nothing when beacon is not live', () => {
+        const room = setupRoom([notLiveEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(notLiveEvent));
+        const component = getComponent({ beacon });
+        expect(component.html()).toBe(null);
+    });
+
+    it('renders nothing when beacon has no location', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        const component = getComponent({ beacon });
+        expect(component.html()).toBe(null);
+    });
+
+    it('renders marker when beacon has location', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent({ beacon });
+        expect(component).toMatchSnapshot();
+    });
+
+    it('updates with new locations', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent({ beacon });
+        expect(component.find('SmartMarker').props()['geoUri']).toEqual('geo:51,41');
+
+        act(() => {
+            beacon.addLocations([location2]);
+        });
+        component.setProps({});
+
+        // updated to latest location
+        expect(component.find('SmartMarker').props()['geoUri']).toEqual('geo:52,42');
+    });
+});
diff --git a/test/components/views/beacon/BeaconStatus-test.tsx b/test/components/views/beacon/BeaconStatus-test.tsx
new file mode 100644
index 00000000000..68a6a34a30f
--- /dev/null
+++ b/test/components/views/beacon/BeaconStatus-test.tsx
@@ -0,0 +1,87 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { Beacon } from 'matrix-js-sdk/src/matrix';
+
+import BeaconStatus from '../../../../src/components/views/beacon/BeaconStatus';
+import { BeaconDisplayStatus } from '../../../../src/components/views/beacon/displayStatus';
+import { findByTestId, makeBeaconInfoEvent } from '../../../test-utils';
+
+describe('<BeaconStatus />', () => {
+    const defaultProps = {
+        displayStatus: BeaconDisplayStatus.Loading,
+        label: 'test label',
+        withIcon: true,
+    };
+    const getComponent = (props = {}) =>
+        mount(<BeaconStatus {...defaultProps} {...props} />);
+
+    it('renders loading state', () => {
+        const component = getComponent({ displayStatus: BeaconDisplayStatus.Loading });
+        expect(component).toMatchSnapshot();
+    });
+
+    it('renders stopped state', () => {
+        const component = getComponent({ displayStatus: BeaconDisplayStatus.Stopped });
+        expect(component).toMatchSnapshot();
+    });
+
+    it('renders without icon', () => {
+        const component = getComponent({ withIcon: false, displayStatus: BeaconDisplayStatus.Stopped });
+        expect(component.find('StyledLiveBeaconIcon').length).toBeFalsy();
+    });
+
+    describe('active state', () => {
+        it('renders without children', () => {
+            // mock for stable snapshot
+            jest.spyOn(Date, 'now').mockReturnValue(123456789);
+            const beacon = new Beacon(makeBeaconInfoEvent('@user:server', '!room:server', {}, '$1'));
+            const component = getComponent({ beacon, displayStatus: BeaconDisplayStatus.Active });
+            expect(component).toMatchSnapshot();
+        });
+
+        it('renders with children', () => {
+            const beacon = new Beacon(makeBeaconInfoEvent('@user:server', '!room:sever'));
+            const component = getComponent({
+                beacon,
+                children: <span data-test-id='test'>test</span>,
+                displayStatus: BeaconDisplayStatus.Active,
+            });
+            expect(findByTestId(component, 'test-child')).toMatchSnapshot();
+        });
+
+        it('renders static remaining time when displayLiveTimeRemaining is falsy', () => {
+            // mock for stable snapshot
+            jest.spyOn(Date, 'now').mockReturnValue(123456789);
+            const beacon = new Beacon(makeBeaconInfoEvent('@user:server', '!room:server', {}, '$1'));
+            const component = getComponent({ beacon, displayStatus: BeaconDisplayStatus.Active });
+            expect(component.text().includes('Live until 11:17')).toBeTruthy();
+        });
+
+        it('renders live time remaining when displayLiveTimeRemaining is truthy', () => {
+            // mock for stable snapshot
+            jest.spyOn(Date, 'now').mockReturnValue(123456789);
+            const beacon = new Beacon(makeBeaconInfoEvent('@user:server', '!room:server', {}, '$1'));
+            const component = getComponent({
+                beacon, displayStatus: BeaconDisplayStatus.Active,
+                displayLiveTimeRemaining: true,
+            });
+            expect(component.text().includes('1h left')).toBeTruthy();
+        });
+    });
+});
diff --git a/test/components/views/beacon/BeaconViewDialog-test.tsx b/test/components/views/beacon/BeaconViewDialog-test.tsx
new file mode 100644
index 00000000000..8d0fb30e307
--- /dev/null
+++ b/test/components/views/beacon/BeaconViewDialog-test.tsx
@@ -0,0 +1,255 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import {
+    MatrixClient,
+    MatrixEvent,
+    Room,
+    RoomMember,
+    getBeaconInfoIdentifier,
+} from 'matrix-js-sdk/src/matrix';
+import maplibregl from 'maplibre-gl';
+
+import BeaconViewDialog from '../../../../src/components/views/beacon/BeaconViewDialog';
+import {
+    findByTestId,
+    getMockClientWithEventEmitter,
+    makeBeaconEvent,
+    makeBeaconInfoEvent,
+    makeRoomWithStateEvents,
+} from '../../../test-utils';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+import { OwnBeaconStore } from '../../../../src/stores/OwnBeaconStore';
+import { BeaconDisplayStatus } from '../../../../src/components/views/beacon/displayStatus';
+
+describe('<BeaconViewDialog />', () => {
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    // stable date for snapshots
+    jest.spyOn(global.Date, 'now').mockReturnValue(now);
+    const roomId = '!room:server';
+    const aliceId = '@alice:server';
+    const bobId = '@bob:server';
+
+    const aliceMember = new RoomMember(roomId, aliceId);
+
+    const mockClient = getMockClientWithEventEmitter({
+        getClientWellKnown: jest.fn().mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        }),
+        getUserId: jest.fn().mockReturnValue(bobId),
+        getRoom: jest.fn(),
+        isGuest: jest.fn().mockReturnValue(false),
+        getVisibleRooms: jest.fn().mockReturnValue([]),
+    });
+
+    const mockMap = new maplibregl.Map();
+
+    // make fresh rooms every time
+    // as we update room state
+    const setupRoom = (stateEvents: MatrixEvent[] = []): Room => {
+        const room1 = makeRoomWithStateEvents(stateEvents, { roomId, mockClient });
+        jest.spyOn(room1, 'getMember').mockReturnValue(aliceMember);
+
+        return room1;
+    };
+
+    const defaultEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true },
+        '$alice-room1-1',
+    );
+
+    const location1 = makeBeaconEvent(
+        aliceId, { beaconInfoId: defaultEvent.getId(), geoUri: 'geo:51,41', timestamp: now + 1 },
+    );
+
+    const defaultProps = {
+        onFinished: jest.fn(),
+        roomId,
+        matrixClient: mockClient as MatrixClient,
+    };
+
+    const getComponent = (props = {}) =>
+        mount(<BeaconViewDialog {...defaultProps} {...props} />);
+
+    beforeEach(() => {
+        jest.spyOn(OwnBeaconStore.instance, 'getLiveBeaconIds').mockRestore();
+
+        jest.clearAllMocks();
+    });
+
+    it('renders a map with markers', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent();
+        expect(component.find('Map').props()).toEqual(expect.objectContaining({
+            centerGeoUri: 'geo:51,41',
+            interactive: true,
+        }));
+        expect(component.find('SmartMarker').length).toEqual(1);
+    });
+
+    it('does not render any own beacon status when user is not live sharing', () => {
+        // default event belongs to alice, we are bob
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent();
+        expect(component.find('DialogOwnBeaconStatus').html()).toBeNull();
+    });
+
+    it('renders own beacon status when user is live sharing', () => {
+        // default event belongs to alice
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        // mock own beacon store to show default event as alice's live beacon
+        jest.spyOn(OwnBeaconStore.instance, 'getLiveBeaconIds').mockReturnValue([beacon.identifier]);
+        jest.spyOn(OwnBeaconStore.instance, 'getBeaconById').mockReturnValue(beacon);
+        const component = getComponent();
+        expect(component.find('MemberAvatar').length).toBeTruthy();
+        expect(component.find('OwnBeaconStatus').props()).toEqual({
+            beacon, displayStatus: BeaconDisplayStatus.Active,
+            className: 'mx_DialogOwnBeaconStatus_status',
+        });
+    });
+
+    it('updates markers on changes to beacons', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent();
+        expect(component.find('BeaconMarker').length).toEqual(1);
+
+        const anotherBeaconEvent = makeBeaconInfoEvent(bobId,
+            roomId,
+            { isLive: true },
+            '$bob-room1-1',
+        );
+
+        act(() => {
+            // emits RoomStateEvent.BeaconLiveness
+            room.currentState.setStateEvents([anotherBeaconEvent]);
+        });
+
+        component.setProps({});
+
+        // two markers now!
+        expect(component.find('BeaconMarker').length).toEqual(2);
+    });
+
+    it('does not update bounds or center on changing beacons', () => {
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent();
+        expect(component.find('BeaconMarker').length).toEqual(1);
+
+        const anotherBeaconEvent = makeBeaconInfoEvent(bobId,
+            roomId,
+            { isLive: true },
+            '$bob-room1-1',
+        );
+
+        act(() => {
+            // emits RoomStateEvent.BeaconLiveness
+            room.currentState.setStateEvents([anotherBeaconEvent]);
+        });
+
+        component.setProps({});
+
+        // two markers now!
+        expect(mockMap.setCenter).toHaveBeenCalledTimes(1);
+        expect(mockMap.fitBounds).toHaveBeenCalledTimes(1);
+    });
+
+    it('renders a fallback when no live beacons remain', () => {
+        const onFinished = jest.fn();
+        const room = setupRoom([defaultEvent]);
+        const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+        beacon.addLocations([location1]);
+        const component = getComponent({ onFinished });
+        expect(component.find('BeaconMarker').length).toEqual(1);
+
+        // this will replace the defaultEvent
+        // leading to no more live beacons
+        const anotherBeaconEvent = makeBeaconInfoEvent(aliceId,
+            roomId,
+            { isLive: false },
+            '$bob-room1-1',
+        );
+
+        act(() => {
+            // emits RoomStateEvent.BeaconLiveness
+            room.currentState.setStateEvents([anotherBeaconEvent]);
+        });
+
+        component.setProps({});
+
+        // map placeholder
+        expect(findByTestId(component, 'beacon-view-dialog-map-fallback')).toMatchSnapshot();
+
+        act(() => {
+            findByTestId(component, 'beacon-view-dialog-fallback-close').at(0).simulate('click');
+        });
+
+        expect(onFinished).toHaveBeenCalled();
+    });
+
+    describe('sidebar', () => {
+        it('opens sidebar on view list button click', () => {
+            const room = setupRoom([defaultEvent]);
+            const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+            beacon.addLocations([location1]);
+            const component = getComponent();
+
+            act(() => {
+                findByTestId(component, 'beacon-view-dialog-open-sidebar').at(0).simulate('click');
+                component.setProps({});
+            });
+
+            expect(component.find('DialogSidebar').length).toBeTruthy();
+        });
+
+        it('closes sidebar on close button click', () => {
+            const room = setupRoom([defaultEvent]);
+            const beacon = room.currentState.beacons.get(getBeaconInfoIdentifier(defaultEvent));
+            beacon.addLocations([location1]);
+            const component = getComponent();
+
+            // open the sidebar
+            act(() => {
+                findByTestId(component, 'beacon-view-dialog-open-sidebar').at(0).simulate('click');
+                component.setProps({});
+            });
+
+            expect(component.find('DialogSidebar').length).toBeTruthy();
+
+            // now close it
+            act(() => {
+                findByTestId(component, 'dialog-sidebar-close').at(0).simulate('click');
+                component.setProps({});
+            });
+
+            expect(component.find('DialogSidebar').length).toBeFalsy();
+        });
+    });
+});
diff --git a/test/components/views/beacon/DialogSidebar-test.tsx b/test/components/views/beacon/DialogSidebar-test.tsx
new file mode 100644
index 00000000000..a5a1f0e5e79
--- /dev/null
+++ b/test/components/views/beacon/DialogSidebar-test.tsx
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+
+import DialogSidebar from '../../../../src/components/views/beacon/DialogSidebar';
+import { findByTestId } from '../../../test-utils';
+
+describe('<DialogSidebar />', () => {
+    const defaultProps = {
+        beacons: [],
+        requestClose: jest.fn(),
+    };
+    const getComponent = (props = {}) =>
+        mount(<DialogSidebar {...defaultProps} {...props} />);
+
+    it('renders sidebar correctly', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('closes on close button click', () => {
+        const requestClose = jest.fn();
+        const component = getComponent({ requestClose });
+
+        act(() => {
+            findByTestId(component, 'dialog-sidebar-close').at(0).simulate('click');
+        });
+        expect(requestClose).toHaveBeenCalled();
+    });
+});
diff --git a/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx b/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx
new file mode 100644
index 00000000000..d02f4d0c3d4
--- /dev/null
+++ b/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx
@@ -0,0 +1,248 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mocked } from 'jest-mock';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import { Beacon, BeaconIdentifier } from 'matrix-js-sdk/src/matrix';
+
+import LeftPanelLiveShareWarning from '../../../../src/components/views/beacon/LeftPanelLiveShareWarning';
+import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../../src/stores/OwnBeaconStore';
+import { flushPromises, makeBeaconInfoEvent } from '../../../test-utils';
+import dispatcher from '../../../../src/dispatcher/dispatcher';
+import { Action } from '../../../../src/dispatcher/actions';
+
+jest.mock('../../../../src/stores/OwnBeaconStore', () => {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const EventEmitter = require("events");
+    class MockOwnBeaconStore extends EventEmitter {
+        public getLiveBeaconIdsWithLocationPublishError = jest.fn().mockReturnValue([]);
+        public getBeaconById = jest.fn();
+        public getLiveBeaconIds = jest.fn().mockReturnValue([]);
+        public readonly beaconUpdateErrors = new Map<BeaconIdentifier, Error>();
+    }
+    return {
+        // @ts-ignore
+        ...jest.requireActual('../../../../src/stores/OwnBeaconStore'),
+        OwnBeaconStore: {
+            instance: new MockOwnBeaconStore() as unknown as OwnBeaconStore,
+        },
+    };
+},
+);
+
+describe('<LeftPanelLiveShareWarning />', () => {
+    const defaultProps = {};
+    const getComponent = (props = {}) =>
+        mount(<LeftPanelLiveShareWarning {...defaultProps} {...props} />);
+
+    const roomId1 = '!room1:server';
+    const roomId2 = '!room2:server';
+    const aliceId = '@alive:server';
+
+    const now = 1647270879403;
+    const HOUR_MS = 3600000;
+
+    beforeEach(() => {
+        jest.spyOn(global.Date, 'now').mockReturnValue(now);
+        jest.spyOn(dispatcher, 'dispatch').mockClear().mockImplementation(() => { });
+
+        OwnBeaconStore.instance.beaconUpdateErrors.clear();
+    });
+
+    afterAll(() => {
+        jest.spyOn(global.Date, 'now').mockRestore();
+
+        jest.restoreAllMocks();
+    });
+    // 12h old, 12h left
+    const beacon1 = new Beacon(makeBeaconInfoEvent(aliceId,
+        roomId1,
+        { timeout: HOUR_MS * 24, timestamp: now - 12 * HOUR_MS },
+        '$1',
+    ));
+    // 10h left
+    const beacon2 = new Beacon(makeBeaconInfoEvent(aliceId,
+        roomId2,
+        { timeout: HOUR_MS * 10, timestamp: now },
+        '$2',
+    ));
+
+    it('renders nothing when user has no live beacons', () => {
+        const component = getComponent();
+        expect(component.html()).toBe(null);
+    });
+
+    describe('when user has live location monitor', () => {
+        beforeAll(() => {
+            mocked(OwnBeaconStore.instance).getBeaconById.mockImplementation(beaconId => {
+                if (beaconId === beacon1.identifier) {
+                    return beacon1;
+                }
+                return beacon2;
+            });
+        });
+
+        beforeEach(() => {
+            mocked(OwnBeaconStore.instance).isMonitoringLiveLocation = true;
+            mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue([]);
+            mocked(OwnBeaconStore.instance).getLiveBeaconIds.mockReturnValue([beacon2.identifier, beacon1.identifier]);
+        });
+
+        it('renders correctly when not minimized', () => {
+            const component = getComponent();
+            expect(component).toMatchSnapshot();
+        });
+
+        it('goes to room of latest beacon when clicked', () => {
+            const component = getComponent();
+            const dispatchSpy = jest.spyOn(dispatcher, 'dispatch');
+
+            act(() => {
+                component.simulate('click');
+            });
+
+            expect(dispatchSpy).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                metricsTrigger: undefined,
+                // latest beacon's room
+                room_id: roomId2,
+            });
+        });
+
+        it('renders correctly when minimized', () => {
+            const component = getComponent({ isMinimized: true });
+            expect(component).toMatchSnapshot();
+        });
+
+        it('renders location publish error', () => {
+            mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue(
+                [beacon1.identifier],
+            );
+            const component = getComponent();
+            expect(component).toMatchSnapshot();
+        });
+
+        it('goes to room of latest beacon with location publish error when clicked', () => {
+            mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue(
+                [beacon1.identifier],
+            );
+            const component = getComponent();
+            const dispatchSpy = jest.spyOn(dispatcher, 'dispatch');
+
+            act(() => {
+                component.simulate('click');
+            });
+
+            expect(dispatchSpy).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                metricsTrigger: undefined,
+                // error beacon's room
+                room_id: roomId1,
+            });
+        });
+
+        it('goes back to default style when wire errors are cleared', () => {
+            mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue(
+                [beacon1.identifier],
+            );
+            const component = getComponent();
+            // error mode
+            expect(component.find('.mx_LeftPanelLiveShareWarning').at(0).text()).toEqual(
+                'An error occured whilst sharing your live location',
+            );
+
+            act(() => {
+                mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue([]);
+                OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.LocationPublishError, 'abc');
+            });
+
+            component.setProps({});
+
+            // default mode
+            expect(component.find('.mx_LeftPanelLiveShareWarning').at(0).text()).toEqual(
+                'You are sharing your live location',
+            );
+        });
+
+        it('removes itself when user stops having live beacons', async () => {
+            const component = getComponent({ isMinimized: true });
+            // started out rendered
+            expect(component.html()).toBeTruthy();
+
+            act(() => {
+                mocked(OwnBeaconStore.instance).isMonitoringLiveLocation = false;
+                OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.MonitoringLivePosition);
+            });
+
+            await flushPromises();
+            component.setProps({});
+
+            expect(component.html()).toBe(null);
+        });
+
+        describe('stopping errors', () => {
+            it('renders stopping error', () => {
+                OwnBeaconStore.instance.beaconUpdateErrors.set(beacon2.identifier, new Error('error'));
+                const component = getComponent();
+                expect(component.text()).toEqual('An error occurred while stopping your live location');
+            });
+
+            it('starts rendering stopping error on beaconUpdateError emit', () => {
+                const component = getComponent();
+                // no error
+                expect(component.text()).toEqual('You are sharing your live location');
+
+                act(() => {
+                    OwnBeaconStore.instance.beaconUpdateErrors.set(beacon2.identifier, new Error('error'));
+                    OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.BeaconUpdateError, beacon2.identifier, true);
+                });
+
+                expect(component.text()).toEqual('An error occurred while stopping your live location');
+            });
+
+            it('renders stopping error when beacons have stopping and location errors', () => {
+                mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue(
+                    [beacon1.identifier],
+                );
+                OwnBeaconStore.instance.beaconUpdateErrors.set(beacon2.identifier, new Error('error'));
+                const component = getComponent();
+                expect(component.text()).toEqual('An error occurred while stopping your live location');
+            });
+
+            it('goes to room of latest beacon with stopping error when clicked', () => {
+                mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue(
+                    [beacon1.identifier],
+                );
+                OwnBeaconStore.instance.beaconUpdateErrors.set(beacon2.identifier, new Error('error'));
+                const component = getComponent();
+                const dispatchSpy = jest.spyOn(dispatcher, 'dispatch');
+
+                act(() => {
+                    component.simulate('click');
+                });
+
+                expect(dispatchSpy).toHaveBeenCalledWith({
+                    action: Action.ViewRoom,
+                    metricsTrigger: undefined,
+                    // stopping error beacon's room
+                    room_id: beacon2.roomId,
+                });
+            });
+        });
+    });
+});
diff --git a/test/components/views/beacon/OwnBeaconStatus-test.tsx b/test/components/views/beacon/OwnBeaconStatus-test.tsx
new file mode 100644
index 00000000000..57f3f98b829
--- /dev/null
+++ b/test/components/views/beacon/OwnBeaconStatus-test.tsx
@@ -0,0 +1,161 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import { mocked } from 'jest-mock';
+import { Beacon } from 'matrix-js-sdk/src/matrix';
+
+import OwnBeaconStatus from '../../../../src/components/views/beacon/OwnBeaconStatus';
+import { BeaconDisplayStatus } from '../../../../src/components/views/beacon/displayStatus';
+import { useOwnLiveBeacons } from '../../../../src/utils/beacon';
+import { findByTestId, makeBeaconInfoEvent } from '../../../test-utils';
+
+jest.mock('../../../../src/utils/beacon/useOwnLiveBeacons', () => ({
+    useOwnLiveBeacons: jest.fn(),
+}));
+
+describe('<OwnBeaconStatus />', () => {
+    const defaultProps = {
+        displayStatus: BeaconDisplayStatus.Loading,
+    };
+    const userId = '@user:server';
+    const roomId = '!room:server';
+    let defaultBeacon;
+    const getComponent = (props = {}) =>
+        mount(<OwnBeaconStatus {...defaultProps} {...props} />);
+
+    beforeEach(() => {
+        jest.spyOn(global.Date, 'now').mockReturnValue(123456789);
+        mocked(useOwnLiveBeacons).mockClear().mockReturnValue({});
+
+        defaultBeacon = new Beacon(makeBeaconInfoEvent(userId, roomId));
+    });
+
+    it('renders without a beacon instance', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('renders loading state correctly', () => {
+        const component = getComponent();
+        expect(component.find('BeaconStatus').props()).toBeTruthy();
+    });
+
+    describe('Active state', () => {
+        it('renders stop button', () => {
+            const displayStatus = BeaconDisplayStatus.Active;
+            mocked(useOwnLiveBeacons).mockReturnValue({
+                onStopSharing: jest.fn(),
+            });
+            const component = getComponent({ displayStatus, beacon: defaultBeacon });
+            expect(component.text()).toContain('Live location enabled');
+
+            expect(findByTestId(component, 'beacon-status-stop-beacon').length).toBeTruthy();
+        });
+
+        it('stops sharing on stop button click', () => {
+            const displayStatus = BeaconDisplayStatus.Active;
+            const onStopSharing = jest.fn();
+            mocked(useOwnLiveBeacons).mockReturnValue({
+                onStopSharing,
+            });
+            const component = getComponent({ displayStatus, beacon: defaultBeacon });
+
+            act(() => {
+                findByTestId(component, 'beacon-status-stop-beacon').at(0).simulate('click');
+            });
+
+            expect(onStopSharing).toHaveBeenCalled();
+        });
+    });
+
+    describe('errors', () => {
+        it('renders in error mode when displayStatus is error', () => {
+            const displayStatus = BeaconDisplayStatus.Error;
+            const component = getComponent({ displayStatus });
+            expect(component.text()).toEqual('Live location error');
+
+            // no actions for plain error
+            expect(component.find('AccessibleButton').length).toBeFalsy();
+        });
+
+        describe('with location publish error', () => {
+            it('renders in error mode', () => {
+                const displayStatus = BeaconDisplayStatus.Active;
+                mocked(useOwnLiveBeacons).mockReturnValue({
+                    hasLocationPublishError: true,
+                    onResetLocationPublishError: jest.fn(),
+                });
+                const component = getComponent({ displayStatus, beacon: defaultBeacon });
+                expect(component.text()).toContain('Live location error');
+                // retry button
+                expect(findByTestId(component, 'beacon-status-reset-wire-error').length).toBeTruthy();
+            });
+
+            it('retry button resets location publish error', () => {
+                const displayStatus = BeaconDisplayStatus.Active;
+                const onResetLocationPublishError = jest.fn();
+                mocked(useOwnLiveBeacons).mockReturnValue({
+                    hasLocationPublishError: true,
+                    onResetLocationPublishError,
+                });
+                const component = getComponent({ displayStatus, beacon: defaultBeacon });
+                act(() => {
+                    findByTestId(component, 'beacon-status-reset-wire-error').at(0).simulate('click');
+                });
+
+                expect(onResetLocationPublishError).toHaveBeenCalled();
+            });
+        });
+
+        describe('with stopping error', () => {
+            it('renders in error mode', () => {
+                const displayStatus = BeaconDisplayStatus.Active;
+                mocked(useOwnLiveBeacons).mockReturnValue({
+                    hasLocationPublishError: false,
+                    hasStopSharingError: true,
+                    onStopSharing: jest.fn(),
+                });
+                const component = getComponent({ displayStatus, beacon: defaultBeacon });
+                expect(component.text()).toContain('Live location error');
+                // retry button
+                expect(findByTestId(component, 'beacon-status-stop-beacon-retry').length).toBeTruthy();
+            });
+
+            it('retry button retries stop sharing', () => {
+                const displayStatus = BeaconDisplayStatus.Active;
+                const onStopSharing = jest.fn();
+                mocked(useOwnLiveBeacons).mockReturnValue({
+                    hasStopSharingError: true,
+                    onStopSharing,
+                });
+                const component = getComponent({ displayStatus, beacon: defaultBeacon });
+                act(() => {
+                    findByTestId(component, 'beacon-status-stop-beacon-retry').at(0).simulate('click');
+                });
+
+                expect(onStopSharing).toHaveBeenCalled();
+            });
+        });
+    });
+
+    it('renders loading state correctly', () => {
+        const component = getComponent();
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/test/components/views/beacon/RoomLiveShareWarning-test.tsx b/test/components/views/beacon/RoomLiveShareWarning-test.tsx
new file mode 100644
index 00000000000..13ae42fce4f
--- /dev/null
+++ b/test/components/views/beacon/RoomLiveShareWarning-test.tsx
@@ -0,0 +1,415 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { mount } from 'enzyme';
+import { Room, Beacon, BeaconEvent, getBeaconInfoIdentifier } from 'matrix-js-sdk/src/matrix';
+import { logger } from 'matrix-js-sdk/src/logger';
+
+import RoomLiveShareWarning from '../../../../src/components/views/beacon/RoomLiveShareWarning';
+import { OwnBeaconStore, OwnBeaconStoreEvent } from '../../../../src/stores/OwnBeaconStore';
+import {
+    advanceDateAndTime,
+    findByTestId,
+    flushPromisesWithFakeTimers,
+    getMockClientWithEventEmitter,
+    makeBeaconInfoEvent,
+    mockGeolocation,
+    resetAsyncStoreWithClient,
+    setupAsyncStoreWithClient,
+} from '../../../test-utils';
+
+jest.useFakeTimers();
+describe('<RoomLiveShareWarning />', () => {
+    const aliceId = '@alice:server.org';
+    const room1Id = '$room1:server.org';
+    const room2Id = '$room2:server.org';
+    const room3Id = '$room3:server.org';
+    const mockClient = getMockClientWithEventEmitter({
+        getVisibleRooms: jest.fn().mockReturnValue([]),
+        getUserId: jest.fn().mockReturnValue(aliceId),
+        unstable_setLiveBeacon: jest.fn().mockResolvedValue({ event_id: '1' }),
+        sendEvent: jest.fn(),
+    });
+
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    const MINUTE_MS = 60000;
+    const HOUR_MS = 3600000;
+    // mock the date so events are stable for snapshots etc
+    jest.spyOn(global.Date, 'now').mockReturnValue(now);
+    const room1Beacon1 = makeBeaconInfoEvent(aliceId, room1Id, {
+        isLive: true,
+        timeout: HOUR_MS,
+    }, '$0');
+    const room2Beacon1 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS }, '$1');
+    const room2Beacon2 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS * 12 }, '$2');
+    const room3Beacon1 = makeBeaconInfoEvent(aliceId, room3Id, { isLive: true, timeout: HOUR_MS }, '$3');
+
+    // make fresh rooms every time
+    // as we update room state
+    const makeRoomsWithStateEvents = (stateEvents = []): [Room, Room] => {
+        const room1 = new Room(room1Id, mockClient, aliceId);
+        const room2 = new Room(room2Id, mockClient, aliceId);
+
+        room1.currentState.setStateEvents(stateEvents);
+        room2.currentState.setStateEvents(stateEvents);
+        mockClient.getVisibleRooms.mockReturnValue([room1, room2]);
+
+        return [room1, room2];
+    };
+
+    const makeOwnBeaconStore = async () => {
+        const store = OwnBeaconStore.instance;
+
+        await setupAsyncStoreWithClient(store, mockClient);
+        return store;
+    };
+
+    const defaultProps = {
+        roomId: room1Id,
+    };
+    const getComponent = (props = {}) => {
+        let component;
+        // component updates on render
+        // wrap in act
+        act(() => {
+            component = mount(<RoomLiveShareWarning {...defaultProps} {...props} />);
+        });
+        return component;
+    };
+
+    const localStorageSpy = jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(undefined);
+
+    beforeEach(() => {
+        mockGeolocation();
+        jest.spyOn(global.Date, 'now').mockReturnValue(now);
+        mockClient.unstable_setLiveBeacon.mockReset().mockResolvedValue({ event_id: '1' });
+
+        // assume all beacons were created on this device
+        localStorageSpy.mockReturnValue(JSON.stringify([
+            room1Beacon1.getId(),
+            room2Beacon1.getId(),
+            room2Beacon2.getId(),
+            room3Beacon1.getId(),
+        ]));
+    });
+
+    afterEach(async () => {
+        jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockRestore();
+        await resetAsyncStoreWithClient(OwnBeaconStore.instance);
+    });
+
+    afterAll(() => {
+        jest.spyOn(global.Date, 'now').mockRestore();
+        localStorageSpy.mockRestore();
+    });
+
+    const getExpiryText = wrapper => findByTestId(wrapper, 'room-live-share-expiry').text();
+
+    it('renders nothing when user has no live beacons at all', async () => {
+        await makeOwnBeaconStore();
+        const component = getComponent();
+        expect(component.html()).toBe(null);
+    });
+
+    it('renders nothing when user has no live beacons in room', async () => {
+        await act(async () => {
+            await makeRoomsWithStateEvents([room2Beacon1]);
+            await makeOwnBeaconStore();
+        });
+        const component = getComponent({ roomId: room1Id });
+        expect(component.html()).toBe(null);
+    });
+
+    it('does not render when geolocation is not working', async () => {
+        jest.spyOn(logger, 'error').mockImplementation(() => { });
+        // @ts-ignore
+        navigator.geolocation = undefined;
+        await act(async () => {
+            await makeRoomsWithStateEvents([room1Beacon1, room2Beacon1, room2Beacon2]);
+            await makeOwnBeaconStore();
+        });
+        const component = getComponent({ roomId: room1Id });
+
+        // beacons have generated ids that break snapshots
+        // assert on html
+        expect(component.html()).toBeNull();
+    });
+
+    describe('when user has live beacons and geolocation is available', () => {
+        beforeEach(async () => {
+            await act(async () => {
+                await makeRoomsWithStateEvents([room1Beacon1, room2Beacon1, room2Beacon2]);
+                await makeOwnBeaconStore();
+            });
+        });
+
+        it('renders correctly with one live beacon in room', () => {
+            const component = getComponent({ roomId: room1Id });
+            // beacons have generated ids that break snapshots
+            // assert on html
+            expect(component.html()).toMatchSnapshot();
+        });
+
+        it('renders correctly with two live beacons in room', () => {
+            const component = getComponent({ roomId: room2Id });
+            // beacons have generated ids that break snapshots
+            // assert on html
+            expect(component.html()).toMatchSnapshot();
+            // later expiry displayed
+            expect(getExpiryText(component)).toEqual('12h left');
+        });
+
+        it('removes itself when user stops having live beacons', async () => {
+            const component = getComponent({ roomId: room1Id });
+            // started out rendered
+            expect(component.html()).toBeTruthy();
+
+            // time travel until room1Beacon1 is expired
+            act(() => {
+                advanceDateAndTime(HOUR_MS + 1);
+            });
+            act(() => {
+                mockClient.emit(BeaconEvent.LivenessChange, false, new Beacon(room1Beacon1));
+                component.setProps({});
+            });
+
+            expect(component.html()).toBe(null);
+        });
+
+        it('removes itself when user stops monitoring live position', async () => {
+            const component = getComponent({ roomId: room1Id });
+            // started out rendered
+            expect(component.html()).toBeTruthy();
+
+            act(() => {
+                // cheat to clear this
+                // @ts-ignore
+                OwnBeaconStore.instance.clearPositionWatch = undefined;
+                OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.MonitoringLivePosition);
+                component.setProps({});
+            });
+
+            expect(component.html()).toBe(null);
+        });
+
+        it('renders when user adds a live beacon', async () => {
+            const component = getComponent({ roomId: room3Id });
+            // started out not rendered
+            expect(component.html()).toBeFalsy();
+
+            act(() => {
+                mockClient.emit(BeaconEvent.New, room3Beacon1, new Beacon(room3Beacon1));
+                component.setProps({});
+            });
+
+            expect(component.html()).toBeTruthy();
+        });
+
+        it('updates beacon time left periodically', () => {
+            const component = getComponent({ roomId: room1Id });
+            expect(getExpiryText(component)).toEqual('1h left');
+
+            act(() => {
+                advanceDateAndTime(MINUTE_MS * 25);
+            });
+
+            expect(getExpiryText(component)).toEqual('35m left');
+        });
+
+        it('updates beacon time left when beacon updates', () => {
+            const component = getComponent({ roomId: room1Id });
+            expect(getExpiryText(component)).toEqual('1h left');
+
+            expect(getExpiryText(component)).toEqual('1h left');
+
+            act(() => {
+                const beacon = OwnBeaconStore.instance.getBeaconById(getBeaconInfoIdentifier(room1Beacon1));
+                const room1Beacon1Update = makeBeaconInfoEvent(aliceId, room1Id, {
+                    isLive: true,
+                    timeout: 3 * HOUR_MS,
+                }, '$0');
+                beacon.update(room1Beacon1Update);
+            });
+
+            // update to expiry of new beacon
+            expect(getExpiryText(component)).toEqual('3h left');
+        });
+
+        it('clears expiry time interval on unmount', () => {
+            const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
+            const component = getComponent({ roomId: room1Id });
+            expect(getExpiryText(component)).toEqual('1h left');
+
+            act(() => {
+                component.unmount();
+            });
+
+            expect(clearIntervalSpy).toHaveBeenCalled();
+        });
+
+        describe('stopping beacons', () => {
+            it('stops beacon on stop sharing click', () => {
+                const component = getComponent({ roomId: room2Id });
+
+                act(() => {
+                    findByTestId(component, 'room-live-share-primary-button').at(0).simulate('click');
+                    component.setProps({});
+                });
+
+                expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalled();
+                expect(component.find('Spinner').length).toBeTruthy();
+                expect(findByTestId(component, 'room-live-share-primary-button').at(0).props().disabled).toBeTruthy();
+            });
+
+            it('displays error when stop sharing fails', async () => {
+                const component = getComponent({ roomId: room1Id });
+
+                // fail first time
+                mockClient.unstable_setLiveBeacon
+                    .mockRejectedValueOnce(new Error('oups'))
+                    .mockResolvedValue(({ event_id: '1' }));
+
+                await act(async () => {
+                    findByTestId(component, 'room-live-share-primary-button').at(0).simulate('click');
+                    await flushPromisesWithFakeTimers();
+                });
+                component.setProps({});
+
+                expect(component.html()).toMatchSnapshot();
+
+                act(() => {
+                    findByTestId(component, 'room-live-share-primary-button').at(0).simulate('click');
+                    component.setProps({});
+                });
+
+                expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledTimes(2);
+            });
+
+            it('displays again with correct state after stopping a beacon', () => {
+                // make sure the loading state is reset correctly after removing a beacon
+                const component = getComponent({ roomId: room1Id });
+
+                // stop the beacon
+                act(() => {
+                    findByTestId(component, 'room-live-share-primary-button').at(0).simulate('click');
+                });
+                // time travel until room1Beacon1 is expired
+                act(() => {
+                    advanceDateAndTime(HOUR_MS + 1);
+                });
+                act(() => {
+                    mockClient.emit(BeaconEvent.LivenessChange, false, new Beacon(room1Beacon1));
+                });
+
+                const newLiveBeacon = makeBeaconInfoEvent(aliceId, room1Id, { isLive: true });
+                act(() => {
+                    mockClient.emit(BeaconEvent.New, newLiveBeacon, new Beacon(newLiveBeacon));
+                });
+
+                // button not disabled and expiry time shown
+                expect(findByTestId(component, 'room-live-share-primary-button').at(0).props().disabled).toBeFalsy();
+                expect(findByTestId(component, 'room-live-share-expiry').text()).toEqual('1h left');
+            });
+        });
+
+        describe('with location publish errors', () => {
+            it('displays location publish error when mounted with location publish errors', async () => {
+                const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError')
+                    .mockReturnValue(true);
+                const component = getComponent({ roomId: room2Id });
+
+                expect(component).toMatchSnapshot();
+                expect(locationPublishErrorSpy).toHaveBeenCalledWith(
+                    getBeaconInfoIdentifier(room2Beacon1), 0, [getBeaconInfoIdentifier(room2Beacon1)],
+                );
+            });
+
+            it(
+                'displays location publish error when locationPublishError event is emitted' +
+                ' and beacons have errors',
+                async () => {
+                    const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError')
+                        .mockReturnValue(false);
+                    const component = getComponent({ roomId: room2Id });
+
+                    // update mock and emit event
+                    act(() => {
+                        locationPublishErrorSpy.mockReturnValue(true);
+                        OwnBeaconStore.instance.emit(
+                            OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(room2Beacon1),
+                        );
+                    });
+                    component.setProps({});
+
+                    // renders wire error ui
+                    expect(component.find('.mx_RoomLiveShareWarning_label').text()).toEqual(
+                        'An error occured whilst sharing your live location, please try again',
+                    );
+                    expect(findByTestId(component, 'room-live-share-wire-error-close-button').length).toBeTruthy();
+                });
+
+            it('stops displaying wire error when errors are cleared', async () => {
+                const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError')
+                    .mockReturnValue(true);
+                const component = getComponent({ roomId: room2Id });
+
+                // update mock and emit event
+                act(() => {
+                    locationPublishErrorSpy.mockReturnValue(false);
+                    OwnBeaconStore.instance.emit(
+                        OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(room2Beacon1),
+                    );
+                });
+                component.setProps({});
+
+                // renders error-free ui
+                expect(component.find('.mx_RoomLiveShareWarning_label').text()).toEqual(
+                    'You are sharing your live location',
+                );
+                expect(findByTestId(component, 'room-live-share-wire-error-close-button').length).toBeFalsy();
+            });
+
+            it('clicking retry button resets location publish errors', async () => {
+                jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockReturnValue(true);
+                const resetErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'resetLocationPublishError');
+
+                const component = getComponent({ roomId: room2Id });
+
+                act(() => {
+                    findByTestId(component, 'room-live-share-primary-button').at(0).simulate('click');
+                });
+
+                expect(resetErrorSpy).toHaveBeenCalledWith(getBeaconInfoIdentifier(room2Beacon1));
+            });
+
+            it('clicking close button stops beacons', async () => {
+                jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockReturnValue(true);
+                const stopBeaconSpy = jest.spyOn(OwnBeaconStore.instance, 'stopBeacon');
+
+                const component = getComponent({ roomId: room2Id });
+
+                act(() => {
+                    findByTestId(component, 'room-live-share-wire-error-close-button').at(0).simulate('click');
+                });
+
+                expect(stopBeaconSpy).toHaveBeenCalledWith(getBeaconInfoIdentifier(room2Beacon1));
+            });
+        });
+    });
+});
diff --git a/test/components/views/beacon/StyledLiveBeaconIcon-test.tsx b/test/components/views/beacon/StyledLiveBeaconIcon-test.tsx
new file mode 100644
index 00000000000..f239a264705
--- /dev/null
+++ b/test/components/views/beacon/StyledLiveBeaconIcon-test.tsx
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+
+import StyledLiveBeaconIcon from '../../../../src/components/views/beacon/StyledLiveBeaconIcon';
+
+describe('<StyledLiveBeaconIcon />', () => {
+    const defaultProps = {};
+    const getComponent = (props = {}) =>
+        mount(<StyledLiveBeaconIcon {...defaultProps} {...props} />);
+
+    it('renders', () => {
+        const component = getComponent();
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
new file mode 100644
index 00000000000..1518a60dba9
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<BeaconListItem /> when a beacon is live and has locations renders beacon info 1`] = `"<li class=\\"mx_BeaconListItem\\"><div class=\\"mx_StyledLiveBeaconIcon mx_BeaconListItem_avatarIcon\\"></div><div class=\\"mx_BeaconListItem_info\\"><div class=\\"mx_BeaconStatus mx_BeaconStatus_Active mx_BeaconListItem_status\\"><div class=\\"mx_BeaconStatus_description\\"><span class=\\"mx_BeaconStatus_label\\">Alice's car</span><span class=\\"mx_BeaconStatus_expiryTime\\">Live until 16:04</span></div><div class=\\"mx_CopyableText\\"><div aria-label=\\"Copy\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_CopyableText_copyButton\\"></div></div></div><span class=\\"mx_BeaconListItem_lastUpdated\\">Updated a few seconds ago</span></div></li>"`;
diff --git a/test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
new file mode 100644
index 00000000000..e590cbcd9f3
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/BeaconMarker-test.tsx.snap
@@ -0,0 +1,233 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
+<BeaconMarker
+  beacon={
+    Beacon {
+      "_beaconInfo": Object {
+        "assetType": "m.self",
+        "description": undefined,
+        "live": true,
+        "timeout": 3600000,
+        "timestamp": 1647270879403,
+      },
+      "_events": Object {
+        "Beacon.Destroy": Array [
+          [Function],
+          [Function],
+        ],
+        "Beacon.LivenessChange": Array [
+          [Function],
+          [Function],
+        ],
+        "Beacon.LocationUpdate": [Function],
+        "Beacon.new": [Function],
+        "Beacon.update": [Function],
+      },
+      "_eventsCount": 5,
+      "_isLive": true,
+      "_latestLocationState": Object {
+        "description": undefined,
+        "timestamp": 1647270879404,
+        "uri": "geo:51,41",
+      },
+      "_maxListeners": undefined,
+      "clearLatestLocation": [Function],
+      "livenessWatchInterval": undefined,
+      "roomId": "!room:server",
+      "rootEvent": Object {
+        "content": Object {
+          "description": undefined,
+          "live": true,
+          "org.matrix.msc3488.asset": Object {
+            "type": "m.self",
+          },
+          "org.matrix.msc3488.ts": 1647270879403,
+          "timeout": 3600000,
+        },
+        "event_id": "$alice-room1-1",
+        "origin_server_ts": 1647270879403,
+        "room_id": "!room:server",
+        "sender": "@alice:server",
+        "state_key": "@alice:server",
+        "type": "org.matrix.msc3672.beacon_info",
+      },
+      Symbol(kCapture): false,
+    }
+  }
+  map={
+    MockMap {
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_maxListeners": undefined,
+      "addControl": [MockFunction],
+      "fitBounds": [MockFunction],
+      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
+      "zoomIn": [MockFunction],
+      "zoomOut": [MockFunction],
+      Symbol(kCapture): false,
+    }
+  }
+>
+  <SmartMarker
+    geoUri="geo:51,41"
+    id="!room:server_@alice:server"
+    map={
+      MockMap {
+        "_events": Object {},
+        "_eventsCount": 0,
+        "_maxListeners": undefined,
+        "addControl": [MockFunction],
+        "fitBounds": [MockFunction],
+        "removeControl": [MockFunction],
+        "setCenter": [MockFunction],
+        "setStyle": [MockFunction],
+        "zoomIn": [MockFunction],
+        "zoomOut": [MockFunction],
+        Symbol(kCapture): false,
+      }
+    }
+    roomMember={
+      RoomMember {
+        "_events": Object {},
+        "_eventsCount": 0,
+        "_isOutOfBand": false,
+        "_maxListeners": undefined,
+        "_modified": 1647270879403,
+        "_requestedProfileInfo": undefined,
+        "disambiguate": false,
+        "events": Object {
+          "member": null,
+        },
+        "membership": null,
+        "name": "@alice:server",
+        "powerLevel": 0,
+        "powerLevelNorm": 0,
+        "rawDisplayName": "@alice:server",
+        "roomId": "!room:server",
+        "typing": false,
+        "user": null,
+        "userId": "@alice:server",
+        Symbol(kCapture): false,
+      }
+    }
+    useMemberColor={true}
+  >
+    <span>
+      <ForwardRef
+        id="!room:server_@alice:server"
+        roomMember={
+          RoomMember {
+            "_events": Object {},
+            "_eventsCount": 0,
+            "_isOutOfBand": false,
+            "_maxListeners": undefined,
+            "_modified": 1647270879403,
+            "_requestedProfileInfo": undefined,
+            "disambiguate": false,
+            "events": Object {
+              "member": null,
+            },
+            "membership": null,
+            "name": "@alice:server",
+            "powerLevel": 0,
+            "powerLevelNorm": 0,
+            "rawDisplayName": "@alice:server",
+            "roomId": "!room:server",
+            "typing": false,
+            "user": null,
+            "userId": "@alice:server",
+            Symbol(kCapture): false,
+          }
+        }
+        useMemberColor={true}
+      >
+        <div
+          className="mx_Marker mx_Username_color4"
+          id="!room:server_@alice:server"
+        >
+          <div
+            className="mx_Marker_border"
+          >
+            <MemberAvatar
+              height={36}
+              member={
+                RoomMember {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                  "_isOutOfBand": false,
+                  "_maxListeners": undefined,
+                  "_modified": 1647270879403,
+                  "_requestedProfileInfo": undefined,
+                  "disambiguate": false,
+                  "events": Object {
+                    "member": null,
+                  },
+                  "membership": null,
+                  "name": "@alice:server",
+                  "powerLevel": 0,
+                  "powerLevelNorm": 0,
+                  "rawDisplayName": "@alice:server",
+                  "roomId": "!room:server",
+                  "typing": false,
+                  "user": null,
+                  "userId": "@alice:server",
+                  Symbol(kCapture): false,
+                }
+              }
+              resizeMethod="crop"
+              viewUserOnClick={false}
+              width={36}
+            >
+              <BaseAvatar
+                height={36}
+                idName="@alice:server"
+                name="@alice:server"
+                resizeMethod="crop"
+                title="@alice:server"
+                url={null}
+                width={36}
+              >
+                <span
+                  className="mx_BaseAvatar"
+                  role="presentation"
+                >
+                  <span
+                    aria-hidden="true"
+                    className="mx_BaseAvatar_initial"
+                    style={
+                      Object {
+                        "fontSize": "23.400000000000002px",
+                        "lineHeight": "36px",
+                        "width": "36px",
+                      }
+                    }
+                  >
+                    A
+                  </span>
+                  <img
+                    alt=""
+                    aria-hidden="true"
+                    className="mx_BaseAvatar_image"
+                    onError={[Function]}
+                    src="data:image/png;base64,00"
+                    style={
+                      Object {
+                        "height": "36px",
+                        "width": "36px",
+                      }
+                    }
+                    title="@alice:server"
+                  />
+                </span>
+              </BaseAvatar>
+            </MemberAvatar>
+          </div>
+        </div>
+      </ForwardRef>
+    </span>
+  </SmartMarker>
+</BeaconMarker>
+`;
diff --git a/test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
new file mode 100644
index 00000000000..b3366336a17
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
@@ -0,0 +1,174 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<BeaconStatus /> active state renders with children 1`] = `null`;
+
+exports[`<BeaconStatus /> active state renders without children 1`] = `
+<BeaconStatus
+  beacon={
+    Beacon {
+      "_beaconInfo": Object {
+        "assetType": "m.self",
+        "description": undefined,
+        "live": undefined,
+        "timeout": 3600000,
+        "timestamp": 123456789,
+      },
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_isLive": undefined,
+      "_latestLocationState": undefined,
+      "_maxListeners": undefined,
+      "clearLatestLocation": [Function],
+      "livenessWatchInterval": undefined,
+      "roomId": "!room:server",
+      "rootEvent": Object {
+        "content": Object {
+          "description": undefined,
+          "live": undefined,
+          "org.matrix.msc3488.asset": Object {
+            "type": "m.self",
+          },
+          "org.matrix.msc3488.ts": 123456789,
+          "timeout": 3600000,
+        },
+        "event_id": "$1",
+        "origin_server_ts": 123456789,
+        "room_id": "!room:server",
+        "sender": "@user:server",
+        "state_key": "@user:server",
+        "type": "org.matrix.msc3672.beacon_info",
+      },
+      Symbol(kCapture): false,
+    }
+  }
+  displayStatus="Active"
+  label="test label"
+  withIcon={true}
+>
+  <div
+    className="mx_BeaconStatus mx_BeaconStatus_Active"
+  >
+    <StyledLiveBeaconIcon
+      className="mx_BeaconStatus_icon"
+      isIdle={false}
+      withError={false}
+    >
+      <div
+        className="mx_StyledLiveBeaconIcon mx_BeaconStatus_icon"
+      />
+    </StyledLiveBeaconIcon>
+    <div
+      className="mx_BeaconStatus_description"
+    >
+      <span
+        className="mx_BeaconStatus_label"
+      >
+        test label
+      </span>
+      <BeaconExpiryTime
+        beacon={
+          Beacon {
+            "_beaconInfo": Object {
+              "assetType": "m.self",
+              "description": undefined,
+              "live": undefined,
+              "timeout": 3600000,
+              "timestamp": 123456789,
+            },
+            "_events": Object {},
+            "_eventsCount": 0,
+            "_isLive": undefined,
+            "_latestLocationState": undefined,
+            "_maxListeners": undefined,
+            "clearLatestLocation": [Function],
+            "livenessWatchInterval": undefined,
+            "roomId": "!room:server",
+            "rootEvent": Object {
+              "content": Object {
+                "description": undefined,
+                "live": undefined,
+                "org.matrix.msc3488.asset": Object {
+                  "type": "m.self",
+                },
+                "org.matrix.msc3488.ts": 123456789,
+                "timeout": 3600000,
+              },
+              "event_id": "$1",
+              "origin_server_ts": 123456789,
+              "room_id": "!room:server",
+              "sender": "@user:server",
+              "state_key": "@user:server",
+              "type": "org.matrix.msc3672.beacon_info",
+            },
+            Symbol(kCapture): false,
+          }
+        }
+      >
+        <span
+          className="mx_BeaconStatus_expiryTime"
+        >
+          Live until 11:17
+        </span>
+      </BeaconExpiryTime>
+    </div>
+  </div>
+</BeaconStatus>
+`;
+
+exports[`<BeaconStatus /> renders loading state 1`] = `
+<BeaconStatus
+  displayStatus="Loading"
+  label="test label"
+  withIcon={true}
+>
+  <div
+    className="mx_BeaconStatus mx_BeaconStatus_Loading"
+  >
+    <StyledLiveBeaconIcon
+      className="mx_BeaconStatus_icon"
+      isIdle={true}
+      withError={false}
+    >
+      <div
+        className="mx_StyledLiveBeaconIcon mx_BeaconStatus_icon mx_StyledLiveBeaconIcon_idle"
+      />
+    </StyledLiveBeaconIcon>
+    <div
+      className="mx_BeaconStatus_description"
+    >
+      <span>
+        Loading live location...
+      </span>
+    </div>
+  </div>
+</BeaconStatus>
+`;
+
+exports[`<BeaconStatus /> renders stopped state 1`] = `
+<BeaconStatus
+  displayStatus="Stopped"
+  label="test label"
+  withIcon={true}
+>
+  <div
+    className="mx_BeaconStatus mx_BeaconStatus_Stopped"
+  >
+    <StyledLiveBeaconIcon
+      className="mx_BeaconStatus_icon"
+      isIdle={true}
+      withError={false}
+    >
+      <div
+        className="mx_StyledLiveBeaconIcon mx_BeaconStatus_icon mx_StyledLiveBeaconIcon_idle"
+      />
+    </StyledLiveBeaconIcon>
+    <div
+      className="mx_BeaconStatus_description"
+    >
+      <span>
+        Live location ended
+      </span>
+    </div>
+  </div>
+</BeaconStatus>
+`;
diff --git a/test/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
new file mode 100644
index 00000000000..59e47767817
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/BeaconViewDialog-test.tsx.snap
@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<BeaconViewDialog /> renders a fallback when no live beacons remain 1`] = `
+<div
+  className="mx_BeaconViewDialog_map mx_BeaconViewDialog_mapFallback"
+  data-test-id="beacon-view-dialog-map-fallback"
+>
+  <div
+    className="mx_BeaconViewDialog_mapFallbackIcon"
+  />
+  <span
+    className="mx_BeaconViewDialog_mapFallbackMessage"
+  >
+    No live locations
+  </span>
+  <AccessibleButton
+    data-test-id="beacon-view-dialog-fallback-close"
+    element="div"
+    kind="primary"
+    onClick={[MockFunction]}
+    role="button"
+    tabIndex={0}
+  >
+    <div
+      className="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+      data-test-id="beacon-view-dialog-fallback-close"
+      onClick={[MockFunction]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      role="button"
+      tabIndex={0}
+    >
+      Close
+    </div>
+  </AccessibleButton>
+</div>
+`;
diff --git a/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap b/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
new file mode 100644
index 00000000000..e3b6f104907
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
@@ -0,0 +1,53 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<DialogSidebar /> renders sidebar correctly 1`] = `
+<DialogSidebar
+  beacons={Array []}
+  requestClose={[MockFunction]}
+>
+  <div
+    className="mx_DialogSidebar"
+  >
+    <div
+      className="mx_DialogSidebar_header"
+    >
+      <Heading
+        size="h4"
+      >
+        <h4
+          className="mx_Heading_h4"
+        >
+          View List
+        </h4>
+      </Heading>
+      <AccessibleButton
+        className="mx_DialogSidebar_closeButton"
+        data-test-id="dialog-sidebar-close"
+        element="div"
+        onClick={[MockFunction]}
+        role="button"
+        tabIndex={0}
+        title="Close sidebar"
+      >
+        <div
+          className="mx_AccessibleButton mx_DialogSidebar_closeButton"
+          data-test-id="dialog-sidebar-close"
+          onClick={[MockFunction]}
+          onKeyDown={[Function]}
+          onKeyUp={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Close sidebar"
+        >
+          <div
+            className="mx_DialogSidebar_closeButtonIcon"
+          />
+        </div>
+      </AccessibleButton>
+    </div>
+    <ol
+      className="mx_DialogSidebar_list"
+    />
+  </div>
+</DialogSidebar>
+`;
diff --git a/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
new file mode 100644
index 00000000000..d1d6dd56c02
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
@@ -0,0 +1,76 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LeftPanelLiveShareWarning /> when user has live location monitor renders correctly when minimized 1`] = `
+<LeftPanelLiveShareWarning
+  isMinimized={true}
+>
+  <AccessibleButton
+    className="mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__minimized"
+    element="div"
+    onClick={[Function]}
+    role="button"
+    tabIndex={0}
+    title="You are sharing your live location"
+  >
+    <div
+      className="mx_AccessibleButton mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__minimized"
+      onClick={[Function]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      role="button"
+      tabIndex={0}
+      title="You are sharing your live location"
+    >
+      <div
+        height={10}
+      />
+    </div>
+  </AccessibleButton>
+</LeftPanelLiveShareWarning>
+`;
+
+exports[`<LeftPanelLiveShareWarning /> when user has live location monitor renders correctly when not minimized 1`] = `
+<LeftPanelLiveShareWarning>
+  <AccessibleButton
+    className="mx_LeftPanelLiveShareWarning"
+    element="div"
+    onClick={[Function]}
+    role="button"
+    tabIndex={0}
+  >
+    <div
+      className="mx_AccessibleButton mx_LeftPanelLiveShareWarning"
+      onClick={[Function]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      role="button"
+      tabIndex={0}
+    >
+      You are sharing your live location
+    </div>
+  </AccessibleButton>
+</LeftPanelLiveShareWarning>
+`;
+
+exports[`<LeftPanelLiveShareWarning /> when user has live location monitor renders location publish error 1`] = `
+<LeftPanelLiveShareWarning>
+  <AccessibleButton
+    className="mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__error"
+    element="div"
+    onClick={[Function]}
+    role="button"
+    tabIndex={0}
+  >
+    <div
+      className="mx_AccessibleButton mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__error"
+      onClick={[Function]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      role="button"
+      tabIndex={0}
+    >
+      An error occured whilst sharing your live location
+    </div>
+  </AccessibleButton>
+</LeftPanelLiveShareWarning>
+`;
diff --git a/test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap b/test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
new file mode 100644
index 00000000000..d2751ba2d9d
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<OwnBeaconStatus /> renders without a beacon instance 1`] = `
+<OwnBeaconStatus
+  displayStatus="Loading"
+>
+  <BeaconStatus
+    displayLiveTimeRemaining={true}
+    displayStatus="Loading"
+    label="Live location enabled"
+  >
+    <div
+      className="mx_BeaconStatus mx_BeaconStatus_Loading"
+    >
+      <div
+        className="mx_BeaconStatus_description"
+      >
+        <span>
+          Loading live location...
+        </span>
+      </div>
+    </div>
+  </BeaconStatus>
+</OwnBeaconStatus>
+`;
diff --git a/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
new file mode 100644
index 00000000000..c9695ddf582
--- /dev/null
+++ b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
@@ -0,0 +1,86 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with one live beacon in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">1h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop sharing</button></div>"`;
+
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with two live beacons in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">12h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop sharing</button></div>"`;
+
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available stopping beacons displays error when stop sharing fails 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon mx_StyledLiveBeaconIcon_error\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">An error occurred while stopping your live location, please try again</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Retry</button></div>"`;
+
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available with location publish errors displays location publish error when mounted with location publish errors 1`] = `
+<RoomLiveShareWarning
+  roomId="$room2:server.org"
+>
+  <RoomLiveShareWarningInner
+    liveBeaconIds={
+      Array [
+        "$room2:server.org_@alice:server.org",
+      ]
+    }
+    roomId="$room2:server.org"
+  >
+    <div
+      className="mx_RoomLiveShareWarning"
+    >
+      <StyledLiveBeaconIcon
+        className="mx_RoomLiveShareWarning_icon"
+        withError={true}
+      >
+        <div
+          className="mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon mx_StyledLiveBeaconIcon_error"
+        />
+      </StyledLiveBeaconIcon>
+      <span
+        className="mx_RoomLiveShareWarning_label"
+      >
+        An error occured whilst sharing your live location, please try again
+      </span>
+      <AccessibleButton
+        className="mx_RoomLiveShareWarning_stopButton"
+        data-test-id="room-live-share-primary-button"
+        disabled={false}
+        element="button"
+        kind="danger"
+        onClick={[Function]}
+        role="button"
+        tabIndex={0}
+      >
+        <button
+          className="mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger"
+          data-test-id="room-live-share-primary-button"
+          onClick={[Function]}
+          onKeyDown={[Function]}
+          onKeyUp={[Function]}
+          role="button"
+          tabIndex={0}
+        >
+          Retry
+        </button>
+      </AccessibleButton>
+      <AccessibleButton
+        className="mx_RoomLiveShareWarning_closeButton"
+        data-test-id="room-live-share-wire-error-close-button"
+        element="button"
+        onClick={[Function]}
+        role="button"
+        tabIndex={0}
+        title="Stop sharing and close"
+      >
+        <button
+          className="mx_AccessibleButton mx_RoomLiveShareWarning_closeButton"
+          data-test-id="room-live-share-wire-error-close-button"
+          onClick={[Function]}
+          onKeyDown={[Function]}
+          onKeyUp={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Stop sharing and close"
+        >
+          <div
+            className="mx_RoomLiveShareWarning_closeButtonIcon"
+          />
+        </button>
+      </AccessibleButton>
+    </div>
+  </RoomLiveShareWarningInner>
+</RoomLiveShareWarning>
+`;
diff --git a/test/components/views/context_menus/ContextMenu-test.tsx b/test/components/views/context_menus/ContextMenu-test.tsx
index 29a041f0f0e..46dbbe31fe0 100644
--- a/test/components/views/context_menus/ContextMenu-test.tsx
+++ b/test/components/views/context_menus/ContextMenu-test.tsx
@@ -17,9 +17,8 @@ limitations under the License.
 import React from "react";
 import { mount } from "enzyme";
 
-import "../../../skinned-sdk";
-import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu.tsx";
-import UIStore from "../../../../src/stores/UIStore.ts";
+import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu";
+import UIStore from "../../../../src/stores/UIStore";
 
 describe("<ContextMenu />", () => {
     // Hardcode window and menu dimensions
@@ -28,7 +27,7 @@ describe("<ContextMenu />", () => {
     jest.spyOn(UIStore, "instance", "get").mockImplementation(() => ({
         windowWidth: windowSize,
         windowHeight: windowSize,
-    }));
+    }) as unknown as UIStore);
     window.Element.prototype.getBoundingClientRect = jest.fn().mockReturnValue({
         width: menuSize,
         height: menuSize,
@@ -38,19 +37,22 @@ describe("<ContextMenu />", () => {
 
     describe("near top edge of window", () => {
         const targetY = -50;
+        const onFinished = jest.fn();
 
         const wrapper = mount(
             <ContextMenu
                 bottom={windowSize - targetY - menuSize}
                 right={menuSize}
+                onFinished={onFinished}
                 chevronFace={ChevronFace.Left}
                 chevronOffset={targetChevronOffset}
             />,
         );
         const chevron = wrapper.find(".mx_ContextualMenu_chevron_left");
 
-        const actualY = windowSize - parseInt(wrapper.getDOMNode().style.getPropertyValue("bottom")) - menuSize;
-        const actualChevronOffset = parseInt(chevron.getDOMNode().style.getPropertyValue("top"));
+        const bottomStyle = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("bottom"));
+        const actualY = windowSize - bottomStyle - menuSize;
+        const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("top"));
 
         it("stays within the window", () => {
             expect(actualY).toBeGreaterThanOrEqual(0);
@@ -62,10 +64,12 @@ describe("<ContextMenu />", () => {
 
     describe("near right edge of window", () => {
         const targetX = windowSize - menuSize + 50;
+        const onFinished = jest.fn();
 
         const wrapper = mount(
             <ContextMenu
                 bottom={0}
+                onFinished={onFinished}
                 left={targetX}
                 chevronFace={ChevronFace.Top}
                 chevronOffset={targetChevronOffset}
@@ -73,8 +77,8 @@ describe("<ContextMenu />", () => {
         );
         const chevron = wrapper.find(".mx_ContextualMenu_chevron_top");
 
-        const actualX = parseInt(wrapper.getDOMNode().style.getPropertyValue("left"));
-        const actualChevronOffset = parseInt(chevron.getDOMNode().style.getPropertyValue("left"));
+        const actualX = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("left"));
+        const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("left"));
 
         it("stays within the window", () => {
             expect(actualX + menuSize).toBeLessThanOrEqual(windowSize);
@@ -86,19 +90,21 @@ describe("<ContextMenu />", () => {
 
     describe("near bottom edge of window", () => {
         const targetY = windowSize - menuSize + 50;
+        const onFinished = jest.fn();
 
         const wrapper = mount(
             <ContextMenu
                 top={targetY}
                 left={0}
+                onFinished={onFinished}
                 chevronFace={ChevronFace.Right}
                 chevronOffset={targetChevronOffset}
             />,
         );
         const chevron = wrapper.find(".mx_ContextualMenu_chevron_right");
 
-        const actualY = parseInt(wrapper.getDOMNode().style.getPropertyValue("top"));
-        const actualChevronOffset = parseInt(chevron.getDOMNode().style.getPropertyValue("top"));
+        const actualY = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("top"));
+        const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("top"));
 
         it("stays within the window", () => {
             expect(actualY + menuSize).toBeLessThanOrEqual(windowSize);
@@ -110,19 +116,22 @@ describe("<ContextMenu />", () => {
 
     describe("near left edge of window", () => {
         const targetX = -50;
+        const onFinished = jest.fn();
 
         const wrapper = mount(
             <ContextMenu
                 top={0}
                 right={windowSize - targetX - menuSize}
                 chevronFace={ChevronFace.Bottom}
+                onFinished={onFinished}
                 chevronOffset={targetChevronOffset}
             />,
         );
         const chevron = wrapper.find(".mx_ContextualMenu_chevron_bottom");
 
-        const actualX = windowSize - parseInt(wrapper.getDOMNode().style.getPropertyValue("right")) - menuSize;
-        const actualChevronOffset = parseInt(chevron.getDOMNode().style.getPropertyValue("left"));
+        const rightStyle = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("right"));
+        const actualX = windowSize - rightStyle - menuSize;
+        const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("left"));
 
         it("stays within the window", () => {
             expect(actualX).toBeGreaterThanOrEqual(0);
diff --git a/test/components/views/context_menus/MessageContextMenu-test.tsx b/test/components/views/context_menus/MessageContextMenu-test.tsx
index 5755a7d280f..567e54b4189 100644
--- a/test/components/views/context_menus/MessageContextMenu-test.tsx
+++ b/test/components/views/context_menus/MessageContextMenu-test.tsx
@@ -21,7 +21,6 @@ import { Room } from 'matrix-js-sdk/src/models/room';
 import { PendingEventOrdering } from 'matrix-js-sdk/src/matrix';
 import { ExtensibleEvent, MessageEvent, M_POLL_KIND_DISCLOSED, PollStartEvent } from 'matrix-events-sdk';
 
-import '../../../skinned-sdk';
 import * as TestUtils from '../../../test-utils';
 import MessageContextMenu from '../../../../src/components/views/context_menus/MessageContextMenu';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
diff --git a/test/components/views/context_menus/SpaceContextMenu-test.tsx b/test/components/views/context_menus/SpaceContextMenu-test.tsx
index 249a74ce458..4dff077f0fc 100644
--- a/test/components/views/context_menus/SpaceContextMenu-test.tsx
+++ b/test/components/views/context_menus/SpaceContextMenu-test.tsx
@@ -19,19 +19,19 @@ import { mount } from 'enzyme';
 import { Room } from 'matrix-js-sdk/src/matrix';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
+import 'focus-visible'; // to fix context menus
 
-import '../../../skinned-sdk';
 import SpaceContextMenu from '../../../../src/components/views/context_menus/SpaceContextMenu';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
 import { findByTestId } from '../../../test-utils';
 import {
-    leaveSpace,
     shouldShowSpaceSettings,
     showCreateNewRoom,
     showCreateNewSubspace,
     showSpaceInvite,
     showSpaceSettings,
 } from '../../../../src/utils/space';
+import { leaveSpace } from "../../../../src/utils/leave-behaviour";
 import { shouldShowComponent } from '../../../../src/customisations/helpers/UIComponents';
 import { UIComponent } from '../../../../src/settings/UIFeature';
 
@@ -40,7 +40,6 @@ jest.mock('../../../../src/customisations/helpers/UIComponents', () => ({
 }));
 
 jest.mock('../../../../src/utils/space', () => ({
-    leaveSpace: jest.fn(),
     shouldShowSpaceSettings: jest.fn(),
     showCreateNewRoom: jest.fn(),
     showCreateNewSubspace: jest.fn(),
@@ -48,8 +47,9 @@ jest.mock('../../../../src/utils/space', () => ({
     showSpacePreferences: jest.fn(),
     showSpaceSettings: jest.fn(),
 }));
-jest.mock('../../../../src/stores/spaces/SpaceStore', () => ({
-    spacesEnabled: true,
+
+jest.mock('../../../../src/utils/leave-behaviour', () => ({
+    leaveSpace: jest.fn(),
 }));
 
 describe('<SpaceContextMenu />', () => {
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index b429da4bc64..d90b23baac1 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -18,12 +18,10 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { stubClient } from '../../../test-utils';
 import { findById, flushPromises } from '../../../test-utils';
-
-const AccessSecretStorageDialog = sdk.getComponent("dialogs.security.AccessSecretStorageDialog");
+import AccessSecretStorageDialog from "../../../../src/components/views/dialogs/security/AccessSecretStorageDialog";
 
 describe("AccessSecretStorageDialog", function() {
     it("Closes the dialog if _onRecoveryKeyNext is called with a valid key", async () => {
diff --git a/test/components/views/dialogs/ExportDialog-test.tsx b/test/components/views/dialogs/ExportDialog-test.tsx
index 252acc7526b..a23c719717b 100644
--- a/test/components/views/dialogs/ExportDialog-test.tsx
+++ b/test/components/views/dialogs/ExportDialog-test.tsx
@@ -20,7 +20,6 @@ import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";
 import { Room } from 'matrix-js-sdk/src/matrix';
 
-import '../../../skinned-sdk';
 import ExportDialog from '../../../../src/components/views/dialogs/ExportDialog';
 import { ExportType, ExportFormat } from '../../../../src/utils/exportUtils/exportUtils';
 import { createTestClient, mkStubRoom } from '../../../test-utils';
diff --git a/test/components/views/dialogs/ForwardDialog-test.js b/test/components/views/dialogs/ForwardDialog-test.js
index 2d260150798..835f73bbf69 100644
--- a/test/components/views/dialogs/ForwardDialog-test.js
+++ b/test/components/views/dialogs/ForwardDialog-test.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
-
 import React from "react";
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 86c803be2c3..798a30886c6 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -20,13 +20,9 @@ import ReactTestUtils from 'react-dom/test-utils';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
 import { sleep } from "matrix-js-sdk/src/utils";
 
-import sdk from '../../../skinned-sdk';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import * as TestUtilsMatrix from '../../../test-utils';
-
-const InteractiveAuthDialog = sdk.getComponent(
-    'views.dialogs.InteractiveAuthDialog',
-);
+import InteractiveAuthDialog from "../../../../src/components/views/dialogs/InteractiveAuthDialog";
 
 describe('InteractiveAuthDialog', function() {
     let parentDiv;
diff --git a/test/components/views/elements/AppTile-test.tsx b/test/components/views/elements/AppTile-test.tsx
index 3d3779568d4..7850442d32e 100644
--- a/test/components/views/elements/AppTile-test.tsx
+++ b/test/components/views/elements/AppTile-test.tsx
@@ -20,8 +20,6 @@ import { jest } from "@jest/globals";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixWidgetType } from "matrix-widget-api";
 
-// We can't use the usual `skinned-sdk`, as it stubs out the RightPanel
-import "../../../minimal-sdk";
 import RightPanel from "../../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
@@ -35,6 +33,7 @@ import { RightPanelPhases } from "../../../../src/stores/right-panel/RightPanelS
 import RightPanelStore from "../../../../src/stores/right-panel/RightPanelStore";
 import { UPDATE_EVENT } from "../../../../src/stores/AsyncStore";
 import WidgetStore, { IApp } from "../../../../src/stores/WidgetStore";
+import ActiveWidgetStore from "../../../../src/stores/ActiveWidgetStore";
 import AppTile from "../../../../src/components/views/elements/AppTile";
 import { Container, WidgetLayoutStore } from "../../../../src/stores/widgets/WidgetLayoutStore";
 import AppsDrawer from "../../../../src/components/views/rooms/AppsDrawer";
@@ -44,7 +43,20 @@ describe("AppTile", () => {
     let r1;
     let r2;
     const resizeNotifier = new ResizeNotifier();
-    let app: IApp;
+    let app1: IApp;
+    let app2: IApp;
+
+    const waitForRps = (roomId: string) => new Promise<void>(resolve => {
+        const update = () => {
+            if (
+                RightPanelStore.instance.currentCardForRoom(roomId).phase !==
+                RightPanelPhases.Widget
+            ) return;
+            RightPanelStore.instance.off(UPDATE_EVENT, update);
+            resolve();
+        };
+        RightPanelStore.instance.on(UPDATE_EVENT, update);
+    });
 
     beforeAll(async () => {
         stubClient();
@@ -66,18 +78,31 @@ describe("AppTile", () => {
             return [r1, r2];
         });
 
-        // Adjust various widget stores to add a mock app
-        app = {
+        // Adjust various widget stores to add mock apps
+        app1 = {
             id: "1",
             eventId: "1",
             roomId: "r1",
             type: MatrixWidgetType.Custom,
             url: "https://example.com",
-            name: "Example",
+            name: "Example 1",
+            creatorUserId: cli.getUserId(),
+            avatar_url: null,
+        };
+        app2 = {
+            id: "1",
+            eventId: "2",
+            roomId: "r2",
+            type: MatrixWidgetType.Custom,
+            url: "https://example.com",
+            name: "Example 2",
             creatorUserId: cli.getUserId(),
             avatar_url: null,
         };
-        jest.spyOn(WidgetStore.instance, "getApps").mockReturnValue([app]);
+        jest.spyOn(WidgetStore.instance, "getApps").mockImplementation(roomId => {
+            if (roomId === "r1") return [app1];
+            if (roomId === "r2") return [app2];
+        });
 
         // Wake up various stores we rely on
         WidgetLayoutStore.instance.useUnitTestClient(cli);
@@ -88,6 +113,10 @@ describe("AppTile", () => {
         await RightPanelStore.instance.onReady();
     });
 
+    beforeEach(() => {
+        jest.spyOn(SettingsStore, "getValue").mockRestore();
+    });
+
     it("destroys non-persisted right panel widget on room change", async () => {
         // Set up right panel state
         const realGetValue = SettingsStore.getValue;
@@ -115,24 +144,14 @@ describe("AppTile", () => {
             />
         </MatrixClientContext.Provider>);
         // Wait for RPS room 1 updates to fire
-        const rpsUpdated = new Promise<void>(resolve => {
-            const update = () => {
-                if (
-                    RightPanelStore.instance.currentCardForRoom("r1").phase !==
-                    RightPanelPhases.Widget
-                ) return;
-                RightPanelStore.instance.off(UPDATE_EVENT, update);
-                resolve();
-            };
-            RightPanelStore.instance.on(UPDATE_EVENT, update);
-        });
+        const rpsUpdated = waitForRps("r1");
         dis.dispatch({
             action: Action.ViewRoom,
             room_id: "r1",
         });
         await rpsUpdated;
 
-        expect(AppTile.isLive("1")).toBe(true);
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(true);
 
         // We want to verify that as we change to room 2, we should close the
         // right panel and destroy the widget.
@@ -152,11 +171,86 @@ describe("AppTile", () => {
         </MatrixClientContext.Provider>);
 
         expect(endWidgetActions.mock.calls.length).toBe(1);
-        expect(AppTile.isLive("1")).toBe(false);
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(false);
 
         mockSettings.mockRestore();
     });
 
+    it("distinguishes widgets with the same ID in different rooms", async () => {
+        // Set up right panel state
+        const realGetValue = SettingsStore.getValue;
+        jest.spyOn(SettingsStore, 'getValue').mockImplementation((name, roomId) => {
+            if (name === "RightPanel.phases") {
+                if (roomId === "r1") {
+                    return {
+                        history: [{
+                            phase: RightPanelPhases.Widget,
+                            state: {
+                                widgetId: "1",
+                            },
+                        }],
+                        isOpen: true,
+                    };
+                }
+                return null;
+            }
+            return realGetValue(name, roomId);
+        });
+
+        // Run initial render with room 1, and also running lifecycle methods
+        const renderer = TestRenderer.create(<MatrixClientContext.Provider value={cli}>
+            <RightPanel
+                room={r1}
+                resizeNotifier={resizeNotifier}
+            />
+        </MatrixClientContext.Provider>);
+        // Wait for RPS room 1 updates to fire
+        const rpsUpdated1 = waitForRps("r1");
+        dis.dispatch({
+            action: Action.ViewRoom,
+            room_id: "r1",
+        });
+        await rpsUpdated1;
+
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(true);
+        expect(ActiveWidgetStore.instance.isLive("1", "r2")).toBe(false);
+
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((name, roomId) => {
+            if (name === "RightPanel.phases") {
+                if (roomId === "r2") {
+                    return {
+                        history: [{
+                            phase: RightPanelPhases.Widget,
+                            state: {
+                                widgetId: "1",
+                            },
+                        }],
+                        isOpen: true,
+                    };
+                }
+                return null;
+            }
+            return realGetValue(name, roomId);
+        });
+        // Wait for RPS room 2 updates to fire
+        const rpsUpdated2 = waitForRps("r2");
+        // Switch to room 2
+        dis.dispatch({
+            action: Action.ViewRoom,
+            room_id: "r2",
+        });
+        renderer.update(<MatrixClientContext.Provider value={cli}>
+            <RightPanel
+                room={r2}
+                resizeNotifier={resizeNotifier}
+            />
+        </MatrixClientContext.Provider>);
+        await rpsUpdated2;
+
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(false);
+        expect(ActiveWidgetStore.instance.isLive("1", "r2")).toBe(true);
+    });
+
     it("preserves non-persisted widget on container move", async () => {
         // Set up widget in top container
         const realGetValue = SettingsStore.getValue;
@@ -187,7 +281,7 @@ describe("AppTile", () => {
             />
         </MatrixClientContext.Provider>);
 
-        expect(AppTile.isLive("1")).toBe(true);
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(true);
 
         // We want to verify that as we move the widget to the center container,
         // the widget frame remains running.
@@ -199,11 +293,11 @@ describe("AppTile", () => {
         // Stop mocking settings so that the widget move can take effect
         mockSettings.mockRestore();
         TestRenderer.act(() => {
-            WidgetLayoutStore.instance.moveToContainer(r1, app, Container.Center);
+            WidgetLayoutStore.instance.moveToContainer(r1, app1, Container.Center);
         });
 
         expect(endWidgetActions.mock.calls.length).toBe(0);
-        expect(AppTile.isLive("1")).toBe(true);
+        expect(ActiveWidgetStore.instance.isLive("1", "r1")).toBe(true);
     });
 
     afterAll(async () => {
diff --git a/test/components/views/elements/EventListSummary-test.js b/test/components/views/elements/EventListSummary-test.js
index 0fb21eccede..9ca5863aeed 100644
--- a/test/components/views/elements/EventListSummary-test.js
+++ b/test/components/views/elements/EventListSummary-test.js
@@ -2,11 +2,11 @@ import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ShallowRenderer from "react-test-renderer/shallow";
 
-import sdk from '../../../skinned-sdk';
 import * as testUtils from '../../../test-utils';
+import _EventListSummary from "../../../../src/components/views/elements/EventListSummary";
 
 // Give ELS a matrixClient in its child context
-const EventListSummary = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.elements.EventListSummary'));
+const EventListSummary = testUtils.wrapInMatrixClientContext(_EventListSummary);
 
 describe('EventListSummary', function() {
     // Generate dummy event tiles for use in simulating an expanded MELS
diff --git a/test/components/views/elements/InteractiveTooltip-test.ts b/test/components/views/elements/InteractiveTooltip-test.ts
index fcf3da8eb55..68efca41bd5 100644
--- a/test/components/views/elements/InteractiveTooltip-test.ts
+++ b/test/components/views/elements/InteractiveTooltip-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../../../skinned-sdk';
 import { Direction, mouseWithinRegion } from "../../../../src/components/views/elements/InteractiveTooltip";
 
 describe("InteractiveTooltip", () => {
diff --git a/test/components/views/elements/PollCreateDialog-test.tsx b/test/components/views/elements/PollCreateDialog-test.tsx
index 7ac68ccf3ba..41d2591b649 100644
--- a/test/components/views/elements/PollCreateDialog-test.tsx
+++ b/test/components/views/elements/PollCreateDialog-test.tsx
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
 import { Room } from "matrix-js-sdk/src/models/room";
@@ -26,16 +24,15 @@ import {
     M_TEXT,
     PollStartEvent,
 } from 'matrix-events-sdk';
-import { IContent, MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 
 import {
-    wrapInMatrixClientContext,
     findById,
-    stubClient,
+    getMockClientWithEventEmitter,
 } from '../../../test-utils';
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import _PollCreateDialog from "../../../../src/components/views/elements/PollCreateDialog";
-const PollCreateDialog = wrapInMatrixClientContext(_PollCreateDialog);
+import PollCreateDialog from "../../../../src/components/views/elements/PollCreateDialog";
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
 
 // Fake date to give a predictable snapshot
 const realDateNow = Date.now;
@@ -51,9 +48,21 @@ afterAll(() => {
 });
 
 describe("PollCreateDialog", () => {
+    const mockClient = getMockClientWithEventEmitter({
+        sendEvent: jest.fn().mockResolvedValue({ event_id: '1' }),
+    });
+
+    beforeEach(() => {
+        mockClient.sendEvent.mockClear();
+    });
+
     it("renders a blank poll", () => {
         const dialog = mount(
             <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
+            {
+                wrappingComponent: MatrixClientContext.Provider,
+                wrappingComponentProps: { value: mockClient },
+            },
         );
         expect(dialog.html()).toMatchSnapshot();
     });
@@ -207,9 +216,6 @@ describe("PollCreateDialog", () => {
     });
 
     it("displays a spinner after submitting", () => {
-        stubClient();
-        MatrixClientPeg.get().sendEvent = jest.fn(() => Promise.resolve());
-
         const dialog = mount(
             <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
         );
@@ -223,21 +229,6 @@ describe("PollCreateDialog", () => {
     });
 
     it("sends a poll create event when submitted", () => {
-        stubClient();
-        let sentEventContent: IContent = null;
-        MatrixClientPeg.get().sendEvent = jest.fn(
-            (
-                _roomId: string,
-                _threadId: string,
-                eventType: string,
-                content: IContent,
-            ) => {
-                expect(M_POLL_START.matches(eventType)).toBeTruthy();
-                sentEventContent = content;
-                return Promise.resolve();
-            },
-        );
-
         const dialog = mount(
             <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
         );
@@ -246,6 +237,8 @@ describe("PollCreateDialog", () => {
         changeValue(dialog, "Option 2", "A2");
 
         dialog.find("button").simulate("click");
+        const [, , eventType, sentEventContent] = mockClient.sendEvent.mock.calls[0];
+        expect(M_POLL_START.matches(eventType)).toBeTruthy();
         expect(sentEventContent).toEqual(
             {
                 [M_TEXT.name]: "Q\n1. A1\n2. A2",
@@ -275,21 +268,6 @@ describe("PollCreateDialog", () => {
     });
 
     it("sends a poll edit event when editing", () => {
-        stubClient();
-        let sentEventContent: IContent = null;
-        MatrixClientPeg.get().sendEvent = jest.fn(
-            (
-                _roomId: string,
-                _threadId: string,
-                eventType: string,
-                content: IContent,
-            ) => {
-                expect(M_POLL_START.matches(eventType)).toBeTruthy();
-                sentEventContent = content;
-                return Promise.resolve();
-            },
-        );
-
         const previousEvent: MatrixEvent = new MatrixEvent(
             PollStartEvent.from(
                 "Poll Q",
@@ -312,6 +290,8 @@ describe("PollCreateDialog", () => {
         changeKind(dialog, M_POLL_KIND_UNDISCLOSED.name);
         dialog.find("button").simulate("click");
 
+        const [, , eventType, sentEventContent] = mockClient.sendEvent.mock.calls[0];
+        expect(M_POLL_START.matches(eventType)).toBeTruthy();
         expect(sentEventContent).toEqual(
             {
                 "m.new_content": {
diff --git a/test/components/views/elements/ReplyChain-test.js b/test/components/views/elements/ReplyChain-test.tsx
similarity index 96%
rename from test/components/views/elements/ReplyChain-test.js
rename to test/components/views/elements/ReplyChain-test.tsx
index 64784835e19..bcc33c1fedf 100644
--- a/test/components/views/elements/ReplyChain-test.js
+++ b/test/components/views/elements/ReplyChain-test.tsx
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
 import * as testUtils from '../../../test-utils';
 import { getParentEventId } from "../../../../src/utils/Reply";
 
@@ -70,7 +69,7 @@ describe("ReplyChain", () => {
                     },
                     "m.relates_to": {
                         "rel_type": "m.replace",
-                        "event_id": originalEventWithRelation.event_id,
+                        "event_id": originalEventWithRelation.getId(),
                     },
                 },
                 user: "some_other_user",
@@ -114,7 +113,7 @@ describe("ReplyChain", () => {
                     },
                     "m.relates_to": {
                         "rel_type": "m.replace",
-                        "event_id": originalEvent.event_id,
+                        "event_id": originalEvent.getId(),
                     },
                 },
                 user: "some_other_user",
@@ -163,7 +162,7 @@ describe("ReplyChain", () => {
                     },
                     "m.relates_to": {
                         "rel_type": "m.replace",
-                        "event_id": originalEventWithRelation.event_id,
+                        "event_id": originalEventWithRelation.getId(),
                     },
                 },
                 user: "some_other_user",
@@ -208,7 +207,7 @@ describe("ReplyChain", () => {
                     },
                     "m.relates_to": {
                         "rel_type": "m.replace",
-                        "event_id": originalEventWithRelation.event_id,
+                        "event_id": originalEventWithRelation.getId(),
                     },
                 },
                 user: "some_other_user",
diff --git a/test/components/views/elements/StyledRadioGroup-test.tsx b/test/components/views/elements/StyledRadioGroup-test.tsx
index b82920b92b9..d567be33948 100644
--- a/test/components/views/elements/StyledRadioGroup-test.tsx
+++ b/test/components/views/elements/StyledRadioGroup-test.tsx
@@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import "../../../skinned-sdk";
 
 import React from 'react';
 import { mount } from 'enzyme';
diff --git a/test/components/views/elements/TooltipTarget-test.tsx b/test/components/views/elements/TooltipTarget-test.tsx
index cdb550a6d00..cf7657bc400 100644
--- a/test/components/views/elements/TooltipTarget-test.tsx
+++ b/test/components/views/elements/TooltipTarget-test.tsx
@@ -1,5 +1,3 @@
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
 import {
     renderIntoDocument,
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
deleted file mode 100644
index bdb7713fd4f..00000000000
--- a/test/components/views/groups/GroupMemberList-test.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-import ReactDOM from "react-dom";
-import ReactTestUtils from "react-dom/test-utils";
-import MockHttpBackend from "matrix-mock-request";
-import * as Matrix from "matrix-js-sdk/src/matrix";
-
-import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import sdk from "../../../skinned-sdk";
-import * as TestUtils from "../../../test-utils";
-
-const { waitForUpdate } = TestUtils;
-
-const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");
-const WrappedGroupMemberList = TestUtils.wrapInMatrixClientContext(GroupMemberList);
-
-describe("GroupMemberList", function() {
-    let root;
-    let rootElement;
-    let httpBackend;
-    let summaryResponse;
-    let groupId;
-    let groupIdEncoded;
-
-    // Summary response fields
-    const user = {
-        is_privileged: true, // can edit the group
-        is_public: true, // appear as a member to non-members
-        is_publicised: true, // display flair
-    };
-    const usersSection = {
-        roles: {},
-        total_user_count_estimate: 0,
-        users: [],
-    };
-    const roomsSection = {
-        categories: {},
-        rooms: [],
-        total_room_count_estimate: 0,
-    };
-
-    // Users response fields
-    const usersResponse = {
-        chunk: [
-            {
-                user_id: "@test:matrix.org",
-                displayname: "Test",
-                avatar_url: "mxc://matrix.org/oUxxDyzQOHdVDMxgwFzyCWEe",
-                is_public: true,
-                is_privileged: true,
-                attestation: {},
-            },
-        ],
-    };
-
-    beforeEach(function() {
-        httpBackend = new MockHttpBackend();
-
-        Matrix.request(httpBackend.requestFn);
-
-        MatrixClientPeg.get = () => Matrix.createClient({
-            baseUrl: "https://my.home.server",
-            userId: "@me:here",
-            accessToken: "123456789",
-        });
-
-        summaryResponse = {
-            profile: {
-                avatar_url: "mxc://someavatarurl",
-                is_openly_joinable: true,
-                is_public: true,
-                long_description: "This is a <b>LONG</b> description.",
-                name: "The name of a community",
-                short_description: "This is a community",
-            },
-            user,
-            users_section: usersSection,
-            rooms_section: roomsSection,
-        };
-
-        groupId = "+" + Math.random().toString(16).slice(2) + ":domain";
-        groupIdEncoded = encodeURIComponent(groupId);
-
-        rootElement = document.createElement("div");
-        root = ReactDOM.render(<WrappedGroupMemberList groupId={groupId} />, rootElement);
-    });
-
-    afterEach(function() {
-        ReactDOM.unmountComponentAtNode(rootElement);
-    });
-
-    it("should show group member list after successful /users", function() {
-        const groupMemberList = ReactTestUtils.findRenderedComponentWithType(root, GroupMemberList);
-        const prom = waitForUpdate(groupMemberList, 4).then(() => {
-            ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList");
-
-            const memberList = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList_joined");
-            const memberListElement = ReactDOM.findDOMNode(memberList);
-            expect(memberListElement).toBeTruthy();
-            const userNameElement = memberListElement.querySelector(".mx_EntityTile_name");
-            expect(userNameElement).toBeTruthy();
-            expect(userNameElement.textContent).toBe("Test");
-        });
-
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/summary").respond(200, summaryResponse);
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/users").respond(200, usersResponse);
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/invited_users").respond(200, { chunk: [] });
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/rooms").respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-
-    it("should show error message after failed /users", function() {
-        const groupMemberList = ReactTestUtils.findRenderedComponentWithType(root, GroupMemberList);
-        const prom = waitForUpdate(groupMemberList, 4).then(() => {
-            ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList");
-
-            const memberList = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList_joined");
-            const memberListElement = ReactDOM.findDOMNode(memberList);
-            expect(memberListElement).toBeTruthy();
-            expect(memberListElement.textContent).toBe("Failed to load group members");
-        });
-
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/summary").respond(200, summaryResponse);
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/users").respond(500, {});
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/invited_users").respond(200, { chunk: [] });
-        httpBackend.when("GET", "/groups/" + groupIdEncoded + "/rooms").respond(200, { chunk: [] });
-
-        httpBackend.flush(undefined, undefined, 0);
-        return prom;
-    });
-});
diff --git a/test/components/views/location/LiveDurationDropdown-test.tsx b/test/components/views/location/LiveDurationDropdown-test.tsx
new file mode 100644
index 00000000000..b07b9b9d224
--- /dev/null
+++ b/test/components/views/location/LiveDurationDropdown-test.tsx
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+
+import LiveDurationDropdown, { DEFAULT_DURATION_MS }
+    from '../../../../src/components/views/location/LiveDurationDropdown';
+import { findById, mockPlatformPeg } from '../../../test-utils';
+
+mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
+
+describe('<LiveDurationDropdown />', () => {
+    const defaultProps = {
+        timeout: DEFAULT_DURATION_MS,
+        onChange: jest.fn(),
+    };
+    const getComponent = (props = {}) =>
+        mount(<LiveDurationDropdown {...defaultProps} {...props} />);
+
+    const getOption = (wrapper, timeout) => findById(wrapper, `live-duration__${timeout}`).at(0);
+    const getSelectedOption = (wrapper) => findById(wrapper, 'live-duration_value');
+    const openDropdown = (wrapper) => act(() => {
+        wrapper.find('[role="button"]').at(0).simulate('click');
+        wrapper.setProps({});
+    });
+
+    it('renders timeout as selected option', () => {
+        const wrapper = getComponent();
+        expect(getSelectedOption(wrapper).text()).toEqual('Share for 15m');
+    });
+
+    it('renders non-default timeout as selected option', () => {
+        const timeout = 1234567;
+        const wrapper = getComponent({ timeout });
+        expect(getSelectedOption(wrapper).text()).toEqual(`Share for 21m`);
+    });
+
+    it('renders a dropdown option for a non-default timeout value', () => {
+        const timeout = 1234567;
+        const wrapper = getComponent({ timeout });
+        openDropdown(wrapper);
+        expect(getOption(wrapper, timeout).text()).toEqual(`Share for 21m`);
+    });
+
+    it('updates value on option selection', () => {
+        const onChange = jest.fn();
+        const wrapper = getComponent({ onChange });
+
+        const ONE_HOUR = 3600000;
+
+        openDropdown(wrapper);
+
+        act(() => {
+            getOption(wrapper, ONE_HOUR).simulate('click');
+        });
+
+        expect(onChange).toHaveBeenCalledWith(ONE_HOUR);
+    });
+});
diff --git a/test/components/views/location/LocationButton-test.tsx b/test/components/views/location/LocationButton-test.tsx
index 2737fa83549..2a247d472d9 100644
--- a/test/components/views/location/LocationButton-test.tsx
+++ b/test/components/views/location/LocationButton-test.tsx
@@ -14,11 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import sdk from "../../../skinned-sdk";
 import { textForLocation } from "../../../../src/components/views/location/shareLocation";
 
-sdk.getComponent("LocationPicker");
-
 describe("LocationButton", () => {
     describe("textForLocation", () => {
         it("with no description, simply dumps URI and date", () => {
diff --git a/test/components/views/location/LocationPicker-test.tsx b/test/components/views/location/LocationPicker-test.tsx
index e28c8cea78e..6dd25ae72d0 100644
--- a/test/components/views/location/LocationPicker-test.tsx
+++ b/test/components/views/location/LocationPicker-test.tsx
@@ -14,89 +14,312 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk"; // Must be first for skinning to work
-import { getGeoUri } from "../../../../src/components/views/location/LocationPicker";
+import React from 'react';
+import maplibregl from "maplibre-gl";
+import { mount } from "enzyme";
+import { act } from 'react-dom/test-utils';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixClient } from 'matrix-js-sdk/src/client';
+import { mocked } from 'jest-mock';
+import { logger } from 'matrix-js-sdk/src/logger';
+
+import LocationPicker from "../../../../src/components/views/location/LocationPicker";
+import { LocationShareType } from "../../../../src/components/views/location/shareLocation";
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import { findById, findByTestId, mockPlatformPeg } from '../../../test-utils';
+import { findMapStyleUrl, LocationShareError } from '../../../../src/utils/location';
+
+jest.mock('../../../../src/utils/location/findMapStyleUrl', () => ({
+    findMapStyleUrl: jest.fn().mockReturnValue('tileserver.com'),
+}));
+
+// dropdown uses this
+mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
 
 describe("LocationPicker", () => {
-    describe("getGeoUri", () => {
-        it("Renders a URI with only lat and lon", () => {
-            const pos: GeolocationPosition = {
-                coords: {
-                    latitude: 43.2,
-                    longitude: 12.4,
-                    altitude: undefined,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-                timestamp: 12334,
-            };
-            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
+    describe('<LocationPicker />', () => {
+        const roomId = '!room:server.org';
+        const userId = '@user:server.org';
+        const sender = new RoomMember(roomId, userId);
+        const defaultProps = {
+            sender,
+            shareType: LocationShareType.Own,
+            onChoose: jest.fn(),
+            onFinished: jest.fn(),
+        };
+        const mockClient = {
+            on: jest.fn(),
+            removeListener: jest.fn(),
+            off: jest.fn(),
+            isGuest: jest.fn(),
+            getClientWellKnown: jest.fn(),
+        };
+        const getComponent = (props = {}) => mount(<LocationPicker {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
+
+        const mockMap = new maplibregl.Map();
+        const mockGeolocate = new maplibregl.GeolocateControl();
+        const mockMarker = new maplibregl.Marker();
+
+        const mockGeolocationPosition = {
+            coords: {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: 12.3,
+                accuracy: 21,
+            },
+            timestamp: 123,
+        };
+        const mockClickEvent = {
+            lngLat: {
+                lat: 43.2,
+                lng: 12.4,
+            },
+        };
+
+        beforeEach(() => {
+            jest.spyOn(logger, 'error').mockRestore();
+            jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient as unknown as MatrixClient);
+            jest.clearAllMocks();
+            mocked(mockMap).addControl.mockReset();
+            mocked(findMapStyleUrl).mockReturnValue('tileserver.com');
+        });
+
+        it('displays error when map emits an error', () => {
+            // suppress expected error log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+            const wrapper = getComponent();
+
+            act(() => {
+                // @ts-ignore
+                mocked(mockMap).emit('error', { error: 'Something went wrong' });
+                wrapper.setProps({});
+            });
+
+            expect(findByTestId(wrapper, 'location-picker-error').find('p').text()).toEqual(
+                "This homeserver is not configured correctly to display maps, "
+                + "or the configured map server may be unreachable.",
+            );
+        });
+
+        it('displays error when map display is not configured properly', () => {
+            // suppress expected error log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+            mocked(findMapStyleUrl).mockImplementation(() => {
+                throw new Error(LocationShareError.MapStyleUrlNotConfigured);
+            });
+
+            const wrapper = getComponent();
+            wrapper.setProps({});
+
+            expect(findByTestId(wrapper, 'location-picker-error').find('p').text()).toEqual(
+                "This homeserver is not configured to display maps.",
+            );
+        });
+
+        it('displays error when map setup throws', () => {
+            // suppress expected error log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+
+            // throw an error
+            mocked(mockMap).addControl.mockImplementation(() => { throw new Error('oups'); });
+
+            const wrapper = getComponent();
+            wrapper.setProps({});
+
+            expect(findByTestId(wrapper, 'location-picker-error').find('p').text()).toEqual(
+                "This homeserver is not configured correctly to display maps, "
+                + "or the configured map server may be unreachable.",
+            );
         });
 
-        it("Nulls in location are not shown in URI", () => {
-            const pos: GeolocationPosition = {
-                coords: {
-                    latitude: 43.2,
-                    longitude: 12.4,
-                    altitude: null,
-                    accuracy: null,
-                    altitudeAccuracy: null,
-                    heading: null,
-                    speed: null,
-                },
-                timestamp: 12334,
-            };
-            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
+        it('initiates map with geolocation', () => {
+            getComponent();
+
+            expect(mockMap.addControl).toHaveBeenCalledWith(mockGeolocate);
+            act(() => {
+                // @ts-ignore
+                mocked(mockMap).emit('load');
+            });
+
+            expect(mockGeolocate.trigger).toHaveBeenCalled();
         });
 
-        it("Renders a URI with 3 coords", () => {
-            const pos: GeolocationPosition = {
-                coords: {
-                    latitude: 43.2,
-                    longitude: 12.4,
-                    altitude: 332.54,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-                timestamp: 12334,
-            };
-            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4,332.54");
+        const testUserLocationShareTypes = (shareType: LocationShareType.Own | LocationShareType.Live) => {
+            describe('user location behaviours', () => {
+                it('closes and displays error when geolocation errors', () => {
+                    // suppress expected error log
+                    jest.spyOn(logger, 'error').mockImplementation(() => { });
+                    const onFinished = jest.fn();
+                    getComponent({ onFinished, shareType });
+
+                    expect(mockMap.addControl).toHaveBeenCalledWith(mockGeolocate);
+                    act(() => {
+                        // @ts-ignore
+                        mockMap.emit('load');
+                        // @ts-ignore
+                        mockGeolocate.emit('error', {});
+                    });
+
+                    // dialog is closed on error
+                    expect(onFinished).toHaveBeenCalled();
+                });
+
+                it('sets position on geolocate event', () => {
+                    const wrapper = getComponent({ shareType });
+                    act(() => {
+                        // @ts-ignore
+                        mocked(mockGeolocate).emit('geolocate', mockGeolocationPosition);
+                        wrapper.setProps({});
+                    });
+
+                    // marker added
+                    expect(maplibregl.Marker).toHaveBeenCalled();
+                    expect(mockMarker.setLngLat).toHaveBeenCalledWith(new maplibregl.LngLat(
+                        12.4, 43.2,
+                    ));
+                    // submit button is enabled when position is truthy
+                    expect(findByTestId(wrapper, 'location-picker-submit-button').at(0).props().disabled).toBeFalsy();
+                    expect(wrapper.find('MemberAvatar').length).toBeTruthy();
+                });
+
+                it('submits location', () => {
+                    const onChoose = jest.fn();
+                    const wrapper = getComponent({ onChoose, shareType });
+                    act(() => {
+                        // @ts-ignore
+                        mocked(mockGeolocate).emit('geolocate', mockGeolocationPosition);
+                        // make sure button is enabled
+                        wrapper.setProps({});
+                    });
+
+                    act(() => {
+                        findByTestId(wrapper, 'location-picker-submit-button').at(0).simulate('click');
+                    });
+
+                    // content of this call is tested in LocationShareMenu-test
+                    expect(onChoose).toHaveBeenCalled();
+                });
+            });
+        };
+
+        describe('for Own location share type', () => {
+            testUserLocationShareTypes(LocationShareType.Own);
         });
 
-        it("Renders a URI with accuracy", () => {
-            const pos: GeolocationPosition = {
-                coords: {
-                    latitude: 43.2,
-                    longitude: 12.4,
-                    altitude: undefined,
-                    accuracy: 21,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-                timestamp: 12334,
-            };
-            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4;u=21");
+        describe('for Live location share type', () => {
+            const shareType = LocationShareType.Live;
+            testUserLocationShareTypes(shareType);
+
+            const getOption = (wrapper, timeout) => findById(wrapper, `live-duration__${timeout}`).at(0);
+            const getDropdown = wrapper => findByTestId(wrapper, 'live-duration-dropdown');
+            const getSelectedOption = (wrapper) => findById(wrapper, 'live-duration_value');
+
+            const openDropdown = (wrapper) => act(() => {
+                const dropdown = getDropdown(wrapper);
+                dropdown.find('[role="button"]').at(0).simulate('click');
+                wrapper.setProps({});
+            });
+
+            it('renders live duration dropdown with default option', () => {
+                const wrapper = getComponent({ shareType });
+                expect(getSelectedOption(getDropdown(wrapper)).text()).toEqual('Share for 15m');
+            });
+
+            it('updates selected duration', () => {
+                const wrapper = getComponent({ shareType });
+
+                openDropdown(wrapper);
+                const dropdown = getDropdown(wrapper);
+                act(() => {
+                    getOption(dropdown, 3600000).simulate('click');
+                });
+
+                // value updated
+                expect(getSelectedOption(getDropdown(wrapper)).text()).toEqual('Share for 1h');
+            });
         });
 
-        it("Renders a URI with accuracy and altitude", () => {
-            const pos: GeolocationPosition = {
-                coords: {
-                    latitude: 43.2,
-                    longitude: 12.4,
-                    altitude: 12.3,
-                    accuracy: 21,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-                timestamp: 12334,
-            };
-            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4,12.3;u=21");
+        describe('for Pin drop location share type', () => {
+            const shareType = LocationShareType.Pin;
+            it('initiates map with geolocation', () => {
+                getComponent({ shareType });
+
+                expect(mockMap.addControl).toHaveBeenCalledWith(mockGeolocate);
+                act(() => {
+                    // @ts-ignore
+                    mocked(mockMap).emit('load');
+                });
+
+                expect(mockGeolocate.trigger).toHaveBeenCalled();
+            });
+
+            it('removes geolocation control on geolocation error', () => {
+                // suppress expected error log
+                jest.spyOn(logger, 'error').mockImplementation(() => { });
+                const onFinished = jest.fn();
+                getComponent({ onFinished, shareType });
+                act(() => {
+                    // @ts-ignore
+                    mockMap.emit('load');
+                    // @ts-ignore
+                    mockGeolocate.emit('error', {});
+                });
+
+                expect(mockMap.removeControl).toHaveBeenCalledWith(mockGeolocate);
+                // dialog is not closed
+                expect(onFinished).not.toHaveBeenCalled();
+            });
+
+            it('does not set position on geolocate event', () => {
+                mocked(maplibregl.Marker).mockClear();
+                const wrapper = getComponent({ shareType });
+                act(() => {
+                    // @ts-ignore
+                    mocked(mockGeolocate).emit('geolocate', mockGeolocationPosition);
+                });
+
+                // marker not added
+                expect(wrapper.find('Marker').length).toBeFalsy();
+            });
+
+            it('sets position on click event', () => {
+                const wrapper = getComponent({ shareType });
+                act(() => {
+                    // @ts-ignore
+                    mocked(mockMap).emit('click', mockClickEvent);
+                    wrapper.setProps({});
+                });
+
+                // marker added
+                expect(maplibregl.Marker).toHaveBeenCalled();
+                expect(mockMarker.setLngLat).toHaveBeenCalledWith(new maplibregl.LngLat(
+                    12.4, 43.2,
+                ));
+
+                // marker is set, icon not avatar
+                expect(wrapper.find('.mx_Marker_icon').length).toBeTruthy();
+            });
+
+            it('submits location', () => {
+                const onChoose = jest.fn();
+                const wrapper = getComponent({ onChoose, shareType });
+                act(() => {
+                    // @ts-ignore
+                    mocked(mockMap).emit('click', mockClickEvent);
+                    wrapper.setProps({});
+                });
+
+                act(() => {
+                    findByTestId(wrapper, 'location-picker-submit-button').at(0).simulate('click');
+                });
+
+                // content of this call is tested in LocationShareMenu-test
+                expect(onChoose).toHaveBeenCalled();
+            });
         });
     });
 });
diff --git a/test/components/views/location/LocationShareMenu-test.tsx b/test/components/views/location/LocationShareMenu-test.tsx
index 8ffd80bf294..eca076d705d 100644
--- a/test/components/views/location/LocationShareMenu-test.tsx
+++ b/test/components/views/location/LocationShareMenu-test.tsx
@@ -15,28 +15,44 @@ limitations under the License.
 */
 
 import React from 'react';
-import { mount } from 'enzyme';
+import { mount, ReactWrapper } from 'enzyme';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
+import { M_ASSET, LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+import { logger } from 'matrix-js-sdk/src/logger';
 
-import '../../../skinned-sdk';
 import LocationShareMenu from '../../../../src/components/views/location/LocationShareMenu';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
 import { ChevronFace } from '../../../../src/components/structures/ContextMenu';
 import SettingsStore from '../../../../src/settings/SettingsStore';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-import { LocationShareType } from '../../../../src/components/views/location/ShareType';
-import { findByTestId } from '../../../test-utils';
-
-jest.mock('../../../../src/components/views/messages/MLocationBody', () => ({
+import { LocationShareType } from '../../../../src/components/views/location/shareLocation';
+import {
+    findByTagAndTestId,
+    findByTestId,
+    flushPromisesWithFakeTimers,
+    getMockClientWithEventEmitter,
+    setupAsyncStoreWithClient,
+} from '../../../test-utils';
+import Modal from '../../../../src/Modal';
+import { DEFAULT_DURATION_MS } from '../../../../src/components/views/location/LiveDurationDropdown';
+import { OwnBeaconStore } from '../../../../src/stores/OwnBeaconStore';
+import { SettingLevel } from '../../../../src/settings/SettingLevel';
+
+jest.useFakeTimers();
+
+jest.mock('../../../../src/utils/location/findMapStyleUrl', () => ({
     findMapStyleUrl: jest.fn().mockReturnValue('test'),
 }));
 
 jest.mock('../../../../src/settings/SettingsStore', () => ({
     getValue: jest.fn(),
+    setValue: jest.fn(),
     monitorSetting: jest.fn(),
+    watchSetting: jest.fn(),
+    unwatchSetting: jest.fn(),
 }));
 
 jest.mock('../../../../src/stores/OwnProfileStore', () => ({
@@ -48,17 +64,21 @@ jest.mock('../../../../src/stores/OwnProfileStore', () => ({
     },
 }));
 
+jest.mock('../../../../src/Modal', () => ({
+    createTrackedDialog: jest.fn(),
+}));
+
 describe('<LocationShareMenu />', () => {
     const userId = '@ernie:server.org';
-    const mockClient = {
-        on: jest.fn(),
-        off: jest.fn(),
-        removeListener: jest.fn(),
+    const mockClient = getMockClientWithEventEmitter({
         getUserId: jest.fn().mockReturnValue(userId),
         getClientWellKnown: jest.fn().mockResolvedValue({
             map_style_url: 'maps.com',
         }),
-    };
+        sendMessage: jest.fn(),
+        unstable_createLiveBeacon: jest.fn().mockResolvedValue({ event_id: '1' }),
+        getVisibleRooms: jest.fn().mockReturnValue([]),
+    });
 
     const defaultProps = {
         menuPosition: {
@@ -70,39 +90,86 @@ describe('<LocationShareMenu />', () => {
         roomId: '!room:server.org',
         sender: new RoomMember('!room:server.org', userId),
     };
+
+    const position = {
+        coords: {
+            latitude: -36.24484561954707,
+            longitude: 175.46884959563613,
+            accuracy: 10,
+        },
+        timestamp: 1646305006802,
+        type: 'geolocate',
+    };
+
+    const makeOwnBeaconStore = async () => {
+        const store = OwnBeaconStore.instance;
+
+        await setupAsyncStoreWithClient(store, mockClient);
+        return store;
+    };
+
     const getComponent = (props = {}) =>
         mount(<LocationShareMenu {...defaultProps} {...props} />, {
             wrappingComponent: MatrixClientContext.Provider,
             wrappingComponentProps: { value: mockClient },
         });
 
-    beforeEach(() => {
-        mocked(SettingsStore).getValue.mockImplementation(
-            (settingName) => settingName === "feature_location_share_pin_drop",
-        );
-
+    beforeEach(async () => {
+        jest.spyOn(logger, 'error').mockRestore();
+        mocked(SettingsStore).getValue.mockReturnValue(false);
+        mockClient.sendMessage.mockClear();
+        mockClient.unstable_createLiveBeacon.mockClear().mockResolvedValue({ event_id: '1' });
         jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient as unknown as MatrixClient);
+        mocked(Modal).createTrackedDialog.mockClear();
+
+        jest.clearAllMocks();
+
+        await makeOwnBeaconStore();
     });
 
-    const getShareTypeOption = (component, shareType: LocationShareType) =>
-        findByTestId(component, `share-location-option-${shareType}`);
-    const getBackButton = component => findByTestId(component, 'share-dialog-buttons-back');
-    const getCancelButton = component => findByTestId(component, 'share-dialog-buttons-cancel');
+    const getShareTypeOption = (component: ReactWrapper, shareType: LocationShareType) =>
+        findByTagAndTestId(component, `share-location-option-${shareType}`, 'button');
 
-    describe('when only Own share type is enabled', () => {
-        beforeEach(() => {
-            mocked(SettingsStore).getValue.mockReturnValue(false);
+    const getBackButton = (component: ReactWrapper) =>
+        findByTagAndTestId(component, 'share-dialog-buttons-back', 'button');
+
+    const getCancelButton = (component: ReactWrapper) =>
+        findByTagAndTestId(component, 'share-dialog-buttons-cancel', 'button');
+
+    const getSubmitButton = (component: ReactWrapper) =>
+        findByTagAndTestId(component, 'location-picker-submit-button', 'button');
+
+    const setLocation = (component: ReactWrapper) => {
+        // set the location
+        const locationPickerInstance = component.find('LocationPicker').instance();
+        act(() => {
+            // @ts-ignore
+            locationPickerInstance.onGeolocate(position);
+            // make sure button gets enabled
+            component.setProps({});
+        });
+    };
+
+    const setShareType = (component: ReactWrapper, shareType: LocationShareType) =>
+        act(() => {
+            getShareTypeOption(component, shareType).at(0).simulate('click');
+            component.setProps({});
         });
 
-        it('renders location picker when only Own share type is enabled', () => {
+    describe('when only Own share type is enabled', () => {
+        beforeEach(() => enableSettings([]));
+
+        it('renders own and live location options', () => {
             const component = getComponent();
-            expect(component.find('ShareType').length).toBeFalsy();
-            expect(component.find('LocationPicker').length).toBeTruthy();
+            expect(getShareTypeOption(component, LocationShareType.Own).length).toBe(1);
+            expect(getShareTypeOption(component, LocationShareType.Live).length).toBe(1);
         });
 
-        it('does not render back button when only Own share type is enabled', () => {
+        it('renders back button from location picker screen', () => {
             const component = getComponent();
-            expect(getBackButton(component).length).toBeFalsy();
+            setShareType(component, LocationShareType.Own);
+
+            expect(getBackButton(component).length).toBe(1);
         });
 
         it('clicking cancel button from location picker closes dialog', () => {
@@ -115,22 +182,46 @@ describe('<LocationShareMenu />', () => {
 
             expect(onFinished).toHaveBeenCalled();
         });
+
+        it('creates static own location share event on submission', () => {
+            const onFinished = jest.fn();
+            const component = getComponent({ onFinished });
+
+            setShareType(component, LocationShareType.Own);
+
+            setLocation(component);
+
+            act(() => {
+                getSubmitButton(component).at(0).simulate('click');
+                component.setProps({});
+            });
+
+            expect(onFinished).toHaveBeenCalled();
+            const [messageRoomId, relation, messageBody] = mockClient.sendMessage.mock.calls[0];
+            expect(messageRoomId).toEqual(defaultProps.roomId);
+            expect(relation).toEqual(null);
+            expect(messageBody).toEqual(expect.objectContaining({
+                [M_ASSET.name]: {
+                    type: LocationAssetType.Self,
+                },
+            }));
+        });
     });
 
     describe('with pin drop share type enabled', () => {
-        // feature_location_share_pin_drop is set to enabled by default mocking
+        beforeEach(() => enableSettings(["feature_location_share_pin_drop"]));
 
         it('renders share type switch with own and pin drop options', () => {
             const component = getComponent();
-            expect(component.find('LocationPicker').length).toBeFalsy();
+            expect(component.find('LocationPicker').length).toBe(0);
 
-            expect(getShareTypeOption(component, LocationShareType.Own).length).toBeTruthy();
-            expect(getShareTypeOption(component, LocationShareType.Pin).length).toBeTruthy();
+            expect(getShareTypeOption(component, LocationShareType.Own).length).toBe(1);
+            expect(getShareTypeOption(component, LocationShareType.Pin).length).toBe(1);
         });
 
         it('does not render back button on share type screen', () => {
             const component = getComponent();
-            expect(getBackButton(component).length).toBeFalsy();
+            expect(getBackButton(component).length).toBe(0);
         });
 
         it('clicking cancel button from share type screen closes dialog', () => {
@@ -147,35 +238,198 @@ describe('<LocationShareMenu />', () => {
         it('selecting own location share type advances to location picker', () => {
             const component = getComponent();
 
+            setShareType(component, LocationShareType.Own);
+
+            expect(component.find('LocationPicker').length).toBe(1);
+        });
+
+        it('clicking back button from location picker screen goes back to share screen', () => {
+            const onFinished = jest.fn();
+            const component = getComponent({ onFinished });
+
+            // advance to location picker
+            setShareType(component, LocationShareType.Own);
+
+            expect(component.find('LocationPicker').length).toBe(1);
+
             act(() => {
-                getShareTypeOption(component, LocationShareType.Own).at(0).simulate('click');
+                getBackButton(component).at(0).simulate('click');
+                component.setProps({});
+            });
+
+            // back to share type
+            expect(component.find('ShareType').length).toBe(1);
+        });
+
+        it('creates pin drop location share event on submission', () => {
+            const onFinished = jest.fn();
+            const component = getComponent({ onFinished });
+
+            // advance to location picker
+            setShareType(component, LocationShareType.Pin);
+
+            setLocation(component);
+
+            act(() => {
+                getSubmitButton(component).at(0).simulate('click');
+                component.setProps({});
+            });
+
+            expect(onFinished).toHaveBeenCalled();
+            const [messageRoomId, relation, messageBody] = mockClient.sendMessage.mock.calls[0];
+            expect(messageRoomId).toEqual(defaultProps.roomId);
+            expect(relation).toEqual(null);
+            expect(messageBody).toEqual(expect.objectContaining({
+                [M_ASSET.name]: {
+                    type: LocationAssetType.Pin,
+                },
+            }));
+        });
+    });
+
+    describe('with live location disabled', () => {
+        beforeEach(() => enableSettings([]));
+
+        const getToggle = (component: ReactWrapper) =>
+            findByTestId(component, 'enable-live-share-toggle').find('[role="switch"]').at(0);
+        const getSubmitEnableButton = (component: ReactWrapper) =>
+            findByTestId(component, 'enable-live-share-submit').at(0);
+
+        it('goes to labs flag screen after live options is clicked', () => {
+            const onFinished = jest.fn();
+            const component = getComponent({ onFinished });
+
+            setShareType(component, LocationShareType.Live);
+
+            expect(findByTestId(component, 'location-picker-enable-live-share')).toMatchSnapshot();
+        });
+
+        it('disables OK button when labs flag is not enabled', () => {
+            const component = getComponent();
+
+            setShareType(component, LocationShareType.Live);
+
+            expect(getSubmitEnableButton(component).props()['disabled']).toBeTruthy();
+        });
+
+        it('enables OK button when labs flag is toggled to enabled', () => {
+            const component = getComponent();
+
+            setShareType(component, LocationShareType.Live);
+
+            act(() => {
+                getToggle(component).simulate('click');
+                component.setProps({});
+            });
+            expect(getSubmitEnableButton(component).props()['disabled']).toBeFalsy();
+        });
+
+        it('enables live share setting on ok button submit', () => {
+            const component = getComponent();
+
+            setShareType(component, LocationShareType.Live);
+
+            act(() => {
+                getToggle(component).simulate('click');
+                component.setProps({});
+            });
+
+            act(() => {
+                getSubmitEnableButton(component).simulate('click');
+            });
+
+            expect(SettingsStore.setValue).toHaveBeenCalledWith(
+                'feature_location_share_live', undefined, SettingLevel.DEVICE, true,
+            );
+        });
+
+        it('navigates to location picker when live share is enabled in settings store', () => {
+            // @ts-ignore
+            mocked(SettingsStore.watchSetting).mockImplementation((featureName, roomId, callback) => {
+                callback(featureName, roomId, SettingLevel.DEVICE, '', '');
+                setTimeout(() => {
+                    callback(featureName, roomId, SettingLevel.DEVICE, '', '');
+                }, 1000);
+            });
+            mocked(SettingsStore.getValue).mockReturnValue(false);
+            const component = getComponent();
+
+            setShareType(component, LocationShareType.Live);
+
+            // we're on enable live share screen
+            expect(findByTestId(component, 'location-picker-enable-live-share').length).toBeTruthy();
+
+            act(() => {
+                mocked(SettingsStore.getValue).mockReturnValue(true);
+                // advance so watchSetting will update the value
+                jest.runAllTimers();
             });
 
             component.setProps({});
 
+            // advanced to location picker
             expect(component.find('LocationPicker').length).toBeTruthy();
         });
+    });
 
-        it('clicking back button from location picker screen goes back to share screen', () => {
-            // feature_location_share_pin_drop is set to enabled by default mocking
+    describe('Live location share', () => {
+        beforeEach(() => enableSettings(["feature_location_share_live"]));
+
+        it('creates beacon info event on submission', () => {
             const onFinished = jest.fn();
             const component = getComponent({ onFinished });
 
             // advance to location picker
+            setShareType(component, LocationShareType.Live);
+            setLocation(component);
+
             act(() => {
-                getShareTypeOption(component, LocationShareType.Own).at(0).simulate('click');
+                getSubmitButton(component).at(0).simulate('click');
                 component.setProps({});
             });
 
-            expect(component.find('LocationPicker').length).toBeTruthy();
+            expect(onFinished).toHaveBeenCalled();
+            const [eventRoomId, eventContent] = mockClient.unstable_createLiveBeacon.mock.calls[0];
+            expect(eventRoomId).toEqual(defaultProps.roomId);
+            expect(eventContent).toEqual(expect.objectContaining({
+                // default timeout
+                timeout: DEFAULT_DURATION_MS,
+                description: `Ernie's live location`,
+                live: true,
+                [M_ASSET.name]: {
+                    type: LocationAssetType.Self,
+                },
+            }));
+        });
+
+        it('opens error dialog when beacon creation fails ', async () => {
+            // stub logger to keep console clean from expected error
+            const logSpy = jest.spyOn(logger, 'error').mockReturnValue(undefined);
+            const error = new Error('oh no');
+            mockClient.unstable_createLiveBeacon.mockRejectedValue(error);
+            const component = getComponent();
+
+            // advance to location picker
+            setShareType(component, LocationShareType.Live);
+            setLocation(component);
 
             act(() => {
-                getBackButton(component).at(0).simulate('click');
+                getSubmitButton(component).at(0).simulate('click');
                 component.setProps({});
             });
 
-            // back to share type
-            expect(component.find('ShareType').length).toBeTruthy();
+            await flushPromisesWithFakeTimers();
+            await flushPromisesWithFakeTimers();
+
+            expect(logSpy).toHaveBeenCalledWith("We couldn't start sharing your live location", error);
+            expect(mocked(Modal).createTrackedDialog).toHaveBeenCalled();
         });
     });
 });
+
+function enableSettings(settings: string[]) {
+    mocked(SettingsStore).getValue.mockReturnValue(false);
+    mocked(SettingsStore).getValue.mockImplementation(
+        (settingName: string) => settings.includes(settingName),
+    );
+}
diff --git a/test/components/views/location/LocationViewDialog-test.tsx b/test/components/views/location/LocationViewDialog-test.tsx
new file mode 100644
index 00000000000..fa23192bbfb
--- /dev/null
+++ b/test/components/views/location/LocationViewDialog-test.tsx
@@ -0,0 +1,57 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { RoomMember } from 'matrix-js-sdk/src/matrix';
+import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+
+import LocationViewDialog from '../../../../src/components/views/location/LocationViewDialog';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+import { getMockClientWithEventEmitter, makeLocationEvent } from '../../../test-utils';
+
+describe('<LocationViewDialog />', () => {
+    const roomId = '!room:server';
+    const userId = '@user:server';
+    const mockClient = getMockClientWithEventEmitter({
+        getClientWellKnown: jest.fn().mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        }),
+        isGuest: jest.fn().mockReturnValue(false),
+    });
+    const defaultEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Pin);
+    const defaultProps = {
+        matrixClient: mockClient,
+        mxEvent: defaultEvent,
+        onFinished: jest.fn(),
+    };
+    const getComponent = (props = {}) =>
+        mount(<LocationViewDialog {...defaultProps} {...props} />);
+
+    it('renders map correctly', () => {
+        const component = getComponent();
+        expect(component.find('Map')).toMatchSnapshot();
+    });
+
+    it('renders marker correctly for self share', () => {
+        const selfShareEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Self);
+        const member = new RoomMember(roomId, userId);
+        // @ts-ignore cheat assignment to property
+        selfShareEvent.sender = member;
+        const component = getComponent({ mxEvent: selfShareEvent });
+        expect(component.find('SmartMarker').props()['roomMember']).toEqual(member);
+    });
+});
diff --git a/test/components/views/location/Map-test.tsx b/test/components/views/location/Map-test.tsx
new file mode 100644
index 00000000000..72826a9cdf2
--- /dev/null
+++ b/test/components/views/location/Map-test.tsx
@@ -0,0 +1,198 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import maplibregl from 'maplibre-gl';
+import { ClientEvent } from 'matrix-js-sdk/src/matrix';
+import { logger } from 'matrix-js-sdk/src/logger';
+
+import Map from '../../../../src/components/views/location/Map';
+import { findByTestId, getMockClientWithEventEmitter } from '../../../test-utils';
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+
+describe('<Map />', () => {
+    const defaultProps = {
+        centerGeoUri: 'geo:52,41',
+        id: 'test-123',
+        onError: jest.fn(),
+        onClick: jest.fn(),
+    };
+    const matrixClient = getMockClientWithEventEmitter({
+        getClientWellKnown: jest.fn().mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        }),
+    });
+    const getComponent = (props = {}) =>
+        mount(<Map {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: matrixClient },
+        });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        matrixClient.getClientWellKnown.mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        });
+
+        jest.spyOn(logger, 'error').mockRestore();
+    });
+
+    const mockMap = new maplibregl.Map();
+
+    it('renders', () => {
+        const component = getComponent();
+        expect(component).toBeTruthy();
+    });
+
+    describe('onClientWellKnown emits', () => {
+        it('updates map style when style url is truthy', () => {
+            getComponent();
+
+            act(() => {
+                matrixClient.emit(ClientEvent.ClientWellKnown, {
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'new.maps.com' },
+                });
+            });
+
+            expect(mockMap.setStyle).toHaveBeenCalledWith('new.maps.com');
+        });
+
+        it('does not update map style when style url is truthy', () => {
+            getComponent();
+
+            act(() => {
+                matrixClient.emit(ClientEvent.ClientWellKnown, {
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: undefined },
+                });
+            });
+
+            expect(mockMap.setStyle).not.toHaveBeenCalledWith();
+        });
+    });
+
+    describe('map centering', () => {
+        it('does not try to center when no center uri provided', () => {
+            getComponent({ centerGeoUri: null });
+            expect(mockMap.setCenter).not.toHaveBeenCalled();
+        });
+
+        it('sets map center to centerGeoUri', () => {
+            getComponent({ centerGeoUri: 'geo:51,42' });
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 51, lon: 42 });
+        });
+
+        it('handles invalid centerGeoUri', () => {
+            const logSpy = jest.spyOn(logger, 'error').mockImplementation();
+            getComponent({ centerGeoUri: '123 Sesame Street' });
+            expect(mockMap.setCenter).not.toHaveBeenCalled();
+            expect(logSpy).toHaveBeenCalledWith('Could not set map center', '123 Sesame Street');
+        });
+
+        it('updates map center when centerGeoUri prop changes', () => {
+            const component = getComponent({ centerGeoUri: 'geo:51,42' });
+
+            component.setProps({ centerGeoUri: 'geo:53,45' });
+            component.setProps({ centerGeoUri: 'geo:56,47' });
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 51, lon: 42 });
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 53, lon: 45 });
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 56, lon: 47 });
+        });
+    });
+
+    describe('map bounds', () => {
+        it('does not try to fit map bounds when no bounds provided', () => {
+            getComponent({ bounds: null });
+            expect(mockMap.fitBounds).not.toHaveBeenCalled();
+        });
+
+        it('fits map to bounds', () => {
+            const bounds = { north: 51, south: 50, east: 42, west: 41 };
+            getComponent({ bounds });
+            expect(mockMap.fitBounds).toHaveBeenCalledWith(new maplibregl.LngLatBounds([bounds.west, bounds.south],
+                [bounds.east, bounds.north]), { padding: 100, maxZoom: 15 });
+        });
+
+        it('handles invalid bounds', () => {
+            const logSpy = jest.spyOn(logger, 'error').mockImplementation();
+            const bounds = { north: 'a', south: 'b', east: 42, west: 41 };
+            getComponent({ bounds });
+            expect(mockMap.fitBounds).not.toHaveBeenCalled();
+            expect(logSpy).toHaveBeenCalledWith('Invalid map bounds', new Error('Invalid LngLat object: (41, NaN)'));
+        });
+
+        it('updates map bounds when bounds prop changes', () => {
+            const component = getComponent({ centerGeoUri: 'geo:51,42' });
+
+            const bounds = { north: 51, south: 50, east: 42, west: 41 };
+            const bounds2 = { north: 53, south: 51, east: 45, west: 44 };
+            component.setProps({ bounds });
+            component.setProps({ bounds: bounds2 });
+            expect(mockMap.fitBounds).toHaveBeenCalledTimes(2);
+        });
+    });
+
+    describe('children', () => {
+        it('renders without children', () => {
+            const component = getComponent({ children: null });
+
+            component.setProps({});
+
+            // no error
+            expect(component).toBeTruthy();
+        });
+
+        it('renders children with map renderProp', () => {
+            const children = ({ map }) => <div data-test-id='test-child' data-map={map}>Hello, world</div>;
+
+            const component = getComponent({ children });
+
+            // renders child with map instance
+            expect(findByTestId(component, 'test-child').props()['data-map']).toEqual(mockMap);
+        });
+    });
+
+    describe('onClick', () => {
+        it('eats clicks to maplibre attribution button', () => {
+            const onClick = jest.fn();
+            const component = getComponent({ onClick });
+
+            act(() => {
+                // this is added to the dom by maplibregl
+                // which is mocked
+                // just fake the target
+                const fakeEl = document.createElement('div');
+                fakeEl.className = 'maplibregl-ctrl-attrib-button';
+                component.simulate('click', { target: fakeEl });
+            });
+
+            expect(onClick).not.toHaveBeenCalled();
+        });
+
+        it('calls onClick', () => {
+            const onClick = jest.fn();
+            const component = getComponent({ onClick });
+
+            act(() => {
+                component.simulate('click');
+            });
+
+            expect(onClick).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/test/components/views/location/MapError-test.tsx b/test/components/views/location/MapError-test.tsx
new file mode 100644
index 00000000000..2fa9cf3cd0d
--- /dev/null
+++ b/test/components/views/location/MapError-test.tsx
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+
+import { MapError } from '../../../../src/components/views/location/MapError';
+import { LocationShareError } from '../../../../src/utils/location';
+
+describe('<MapError />', () => {
+    const defaultProps = {
+        onFinished: jest.fn(),
+        error: LocationShareError.MapStyleUrlNotConfigured,
+    };
+    const getComponent = (props = {}) =>
+        mount(<MapError {...defaultProps} {...props} />);
+
+    it('renders correctly for MapStyleUrlNotConfigured', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('renders correctly for MapStyleUrlNotReachable', () => {
+        const component = getComponent({
+            error: LocationShareError.MapStyleUrlNotReachable,
+        });
+        expect(component).toMatchSnapshot();
+    });
+});
diff --git a/test/components/views/location/Marker-test.tsx b/test/components/views/location/Marker-test.tsx
new file mode 100644
index 00000000000..da9ccaf0d66
--- /dev/null
+++ b/test/components/views/location/Marker-test.tsx
@@ -0,0 +1,51 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { RoomMember } from 'matrix-js-sdk/src/matrix';
+
+import Marker from '../../../../src/components/views/location/Marker';
+
+describe('<Marker />', () => {
+    const defaultProps = {
+        id: 'abc123',
+    };
+    const getComponent = (props = {}) =>
+        mount(<Marker {...defaultProps} {...props} />);
+
+    it('renders with location icon when no room member', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('does not try to use member color without room member', () => {
+        const component = getComponent({ useMemberColor: true });
+        expect(component.find('div').at(0).props().className).toEqual('mx_Marker mx_Marker_defaultColor');
+    });
+
+    it('uses member color class', () => {
+        const member = new RoomMember('!room:server', '@user:server');
+        const component = getComponent({ useMemberColor: true, roomMember: member });
+        expect(component.find('div').at(0).props().className).toEqual('mx_Marker mx_Username_color3');
+    });
+
+    it('renders member avatar when roomMember is truthy', () => {
+        const member = new RoomMember('!room:server', '@user:server');
+        const component = getComponent({ roomMember: member });
+        expect(component.find('MemberAvatar').length).toBeTruthy();
+    });
+});
diff --git a/test/components/views/location/SmartMarker-test.tsx b/test/components/views/location/SmartMarker-test.tsx
new file mode 100644
index 00000000000..5fc48085b4b
--- /dev/null
+++ b/test/components/views/location/SmartMarker-test.tsx
@@ -0,0 +1,80 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { mocked } from 'jest-mock';
+import maplibregl from 'maplibre-gl';
+
+import SmartMarker from '../../../../src/components/views/location/SmartMarker';
+
+jest.mock('../../../../src/utils/location/findMapStyleUrl', () => ({
+    findMapStyleUrl: jest.fn().mockReturnValue('tileserver.com'),
+}));
+
+describe('<SmartMarker />', () => {
+    const mockMap = new maplibregl.Map();
+    const mockMarker = new maplibregl.Marker();
+
+    const defaultProps = {
+        map: mockMap,
+        geoUri: 'geo:43.2,54.6',
+    };
+    const getComponent = (props = {}) =>
+        mount(<SmartMarker {...defaultProps} {...props} />);
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('creates a marker on mount', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+
+        component.setProps({});
+
+        // marker added only once
+        expect(maplibregl.Marker).toHaveBeenCalledTimes(1);
+        // set to correct position
+        expect(mockMarker.setLngLat).toHaveBeenCalledWith({ lon: 54.6, lat: 43.2 });
+        // added to map
+        expect(mockMarker.addTo).toHaveBeenCalledWith(mockMap);
+    });
+
+    it('updates marker position on change', () => {
+        const component = getComponent({ geoUri: 'geo:40,50' });
+
+        component.setProps({ geoUri: 'geo:41,51' });
+        component.setProps({ geoUri: 'geo:42,52' });
+
+        // marker added only once
+        expect(maplibregl.Marker).toHaveBeenCalledTimes(1);
+        // set positions
+        expect(mocked(mockMarker.setLngLat)).toHaveBeenCalledWith({ lat: 40, lon: 50 });
+        expect(mocked(mockMarker.setLngLat)).toHaveBeenCalledWith({ lat: 41, lon: 51 });
+        expect(mocked(mockMarker.setLngLat)).toHaveBeenCalledWith({ lat: 42, lon: 52 });
+    });
+
+    it('removes marker on unmount', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+
+        component.setProps({});
+
+        component.unmount();
+        expect(mockMarker.remove).toHaveBeenCalled();
+    });
+});
diff --git a/test/components/views/location/ZoomButtons-test.tsx b/test/components/views/location/ZoomButtons-test.tsx
new file mode 100644
index 00000000000..62f488f43cf
--- /dev/null
+++ b/test/components/views/location/ZoomButtons-test.tsx
@@ -0,0 +1,63 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import maplibregl from 'maplibre-gl';
+import { act } from 'react-dom/test-utils';
+
+import ZoomButtons from '../../../../src/components/views/location/ZoomButtons';
+import { findByTestId } from '../../../test-utils';
+
+describe('<ZoomButtons />', () => {
+    const mockMap = new maplibregl.Map();
+    const defaultProps = {
+        map: mockMap,
+    };
+    const getComponent = (props = {}) =>
+        mount(<ZoomButtons {...defaultProps} {...props} />);
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('renders buttons', () => {
+        const component = getComponent();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('calls map zoom in on zoom in click', () => {
+        const component = getComponent();
+
+        act(() => {
+            findByTestId(component, 'map-zoom-in-button').at(0).simulate('click');
+        });
+
+        expect(mockMap.zoomIn).toHaveBeenCalled();
+        expect(component).toBeTruthy();
+    });
+
+    it('calls map zoom out on zoom out click', () => {
+        const component = getComponent();
+
+        act(() => {
+            findByTestId(component, 'map-zoom-out-button').at(0).simulate('click');
+        });
+
+        expect(mockMap.zoomOut).toHaveBeenCalled();
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/test/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap b/test/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap
new file mode 100644
index 00000000000..758a026368c
--- /dev/null
+++ b/test/components/views/location/__snapshots__/LocationShareMenu-test.tsx.snap
@@ -0,0 +1,99 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LocationShareMenu /> with live location disabled goes to labs flag screen after live options is clicked 1`] = `
+<div
+  className="mx_EnableLiveShare"
+  data-test-id="location-picker-enable-live-share"
+>
+  <StyledLiveBeaconIcon
+    className="mx_EnableLiveShare_icon"
+  >
+    <div
+      className="mx_StyledLiveBeaconIcon mx_EnableLiveShare_icon"
+    />
+  </StyledLiveBeaconIcon>
+  <Heading
+    className="mx_EnableLiveShare_heading"
+    size="h3"
+  >
+    <h3
+      className="mx_Heading_h3 mx_EnableLiveShare_heading"
+    >
+      Live location sharing
+    </h3>
+  </Heading>
+  <p
+    className="mx_EnableLiveShare_description"
+  >
+    Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.
+  </p>
+  <LabelledToggleSwitch
+    data-test-id="enable-live-share-toggle"
+    label="Enable live location sharing"
+    onChange={[Function]}
+    value={false}
+  >
+    <div
+      className="mx_SettingsFlag "
+    >
+      <span
+        className="mx_SettingsFlag_label"
+      >
+        Enable live location sharing
+      </span>
+      <_default
+        aria-label="Enable live location sharing"
+        checked={false}
+        onChange={[Function]}
+      >
+        <AccessibleButton
+          aria-checked={false}
+          aria-disabled={false}
+          aria-label="Enable live location sharing"
+          className="mx_ToggleSwitch mx_ToggleSwitch_enabled"
+          element="div"
+          onClick={[Function]}
+          role="switch"
+          tabIndex={0}
+        >
+          <div
+            aria-checked={false}
+            aria-disabled={false}
+            aria-label="Enable live location sharing"
+            className="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
+            role="switch"
+            tabIndex={0}
+          >
+            <div
+              className="mx_ToggleSwitch_ball"
+            />
+          </div>
+        </AccessibleButton>
+      </_default>
+    </div>
+  </LabelledToggleSwitch>
+  <AccessibleButton
+    className="mx_EnableLiveShare_button"
+    data-test-id="enable-live-share-submit"
+    disabled={true}
+    element="button"
+    kind="primary"
+    onClick={[Function]}
+    role="button"
+    tabIndex={0}
+  >
+    <button
+      aria-disabled={true}
+      className="mx_AccessibleButton mx_EnableLiveShare_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled"
+      data-test-id="enable-live-share-submit"
+      role="button"
+      tabIndex={0}
+    >
+      OK
+    </button>
+  </AccessibleButton>
+</div>
+`;
diff --git a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
new file mode 100644
index 00000000000..8a1910a5820
--- /dev/null
+++ b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
@@ -0,0 +1,160 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LocationViewDialog /> renders map correctly 1`] = `
+<Map
+  centerGeoUri="geo:51.5076,-0.1276"
+  className="mx_LocationViewDialog_map"
+  id="mx_LocationViewDialog_$2"
+  interactive={true}
+  onError={[Function]}
+>
+  <div
+    className="mx_Map mx_LocationViewDialog_map"
+    id="mx_Map_mx_LocationViewDialog_$2"
+    onClick={[Function]}
+  >
+    <SmartMarker
+      geoUri="geo:51.5076,-0.1276"
+      id="mx_LocationViewDialog_$2-marker"
+      map={
+        MockMap {
+          "_events": Object {
+            "error": [Function],
+          },
+          "_eventsCount": 1,
+          "_maxListeners": undefined,
+          "addControl": [MockFunction],
+          "fitBounds": [MockFunction],
+          "removeControl": [MockFunction],
+          "setCenter": [MockFunction] {
+            "calls": Array [
+              Array [
+                Object {
+                  "lat": 51.5076,
+                  "lon": -0.1276,
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
+          "setStyle": [MockFunction],
+          "zoomIn": [MockFunction],
+          "zoomOut": [MockFunction],
+          Symbol(kCapture): false,
+        }
+      }
+    >
+      <span>
+        <ForwardRef
+          id="mx_LocationViewDialog_$2-marker"
+        >
+          <div
+            className="mx_Marker mx_Marker_defaultColor"
+            id="mx_LocationViewDialog_$2-marker"
+          >
+            <div
+              className="mx_Marker_border"
+            >
+              <div
+                className="mx_Marker_icon"
+              />
+            </div>
+          </div>
+        </ForwardRef>
+      </span>
+    </SmartMarker>
+    <ZoomButtons
+      map={
+        MockMap {
+          "_events": Object {
+            "error": [Function],
+          },
+          "_eventsCount": 1,
+          "_maxListeners": undefined,
+          "addControl": [MockFunction],
+          "fitBounds": [MockFunction],
+          "removeControl": [MockFunction],
+          "setCenter": [MockFunction] {
+            "calls": Array [
+              Array [
+                Object {
+                  "lat": 51.5076,
+                  "lon": -0.1276,
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
+          "setStyle": [MockFunction],
+          "zoomIn": [MockFunction],
+          "zoomOut": [MockFunction],
+          Symbol(kCapture): false,
+        }
+      }
+    >
+      <div
+        className="mx_ZoomButtons"
+      >
+        <AccessibleButton
+          className="mx_ZoomButtons_button"
+          data-test-id="map-zoom-in-button"
+          element="div"
+          onClick={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Zoom in"
+        >
+          <div
+            className="mx_AccessibleButton mx_ZoomButtons_button"
+            data-test-id="map-zoom-in-button"
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
+            role="button"
+            tabIndex={0}
+            title="Zoom in"
+          >
+            <div
+              className="mx_ZoomButtons_icon"
+            />
+          </div>
+        </AccessibleButton>
+        <AccessibleButton
+          className="mx_ZoomButtons_button"
+          data-test-id="map-zoom-out-button"
+          element="div"
+          onClick={[Function]}
+          role="button"
+          tabIndex={0}
+          title="Zoom out"
+        >
+          <div
+            className="mx_AccessibleButton mx_ZoomButtons_button"
+            data-test-id="map-zoom-out-button"
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
+            role="button"
+            tabIndex={0}
+            title="Zoom out"
+          >
+            <div
+              className="mx_ZoomButtons_icon"
+            />
+          </div>
+        </AccessibleButton>
+      </div>
+    </ZoomButtons>
+  </div>
+</Map>
+`;
diff --git a/test/components/views/location/__snapshots__/MapError-test.tsx.snap b/test/components/views/location/__snapshots__/MapError-test.tsx.snap
new file mode 100644
index 00000000000..726e9454938
--- /dev/null
+++ b/test/components/views/location/__snapshots__/MapError-test.tsx.snap
@@ -0,0 +1,95 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<MapError /> renders correctly for MapStyleUrlNotConfigured 1`] = `
+<MapError
+  error="MapStyleUrlNotConfigured"
+  onFinished={[MockFunction]}
+>
+  <div
+    className="mx_MapError"
+    data-test-id="location-picker-error"
+  >
+    <div
+      className="mx_MapError_icon"
+    />
+    <Heading
+      className="mx_MapError_heading"
+      size="h3"
+    >
+      <h3
+        className="mx_Heading_h3 mx_MapError_heading"
+      >
+        Unable to load map
+      </h3>
+    </Heading>
+    <p>
+      This homeserver is not configured to display maps.
+    </p>
+    <AccessibleButton
+      element="button"
+      kind="primary"
+      onClick={[MockFunction]}
+      role="button"
+      tabIndex={0}
+    >
+      <button
+        className="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+        onClick={[MockFunction]}
+        onKeyDown={[Function]}
+        onKeyUp={[Function]}
+        role="button"
+        tabIndex={0}
+      >
+        OK
+      </button>
+    </AccessibleButton>
+  </div>
+</MapError>
+`;
+
+exports[`<MapError /> renders correctly for MapStyleUrlNotReachable 1`] = `
+<MapError
+  error="MapStyleUrlNotReachable"
+  onFinished={[MockFunction]}
+>
+  <div
+    className="mx_MapError"
+    data-test-id="location-picker-error"
+  >
+    <div
+      className="mx_MapError_icon"
+    />
+    <Heading
+      className="mx_MapError_heading"
+      size="h3"
+    >
+      <h3
+        className="mx_Heading_h3 mx_MapError_heading"
+      >
+        Unable to load map
+      </h3>
+    </Heading>
+    <p>
+      This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.
+    </p>
+    <AccessibleButton
+      element="button"
+      kind="primary"
+      onClick={[MockFunction]}
+      role="button"
+      tabIndex={0}
+    >
+      <button
+        className="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+        onClick={[MockFunction]}
+        onKeyDown={[Function]}
+        onKeyUp={[Function]}
+        role="button"
+        tabIndex={0}
+      >
+        OK
+      </button>
+    </AccessibleButton>
+  </div>
+</MapError>
+`;
diff --git a/test/components/views/location/__snapshots__/Marker-test.tsx.snap b/test/components/views/location/__snapshots__/Marker-test.tsx.snap
new file mode 100644
index 00000000000..b7596d1af8a
--- /dev/null
+++ b/test/components/views/location/__snapshots__/Marker-test.tsx.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<Marker /> renders with location icon when no room member 1`] = `
+<ForwardRef
+  id="abc123"
+>
+  <div
+    className="mx_Marker mx_Marker_defaultColor"
+    id="abc123"
+  >
+    <div
+      className="mx_Marker_border"
+    >
+      <div
+        className="mx_Marker_icon"
+      />
+    </div>
+  </div>
+</ForwardRef>
+`;
diff --git a/test/components/views/location/__snapshots__/SmartMarker-test.tsx.snap b/test/components/views/location/__snapshots__/SmartMarker-test.tsx.snap
new file mode 100644
index 00000000000..d20c9bcd6ce
--- /dev/null
+++ b/test/components/views/location/__snapshots__/SmartMarker-test.tsx.snap
@@ -0,0 +1,75 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<SmartMarker /> creates a marker on mount 1`] = `
+<SmartMarker
+  geoUri="geo:43.2,54.6"
+  map={
+    MockMap {
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_maxListeners": undefined,
+      "addControl": [MockFunction],
+      "fitBounds": [MockFunction],
+      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
+      "zoomIn": [MockFunction],
+      "zoomOut": [MockFunction],
+      Symbol(kCapture): false,
+    }
+  }
+>
+  <span>
+    <ForwardRef>
+      <div
+        className="mx_Marker mx_Marker_defaultColor"
+      >
+        <div
+          className="mx_Marker_border"
+        >
+          <div
+            className="mx_Marker_icon"
+          />
+        </div>
+      </div>
+    </ForwardRef>
+  </span>
+</SmartMarker>
+`;
+
+exports[`<SmartMarker /> removes marker on unmount 1`] = `
+<SmartMarker
+  geoUri="geo:43.2,54.6"
+  map={
+    MockMap {
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_maxListeners": undefined,
+      "addControl": [MockFunction],
+      "fitBounds": [MockFunction],
+      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
+      "zoomIn": [MockFunction],
+      "zoomOut": [MockFunction],
+      Symbol(kCapture): false,
+    }
+  }
+>
+  <span>
+    <ForwardRef>
+      <div
+        className="mx_Marker mx_Marker_defaultColor"
+      >
+        <div
+          className="mx_Marker_border"
+        >
+          <div
+            className="mx_Marker_icon"
+          />
+        </div>
+      </div>
+    </ForwardRef>
+  </span>
+</SmartMarker>
+`;
diff --git a/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap b/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
new file mode 100644
index 00000000000..0fbc9851687
--- /dev/null
+++ b/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
@@ -0,0 +1,74 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ZoomButtons /> renders buttons 1`] = `
+<ZoomButtons
+  map={
+    MockMap {
+      "_events": Object {},
+      "_eventsCount": 0,
+      "_maxListeners": undefined,
+      "addControl": [MockFunction],
+      "fitBounds": [MockFunction],
+      "removeControl": [MockFunction],
+      "setCenter": [MockFunction],
+      "setStyle": [MockFunction],
+      "zoomIn": [MockFunction],
+      "zoomOut": [MockFunction],
+      Symbol(kCapture): false,
+    }
+  }
+>
+  <div
+    className="mx_ZoomButtons"
+  >
+    <AccessibleButton
+      className="mx_ZoomButtons_button"
+      data-test-id="map-zoom-in-button"
+      element="div"
+      onClick={[Function]}
+      role="button"
+      tabIndex={0}
+      title="Zoom in"
+    >
+      <div
+        className="mx_AccessibleButton mx_ZoomButtons_button"
+        data-test-id="map-zoom-in-button"
+        onClick={[Function]}
+        onKeyDown={[Function]}
+        onKeyUp={[Function]}
+        role="button"
+        tabIndex={0}
+        title="Zoom in"
+      >
+        <div
+          className="mx_ZoomButtons_icon"
+        />
+      </div>
+    </AccessibleButton>
+    <AccessibleButton
+      className="mx_ZoomButtons_button"
+      data-test-id="map-zoom-out-button"
+      element="div"
+      onClick={[Function]}
+      role="button"
+      tabIndex={0}
+      title="Zoom out"
+    >
+      <div
+        className="mx_AccessibleButton mx_ZoomButtons_button"
+        data-test-id="map-zoom-out-button"
+        onClick={[Function]}
+        onKeyDown={[Function]}
+        onKeyUp={[Function]}
+        role="button"
+        tabIndex={0}
+        title="Zoom out"
+      >
+        <div
+          className="mx_ZoomButtons_icon"
+        />
+      </div>
+    </AccessibleButton>
+  </div>
+</ZoomButtons>
+`;
diff --git a/test/components/views/messages/DateSeparator-test.tsx b/test/components/views/messages/DateSeparator-test.tsx
index 574a22289d7..abd809ac95e 100644
--- a/test/components/views/messages/DateSeparator-test.tsx
+++ b/test/components/views/messages/DateSeparator-test.tsx
@@ -16,18 +16,17 @@ limitations under the License.
 
 import React from "react";
 import { mount } from "enzyme";
+import { mocked } from "jest-mock";
 
-import sdk from "../../../skinned-sdk";
-import * as TestUtils from "../../../test-utils";
 import { formatFullDateNoTime } from "../../../../src/DateUtils";
 import SettingsStore from "../../../../src/settings/SettingsStore";
 import { UIFeature } from "../../../../src/settings/UIFeature";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import { getMockClientWithEventEmitter } from "../../../test-utils";
+import DateSeparator from "../../../../src/components/views/messages/DateSeparator";
 
 jest.mock("../../../../src/settings/SettingsStore");
 
-const _DateSeparator = sdk.getComponent("views.messages.DateSeparator");
-const DateSeparator = TestUtils.wrapInMatrixClientContext(_DateSeparator);
-
 describe("DateSeparator", () => {
     const HOUR_MS = 3600000;
     const DAY_MS = HOUR_MS * 24;
@@ -37,6 +36,7 @@ describe("DateSeparator", () => {
     const defaultProps = {
         ts: nowMs,
         now,
+        roomId: "!unused:example.org",
     };
     const RealDate = global.Date;
     class MockDate extends Date {
@@ -45,8 +45,12 @@ describe("DateSeparator", () => {
         }
     }
 
+    const mockClient = getMockClientWithEventEmitter({});
     const getComponent = (props = {}) =>
-        mount(<DateSeparator {...defaultProps} {...props} />);
+        mount(<DateSeparator {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
 
     type TestCase = [string, number, string];
     const testCases: TestCase[] = [
@@ -106,7 +110,7 @@ describe("DateSeparator", () => {
 
     describe('when feature_jump_to_date is enabled', () => {
         beforeEach(() => {
-            (SettingsStore.getValue as jest.Mock) = jest.fn((arg) => {
+            mocked(SettingsStore).getValue.mockImplementation((arg) => {
                 if (arg === "feature_jump_to_date") {
                     return true;
                 }
diff --git a/test/components/views/messages/MBeaconBody-test.tsx b/test/components/views/messages/MBeaconBody-test.tsx
new file mode 100644
index 00000000000..5afbb05c78b
--- /dev/null
+++ b/test/components/views/messages/MBeaconBody-test.tsx
@@ -0,0 +1,318 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import maplibregl from 'maplibre-gl';
+import {
+    BeaconEvent,
+    getBeaconInfoIdentifier,
+} from 'matrix-js-sdk/src/matrix';
+
+import MBeaconBody from '../../../../src/components/views/messages/MBeaconBody';
+import {
+    getMockClientWithEventEmitter,
+    makeBeaconEvent,
+    makeBeaconInfoEvent,
+    makeRoomWithStateEvents,
+} from '../../../test-utils';
+import { RoomPermalinkCreator } from '../../../../src/utils/permalinks/Permalinks';
+import { MediaEventHelper } from '../../../../src/utils/MediaEventHelper';
+import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import Modal from '../../../../src/Modal';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+
+describe('<MBeaconBody />', () => {
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    // stable date for snapshots
+    jest.spyOn(global.Date, 'now').mockReturnValue(now);
+    const roomId = '!room:server';
+    const aliceId = '@alice:server';
+
+    const mockMap = new maplibregl.Map();
+    const mockMarker = new maplibregl.Marker();
+
+    const mockClient = getMockClientWithEventEmitter({
+        getClientWellKnown: jest.fn().mockReturnValue({
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+        }),
+        getUserId: jest.fn().mockReturnValue(aliceId),
+        getRoom: jest.fn(),
+    });
+
+    const defaultEvent = makeBeaconInfoEvent(aliceId,
+        roomId,
+        { isLive: true },
+        '$alice-room1-1',
+    );
+
+    const defaultProps = {
+        mxEvent: defaultEvent,
+        highlights: [],
+        highlightLink: '',
+        onHeightChanged: jest.fn(),
+        onMessageAllowed: jest.fn(),
+        // we dont use these and they pollute the snapshots
+        permalinkCreator: {} as unknown as RoomPermalinkCreator,
+        mediaEventHelper: {} as unknown as MediaEventHelper,
+    };
+
+    const getComponent = (props = {}) =>
+        mount(<MBeaconBody {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
+
+    const modalSpy = jest.spyOn(Modal, 'createTrackedDialog').mockReturnValue(undefined);
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('renders stopped beacon UI for an explicitly stopped beacon', () => {
+        const beaconInfoEvent = makeBeaconInfoEvent(aliceId,
+            roomId,
+            { isLive: false },
+            '$alice-room1-1',
+        );
+        makeRoomWithStateEvents([beaconInfoEvent], { roomId, mockClient });
+        const component = getComponent({ mxEvent: beaconInfoEvent });
+        expect(component.text()).toEqual("Live location ended");
+    });
+
+    it('renders stopped beacon UI for an expired beacon', () => {
+        const beaconInfoEvent = makeBeaconInfoEvent(aliceId,
+            roomId,
+            // puts this beacons live period in the past
+            { isLive: true, timestamp: now - 600000, timeout: 500 },
+            '$alice-room1-1',
+        );
+        makeRoomWithStateEvents([beaconInfoEvent], { roomId, mockClient });
+        const component = getComponent({ mxEvent: beaconInfoEvent });
+        expect(component.text()).toEqual("Live location ended");
+    });
+
+    it('does not open maximised map when on click when beacon is stopped', () => {
+        const beaconInfoEvent = makeBeaconInfoEvent(aliceId,
+            roomId,
+            // puts this beacons live period in the past
+            { isLive: true, timestamp: now - 600000, timeout: 500 },
+            '$alice-room1-1',
+        );
+        makeRoomWithStateEvents([beaconInfoEvent], { roomId, mockClient });
+        const component = getComponent({ mxEvent: beaconInfoEvent });
+        act(() => {
+            component.find('.mx_MBeaconBody_map').simulate('click');
+        });
+
+        expect(modalSpy).not.toHaveBeenCalled();
+    });
+
+    it('renders stopped UI when a beacon event is not the latest beacon for a user', () => {
+        const aliceBeaconInfo1 = makeBeaconInfoEvent(
+            aliceId,
+            roomId,
+            // this one is a little older
+            { isLive: true, timestamp: now - 500 },
+            '$alice-room1-1',
+        );
+        aliceBeaconInfo1.event.origin_server_ts = now - 500;
+        const aliceBeaconInfo2 = makeBeaconInfoEvent(
+            aliceId,
+            roomId,
+            { isLive: true },
+            '$alice-room1-2',
+        );
+
+        makeRoomWithStateEvents([aliceBeaconInfo1, aliceBeaconInfo2], { roomId, mockClient });
+
+        const component = getComponent({ mxEvent: aliceBeaconInfo1 });
+        // beacon1 has been superceded by beacon2
+        expect(component.text()).toEqual("Live location ended");
+    });
+
+    it('renders stopped UI when a beacon event is replaced', () => {
+        const aliceBeaconInfo1 = makeBeaconInfoEvent(
+            aliceId,
+            roomId,
+            // this one is a little older
+            { isLive: true, timestamp: now - 500 },
+            '$alice-room1-1',
+        );
+        aliceBeaconInfo1.event.origin_server_ts = now - 500;
+        const aliceBeaconInfo2 = makeBeaconInfoEvent(
+            aliceId,
+            roomId,
+            { isLive: true },
+            '$alice-room1-2',
+        );
+
+        const room = makeRoomWithStateEvents([aliceBeaconInfo1], { roomId, mockClient });
+        const component = getComponent({ mxEvent: aliceBeaconInfo1 });
+
+        const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo1));
+        // update alice's beacon with a new edition
+        // beacon instance emits
+        act(() => {
+            beaconInstance.update(aliceBeaconInfo2);
+        });
+
+        component.setProps({});
+
+        // beacon1 has been superceded by beacon2
+        expect(component.text()).toEqual("Live location ended");
+    });
+
+    describe('on liveness change', () => {
+        it('renders stopped UI when a beacon stops being live', () => {
+            const aliceBeaconInfo = makeBeaconInfoEvent(
+                aliceId,
+                roomId,
+                { isLive: true },
+                '$alice-room1-1',
+            );
+
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            act(() => {
+                // @ts-ignore cheat to force beacon to not live
+                beaconInstance._isLive = false;
+                beaconInstance.emit(BeaconEvent.LivenessChange, false, beaconInstance);
+            });
+
+            component.setProps({});
+
+            // stopped UI
+            expect(component.text()).toEqual("Live location ended");
+        });
+    });
+
+    describe('latestLocationState', () => {
+        const aliceBeaconInfo = makeBeaconInfoEvent(
+            aliceId,
+            roomId,
+            { isLive: true },
+            '$alice-room1-1',
+        );
+
+        const location1 = makeBeaconEvent(
+            aliceId, { beaconInfoId: aliceBeaconInfo.getId(), geoUri: 'geo:51,41', timestamp: now + 1 },
+        );
+        const location2 = makeBeaconEvent(
+            aliceId, { beaconInfoId: aliceBeaconInfo.getId(), geoUri: 'geo:52,42', timestamp: now + 10000 },
+        );
+
+        it('renders a live beacon without a location correctly', () => {
+            makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            expect(component.text()).toEqual("Loading live location...");
+        });
+
+        it('does nothing on click when a beacon has no location', () => {
+            makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            act(() => {
+                component.find('.mx_MBeaconBody_map').simulate('click');
+            });
+
+            expect(modalSpy).not.toHaveBeenCalled();
+        });
+
+        it('renders a live beacon with a location correctly', () => {
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            beaconInstance.addLocations([location1]);
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            expect(component.find('Map').length).toBeTruthy;
+        });
+
+        it('opens maximised map view on click when beacon has a live location', () => {
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            beaconInstance.addLocations([location1]);
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            act(() => {
+                component.find('Map').simulate('click');
+            });
+
+            // opens modal
+            expect(modalSpy).toHaveBeenCalled();
+        });
+
+        it('does nothing on click when a beacon has no location', () => {
+            makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            act(() => {
+                component.find('.mx_MBeaconBody_map').simulate('click');
+            });
+
+            expect(modalSpy).not.toHaveBeenCalled();
+        });
+
+        it('renders a live beacon with a location correctly', () => {
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            beaconInstance.addLocations([location1]);
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            expect(component.find('Map').length).toBeTruthy;
+        });
+
+        it('opens maximised map view on click when beacon has a live location', () => {
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            beaconInstance.addLocations([location1]);
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            act(() => {
+                component.find('Map').simulate('click');
+            });
+
+            // opens modal
+            expect(modalSpy).toHaveBeenCalled();
+        });
+
+        it('updates latest location', () => {
+            const room = makeRoomWithStateEvents([aliceBeaconInfo], { roomId, mockClient });
+            const component = getComponent({ mxEvent: aliceBeaconInfo });
+
+            const beaconInstance = room.currentState.beacons.get(getBeaconInfoIdentifier(aliceBeaconInfo));
+            act(() => {
+                beaconInstance.addLocations([location1]);
+                component.setProps({});
+            });
+
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 51, lon: 41 });
+            expect(mockMarker.setLngLat).toHaveBeenCalledWith({ lat: 51, lon: 41 });
+
+            act(() => {
+                beaconInstance.addLocations([location2]);
+                component.setProps({});
+            });
+
+            expect(mockMap.setCenter).toHaveBeenCalledWith({ lat: 52, lon: 42 });
+            expect(mockMarker.setLngLat).toHaveBeenCalledWith({ lat: 52, lon: 42 });
+        });
+    });
+});
diff --git a/test/components/views/messages/MKeyVerificationConclusion-test.js b/test/components/views/messages/MKeyVerificationConclusion-test.js
deleted file mode 100644
index 025dc82d45f..00000000000
--- a/test/components/views/messages/MKeyVerificationConclusion-test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import '../../../skinned-sdk'; // Must be first for skinning to work
-import React from 'react';
-import TestRenderer from 'react-test-renderer';
-import { EventEmitter } from 'events';
-import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
-
-import * as TestUtils from '../../../test-utils';
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
-
-const trustworthy = () => ({ isCrossSigningVerified: () => true });
-const untrustworthy = () => ({ isCrossSigningVerified: () => false });
-
-describe("MKeyVerificationConclusion", () => {
-    beforeEach(() => {
-        TestUtils.stubClient();
-        const client = MatrixClientPeg.get();
-        client.checkUserTrust = trustworthy;
-
-        const emitter = new EventEmitter();
-        client.on = emitter.on.bind(emitter);
-        client.removeListener = emitter.removeListener.bind(emitter);
-        client.emit = emitter.emit.bind(emitter);
-    });
-
-    it("shouldn't render if there's no verificationRequest", () => {
-        const event = new MatrixEvent({});
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-    });
-
-    it("shouldn't render if the verificationRequest is pending", () => {
-        const event = new MatrixEvent({});
-        event.verificationRequest = new EventEmitter();
-        event.verificationRequest.pending = true;
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-    });
-
-    it("shouldn't render if the event type is cancel but the request type isn't", () => {
-        const event = new MatrixEvent({ type: "m.key.verification.cancel" });
-        event.verificationRequest = new EventEmitter();
-        event.verificationRequest.cancelled = false;
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-    });
-
-    it("shouldn't render if the event type is done but the request type isn't", () => {
-        const event = new MatrixEvent({ type: "m.key.verification.done" });
-        event.verificationRequest = new EventEmitter();
-        event.verificationRequest.done = false;
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-    });
-
-    it("shouldn't render if the user isn't actually trusted", () => {
-        const client = MatrixClientPeg.get();
-        client.checkUserTrust = untrustworthy;
-
-        const event = new MatrixEvent({ type: "m.key.verification.done" });
-        event.verificationRequest = new EventEmitter();
-        event.verificationRequest.done = true;
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-    });
-
-    it("should rerender appropriately if user trust status changes", () => {
-        const client = MatrixClientPeg.get();
-        client.checkUserTrust = untrustworthy;
-
-        const event = new MatrixEvent({ type: "m.key.verification.done" });
-        event.verificationRequest = new EventEmitter();
-        event.verificationRequest.done = true;
-        event.verificationRequest.otherUserId = "@someuser:domain";
-        const renderer = TestRenderer.create(
-            <MKeyVerificationConclusion mxEvent={event} />,
-        );
-        expect(renderer.toJSON()).toBeNull();
-
-        client.checkUserTrust = trustworthy;
-
-        /* Ensure we don't rerender for every trust status change of any user */
-        client.emit("userTrustStatusChanged", "@anotheruser:domain");
-        expect(renderer.toJSON()).toBeNull();
-
-        /* But when our user changes, we do rerender */
-        client.emit("userTrustStatusChanged", event.verificationRequest.otherUserId);
-        expect(renderer.toJSON()).not.toBeNull();
-    });
-});
diff --git a/test/components/views/messages/MKeyVerificationConclusion-test.tsx b/test/components/views/messages/MKeyVerificationConclusion-test.tsx
new file mode 100644
index 00000000000..c6dd116a72f
--- /dev/null
+++ b/test/components/views/messages/MKeyVerificationConclusion-test.tsx
@@ -0,0 +1,132 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import TestRenderer from 'react-test-renderer';
+import { EventEmitter } from 'events';
+import { MatrixEvent, EventType } from 'matrix-js-sdk/src/matrix';
+import { CryptoEvent } from 'matrix-js-sdk/src/crypto';
+import { UserTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning';
+import { VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest';
+
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
+import { getMockClientWithEventEmitter } from '../../../test-utils';
+
+const trustworthy = ({ isCrossSigningVerified: () => true }) as unknown as UserTrustLevel;
+const untrustworthy = ({ isCrossSigningVerified: () => false }) as unknown as UserTrustLevel;
+
+describe("MKeyVerificationConclusion", () => {
+    const userId = '@user:server';
+    const mockClient = getMockClientWithEventEmitter({
+        getRoom: jest.fn(),
+        getUserId: jest.fn().mockReturnValue(userId),
+        checkUserTrust: jest.fn(),
+    });
+
+    const getMockVerificationRequest = (
+        { pending, cancelled, done, otherUserId }:
+        { pending?: boolean, cancelled?: boolean, done?: boolean, otherUserId?: string },
+    ) => {
+        class MockVerificationRequest extends EventEmitter {
+            constructor(
+                public readonly pending: boolean,
+                public readonly cancelled: boolean,
+                public readonly done: boolean,
+                public readonly otherUserId: string,
+            ) {
+                super();
+            }
+        }
+        return new MockVerificationRequest(pending, cancelled, done, otherUserId) as unknown as VerificationRequest;
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockClient.checkUserTrust.mockReturnValue(trustworthy);
+    });
+
+    afterAll(() => {
+        jest.spyOn(MatrixClientPeg, 'get').mockRestore();
+    });
+
+    it("shouldn't render if there's no verificationRequest", () => {
+        const event = new MatrixEvent({});
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the verificationRequest is pending", () => {
+        const event = new MatrixEvent({});
+        event.verificationRequest = getMockVerificationRequest({ pending: true });
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the event type is cancel but the request type isn't", () => {
+        const event = new MatrixEvent({ type: EventType.KeyVerificationCancel });
+        event.verificationRequest = getMockVerificationRequest({ cancelled: false });
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the event type is done but the request type isn't", () => {
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = getMockVerificationRequest({ done: false });
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the user isn't actually trusted", () => {
+        mockClient.checkUserTrust.mockReturnValue(untrustworthy);
+
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = getMockVerificationRequest({ done: true });
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("should rerender appropriately if user trust status changes", () => {
+        mockClient.checkUserTrust.mockReturnValue(untrustworthy);
+
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = getMockVerificationRequest({ done: true, otherUserId: "@someuser:domain" });
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+
+        mockClient.checkUserTrust.mockReturnValue(trustworthy);
+
+        /* Ensure we don't rerender for every trust status change of any user */
+        mockClient.emit(CryptoEvent.UserTrustStatusChanged, "@anotheruser:domain");
+        expect(renderer.toJSON()).toBeNull();
+
+        /* But when our user changes, we do rerender */
+        mockClient.emit(CryptoEvent.UserTrustStatusChanged, event.verificationRequest.otherUserId);
+        expect(renderer.toJSON()).not.toBeNull();
+    });
+});
diff --git a/test/components/views/messages/MLocationBody-test.tsx b/test/components/views/messages/MLocationBody-test.tsx
index d5b9665f3a8..cc5a6105e50 100644
--- a/test/components/views/messages/MLocationBody-test.tsx
+++ b/test/components/views/messages/MLocationBody-test.tsx
@@ -14,280 +14,145 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
-import {
-    ASSET_NODE_TYPE,
-    LocationAssetType,
-    ILocationContent,
-    LOCATION_EVENT_TYPE,
-    TIMESTAMP_NODE_TYPE,
-} from "matrix-js-sdk/src/@types/location";
-import { TEXT_NODE_TYPE } from "matrix-js-sdk/src/@types/extensible_events";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-
-import sdk from "../../../skinned-sdk";
-import {
-    createMapSiteLink,
-    isSelfLocation,
-    parseGeoUri,
-} from "../../../../src/components/views/messages/MLocationBody";
-
-sdk.getComponent("views.messages.MLocationBody");
+import React from 'react';
+import { mount } from "enzyme";
+import { LocationAssetType } from "matrix-js-sdk/src/@types/location";
+import { RoomMember } from 'matrix-js-sdk/src/matrix';
+import maplibregl from 'maplibre-gl';
+import { logger } from 'matrix-js-sdk/src/logger';
+import { act } from 'react-dom/test-utils';
+
+import MLocationBody from "../../../../src/components/views/messages/MLocationBody";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
+import { MediaEventHelper } from "../../../../src/utils/MediaEventHelper";
+import Modal from '../../../../src/Modal';
+import SdkConfig from "../../../../src/SdkConfig";
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
+import { makeLocationEvent } from "../../../test-utils/location";
+import { getMockClientWithEventEmitter } from '../../../test-utils';
 
 describe("MLocationBody", () => {
-    describe("parseGeoUri", () => {
-        it("fails if the supplied URI is empty", () => {
-            expect(parseGeoUri("")).toBeFalsy();
-        });
-
-        // We use some examples from the spec, but don't check semantics
-        // like two textually-different URIs being equal, since we are
-        // just a humble parser.
-
-        // Note: we do not understand geo URIs with percent-encoded coords
-        // or accuracy.  It is RECOMMENDED in the spec never to percent-encode
-        // these, but it is permitted, and we will fail to parse in that case.
-
-        it("rfc5870 6.1 Simple 3-dimensional", () => {
-            expect(parseGeoUri("geo:48.2010,16.3695,183")).toEqual(
-                {
-                    latitude: 48.2010,
-                    longitude: 16.3695,
-                    altitude: 183,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.2 Explicit CRS and accuracy", () => {
-            expect(parseGeoUri("geo:48.198634,16.371648;crs=wgs84;u=40")).toEqual(
-                {
-                    latitude: 48.198634,
-                    longitude: 16.371648,
-                    altitude: undefined,
-                    accuracy: 40,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.4 Negative longitude and explicit CRS", () => {
-            expect(parseGeoUri("geo:90,-22.43;crs=WGS84")).toEqual(
-                {
-                    latitude: 90,
-                    longitude: -22.43,
-                    altitude: undefined,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.4 Integer lat and lon", () => {
-            expect(parseGeoUri("geo:90,46")).toEqual(
-                {
-                    latitude: 90,
-                    longitude: 46,
-                    altitude: undefined,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.4 Percent-encoded param value", () => {
-            expect(parseGeoUri("geo:66,30;u=6.500;FOo=this%2dthat")).toEqual(
-                {
-                    latitude: 66,
-                    longitude: 30,
-                    altitude: undefined,
-                    accuracy: 6.500,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.4 Unknown param", () => {
-            expect(parseGeoUri("geo:66.0,30;u=6.5;foo=this-that>")).toEqual(
-                {
-                    latitude: 66.0,
-                    longitude: 30,
-                    altitude: undefined,
-                    accuracy: 6.5,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("rfc5870 6.4 Multiple unknown params", () => {
-            expect(parseGeoUri("geo:70,20;foo=1.00;bar=white")).toEqual(
-                {
-                    latitude: 70,
-                    longitude: 20,
-                    altitude: undefined,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("Negative latitude", () => {
-            expect(parseGeoUri("geo:-7.5,20")).toEqual(
-                {
-                    latitude: -7.5,
-                    longitude: 20,
-                    altitude: undefined,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-
-        it("Zero altitude is not unknown", () => {
-            expect(parseGeoUri("geo:-7.5,-20,0")).toEqual(
-                {
-                    latitude: -7.5,
-                    longitude: -20,
-                    altitude: 0,
-                    accuracy: undefined,
-                    altitudeAccuracy: undefined,
-                    heading: undefined,
-                    speed: undefined,
-                },
-            );
-        });
-    });
-
-    describe("createMapSiteLink", () => {
-        it("returns null if event does not contain geouri", () => {
-            expect(createMapSiteLink(nonLocationEvent())).toBeNull();
-        });
-
-        it("returns OpenStreetMap link if event contains m.location", () => {
-            expect(
-                createMapSiteLink(modernLocationEvent("geo:51.5076,-0.1276")),
-            ).toEqual(
-                "https://www.openstreetmap.org/" +
-                "?mlat=51.5076&mlon=-0.1276" +
-                "#map=16/51.5076/-0.1276",
-            );
-        });
-
-        it("returns OpenStreetMap link if event contains geo_uri", () => {
-            expect(
-                createMapSiteLink(oldLocationEvent("geo:51.5076,-0.1276")),
-            ).toEqual(
-                "https://www.openstreetmap.org/" +
-                "?mlat=51.5076&mlon=-0.1276" +
-                "#map=16/51.5076/-0.1276",
-            );
-        });
-    });
-
-    describe("isSelfLocation", () => {
-        it("Returns true for a full m.asset event", () => {
-            const content = makeLocationContent("", "", 0);
-            expect(isSelfLocation(content)).toBe(true);
-        });
-
-        it("Returns true for a missing m.asset", () => {
-            const content = {
-                body: "",
-                msgtype: "m.location",
-                geo_uri: "",
-                [LOCATION_EVENT_TYPE.name]: { uri: "" },
-                [TEXT_NODE_TYPE.name]: "",
-                [TIMESTAMP_NODE_TYPE.name]: 0,
-                // Note: no m.asset!
-            };
-            expect(isSelfLocation(content as ILocationContent)).toBe(true);
-        });
-
-        it("Returns true for a missing m.asset type", () => {
-            const content = {
-                body: "",
-                msgtype: "m.location",
-                geo_uri: "",
-                [LOCATION_EVENT_TYPE.name]: { uri: "" },
-                [TEXT_NODE_TYPE.name]: "",
-                [TIMESTAMP_NODE_TYPE.name]: 0,
-                [ASSET_NODE_TYPE.name]: {
-                    // Note: no type!
-                },
-            };
-            expect(isSelfLocation(content as ILocationContent)).toBe(true);
-        });
-
-        it("Returns false for an unknown asset type", () => {
-            const content = makeLocationContent("", "", 0, "", "org.example.unknown" as unknown as LocationAssetType);
-            expect(isSelfLocation(content)).toBe(false);
+    describe('<MLocationBody>', () => {
+        const roomId = '!room:server';
+        const userId = '@user:server';
+        const mockClient = getMockClientWithEventEmitter({
+            getClientWellKnown: jest.fn().mockReturnValue({
+                [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+            }),
+            isGuest: jest.fn().mockReturnValue(false),
+        });
+        const defaultEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Pin);
+        const defaultProps = {
+            mxEvent: defaultEvent,
+            highlights: [],
+            highlightLink: '',
+            onHeightChanged: jest.fn(),
+            onMessageAllowed: jest.fn(),
+            permalinkCreator: {} as RoomPermalinkCreator,
+            mediaEventHelper: {} as MediaEventHelper,
+        };
+        const getComponent = (props = {}) => mount(<MLocationBody {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        });
+        describe('with error', () => {
+            let sdkConfigSpy;
+
+            beforeEach(() => {
+                // eat expected errors to keep console clean
+                jest.spyOn(logger, 'error').mockImplementation(() => { });
+                mockClient.getClientWellKnown.mockReturnValue({});
+                sdkConfigSpy = jest.spyOn(SdkConfig, 'get').mockReturnValue({});
+            });
+
+            afterAll(() => {
+                sdkConfigSpy.mockRestore();
+                jest.spyOn(logger, 'error').mockRestore();
+            });
+
+            it('displays correct fallback content without error style when map_style_url is not configured', () => {
+                const component = getComponent();
+                expect(component.find(".mx_EventTile_body")).toMatchSnapshot();
+            });
+
+            it('displays correct fallback content when map_style_url is misconfigured', () => {
+                const mockMap = new maplibregl.Map();
+                mockClient.getClientWellKnown.mockReturnValue({
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'bad-tile-server.com' },
+                });
+                const component = getComponent();
+
+                // simulate error initialising map in maplibregl
+                // @ts-ignore
+                mockMap.emit('error', { status: 404 });
+                component.setProps({});
+                expect(component.find(".mx_EventTile_body")).toMatchSnapshot();
+            });
+        });
+
+        describe('without error', () => {
+            beforeEach(() => {
+                mockClient.getClientWellKnown.mockReturnValue({
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
+                });
+
+                // MLocationBody uses random number for map id
+                // stabilise for test
+                jest.spyOn(global.Math, 'random').mockReturnValue(0.123456);
+            });
+
+            afterAll(() => {
+                jest.spyOn(global.Math, 'random').mockRestore();
+            });
+
+            it('renders map correctly', () => {
+                const mockMap = new maplibregl.Map();
+                const component = getComponent();
+
+                expect(component).toMatchSnapshot();
+                // map was centered
+                expect(mockMap.setCenter).toHaveBeenCalledWith({
+                    lat: 51.5076, lon: -0.1276,
+                });
+            });
+
+            it('opens map dialog on click', () => {
+                const modalSpy = jest.spyOn(Modal, 'createTrackedDialog').mockReturnValue(undefined);
+                const component = getComponent();
+
+                act(() => {
+                    component.find('Map').at(0).simulate('click');
+                });
+
+                expect(modalSpy).toHaveBeenCalled();
+            });
+
+            it('renders marker correctly for a non-self share', () => {
+                const mockMap = new maplibregl.Map();
+                const component = getComponent();
+
+                expect(component.find('SmartMarker').at(0).props()).toEqual(
+                    expect.objectContaining({
+                        map: mockMap,
+                        geoUri: 'geo:51.5076,-0.1276',
+                        roomMember: undefined,
+                    }),
+                );
+            });
+
+            it('renders marker correctly for a self share', () => {
+                const selfShareEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Self);
+                const member = new RoomMember(roomId, userId);
+                // @ts-ignore cheat assignment to property
+                selfShareEvent.sender = member;
+                const component = getComponent({ mxEvent: selfShareEvent });
+
+                // render self locations with user avatars
+                expect(component.find('SmartMarker').at(0).props()['roomMember']).toEqual(
+                    member,
+                );
+            });
         });
     });
 });
-
-function oldLocationEvent(geoUri: string): MatrixEvent {
-    return new MatrixEvent(
-        {
-            "event_id": nextId(),
-            "type": LOCATION_EVENT_TYPE.name,
-            "content": {
-                "body": "Something about where I am",
-                "msgtype": "m.location",
-                "geo_uri": geoUri,
-            },
-        },
-    );
-}
-
-function modernLocationEvent(geoUri: string): MatrixEvent {
-    return new MatrixEvent(
-        {
-            "event_id": nextId(),
-            "type": LOCATION_EVENT_TYPE.name,
-            "content": makeLocationContent(
-                `Found at ${geoUri} at 2021-12-21T12:22+0000`,
-                geoUri,
-                252523,
-                "Human-readable label",
-            ),
-        },
-    );
-}
-
-function nonLocationEvent(): MatrixEvent {
-    return new MatrixEvent(
-        {
-            "event_id": nextId(),
-            "type": "some.event.type",
-            "content": {
-                "m.relates_to": {
-                    "rel_type": "m.reference",
-                    "event_id": "$mypoll",
-                },
-            },
-        },
-    );
-}
-
-let EVENT_ID = 0;
-function nextId(): string {
-    EVENT_ID++;
-    return EVENT_ID.toString();
-}
diff --git a/test/components/views/messages/MPollBody-test.tsx b/test/components/views/messages/MPollBody-test.tsx
index 69cf16ab477..5fa55cd46f0 100644
--- a/test/components/views/messages/MPollBody-test.tsx
+++ b/test/components/views/messages/MPollBody-test.tsx
@@ -16,8 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
-import { Callback, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
-import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
+import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 import { RelatedRelations } from "matrix-js-sdk/src/models/related-relations";
 import {
@@ -30,9 +29,8 @@ import {
     M_TEXT,
     POLL_ANSWER,
 } from "matrix-events-sdk";
+import { MockedObject } from "jest-mock";
 
-import * as TestUtils from "../../../test-utils";
-import sdk from "../../../skinned-sdk";
 import {
     UserVote,
     allVotes,
@@ -42,19 +40,25 @@ import {
 } from "../../../../src/components/views/messages/MPollBody";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import { IBodyProps } from "../../../../src/components/views/messages/IBodyProps";
+import { getMockClientWithEventEmitter } from "../../../test-utils";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import MPollBody from "../../../../src/components/views/messages/MPollBody";
 
 const CHECKED = "mx_MPollBody_option_checked";
 
-const _MPollBody = sdk.getComponent("views.messages.MPollBody");
-const MPollBody = TestUtils.wrapInMatrixClientContext(_MPollBody);
+const mockClient = getMockClientWithEventEmitter({
+    getUserId: jest.fn().mockReturnValue("@me:example.com"),
+    sendEvent: jest.fn().mockReturnValue(Promise.resolve({ "event_id": "fake_send_id" })),
+    getRoom: jest.fn(),
+});
 
-MatrixClientPeg.matrixClient = {
-    getUserId: () => "@me:example.com",
-    sendEvent: () => Promise.resolve({ "event_id": "fake_send_id" }),
-};
-setRedactionAllowedForMeOnly(MatrixClientPeg.matrixClient);
+setRedactionAllowedForMeOnly(mockClient);
 
 describe("MPollBody", () => {
+    beforeEach(() => {
+        mockClient.sendEvent.mockClear();
+    });
+
     it("finds no votes if there are none", () => {
         expect(
             allVotes(
@@ -110,13 +114,12 @@ describe("MPollBody", () => {
             ]),
         ]);
 
-        const matrixClient = TestUtils.createTestClient();
-        setRedactionAllowedForMeOnly(matrixClient);
+        setRedactionAllowedForMeOnly(mockClient);
 
         expect(
             pollEndTs(
                 { getRoomId: () => "$room" } as MatrixEvent,
-                matrixClient,
+                mockClient,
                 endRelations,
             ),
         ).toBe(12);
@@ -132,13 +135,12 @@ describe("MPollBody", () => {
             ]),
         ]);
 
-        const matrixClient = TestUtils.createTestClient();
-        setRedactionAllowedForMeOnly(matrixClient);
+        setRedactionAllowedForMeOnly(mockClient);
 
         expect(
             pollEndTs(
                 { getRoomId: () => "$room" } as MatrixEvent,
-                matrixClient,
+                mockClient,
                 endRelations,
             ),
         ).toBe(13);
@@ -460,7 +462,7 @@ describe("MPollBody", () => {
         const votes = [];
         const ends = [];
         const body = newMPollBody(votes, ends, answers);
-        expect(body.html()).toBe("");
+        expect(body.html()).toBeNull();
     });
 
     it("renders the first 20 answers if 21 were given", () => {
@@ -530,110 +532,47 @@ describe("MPollBody", () => {
     });
 
     it("sends a vote event when I choose an option", () => {
-        const receivedEvents = [];
-        MatrixClientPeg.matrixClient.sendEvent = (
-            roomId: string,
-            eventType: string,
-            content: IContent,
-            txnId?: string,
-            callback?: Callback,
-        ): Promise<ISendEventResponse> => {
-            receivedEvents.push({ roomId, eventType, content, txnId, callback });
-            return Promise.resolve({ "event_id": "fake_tracked_send_id" });
-        };
-
         const votes = [];
         const body = newMPollBody(votes);
         clickRadio(body, "wings");
-        expect(receivedEvents).toEqual([
-            expectedResponseEvent("wings"),
-        ]);
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(...expectedResponseEventCall("wings"));
     });
 
     it("sends only one vote event when I click several times", () => {
-        const receivedEvents = [];
-        MatrixClientPeg.matrixClient.sendEvent = (
-            roomId: string,
-            eventType: string,
-            content: IContent,
-            txnId?: string,
-            callback?: Callback,
-        ): Promise<ISendEventResponse> => {
-            receivedEvents.push({ roomId, eventType, content, txnId, callback });
-            return Promise.resolve({ "event_id": "fake_tracked_send_id" });
-        };
-
         const votes = [];
         const body = newMPollBody(votes);
         clickRadio(body, "wings");
         clickRadio(body, "wings");
         clickRadio(body, "wings");
         clickRadio(body, "wings");
-        expect(receivedEvents).toEqual([
-            expectedResponseEvent("wings"),
-        ]);
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(
+            ...expectedResponseEventCall("wings"),
+        );
     });
 
     it("sends no vote event when I click what I already chose", () => {
-        const receivedEvents = [];
-        MatrixClientPeg.matrixClient.sendEvent = (
-            roomId: string,
-            eventType: string,
-            content: IContent,
-            txnId?: string,
-            callback?: Callback,
-        ): Promise<ISendEventResponse> => {
-            receivedEvents.push({ roomId, eventType, content, txnId, callback });
-            return Promise.resolve({ "event_id": "fake_tracked_send_id" });
-        };
-
         const votes = [responseEvent("@me:example.com", "wings")];
         const body = newMPollBody(votes);
         clickRadio(body, "wings");
         clickRadio(body, "wings");
         clickRadio(body, "wings");
         clickRadio(body, "wings");
-        expect(receivedEvents).toEqual([]);
+        expect(mockClient.sendEvent).not.toHaveBeenCalled();
     });
 
     it("sends several events when I click different options", () => {
-        const receivedEvents = [];
-        MatrixClientPeg.matrixClient.sendEvent = (
-            roomId: string,
-            eventType: string,
-            content: IContent,
-            txnId?: string,
-            callback?: Callback,
-        ): Promise<ISendEventResponse> => {
-            receivedEvents.push({ roomId, eventType, content, txnId, callback });
-            return Promise.resolve({ "event_id": "fake_tracked_send_id" });
-        };
-
         const votes = [];
         const body = newMPollBody(votes);
         clickRadio(body, "wings");
         clickRadio(body, "italian");
         clickRadio(body, "poutine");
-        expect(receivedEvents).toEqual([
-            expectedResponseEvent("wings"),
-            expectedResponseEvent("italian"),
-            expectedResponseEvent("poutine"),
-        ]);
+        expect(mockClient.sendEvent).toHaveBeenCalledTimes(3);
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(...expectedResponseEventCall("wings"));
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(...expectedResponseEventCall("italian"));
+        expect(mockClient.sendEvent).toHaveBeenCalledWith(...expectedResponseEventCall("poutine"));
     });
 
     it("sends no events when I click in an ended poll", () => {
-        const receivedEvents = [];
-        MatrixClientPeg.matrixClient.sendEvent = (
-            roomId: string,
-            eventType: string,
-            content: IContent,
-            txnId?: string,
-            callback?: Callback,
-        ): Promise<ISendEventResponse> => {
-            receivedEvents.push({ roomId, eventType, content, txnId, callback });
-            return Promise.resolve({ "event_id": "fake_tracked_send_id" });
-        };
-
         const ends = [
             endEvent("@me:example.com", 25),
         ];
@@ -645,7 +584,7 @@ describe("MPollBody", () => {
         clickEndedOption(body, "wings");
         clickEndedOption(body, "italian");
         clickEndedOption(body, "poutine");
-        expect(receivedEvents).toEqual([]);
+        expect(mockClient.sendEvent).not.toHaveBeenCalled();
     });
 
     it("finds the top answer among several votes", () => {
@@ -888,9 +827,8 @@ describe("MPollBody", () => {
 
     it("says poll is not ended if endRelations is undefined", () => {
         const pollEvent = new MatrixEvent();
-        const matrixClient = TestUtils.createTestClient();
-        setRedactionAllowedForMeOnly(matrixClient);
-        expect(isPollEnded(pollEvent, matrixClient, undefined)).toBe(false);
+        setRedactionAllowedForMeOnly(mockClient);
+        expect(isPollEnded(pollEvent, mockClient, undefined)).toBe(false);
     });
 
     it("says poll is not ended if asking for relations returns undefined", () => {
@@ -899,15 +837,15 @@ describe("MPollBody", () => {
             "room_id": "#myroom:example.com",
             "content": newPollStart([]),
         });
-        MatrixClientPeg.matrixClient.getRoom = () => {
+        mockClient.getRoom.mockImplementation((_roomId) => {
             return {
                 currentState: {
                     maySendRedactionForEvent: (_evt: MatrixEvent, userId: string) => {
                         return userId === "@me:example.com";
                     },
                 },
-            };
-        };
+            } as unknown as Room;
+        });
         const getRelationsForEvent =
             (eventId: string, relationType: string, eventType: string) => {
                 expect(eventId).toBe("$mypoll");
@@ -1134,7 +1072,20 @@ function newMPollBodyFromEvent(
                 }
             }
         }
-    />);
+
+        // We don't use any of these props, but they're required.
+        highlightLink="unused"
+        highlights={[]}
+        mediaEventHelper={null}
+        onHeightChanged={() => {}}
+        onMessageAllowed={() => {}}
+        permalinkCreator={null}
+    />, {
+        wrappingComponent: MatrixClientContext.Provider,
+        wrappingComponentProps: {
+            value: mockClient,
+        },
+    });
 }
 
 function clickRadio(wrapper: ReactWrapper, value: string) {
@@ -1271,12 +1222,20 @@ function expectedResponseEvent(answer: string) {
                 "rel_type": "m.reference",
             },
         },
-        "eventType": M_POLL_RESPONSE.name,
         "roomId": "#myroom:example.com",
+        "eventType": M_POLL_RESPONSE.name,
         "txnId": undefined,
         "callback": undefined,
     };
 }
+function expectedResponseEventCall(answer: string) {
+    const {
+        content, roomId, eventType,
+    } = expectedResponseEvent(answer);
+    return [
+        roomId, eventType, content,
+    ];
+}
 
 function endEvent(
     sender = "@me:example.com",
@@ -1309,8 +1268,7 @@ function runIsPollEnded(ends: MatrixEvent[]) {
         "content": newPollStart(),
     });
 
-    const matrixClient = TestUtils.createTestClient();
-    setRedactionAllowedForMeOnly(matrixClient);
+    setRedactionAllowedForMeOnly(mockClient);
 
     const getRelationsForEvent =
         (eventId: string, relationType: string, eventType: string) => {
@@ -1320,7 +1278,7 @@ function runIsPollEnded(ends: MatrixEvent[]) {
             return newEndRelations(ends);
         };
 
-    return isPollEnded(pollEvent, matrixClient, getRelationsForEvent);
+    return isPollEnded(pollEvent, mockClient, getRelationsForEvent);
 }
 
 function runFindTopAnswer(votes: MatrixEvent[], ends: MatrixEvent[]) {
@@ -1347,8 +1305,8 @@ function runFindTopAnswer(votes: MatrixEvent[], ends: MatrixEvent[]) {
     return findTopAnswer(pollEvent, MatrixClientPeg.get(), getRelationsForEvent);
 }
 
-function setRedactionAllowedForMeOnly(matrixClient: MatrixClient) {
-    matrixClient.getRoom = (_roomId: string) => {
+function setRedactionAllowedForMeOnly(matrixClient: MockedObject<MatrixClient>) {
+    matrixClient.getRoom.mockImplementation((_roomId: string) => {
         return {
             currentState: {
                 maySendRedactionForEvent: (_evt: MatrixEvent, userId: string) => {
@@ -1356,7 +1314,7 @@ function setRedactionAllowedForMeOnly(matrixClient: MatrixClient) {
                 },
             },
         } as Room;
-    };
+    });
 }
 
 let EVENT_ID = 0;
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.tsx
similarity index 82%
rename from test/components/views/messages/TextualBody-test.js
rename to test/components/views/messages/TextualBody-test.tsx
index 5018663febb..371c372196f 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,29 +16,60 @@ limitations under the License.
 
 import React from "react";
 import { mount } from "enzyme";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import { MockedObject } from "jest-mock";
 
-import sdk from "../../../skinned-sdk";
-import { mkEvent, mkStubRoom } from "../../../test-utils";
+import { getMockClientWithEventEmitter, mkEvent, mkStubRoom } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import * as languageHandler from "../../../../src/languageHandler";
-import * as TestUtils from "../../../test-utils";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
-
-const _TextualBody = sdk.getComponent("views.messages.TextualBody");
-const TextualBody = TestUtils.wrapInMatrixClientContext(_TextualBody);
+import TextualBody from "../../../../src/components/views/messages/TextualBody";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
+import { MediaEventHelper } from "../../../../src/utils/MediaEventHelper";
 
 describe("<TextualBody />", () => {
     afterEach(() => {
-        MatrixClientPeg.matrixClient = null;
+        jest.spyOn(MatrixClientPeg, 'get').mockRestore();
     });
 
-    it("renders m.emote correctly", () => {
-        MatrixClientPeg.matrixClient = {
-            getRoom: () => mkStubRoom("room_id"),
+    const defaultRoom = mkStubRoom("room_id", "test room", undefined);
+    let defaultMatrixClient: MockedObject<MatrixClient>;
+    beforeEach(() => {
+        defaultMatrixClient = getMockClientWithEventEmitter({
+            getRoom: () => defaultRoom,
             getAccountData: () => undefined,
             isGuest: () => false,
             mxcUrlToHttp: (s) => s,
-        };
+        });
+    });
+
+    const defaultEvent = mkEvent({
+        type: "m.room.message",
+        room: "room_id",
+        user: "sender",
+        content: {
+            body: "winks",
+            msgtype: "m.emote",
+        },
+        event: true,
+    });
+    const defaultProps = {
+        mxEvent: defaultEvent,
+        highlights: [],
+        highlightLink: '',
+        onMessageAllowed: jest.fn(),
+        onHeightChanged: jest.fn(),
+        permalinkCreator: new RoomPermalinkCreator(defaultRoom),
+        mediaEventHelper: {} as MediaEventHelper,
+    };
+    const getComponent = (props = {}, matrixClient: MatrixClient = defaultMatrixClient) =>
+        mount(<TextualBody {...defaultProps} {...props} />, {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: matrixClient },
+        });
+
+    it("renders m.emote correctly", () => {
         DMRoomMap.makeShared();
 
         const ev = mkEvent({
@@ -52,19 +83,13 @@ describe("<TextualBody />", () => {
             event: true,
         });
 
-        const wrapper = mount(<TextualBody mxEvent={ev} />);
+        const wrapper = getComponent({ mxEvent: ev });
         expect(wrapper.text()).toBe("* sender winks");
         const content = wrapper.find(".mx_EventTile_body");
         expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">winks</span>');
     });
 
     it("renders m.notice correctly", () => {
-        MatrixClientPeg.matrixClient = {
-            getRoom: () => mkStubRoom("room_id"),
-            getAccountData: () => undefined,
-            isGuest: () => false,
-            mxcUrlToHttp: (s) => s,
-        };
         DMRoomMap.makeShared();
 
         const ev = mkEvent({
@@ -78,7 +103,7 @@ describe("<TextualBody />", () => {
             event: true,
         });
 
-        const wrapper = mount(<TextualBody mxEvent={ev} />);
+        const wrapper = getComponent({ mxEvent: ev });
         expect(wrapper.text()).toBe(ev.getContent().body);
         const content = wrapper.find(".mx_EventTile_body");
         expect(content.html()).toBe(`<span class="mx_EventTile_body" dir="auto">${ ev.getContent().body }</span>`);
@@ -86,12 +111,6 @@ describe("<TextualBody />", () => {
 
     describe("renders plain-text m.text correctly", () => {
         beforeEach(() => {
-            MatrixClientPeg.matrixClient = {
-                getRoom: () => mkStubRoom("room_id"),
-                getAccountData: () => undefined,
-                isGuest: () => false,
-                mxcUrlToHttp: (s) => s,
-            };
             DMRoomMap.makeShared();
         });
 
@@ -107,7 +126,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev });
             expect(wrapper.text()).toBe(ev.getContent().body);
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe(`<span class="mx_EventTile_body" dir="auto">${ ev.getContent().body }</span>`);
@@ -126,7 +145,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev });
             expect(wrapper.text()).toBe(ev.getContent().body);
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">' +
@@ -136,9 +155,10 @@ describe("<TextualBody />", () => {
     });
 
     describe("renders formatted m.text correctly", () => {
+        let matrixClient;
         beforeEach(() => {
-            MatrixClientPeg.matrixClient = {
-                getRoom: () => mkStubRoom("room_id"),
+            matrixClient = getMockClientWithEventEmitter({
+                getRoom: () => mkStubRoom("room_id", "room name", undefined),
                 getAccountData: () => undefined,
                 getUserId: () => "@me:my_server",
                 getHomeserverUrl: () => "https://my_server/",
@@ -146,7 +166,7 @@ describe("<TextualBody />", () => {
                 removeListener: () => undefined,
                 isGuest: () => false,
                 mxcUrlToHttp: (s) => s,
-            };
+            });
             DMRoomMap.makeShared();
         });
 
@@ -164,7 +184,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
             expect(wrapper.text()).toBe("foo baz bar del u");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
@@ -185,7 +205,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
             expect(wrapper.text()).toBe("Hey (movie) the movie was awesome");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
@@ -211,7 +231,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
             expect(wrapper.text()).toBe("Hey Member");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
@@ -236,7 +256,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev });
             expect(wrapper.text()).toBe("@room\n1@room\n\n");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toMatchSnapshot();
@@ -260,7 +280,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
             expect(wrapper.text()).toBe("An event link with text");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe(
@@ -289,8 +309,8 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
-            expect(wrapper.text()).toBe("A !ZxbRYPQXDXKGmDnJNg:example.com with vias");
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
+            expect(wrapper.text()).toBe("A room name with vias");
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe(
                 '<span class="mx_EventTile_body markdown-body" dir="auto">' +
@@ -300,7 +320,7 @@ describe("<TextualBody />", () => {
                 '><img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
                 'src="mxc://avatar.url/room.png" ' +
                 'style="width: 16px; height: 16px;" alt="" aria-hidden="true">' +
-                '!ZxbRYPQXDXKGmDnJNg:example.com</a></span> with vias</span>',
+                'room name</a></span> with vias</span>',
             );
         });
 
@@ -318,7 +338,7 @@ describe("<TextualBody />", () => {
                 event: true,
             });
 
-            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            const wrapper = getComponent({ mxEvent: ev }, matrixClient);
 
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe(
@@ -332,13 +352,13 @@ describe("<TextualBody />", () => {
     it("renders url previews correctly", () => {
         languageHandler.setMissingEntryGenerator(key => key.split('|', 2)[1]);
 
-        MatrixClientPeg.matrixClient = {
-            getRoom: () => mkStubRoom("room_id"),
+        const matrixClient = getMockClientWithEventEmitter({
+            getRoom: () => mkStubRoom("room_id", "room name", undefined),
             getAccountData: () => undefined,
             getUrlPreview: (url) => new Promise(() => {}),
             isGuest: () => false,
             mxcUrlToHttp: (s) => s,
-        };
+        });
         DMRoomMap.makeShared();
 
         const ev = mkEvent({
@@ -352,7 +372,7 @@ describe("<TextualBody />", () => {
             event: true,
         });
 
-        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} onHeightChanged={() => {}} />);
+        const wrapper = getComponent({ mxEvent: ev, showUrlPreview: true, onHeightChanged: jest.fn() }, matrixClient);
         expect(wrapper.text()).toBe(ev.getContent().body);
 
         let widgets = wrapper.find("LinkPreviewGroup");
diff --git a/test/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap b/test/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
index cc65b5cb1f5..d848ae092f0 100644
--- a/test/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
+++ b/test/components/views/messages/__snapshots__/DateSeparator-test.tsx.snap
@@ -1,116 +1,108 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DateSeparator renders the date separator correctly 1`] = `
-<Wrapper
+<DateSeparator
   now="2021-12-17T08:09:00.000Z"
+  roomId="!unused:example.org"
   ts={1639728540000}
 >
-  <DateSeparator
-    now="2021-12-17T08:09:00.000Z"
-    ts={1639728540000}
+  <h2
+    aria-label="Today"
+    className="mx_DateSeparator"
+    role="separator"
+    tabIndex={-1}
   >
-    <h2
-      aria-label="Today"
-      className="mx_DateSeparator"
-      role="separator"
-      tabIndex={-1}
+    <hr
+      role="none"
+    />
+    <div
+      aria-hidden="true"
     >
-      <hr
-        role="none"
-      />
-      <div
-        aria-hidden="true"
-      >
-        Today
-      </div>
-      <hr
-        role="none"
-      />
-    </h2>
-  </DateSeparator>
-</Wrapper>
+      Today
+    </div>
+    <hr
+      role="none"
+    />
+  </h2>
+</DateSeparator>
 `;
 
 exports[`DateSeparator when feature_jump_to_date is enabled renders the date separator correctly 1`] = `
-<Wrapper
+<DateSeparator
   now="2021-12-17T08:09:00.000Z"
+  roomId="!unused:example.org"
   ts={1639728540000}
 >
-  <DateSeparator
-    now="2021-12-17T08:09:00.000Z"
-    ts={1639728540000}
+  <h2
+    aria-label="Fri, Dec 17 2021"
+    className="mx_DateSeparator"
+    role="separator"
+    tabIndex={-1}
   >
-    <h2
-      aria-label="Fri, Dec 17 2021"
-      className="mx_DateSeparator"
-      role="separator"
-      tabIndex={-1}
+    <hr
+      role="none"
+    />
+    <ContextMenuTooltipButton
+      className="mx_DateSeparator_jumpToDateMenu"
+      isExpanded={false}
+      onClick={[Function]}
+      title="Jump to date"
     >
-      <hr
-        role="none"
-      />
-      <ContextMenuTooltipButton
+      <AccessibleTooltipButton
+        aria-expanded={false}
+        aria-haspopup={true}
         className="mx_DateSeparator_jumpToDateMenu"
-        isExpanded={false}
+        forceHide={false}
         onClick={[Function]}
+        onContextMenu={[Function]}
         title="Jump to date"
       >
-        <AccessibleTooltipButton
+        <AccessibleButton
           aria-expanded={false}
           aria-haspopup={true}
+          aria-label="Jump to date"
           className="mx_DateSeparator_jumpToDateMenu"
-          forceHide={false}
+          element="div"
+          onBlur={[Function]}
           onClick={[Function]}
           onContextMenu={[Function]}
-          title="Jump to date"
+          onFocus={[Function]}
+          onMouseLeave={[Function]}
+          onMouseOver={[Function]}
+          role="button"
+          tabIndex={0}
         >
-          <AccessibleButton
+          <div
             aria-expanded={false}
             aria-haspopup={true}
             aria-label="Jump to date"
-            className="mx_DateSeparator_jumpToDateMenu"
-            element="div"
+            className="mx_AccessibleButton mx_DateSeparator_jumpToDateMenu"
             onBlur={[Function]}
             onClick={[Function]}
             onContextMenu={[Function]}
             onFocus={[Function]}
+            onKeyDown={[Function]}
+            onKeyUp={[Function]}
             onMouseLeave={[Function]}
             onMouseOver={[Function]}
             role="button"
             tabIndex={0}
           >
             <div
-              aria-expanded={false}
-              aria-haspopup={true}
-              aria-label="Jump to date"
-              className="mx_AccessibleButton mx_DateSeparator_jumpToDateMenu"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onContextMenu={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onKeyUp={[Function]}
-              onMouseLeave={[Function]}
-              onMouseOver={[Function]}
-              role="button"
-              tabIndex={0}
+              aria-hidden="true"
             >
-              <div
-                aria-hidden="true"
-              >
-                Fri, Dec 17 2021
-              </div>
-              <div
-                className="mx_DateSeparator_chevron"
-              />
+              Fri, Dec 17 2021
             </div>
-          </AccessibleButton>
-        </AccessibleTooltipButton>
-      </ContextMenuTooltipButton>
-      <hr
-        role="none"
-      />
-    </h2>
-  </DateSeparator>
-</Wrapper>
+            <div
+              className="mx_DateSeparator_chevron"
+            />
+          </div>
+        </AccessibleButton>
+      </AccessibleTooltipButton>
+    </ContextMenuTooltipButton>
+    <hr
+      role="none"
+    />
+  </h2>
+</DateSeparator>
 `;
diff --git a/test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap b/test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
new file mode 100644
index 00000000000..2edfc8e22d3
--- /dev/null
+++ b/test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
@@ -0,0 +1,188 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MLocationBody <MLocationBody> with error displays correct fallback content when map_style_url is misconfigured 1`] = `
+<div
+  className="mx_EventTile_body"
+>
+  <span
+    className="mx_EventTile_tileError"
+  >
+    Unable to load map: This homeserver is not configured correctly to display maps, or the configured map server may be unreachable.
+  </span>
+  <br />
+  Shared a location: Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000
+</div>
+`;
+
+exports[`MLocationBody <MLocationBody> with error displays correct fallback content without error style when map_style_url is not configured 1`] = `
+<div
+  className="mx_EventTile_body"
+>
+  <span
+    className=""
+  >
+    Unable to load map: This homeserver is not configured to display maps.
+  </span>
+  <br />
+  Shared a location: Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000
+</div>
+`;
+
+exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] = `
+<MLocationBody
+  highlightLink=""
+  highlights={Array []}
+  mediaEventHelper={Object {}}
+  mxEvent={
+    Object {
+      "content": Object {
+        "body": "Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000",
+        "geo_uri": "geo:51.5076,-0.1276",
+        "msgtype": "m.location",
+        "org.matrix.msc1767.text": "Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000",
+        "org.matrix.msc3488.asset": Object {
+          "type": "m.pin",
+        },
+        "org.matrix.msc3488.location": Object {
+          "description": "Human-readable label",
+          "uri": "geo:51.5076,-0.1276",
+        },
+        "org.matrix.msc3488.ts": 252523,
+      },
+      "event_id": "$2",
+      "type": "org.matrix.msc3488.location",
+    }
+  }
+  onHeightChanged={[MockFunction]}
+  onMessageAllowed={[MockFunction]}
+  permalinkCreator={Object {}}
+>
+  <LocationBodyContent
+    mapId="mx_MLocationBody_$2_1f9acffa"
+    mxEvent={
+      Object {
+        "content": Object {
+          "body": "Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000",
+          "geo_uri": "geo:51.5076,-0.1276",
+          "msgtype": "m.location",
+          "org.matrix.msc1767.text": "Found at geo:51.5076,-0.1276 at 2021-12-21T12:22+0000",
+          "org.matrix.msc3488.asset": Object {
+            "type": "m.pin",
+          },
+          "org.matrix.msc3488.location": Object {
+            "description": "Human-readable label",
+            "uri": "geo:51.5076,-0.1276",
+          },
+          "org.matrix.msc3488.ts": 252523,
+        },
+        "event_id": "$2",
+        "type": "org.matrix.msc3488.location",
+      }
+    }
+    onClick={[Function]}
+    onError={[Function]}
+    tooltip="Expand map"
+  >
+    <div
+      className="mx_MLocationBody"
+    >
+      <TooltipTarget
+        alignment={5}
+        label="Expand map"
+        maxParentWidth={450}
+      >
+        <div
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseLeave={[Function]}
+          onMouseOver={[Function]}
+          tabIndex={0}
+        >
+          <Map
+            centerGeoUri="geo:51.5076,-0.1276"
+            className="mx_MLocationBody_map"
+            id="mx_MLocationBody_$2_1f9acffa"
+            onClick={[Function]}
+            onError={[Function]}
+          >
+            <div
+              className="mx_Map mx_MLocationBody_map"
+              id="mx_Map_mx_MLocationBody_$2_1f9acffa"
+              onClick={[Function]}
+            >
+              <SmartMarker
+                geoUri="geo:51.5076,-0.1276"
+                id="mx_MLocationBody_$2_1f9acffa-marker"
+                map={
+                  MockMap {
+                    "_events": Object {
+                      "error": Array [
+                        [Function],
+                        [Function],
+                      ],
+                    },
+                    "_eventsCount": 1,
+                    "_maxListeners": undefined,
+                    "addControl": [MockFunction],
+                    "fitBounds": [MockFunction],
+                    "removeControl": [MockFunction],
+                    "setCenter": [MockFunction] {
+                      "calls": Array [
+                        Array [
+                          Object {
+                            "lat": 51.5076,
+                            "lon": -0.1276,
+                          },
+                        ],
+                        Array [
+                          Object {
+                            "lat": 51.5076,
+                            "lon": -0.1276,
+                          },
+                        ],
+                      ],
+                      "results": Array [
+                        Object {
+                          "type": "return",
+                          "value": undefined,
+                        },
+                        Object {
+                          "type": "return",
+                          "value": undefined,
+                        },
+                      ],
+                    },
+                    "setStyle": [MockFunction],
+                    "zoomIn": [MockFunction],
+                    "zoomOut": [MockFunction],
+                    Symbol(kCapture): false,
+                  }
+                }
+              >
+                <span>
+                  <ForwardRef
+                    id="mx_MLocationBody_$2_1f9acffa-marker"
+                  >
+                    <div
+                      className="mx_Marker mx_Marker_defaultColor"
+                      id="mx_MLocationBody_$2_1f9acffa-marker"
+                    >
+                      <div
+                        className="mx_Marker_border"
+                      >
+                        <div
+                          className="mx_Marker_icon"
+                        />
+                      </div>
+                    </div>
+                  </ForwardRef>
+                </span>
+              </SmartMarker>
+            </div>
+          </Map>
+        </div>
+      </TooltipTarget>
+    </div>
+  </LocationBodyContent>
+</MLocationBody>
+`;
diff --git a/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap b/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
index 6d080f78871..85de67097bf 100644
--- a/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
+++ b/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
@@ -1,8 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MPollBody renders a finished poll 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -41,319 +44,283 @@ exports[`MPollBody renders a finished poll 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
-            checked={false}
-            votesText="0 votes"
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="pizza"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="pizza"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Pizza
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Pizza
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="poutine"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="poutine"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="poutine"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Poutine
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Poutine
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
-          key="italian"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={true}
-            votesText="2 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
+        key="italian"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={true}
+          votesText="2 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
+            data-value="italian"
           >
             <div
-              className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
-              data-value="italian"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Italian
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  2 votes
-                </div>
+                Italian
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                2 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "67%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="wings"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "67%",
               }
             }
-            checked={false}
-            votesText="1 vote"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="wings"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="1 vote"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="wings"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="wings"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Wings
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  1 vote
-                </div>
+                Wings
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                1 vote
               </div>
             </div>
-          </EndedPollOption>
+          </div>
+        </EndedPollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "33%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "33%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        Final result based on 3 votes
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      Final result based on 3 votes
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a finished poll with multiple winners 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -392,319 +359,283 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
-            checked={true}
-            votesText="2 votes"
+          }
+          checked={true}
+          votesText="2 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
+            data-value="pizza"
           >
             <div
-              className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
-              data-value="pizza"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Pizza
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  2 votes
-                </div>
+                Pizza
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                2 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "50%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="poutine"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "50%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="poutine"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="poutine"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Poutine
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Poutine
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="italian"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="italian"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="italian"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="italian"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Italian
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Italian
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
-          key="wings"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={true}
-            votesText="2 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended"
+        key="wings"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={true}
+          votesText="2 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
+            data-value="wings"
           >
             <div
-              className="mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner"
-              data-value="wings"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Wings
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  2 votes
-                </div>
+                Wings
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                2 votes
               </div>
             </div>
-          </EndedPollOption>
+          </div>
+        </EndedPollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "50%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "50%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        Final result based on 4 votes
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      Final result based on 4 votes
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a finished poll with no votes 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -743,319 +674,283 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
-            checked={false}
-            votesText="0 votes"
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="pizza"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="pizza"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Pizza
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Pizza
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="poutine"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="poutine"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="poutine"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Poutine
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Poutine
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="italian"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="italian"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="italian"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="italian"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Italian
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Italian
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
-          <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
-              }
-            />
           </div>
-        </div>
+        </EndedPollOption>
         <div
-          className="mx_MPollBody_option mx_MPollBody_option_ended"
-          key="wings"
-          onClick={[Function]}
+          className="mx_MPollBody_popularityBackground"
         >
-          <EndedPollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
-                },
+          <div
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
             }
-            checked={false}
-            votesText="0 votes"
+          />
+        </div>
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_ended"
+        key="wings"
+        onClick={[Function]}
+      >
+        <EndedPollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
+                },
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
+            }
+          }
+          checked={false}
+          votesText="0 votes"
+        >
+          <div
+            className="mx_MPollBody_endedOption"
+            data-value="wings"
           >
             <div
-              className="mx_MPollBody_endedOption"
-              data-value="wings"
+              className="mx_MPollBody_optionDescription"
             >
               <div
-                className="mx_MPollBody_optionDescription"
+                className="mx_MPollBody_optionText"
               >
-                <div
-                  className="mx_MPollBody_optionText"
-                >
-                  Wings
-                </div>
-                <div
-                  className="mx_MPollBody_optionVoteCount"
-                >
-                  0 votes
-                </div>
+                Wings
+              </div>
+              <div
+                className="mx_MPollBody_optionVoteCount"
+              >
+                0 votes
               </div>
             </div>
-          </EndedPollOption>
+          </div>
+        </EndedPollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        Final result based on 0 votes
+            }
+          />
+        </div>
       </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      Final result based on 0 votes
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a poll that I have not voted in 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -1094,419 +989,383 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="pizza"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="pizza"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="pizza"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="pizza"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Pizza
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Pizza
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="poutine"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="poutine"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="poutine"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="poutine"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="poutine"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Poutine
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Poutine
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="italian"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="italian"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="italian"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="italian"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="italian"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="italian"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Italian
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Italian
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="wings"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="wings"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="wings"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="wings"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="wings"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="wings"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Wings
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Wings
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        3 votes cast. Vote to see the results
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      3 votes cast. Vote to see the results
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -1545,427 +1404,391 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="1 vote"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="1 vote"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="pizza"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="pizza"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="pizza"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="pizza"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
+                  >
+                    Pizza
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Pizza
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      1 vote
-                    </div>
+                    1 vote
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "20%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "20%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="poutine"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="0 votes"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="0 votes"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="poutine"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="poutine"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="poutine"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="poutine"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
+                  >
+                    Poutine
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Poutine
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      0 votes
-                    </div>
+                    0 votes
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option mx_MPollBody_option_checked"
-          key="italian"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_checked"
+        key="italian"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={true}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="3 votes"
+        >
+          <StyledRadioButton
             checked={true}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="3 votes"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="italian"
           >
-            <StyledRadioButton
-              checked={true}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="italian"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
+              <input
+                checked={true}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="italian"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={true}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="italian"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
+                  >
+                    Italian
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Italian
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      3 votes
-                    </div>
+                    3 votes
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "60%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "60%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="wings"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="wings"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="1 vote"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="1 vote"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="wings"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="wings"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="wings"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="wings"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
+                  >
+                    Wings
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Wings
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      1 vote
-                    </div>
+                    1 vote
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "20%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "20%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        Based on 5 votes
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      Based on 5 votes
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a poll with no votes 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -2004,419 +1827,383 @@ exports[`MPollBody renders a poll with no votes 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="pizza"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="pizza"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="pizza"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="pizza"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Pizza
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Pizza
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="poutine"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="poutine"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="poutine"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="poutine"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="poutine"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Poutine
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Poutine
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="italian"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="italian"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="italian"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="italian"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="italian"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="italian"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Italian
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Italian
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="wings"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="wings"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText=""
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText=""
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="wings"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="wings"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="wings"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="wings"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Wings
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    />
+                    Wings
                   </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  />
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        No votes cast
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      No votes cast
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders a poll with only non-local votes 1`] = `
-<Wrapper
+<MPollBody
   getRelationsForEvent={[Function]}
+  highlightLink="unused"
+  highlights={Array []}
+  mediaEventHelper={null}
   mxEvent={
     Object {
       "content": Object {
@@ -2455,422 +2242,383 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
       "type": "org.matrix.msc3381.poll.start",
     }
   }
+  onHeightChanged={[Function]}
+  onMessageAllowed={[Function]}
+  permalinkCreator={null}
 >
-  <MPollBody
-    getRelationsForEvent={[Function]}
-    mxEvent={
-      Object {
-        "content": Object {
-          "org.matrix.msc1767.text": "What should we order for the party?
-1. Pizza
-2. Poutine
-3. Italian
-4. Wings",
-          "org.matrix.msc3381.poll.start": Object {
-            "answers": Array [
-              Object {
-                "id": "pizza",
-                "org.matrix.msc1767.text": "Pizza",
-              },
-              Object {
-                "id": "poutine",
-                "org.matrix.msc1767.text": "Poutine",
-              },
-              Object {
-                "id": "italian",
-                "org.matrix.msc1767.text": "Italian",
-              },
-              Object {
-                "id": "wings",
-                "org.matrix.msc1767.text": "Wings",
-              },
-            ],
-            "kind": "org.matrix.msc3381.poll.disclosed",
-            "question": Object {
-              "org.matrix.msc1767.text": "What should we order for the party?",
-            },
-          },
-        },
-        "event_id": "$mypoll",
-        "room_id": "#myroom:example.com",
-        "type": "org.matrix.msc3381.poll.start",
-      }
-    }
+  <div
+    className="mx_MPollBody"
   >
+    <h2>
+      What should we order for the party?
+    </h2>
     <div
-      className="mx_MPollBody"
+      className="mx_MPollBody_allOptions"
     >
-      <h2>
-        What should we order for the party?
-      </h2>
       <div
-        className="mx_MPollBody_allOptions"
+        className="mx_MPollBody_option"
+        key="pizza"
+        onClick={[Function]}
       >
-        <div
-          className="mx_MPollBody_option"
-          key="pizza"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "pizza",
-                "renderings": Array [
-                  Object {
-                    "body": "Pizza",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Pizza",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "pizza",
-                    "org.matrix.msc1767.text": "Pizza",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "pizza",
+              "renderings": Array [
+                Object {
+                  "body": "Pizza",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Pizza",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "pizza",
+                  "org.matrix.msc1767.text": "Pizza",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="0 votes"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="0 votes"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="pizza"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="pizza"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="pizza"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="pizza"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Pizza
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      0 votes
-                    </div>
+                    Pizza
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  >
+                    0 votes
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="poutine"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "poutine",
-                "renderings": Array [
-                  Object {
-                    "body": "Poutine",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Poutine",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "poutine",
-                    "org.matrix.msc1767.text": "Poutine",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="poutine"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "poutine",
+              "renderings": Array [
+                Object {
+                  "body": "Poutine",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Poutine",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "poutine",
+                  "org.matrix.msc1767.text": "Poutine",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="0 votes"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="0 votes"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="poutine"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="poutine"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="poutine"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="poutine"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Poutine
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      0 votes
-                    </div>
+                    Poutine
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  >
+                    0 votes
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "0%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "0%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option"
-          key="italian"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "italian",
-                "renderings": Array [
-                  Object {
-                    "body": "Italian",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Italian",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "italian",
-                    "org.matrix.msc1767.text": "Italian",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option"
+        key="italian"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "italian",
+              "renderings": Array [
+                Object {
+                  "body": "Italian",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Italian",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "italian",
+                  "org.matrix.msc1767.text": "Italian",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={false}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="2 votes"
+        >
+          <StyledRadioButton
             checked={false}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="2 votes"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="italian"
           >
-            <StyledRadioButton
-              checked={false}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="italian"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled"
+              <input
+                checked={false}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="italian"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={false}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="italian"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Italian
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      2 votes
-                    </div>
+                    Italian
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  >
+                    2 votes
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "67%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "67%",
               }
-            />
-          </div>
+            }
+          />
         </div>
-        <div
-          className="mx_MPollBody_option mx_MPollBody_option_checked"
-          key="wings"
-          onClick={[Function]}
-        >
-          <LivePollOption
-            answer={
-              PollAnswerSubevent {
-                "html": undefined,
-                "id": "wings",
-                "renderings": Array [
-                  Object {
-                    "body": "Wings",
-                    "mimetype": "text/plain",
-                  },
-                ],
-                "text": "Wings",
-                "wireFormat": Object {
-                  "content": Object {
-                    "id": "wings",
-                    "org.matrix.msc1767.text": "Wings",
-                  },
-                  "type": "org.matrix.sdk.poll.answer",
+      </div>
+      <div
+        className="mx_MPollBody_option mx_MPollBody_option_checked"
+        key="wings"
+        onClick={[Function]}
+      >
+        <LivePollOption
+          answer={
+            PollAnswerSubevent {
+              "html": undefined,
+              "id": "wings",
+              "renderings": Array [
+                Object {
+                  "body": "Wings",
+                  "mimetype": "text/plain",
                 },
-              }
+              ],
+              "text": "Wings",
+              "wireFormat": Object {
+                "content": Object {
+                  "id": "wings",
+                  "org.matrix.msc1767.text": "Wings",
+                },
+                "type": "org.matrix.sdk.poll.answer",
+              },
             }
+          }
+          checked={true}
+          onOptionSelected={[Function]}
+          pollId="$mypoll"
+          votesText="1 vote"
+        >
+          <StyledRadioButton
             checked={true}
-            onOptionSelected={[Function]}
-            pollId="$mypoll"
-            votesText="1 vote"
+            childrenInLabel={true}
+            className="mx_MPollBody_live-option"
+            name="poll_answer_select-$mypoll"
+            onChange={[Function]}
+            value="wings"
           >
-            <StyledRadioButton
-              checked={true}
-              childrenInLabel={true}
-              className="mx_MPollBody_live-option"
-              name="poll_answer_select-$mypoll"
-              onChange={[Function]}
-              value="wings"
+            <label
+              className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
             >
-              <label
-                className="mx_StyledRadioButton mx_MPollBody_live-option mx_StyledRadioButton_enabled mx_StyledRadioButton_checked"
+              <input
+                checked={true}
+                name="poll_answer_select-$mypoll"
+                onChange={[Function]}
+                type="radio"
+                value="wings"
+              />
+              <div>
+                <div />
+              </div>
+              <div
+                className="mx_StyledRadioButton_content"
               >
-                <input
-                  checked={true}
-                  name="poll_answer_select-$mypoll"
-                  onChange={[Function]}
-                  type="radio"
-                  value="wings"
-                />
-                <div>
-                  <div />
-                </div>
                 <div
-                  className="mx_StyledRadioButton_content"
+                  className="mx_MPollBody_optionDescription"
                 >
                   <div
-                    className="mx_MPollBody_optionDescription"
+                    className="mx_MPollBody_optionText"
                   >
-                    <div
-                      className="mx_MPollBody_optionText"
-                    >
-                      Wings
-                    </div>
-                    <div
-                      className="mx_MPollBody_optionVoteCount"
-                    >
-                      1 vote
-                    </div>
+                    Wings
+                  </div>
+                  <div
+                    className="mx_MPollBody_optionVoteCount"
+                  >
+                    1 vote
                   </div>
                 </div>
-                <div
-                  className="mx_StyledRadioButton_spacer"
-                />
-              </label>
-            </StyledRadioButton>
-          </LivePollOption>
+              </div>
+              <div
+                className="mx_StyledRadioButton_spacer"
+              />
+            </label>
+          </StyledRadioButton>
+        </LivePollOption>
+        <div
+          className="mx_MPollBody_popularityBackground"
+        >
           <div
-            className="mx_MPollBody_popularityBackground"
-          >
-            <div
-              className="mx_MPollBody_popularityAmount"
-              style={
-                Object {
-                  "width": "33%",
-                }
+            className="mx_MPollBody_popularityAmount"
+            style={
+              Object {
+                "width": "33%",
               }
-            />
-          </div>
+            }
+          />
         </div>
       </div>
-      <div
-        className="mx_MPollBody_totalVotes"
-      >
-        Based on 3 votes
-      </div>
     </div>
-  </MPollBody>
-</Wrapper>
+    <div
+      className="mx_MPollBody_totalVotes"
+    >
+      Based on 3 votes
+    </div>
+  </div>
+</MPollBody>
 `;
 
 exports[`MPollBody renders an undisclosed, finished poll 1`] = `"<div class=\\"mx_MPollBody\\"><h2>What should we order for the party?</h2><div class=\\"mx_MPollBody_allOptions\\"><div class=\\"mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended\\"><div class=\\"mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner\\" data-value=\\"pizza\\"><div class=\\"mx_MPollBody_optionDescription\\"><div class=\\"mx_MPollBody_optionText\\">Pizza</div><div class=\\"mx_MPollBody_optionVoteCount\\">2 votes</div></div></div><div class=\\"mx_MPollBody_popularityBackground\\"><div class=\\"mx_MPollBody_popularityAmount\\" style=\\"width: 50%;\\"></div></div></div><div class=\\"mx_MPollBody_option mx_MPollBody_option_ended\\"><div class=\\"mx_MPollBody_endedOption\\" data-value=\\"poutine\\"><div class=\\"mx_MPollBody_optionDescription\\"><div class=\\"mx_MPollBody_optionText\\">Poutine</div><div class=\\"mx_MPollBody_optionVoteCount\\">0 votes</div></div></div><div class=\\"mx_MPollBody_popularityBackground\\"><div class=\\"mx_MPollBody_popularityAmount\\" style=\\"width: 0%;\\"></div></div></div><div class=\\"mx_MPollBody_option mx_MPollBody_option_ended\\"><div class=\\"mx_MPollBody_endedOption\\" data-value=\\"italian\\"><div class=\\"mx_MPollBody_optionDescription\\"><div class=\\"mx_MPollBody_optionText\\">Italian</div><div class=\\"mx_MPollBody_optionVoteCount\\">0 votes</div></div></div><div class=\\"mx_MPollBody_popularityBackground\\"><div class=\\"mx_MPollBody_popularityAmount\\" style=\\"width: 0%;\\"></div></div></div><div class=\\"mx_MPollBody_option mx_MPollBody_option_checked mx_MPollBody_option_ended\\"><div class=\\"mx_MPollBody_endedOption mx_MPollBody_endedOptionWinner\\" data-value=\\"wings\\"><div class=\\"mx_MPollBody_optionDescription\\"><div class=\\"mx_MPollBody_optionText\\">Wings</div><div class=\\"mx_MPollBody_optionVoteCount\\">2 votes</div></div></div><div class=\\"mx_MPollBody_popularityBackground\\"><div class=\\"mx_MPollBody_popularityAmount\\" style=\\"width: 50%;\\"></div></div></div></div><div class=\\"mx_MPollBody_totalVotes\\">Final result based on 4 votes</div></div>"`;
diff --git a/test/components/views/messages/__snapshots__/TextualBody-test.js.snap b/test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
similarity index 100%
rename from test/components/views/messages/__snapshots__/TextualBody-test.js.snap
rename to test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
diff --git a/test/components/views/right_panel/PinnedMessagesCard-test.tsx b/test/components/views/right_panel/PinnedMessagesCard-test.tsx
index a8301a2de01..da30ae50ee4 100644
--- a/test/components/views/right_panel/PinnedMessagesCard-test.tsx
+++ b/test/components/views/right_panel/PinnedMessagesCard-test.tsx
@@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
-import { mount } from "enzyme";
+import React, { ComponentProps } from "react";
+import { mount, ReactWrapper } from "enzyme";
+import { mocked } from "jest-mock";
 import { act } from "react-dom/test-utils";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event";
 import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
+import { IEvent, Room, EventTimelineSet, IMinimalEvent } from "matrix-js-sdk/src/matrix";
 import {
     M_POLL_RESPONSE,
     M_POLL_END,
@@ -29,40 +31,39 @@ import {
     PollEndEvent,
 } from "matrix-events-sdk";
 
-import "../../../skinned-sdk";
 import {
     stubClient,
-    wrapInMatrixClientContext,
     mkStubRoom,
     mkEvent,
     mkMessage,
 } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import _PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard";
+import PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard";
 import PinnedEventTile from "../../../../src/components/views/rooms/PinnedEventTile";
-import MPollBody from "../../../../src/components/views/messages/MPollBody.tsx";
-
-const PinnedMessagesCard = wrapInMatrixClientContext(_PinnedMessagesCard);
+import MPollBody from "../../../../src/components/views/messages/MPollBody";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 
 describe("<PinnedMessagesCard />", () => {
     stubClient();
-    const cli = MatrixClientPeg.get();
+    const cli = mocked(MatrixClientPeg.get());
     cli.getUserId.mockReturnValue("@alice:example.org");
-    cli.setRoomAccountData = () => {};
-    cli.relations = jest.fn().mockResolvedValue({ events: [] });
+    cli.setRoomAccountData.mockReturnValue(undefined);
+    cli.relations.mockResolvedValue({ originalEvent: {} as unknown as MatrixEvent, events: [] });
 
     const mkRoom = (localPins: MatrixEvent[], nonLocalPins: MatrixEvent[]): Room => {
-        const room = mkStubRoom("!room:example.org");
+        const room = mkStubRoom("!room:example.org", 'room', cli);
         // Deferred since we may be adding or removing pins later
         const pins = () => [...localPins, ...nonLocalPins];
 
         // Insert pin IDs into room state
-        room.currentState.getStateEvents.mockImplementation(() => mkEvent({
+        mocked(room.currentState).getStateEvents.mockImplementation(() => mkEvent({
             event: true,
             type: EventType.RoomPinnedEvents,
             content: {
                 pinned: pins().map(e => e.getId()),
             },
+            user: '@user:example.org',
+            room: '!room:example.org',
         }));
 
         // Insert local pins into local timeline set
@@ -70,18 +71,24 @@ describe("<PinnedMessagesCard />", () => {
             getTimelineForEvent: () => ({
                 getEvents: () => localPins,
             }),
-        });
+        } as unknown as EventTimelineSet);
 
         // Return all pins over fetchRoomEvent
-        cli.fetchRoomEvent = (roomId, eventId) => pins().find(e => e.getId() === eventId)?.event;
+        cli.fetchRoomEvent.mockImplementation((roomId, eventId) => {
+            const event = pins().find(e => e.getId() === eventId)?.event;
+            return Promise.resolve(event as IMinimalEvent);
+        });
 
         return room;
     };
 
-    const mountPins = async (room: Room): ReactWrapper => {
+    const mountPins = async (room: Room): Promise<ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>> => {
         let pins;
         await act(async () => {
-            pins = mount(<PinnedMessagesCard room={room} onClose={() => {}} />);
+            pins = mount(<PinnedMessagesCard room={room} onClose={jest.fn()} />, {
+                wrappingComponent: MatrixClientContext.Provider,
+                wrappingComponentProps: { value: cli },
+            });
             // Wait a tick for state updates
             await new Promise(resolve => setImmediate(resolve));
         });
@@ -90,13 +97,14 @@ describe("<PinnedMessagesCard />", () => {
         return pins;
     };
 
-    const emitPinUpdates = async (pins: ReactWrapper) => {
+    const emitPinUpdates = async (pins: ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>) => {
         const room = pins.props().room;
-        const pinListener = room.currentState.on.mock.calls
+        const pinListener = mocked(room.currentState).on.mock.calls
             .find(([eventName, listener]) => eventName === RoomStateEvent.Events)[1];
 
         await act(async () => {
             // Emit the update
+            // @ts-ignore what is going on here?
             pinListener(room.currentState.getStateEvents());
             // Wait a tick for state updates
             await new Promise(resolve => setImmediate(resolve));
@@ -159,7 +167,9 @@ describe("<PinnedMessagesCard />", () => {
             event: true,
             type: EventType.RoomMessage,
             content: {},
-            unsigned: { redacted_because: {} },
+            unsigned: { redacted_because: {} as unknown as IEvent },
+            room: "!room:example.org",
+            user: "@alice:example.org",
         });
 
         const pins = await mountPins(mkRoom([pin], []));
@@ -172,7 +182,9 @@ describe("<PinnedMessagesCard />", () => {
             event: true,
             type: EventType.RoomMessage,
             content: {},
-            unsigned: { redacted_because: {} },
+            unsigned: { redacted_because: {} as unknown as IEvent },
+            room: "!room:example.org",
+            user: "@alice:example.org",
         });
 
         const pins = await mountPins(mkRoom([], [pin]));
@@ -180,25 +192,27 @@ describe("<PinnedMessagesCard />", () => {
     });
 
     it("accounts for edits", async () => {
-        cli.relations.mockResolvedValue({
-            events: [mkEvent({
-                event: true,
-                type: EventType.RoomMessage,
-                room: "!room:example.org",
-                user: "@alice:example.org",
-                content: {
-                    "msgtype": MsgType.Text,
-                    "body": " * First pinned message, edited",
-                    "m.new_content": {
-                        msgtype: MsgType.Text,
-                        body: "First pinned message, edited",
-                    },
-                    "m.relates_to": {
-                        rel_type: RelationType.Replace,
-                        event_id: pin1.getId(),
-                    },
+        const messageEvent = mkEvent({
+            event: true,
+            type: EventType.RoomMessage,
+            room: "!room:example.org",
+            user: "@alice:example.org",
+            content: {
+                "msgtype": MsgType.Text,
+                "body": " * First pinned message, edited",
+                "m.new_content": {
+                    msgtype: MsgType.Text,
+                    body: "First pinned message, edited",
                 },
-            })],
+                "m.relates_to": {
+                    rel_type: RelationType.Replace,
+                    event_id: pin1.getId(),
+                },
+            },
+        });
+        cli.relations.mockResolvedValue({
+            originalEvent: pin1,
+            events: [messageEvent],
         });
 
         const pins = await mountPins(mkRoom([], [pin1]));
@@ -224,7 +238,7 @@ describe("<PinnedMessagesCard />", () => {
             ...PollResponseEvent.from([answers[option].id], poll.getId()).serialize(),
             event: true,
             room: "!room:example.org",
-            user,
+            user: user as string,
         }));
         const end = mkEvent({
             ...PollEndEvent.from(poll.getId(), "Closing the poll").serialize(),
@@ -234,14 +248,22 @@ describe("<PinnedMessagesCard />", () => {
         });
 
         // Make the responses available
-        cli.relations.mockImplementation((roomId, eventId, relationType, eventType) => {
+        cli.relations.mockImplementation(async (roomId, eventId, relationType, eventType, { from }) => {
             if (eventId === poll.getId() && relationType === RelationType.Reference) {
                 switch (eventType) {
-                    case M_POLL_RESPONSE.name: return { events: responses };
-                    case M_POLL_END.name: return { events: [end] };
+                    case M_POLL_RESPONSE.name:
+                        // Paginate the results, for added challenge
+                        return (from === "page2") ?
+                            { originalEvent: poll, events: responses.slice(2) } :
+                            { originalEvent: poll, events: responses.slice(0, 2), nextBatch: "page2" };
+                    case M_POLL_END.name:
+                        return { originalEvent: null, events: [end] };
                 }
             }
-            return { events: [] };
+            // type does not allow originalEvent to be falsy
+            // but code seems to
+            // so still test that
+            return { originalEvent: undefined as unknown as MatrixEvent, events: [] };
         });
 
         const pins = await mountPins(mkRoom([], [poll]));
diff --git a/test/components/views/right_panel/UserInfo-test.tsx b/test/components/views/right_panel/UserInfo-test.tsx
index 84587bee5c7..9966a994c4d 100644
--- a/test/components/views/right_panel/UserInfo-test.tsx
+++ b/test/components/views/right_panel/UserInfo-test.tsx
@@ -16,11 +16,11 @@ limitations under the License.
 
 import React from 'react';
 import { mount } from 'enzyme';
+import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";
-import { Room, User } from 'matrix-js-sdk/src/matrix';
+import { Room, User, MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { Phase, VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest';
 
-import "../../../skinned-sdk";
 import UserInfo from '../../../../src/components/views/right_panel/UserInfo';
 import { RightPanelPhases } from '../../../../src/stores/right-panel/RightPanelStorePhases';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
@@ -46,13 +46,7 @@ describe('<UserInfo />', () => {
     const defaultUserId = '@test:test';
     const defaultUser = new User(defaultUserId);
 
-    const defaultProps = {
-        user: defaultUser,
-        phase: RightPanelPhases.RoomMemberInfo,
-        onClose: jest.fn(),
-    };
-
-    const mockClient = {
+    const mockClient = mocked({
         getUser: jest.fn(),
         isGuest: jest.fn().mockReturnValue(false),
         isUserIgnored: jest.fn(),
@@ -67,7 +61,7 @@ describe('<UserInfo />', () => {
         currentState: {
             on: jest.fn(),
         },
-    };
+    } as unknown as MatrixClient);
 
     const verificationRequest = {
         pending: true, on: jest.fn(), phase: Phase.Ready,
@@ -75,17 +69,27 @@ describe('<UserInfo />', () => {
         otherPartySupportsMethod: jest.fn(),
     } as unknown as VerificationRequest;
 
-    const getComponent = (props = {}) => mount(<UserInfo {...defaultProps} {...props} />, {
-        wrappingComponent: MatrixClientContext.Provider,
-        wrappingComponentProps: { value: mockClient },
-    });
+    const defaultProps = {
+        user: defaultUser,
+        // idk what is wrong with this type
+        phase: RightPanelPhases.RoomMemberInfo as RightPanelPhases.RoomMemberInfo,
+        onClose: jest.fn(),
+    };
+
+    const getComponent = (props = {}) => mount(
+        <UserInfo {...defaultProps} {...props} />,
+        {
+            wrappingComponent: MatrixClientContext.Provider,
+            wrappingComponentProps: { value: mockClient },
+        },
+    );
 
     beforeAll(() => {
         jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
     });
 
     beforeEach(() => {
-        mockClient.getUser.mockClear().mockResolvedValue(undefined);
+        mockClient.getUser.mockClear().mockReturnValue({} as unknown as User);
     });
 
     it('closes on close button click', () => {
diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx
index 7a1e73f0e90..9efe741d2bb 100644
--- a/test/components/views/rooms/MemberList-test.tsx
+++ b/test/components/views/rooms/MemberList-test.tsx
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../../../skinned-sdk";
-
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
@@ -28,13 +26,14 @@ import * as TestUtils from '../../../test-utils';
 import { compare } from "../../../../src/utils/strings";
 import MemberList from "../../../../src/components/views/rooms/MemberList";
 import MemberTile from '../../../../src/components/views/rooms/MemberTile';
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
 }
 
 describe('MemberList', () => {
-    function createRoom(opts) {
+    function createRoom(opts = {}) {
         const room = new Room(generateRoomId(), null, client.getUserId());
         if (opts) {
             Object.assign(room, opts);
@@ -114,16 +113,20 @@ describe('MemberList', () => {
             memberListRoom.currentState.members[member.userId] = member;
         }
 
-        const WrappedMemberList = TestUtils.wrapInMatrixClientContext(MemberList);
         const gatherWrappedRef = (r) => {
             memberList = r;
         };
         root = ReactDOM.render(
             (
-                <WrappedMemberList
-                    roomId={memberListRoom.roomId}
-                    wrappedRef={gatherWrappedRef}
-                />
+                <MatrixClientContext.Provider value={client}>
+                    <MemberList
+                        searchQuery=""
+                        onClose={jest.fn()}
+                        onSearchQueryChanged={jest.fn()}
+                        roomId={memberListRoom.roomId}
+                        ref={gatherWrappedRef}
+                    />
+                </MatrixClientContext.Provider>
             ),
             parentDiv,
         );
@@ -196,8 +199,8 @@ describe('MemberList', () => {
             }
 
             if (!groupChange) {
-                const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
-                const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
+                const nameA = memberA.name[0] === '@' ? memberA.name.slice(1) : memberA.name;
+                const nameB = memberB.name[0] === '@' ? memberB.name.slice(1) : memberB.name;
                 const nameCompare = compare(nameB, nameA);
                 console.log("Comparing name");
                 expect(nameCompare).toBeGreaterThanOrEqual(0);
diff --git a/test/components/views/rooms/MessageComposer-test.tsx b/test/components/views/rooms/MessageComposer-test.tsx
index 7b4b0f0b785..e756a7653c4 100644
--- a/test/components/views/rooms/MessageComposer-test.tsx
+++ b/test/components/views/rooms/MessageComposer-test.tsx
@@ -19,12 +19,14 @@ import { mount, ReactWrapper } from "enzyme";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
-import '../../../skinned-sdk'; // Must be first for skinning to work
 import { createTestClient, mkEvent, mkStubRoom, stubClient } from "../../../test-utils";
 import MessageComposer from "../../../../src/components/views/rooms/MessageComposer";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import RoomContext from "../../../../src/contexts/RoomContext";
+import { IRoomState } from "../../../../src/components/structures/RoomView";
+import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
+import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
 
 describe("MessageComposer", () => {
     stubClient();
@@ -32,18 +34,14 @@ describe("MessageComposer", () => {
     const room = mkStubRoom("!roomId:server", "Room 1", cli);
 
     it("Renders a SendMessageComposer and MessageComposerButtons by default", () => {
-        const wrapper = wrapAndRender((
-            <MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
-        ));
+        const wrapper = wrapAndRender({ room });
 
         expect(wrapper.find("SendMessageComposer")).toHaveLength(1);
         expect(wrapper.find("MessageComposerButtons")).toHaveLength(1);
     });
 
     it("Does not render a SendMessageComposer or MessageComposerButtons when user has no permission", () => {
-        const wrapper = wrapAndRender((
-            <MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
-        ), false);
+        const wrapper = wrapAndRender({ room }, false);
 
         expect(wrapper.find("SendMessageComposer")).toHaveLength(0);
         expect(wrapper.find("MessageComposerButtons")).toHaveLength(0);
@@ -51,9 +49,7 @@ describe("MessageComposer", () => {
     });
 
     it("Does not render a SendMessageComposer or MessageComposerButtons when room is tombstoned", () => {
-        const wrapper = wrapAndRender((
-            <MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
-        ), true, mkEvent({
+        const wrapper = wrapAndRender({ room }, true, mkEvent({
             event: true,
             type: "m.room.tombstone",
             room: room.roomId,
@@ -69,7 +65,7 @@ describe("MessageComposer", () => {
     });
 });
 
-function wrapAndRender(component: React.ReactElement, canSendMessages = true, tombstone?: MatrixEvent): ReactWrapper {
+function wrapAndRender(props = {}, canSendMessages = true, tombstone?: MatrixEvent): ReactWrapper {
     const mockClient = MatrixClientPeg.get();
     const roomId = "myroomid";
     const room: any = {
@@ -80,10 +76,21 @@ function wrapAndRender(component: React.ReactElement, canSendMessages = true, to
             return new RoomMember(roomId, userId);
         },
     };
+
+    const roomState = {
+        room, canSendMessages, tombstone,
+    } as unknown as IRoomState;
+
+    const defaultProps = {
+        room,
+        resizeNotifier: new ResizeNotifier(),
+        permalinkCreator: new RoomPermalinkCreator(room),
+    };
+
     return mount(
         <MatrixClientContext.Provider value={mockClient}>
-            <RoomContext.Provider value={{ room, canSendMessages, tombstone }}>
-                { component }
+            <RoomContext.Provider value={roomState}>
+                <MessageComposer {...defaultProps} {...props} />
             </RoomContext.Provider>
         </MatrixClientContext.Provider>,
     );
diff --git a/test/components/views/rooms/MessageComposerButtons-test.tsx b/test/components/views/rooms/MessageComposerButtons-test.tsx
index d89d0141a4e..4abe3e36373 100644
--- a/test/components/views/rooms/MessageComposerButtons-test.tsx
+++ b/test/components/views/rooms/MessageComposerButtons-test.tsx
@@ -19,19 +19,25 @@ import { mount, ReactWrapper } from "enzyme";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import * as TestUtils from "../../../test-utils";
-import sdk from "../../../skinned-sdk";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { Layout } from "../../../../src/settings/enums/Layout";
 import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
 import { createTestClient } from "../../../test-utils";
 import { IRoomState } from "../../../../src/components/structures/RoomView";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import MessageComposerButtons from "../../../../src/components/views/rooms/MessageComposerButtons";
 
-const _MessageComposerButtons = sdk.getComponent("views.rooms.MessageComposerButtons");
-const MessageComposerButtons = TestUtils.wrapInMatrixClientContext(
-    _MessageComposerButtons,
-);
+// @ts-ignore - we're deliberately not implementing the whole interface here, but
+// can't use Partial<> for types because it'll annoy TS more than it helps.
+const mockProps: React.ComponentProps<typeof MessageComposerButtons> = {
+    addEmoji: () => false,
+    haveRecording: false,
+    isStickerPickerOpen: false,
+    menuPosition: null,
+    onRecordStartEndClick: () => {},
+    setStickerPickerOpen: () => {},
+    toggleButtonMenu: () => {},
+};
 
 describe("MessageComposerButtons", () => {
     it("Renders emoji and upload buttons in wide mode", () => {
@@ -41,7 +47,7 @@ describe("MessageComposerButtons", () => {
                 showLocationButton={true}
                 showPollsButton={true}
                 showStickersButton={true}
-                toggleButtonMenu={() => {}}
+                {...mockProps}
             />,
             false,
         );
@@ -60,7 +66,7 @@ describe("MessageComposerButtons", () => {
                 showLocationButton={true}
                 showPollsButton={true}
                 showStickersButton={true}
-                toggleButtonMenu={() => {}}
+                {...mockProps}
             />,
             false,
         );
@@ -85,7 +91,7 @@ describe("MessageComposerButtons", () => {
                 showLocationButton={true}
                 showPollsButton={true}
                 showStickersButton={true}
-                toggleButtonMenu={() => {}}
+                {...mockProps}
             />,
             true,
         );
@@ -103,7 +109,7 @@ describe("MessageComposerButtons", () => {
                 showLocationButton={true}
                 showPollsButton={true}
                 showStickersButton={true}
-                toggleButtonMenu={() => {}}
+                {...mockProps}
             />,
             true,
         );
@@ -128,7 +134,7 @@ describe("MessageComposerButtons", () => {
                     showLocationButton={true}
                     showPollsButton={true}
                     showStickersButton={true}
-                    toggleButtonMenu={() => {}}
+                    {...mockProps}
                 />,
                 true,
             );
@@ -152,7 +158,7 @@ describe("MessageComposerButtons", () => {
                     showLocationButton={true}
                     showPollsButton={false} // !! the change from the alternate test
                     showStickersButton={true}
-                    toggleButtonMenu={() => {}}
+                    {...mockProps}
                 />,
                 true,
             );
@@ -172,7 +178,8 @@ describe("MessageComposerButtons", () => {
 });
 
 function wrapAndRender(component: React.ReactElement, narrow: boolean): ReactWrapper {
-    const mockClient = MatrixClientPeg.matrixClient = createTestClient();
+    const mockClient = createTestClient();
+    jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
     const roomId = "myroomid";
     const mockRoom: any = {
         currentState: undefined,
@@ -202,7 +209,6 @@ function createRoomState(room: Room, narrow: boolean): IRoomState {
         shouldPeek: true,
         membersLoaded: false,
         numUnreadMessages: 0,
-        searching: false,
         guestsCanJoin: false,
         canPeek: false,
         showApps: false,
@@ -221,7 +227,7 @@ function createRoomState(room: Room, narrow: boolean): IRoomState {
         showTwelveHourTimestamps: false,
         readMarkerInViewThresholdMs: 3000,
         readMarkerOutOfViewThresholdMs: 30000,
-        showHiddenEventsInTimeline: false,
+        showHiddenEvents: false,
         showReadReceipts: true,
         showRedactions: true,
         showJoinLeaves: true,
@@ -230,6 +236,7 @@ function createRoomState(room: Room, narrow: boolean): IRoomState {
         matrixClientIsReady: false,
         timelineRenderingType: TimelineRenderingType.Room,
         liveTimeline: undefined,
+        resizing: false,
         narrow,
     };
 }
diff --git a/test/components/views/rooms/RoomHeader-test.tsx b/test/components/views/rooms/RoomHeader-test.tsx
index 9cff224f480..1037b0377ce 100644
--- a/test/components/views/rooms/RoomHeader-test.tsx
+++ b/test/components/views/rooms/RoomHeader-test.tsx
@@ -2,14 +2,12 @@ import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk/src/matrix';
 
-import "../../../skinned-sdk";
 import * as TestUtils from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
 import RoomHeader from '../../../../src/components/views/rooms/RoomHeader';
 import { SearchScope } from '../../../../src/components/views/rooms/SearchBar';
 import { E2EStatus } from '../../../../src/utils/ShieldUtils';
-import { PlaceCallType } from '../../../../src/CallHandler';
 import { mkEvent } from '../../../test-utils';
 import { IRoomState } from "../../../../src/components/structures/RoomView";
 import RoomContext from '../../../../src/contexts/RoomContext';
@@ -173,13 +171,14 @@ function createRoom(info: IRoomCreationInfo) {
 
 function render(room: Room, roomContext?: Partial<IRoomState>): ReactWrapper {
     return mount((
-        <RoomContext.Provider value={{ ...roomContext, room }}>
+        <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
             <RoomHeader
                 room={room}
                 inRoom={true}
                 onSearchClick={() => {}}
+                onInviteClick={null}
                 onForgetClick={() => {}}
-                onCallPlaced={(_type: PlaceCallType) => {}}
+                onCallPlaced={(_type) => { }}
                 onAppsClick={() => {}}
                 e2eStatus={E2EStatus.Normal}
                 appsShown={true}
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 28d44091229..f13f24da8b6 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -5,12 +5,14 @@ import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk/src/matrix';
 
 import * as TestUtils from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-import sdk from '../../../skinned-sdk';
 import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
 import { DefaultTagID } from "../../../../src/stores/room-list/models";
 import RoomListStore, { RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
 import RoomListLayoutStore from "../../../../src/stores/room-list/RoomListLayoutStore";
+import RoomList from "../../../../src/components/views/rooms/RoomList";
+import RoomSublist from "../../../../src/components/views/rooms/RoomSublist";
+import RoomTile from "../../../../src/components/views/rooms/RoomTile";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
@@ -54,7 +56,6 @@ describe('RoomList', () => {
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
 
-        const RoomList = sdk.getComponent('views.rooms.RoomList');
         const WrappedRoomList = TestUtils.wrapInMatrixClientContext(RoomList);
         root = ReactDOM.render(
             <WrappedRoomList searchFilter="" onResize={() => {}} />,
@@ -119,10 +120,7 @@ describe('RoomList', () => {
     });
 
     function expectRoomInSubList(room, subListTest) {
-        const RoomSubList = sdk.getComponent('views.rooms.RoomSublist');
-        const RoomTile = sdk.getComponent('views.rooms.RoomTile');
-
-        const subLists = ReactTestUtils.scryRenderedComponentsWithType(root, RoomSubList);
+        const subLists = ReactTestUtils.scryRenderedComponentsWithType(root, RoomSublist);
         const containingSubList = subLists.find(subListTest);
 
         let expectedRoomTile;
diff --git a/test/components/views/rooms/RoomListHeader-test.tsx b/test/components/views/rooms/RoomListHeader-test.tsx
new file mode 100644
index 00000000000..1baabebbb8a
--- /dev/null
+++ b/test/components/views/rooms/RoomListHeader-test.tsx
@@ -0,0 +1,136 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
+import { act } from "react-dom/test-utils";
+
+import SpaceStore from "../../../../src/stores/spaces/SpaceStore";
+import { MetaSpace } from "../../../../src/stores/spaces";
+import RoomListHeader from "../../../../src/components/views/rooms/RoomListHeader";
+import * as testUtils from "../../../test-utils";
+import { createTestClient, mkSpace } from "../../../test-utils";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
+import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
+import SettingsStore from "../../../../src/settings/SettingsStore";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
+
+describe("RoomListHeader", () => {
+    let client: MatrixClient;
+
+    beforeEach(() => {
+        client = createTestClient();
+    });
+
+    it("renders a main menu for the home space", () => {
+        act(() => {
+            SpaceStore.instance.setActiveSpace(MetaSpace.Home);
+        });
+
+        const wrapper = mount(<MatrixClientContext.Provider value={client}>
+            <RoomListHeader />
+        </MatrixClientContext.Provider>);
+
+        expect(wrapper.text()).toBe("Home");
+        act(() => {
+            wrapper.find('[aria-label="Home options"]').hostNodes().simulate("click");
+        });
+        wrapper.update();
+
+        const menu = wrapper.find(".mx_IconizedContextMenu");
+        const items = menu.find(".mx_IconizedContextMenu_item").hostNodes();
+        expect(items).toHaveLength(1);
+        expect(items.at(0).text()).toBe("Show all rooms");
+    });
+
+    it("renders a main menu for spaces", async () => {
+        const testSpace = mkSpace(client, "!space:server");
+        testSpace.name = "Test Space";
+        client.getRoom = () => testSpace;
+
+        const getUserIdForRoomId = jest.fn();
+        const getDMRoomsForUserId = jest.fn();
+        // @ts-ignore
+        DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };
+
+        await testUtils.setupAsyncStoreWithClient(SpaceStore.instance, client);
+        act(() => {
+            SpaceStore.instance.setActiveSpace(testSpace.roomId);
+        });
+
+        const wrapper = mount(<MatrixClientContext.Provider value={client}>
+            <RoomListHeader />
+        </MatrixClientContext.Provider>);
+
+        expect(wrapper.text()).toBe("Test Space");
+        act(() => {
+            wrapper.find('[aria-label="Test Space menu"]').hostNodes().simulate("click");
+        });
+        wrapper.update();
+
+        const menu = wrapper.find(".mx_IconizedContextMenu");
+        const items = menu.find(".mx_IconizedContextMenu_item").hostNodes();
+        expect(items).toHaveLength(6);
+        expect(items.at(0).text()).toBe("Space home");
+        expect(items.at(1).text()).toBe("Manage & explore rooms");
+        expect(items.at(2).text()).toBe("Preferences");
+        expect(items.at(3).text()).toBe("Settings");
+        expect(items.at(4).text()).toBe("Room");
+        expect(items.at(4).text()).toBe("Room");
+    });
+
+    it("closes menu if space changes from under it", async () => {
+        await SettingsStore.setValue("Spaces.enabledMetaSpaces", null, SettingLevel.DEVICE, {
+            [MetaSpace.Home]: true,
+            [MetaSpace.Favourites]: true,
+        });
+
+        const testSpace = mkSpace(client, "!space:server");
+        testSpace.name = "Test Space";
+        client.getRoom = () => testSpace;
+
+        const getUserIdForRoomId = jest.fn();
+        const getDMRoomsForUserId = jest.fn();
+        // @ts-ignore
+        DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };
+
+        await testUtils.setupAsyncStoreWithClient(SpaceStore.instance, client);
+        act(() => {
+            SpaceStore.instance.setActiveSpace(testSpace.roomId);
+        });
+
+        const wrapper = mount(<MatrixClientContext.Provider value={client}>
+            <RoomListHeader />
+        </MatrixClientContext.Provider>);
+
+        expect(wrapper.text()).toBe("Test Space");
+        act(() => {
+            wrapper.find('[aria-label="Test Space menu"]').hostNodes().simulate("click");
+        });
+        wrapper.update();
+
+        act(() => {
+            SpaceStore.instance.setActiveSpace(MetaSpace.Favourites);
+        });
+        wrapper.update();
+
+        expect(wrapper.text()).toBe("Favourites");
+
+        const menu = wrapper.find(".mx_IconizedContextMenu");
+        expect(menu).toHaveLength(0);
+    });
+});
diff --git a/test/components/views/rooms/RoomPreviewBar-test.tsx b/test/components/views/rooms/RoomPreviewBar-test.tsx
index 132b0e1cc95..8f43e4cdf02 100644
--- a/test/components/views/rooms/RoomPreviewBar-test.tsx
+++ b/test/components/views/rooms/RoomPreviewBar-test.tsx
@@ -23,7 +23,6 @@ import {
 } from 'react-dom/test-utils';
 import { Room, RoomMember, MatrixError, IContent } from 'matrix-js-sdk/src/matrix';
 
-import "../../../skinned-sdk";
 import { stubClient } from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import DMRoomMap from '../../../../src/utils/DMRoomMap';
@@ -108,7 +107,7 @@ describe('<RoomPreviewBar />', () => {
         const component = getComponent({ joining: true });
 
         expect(isSpinnerRendered(component)).toBeTruthy();
-        expect(getMessage(component).textContent).toEqual('Joining room …');
+        expect(getMessage(component).textContent).toEqual('Joining …');
     });
     it('renders rejecting message', () => {
         const component = getComponent({ rejecting: true });
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
deleted file mode 100644
index f05262d102c..00000000000
--- a/test/components/views/rooms/RoomSettings-test.js
+++ /dev/null
@@ -1,188 +0,0 @@
-// TODO: Rewrite room settings tests for dialog support
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import * as testUtils from '../../../test-utils';
-import sdk from '../../../skinned-sdk';
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
-import SettingsStore from '../../../../src/settings/SettingsStore';
-
-describe.skip('RoomSettings', () => {
-    const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
-
-    let parentDiv = null;
-    let client = null;
-    let roomSettings = null;
-    const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
-
-    function expectSentStateEvent(roomId, eventType, expectedEventContent) {
-        let found = false;
-        for (const call of client.sendStateEvent.mock.calls) {
-            const [
-                actualRoomId,
-                actualEventType,
-                actualEventContent,
-            ] = call.slice(0, 3);
-
-            if (roomId === actualRoomId && actualEventType === eventType) {
-                expect(actualEventContent).toEqual(expectedEventContent);
-                found = true;
-                break;
-            }
-        }
-        expect(found).toBe(true);
-    }
-
-    beforeEach(function(done) {
-        testUtils.stubClient();
-        client = MatrixClientPeg.get();
-        client.credentials = { userId: '@me:domain.com' };
-
-        client.setRoomName = jest.fn().mockReturnValue(Promise.resolve());
-        client.setRoomTopic = jest.fn().mockReturnValue(Promise.resolve());
-        client.setRoomDirectoryVisibility = jest.fn().mockReturnValue(Promise.resolve());
-
-        // Covers any room state event (e.g. name, avatar, topic)
-        client.sendStateEvent = jest.fn().mockReturnValue(Promise.resolve());
-
-        // Covers room tagging
-        client.setRoomTag = jest.fn().mockReturnValue(Promise.resolve());
-        client.deleteRoomTag = jest.fn().mockReturnValue(Promise.resolve());
-
-        // Covers any setting in the SettingsStore
-        // (including local client settings not stored via matrix)
-        SettingsStore.setValue = jest.fn().mockReturnValue(Promise.resolve());
-
-        parentDiv = document.createElement('div');
-        document.body.appendChild(parentDiv);
-
-        const gatherWrappedRef = (r) => {roomSettings = r;};
-
-        // get use wrappedRef because we're using wrapInMatrixClientContext
-        ReactDOM.render(
-            <WrappedRoomSettings
-                wrappedRef={gatherWrappedRef}
-                room={room}
-            />,
-            parentDiv,
-            done,
-        );
-    });
-
-    afterEach((done) => {
-        if (parentDiv) {
-            ReactDOM.unmountComponentAtNode(parentDiv);
-            parentDiv.remove();
-            parentDiv = null;
-        }
-        done();
-    });
-
-    it('should not set when no setting is changed', (done) => {
-        roomSettings.save().then(() => {
-            expect(client.sendStateEvent).not.toHaveBeenCalled();
-            expect(client.setRoomTag).not.toHaveBeenCalled();
-            expect(client.deleteRoomTag).not.toHaveBeenCalled();
-            done();
-        });
-    });
-
-    // XXX: Apparently we do call SettingsStore.setValue
-    xit('should not settings via the SettingsStore when no setting is changed', (done) => {
-        roomSettings.save().then(() => {
-            expect(SettingsStore.setValue).not.toHaveBeenCalled();
-            done();
-        });
-    });
-
-    it('should set room name when it has changed', (done) => {
-        const name = "My Room Name";
-        roomSettings.setName(name);
-
-        roomSettings.save().then(() => {
-            expect(client.setRoomName.mock.calls[0].slice(0, 2))
-                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', name]);
-
-            done();
-        });
-    });
-
-    it('should set room topic when it has changed', (done) => {
-        const topic = "this is a topic";
-        roomSettings.setTopic(topic);
-
-        roomSettings.save().then(() => {
-            expect(client.setRoomTopic.mock.calls[0].slice(0, 2))
-                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', topic]);
-
-            done();
-        });
-    });
-
-    it('should set history visibility when it has changed', (done) => {
-        const historyVisibility = "translucent";
-        roomSettings.setState({
-            history_visibility: historyVisibility,
-        });
-
-        roomSettings.save().then(() => {
-            expectSentStateEvent(
-                "!DdJkzRliezrwpNebLk:matrix.org",
-                "m.room.history_visibility", { history_visibility: historyVisibility },
-            );
-            done();
-        });
-    });
-
-    // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentDidMount`
-    xit('should set room directory publicity when set to true', (done) => {
-        const isRoomPublished = true;
-        roomSettings.setState({
-            isRoomPublished,
-        }, () => {
-            roomSettings.save().then(() => {
-                expect(client.setRoomDirectoryVisibility.calls[0].arguments.slice(0, 2))
-                    .toEqual("!DdJkzRliezrwpNebLk:matrix.org", isRoomPublished ? "public" : "private");
-                done();
-            });
-        });
-    });
-
-    it('should set power levels when changed', (done) => {
-        roomSettings.onPowerLevelsChanged(42, "invite");
-
-        roomSettings.save().then(() => {
-            expectSentStateEvent(
-                "!DdJkzRliezrwpNebLk:matrix.org",
-                "m.room.power_levels", { invite: 42 },
-            );
-            done();
-        });
-    });
-
-    it('should set event power levels when changed', (done) => {
-        roomSettings.onPowerLevelsChanged(42, "event_levels_m.room.message");
-
-        roomSettings.save().then(() => {
-            // We expect all state events to be set to the state_default (50)
-            // See powerLevelDescriptors in RoomSettings
-            expectSentStateEvent(
-                "!DdJkzRliezrwpNebLk:matrix.org",
-                "m.room.power_levels", {
-                    events: {
-                        'm.room.message': 42,
-                        'm.room.avatar': 50,
-                        'm.room.name': 50,
-                        'm.room.canonical_alias': 50,
-                        'm.room.history_visibility': 50,
-                        'm.room.power_levels': 50,
-                        'm.room.topic': 50,
-                        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
-                        'im.vector.modular.widgets': 50,
-                    },
-                },
-            );
-            done();
-        });
-    });
-});
diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx
new file mode 100644
index 00000000000..d07360f6d4f
--- /dev/null
+++ b/test/components/views/rooms/RoomTile-test.tsx
@@ -0,0 +1,157 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { mount } from "enzyme";
+import { act } from "react-dom/test-utils";
+import { mocked } from "jest-mock";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
+import {
+    stubClient,
+    mockStateEventImplementation,
+    mkRoom,
+    mkVideoChannelMember,
+    stubVideoChannelStore,
+    StubVideoChannelStore,
+} from "../../../test-utils";
+import RoomTile from "../../../../src/components/views/rooms/RoomTile";
+import SettingsStore from "../../../../src/settings/SettingsStore";
+import { DefaultTagID } from "../../../../src/stores/room-list/models";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import PlatformPeg from "../../../../src/PlatformPeg";
+import BasePlatform from "../../../../src/BasePlatform";
+
+describe("RoomTile", () => {
+    jest.spyOn(PlatformPeg, 'get')
+        .mockReturnValue({ overrideBrowserShortcuts: () => false } as unknown as BasePlatform);
+
+    let cli: MatrixClient;
+    let store: StubVideoChannelStore;
+    beforeEach(() => {
+        const realGetValue = SettingsStore.getValue;
+        SettingsStore.getValue = <T, >(name: string, roomId?: string): T => {
+            if (name === "feature_video_rooms") {
+                return true as unknown as T;
+            }
+            return realGetValue(name, roomId);
+        };
+
+        stubClient();
+        cli = MatrixClientPeg.get();
+        store = stubVideoChannelStore();
+        DMRoomMap.makeShared();
+    });
+
+    afterEach(() => jest.clearAllMocks());
+
+    describe("video rooms", () => {
+        let room: Room;
+        beforeEach(() => {
+            room = mkRoom(cli, "!1:example.org");
+            mocked(room.isElementVideoRoom).mockReturnValue(true);
+        });
+
+        it("tracks connection state", () => {
+            const tile = mount(
+                <RoomTile
+                    room={room}
+                    showMessagePreview={false}
+                    isMinimized={false}
+                    tag={DefaultTagID.Untagged}
+                />,
+            );
+            expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Video");
+
+            act(() => { store.startConnect("!1:example.org"); });
+            tile.update();
+            expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connecting...");
+
+            act(() => { store.connect("!1:example.org"); });
+            tile.update();
+            expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Connected");
+
+            act(() => { store.disconnect(); });
+            tile.update();
+            expect(tile.find(".mx_RoomTile_videoIndicator").text()).toEqual("Video");
+        });
+
+        it("displays connected members", () => {
+            mocked(room.currentState).getStateEvents.mockImplementation(mockStateEventImplementation([
+                // A user connected from 2 devices
+                mkVideoChannelMember("@alice:example.org", ["device 1", "device 2"]),
+                // A disconnected user
+                mkVideoChannelMember("@bob:example.org", []),
+                // A user that claims to have a connected device, but has left the room
+                mkVideoChannelMember("@chris:example.org", ["device 1"]),
+            ]));
+
+            mocked(room).getMember.mockImplementation(userId => ({
+                userId,
+                membership: userId === "@chris:example.org" ? "leave" : "join",
+                name: userId,
+                rawDisplayName: userId,
+                roomId: "!1:example.org",
+                getAvatarUrl: () => {},
+                getMxcAvatarUrl: () => {},
+            }) as unknown as RoomMember);
+
+            const tile = mount(
+                <RoomTile
+                    room={room}
+                    showMessagePreview={false}
+                    isMinimized={false}
+                    tag={DefaultTagID.Untagged}
+                />,
+            );
+
+            // Only Alice should display as connected
+            expect(tile.find(".mx_RoomTile_videoParticipants").text()).toEqual("1");
+        });
+
+        it("reflects local echo in connected members", () => {
+            mocked(room.currentState).getStateEvents.mockImplementation(mockStateEventImplementation([
+                // Make the remote echo claim that we're connected, while leaving the store disconnected
+                mkVideoChannelMember(cli.getUserId(), [cli.getDeviceId()]),
+            ]));
+
+            mocked(room).getMember.mockImplementation(userId => ({
+                userId,
+                membership: "join",
+                name: userId,
+                rawDisplayName: userId,
+                roomId: "!1:example.org",
+                getAvatarUrl: () => {},
+                getMxcAvatarUrl: () => {},
+            }) as unknown as RoomMember);
+
+            const tile = mount(
+                <RoomTile
+                    room={room}
+                    showMessagePreview={false}
+                    isMinimized={false}
+                    tag={DefaultTagID.Untagged}
+                />,
+            );
+
+            // Because of our local echo, we should still appear as disconnected
+            expect(tile.find(".mx_RoomTile_videoParticipants").exists()).toEqual(false);
+        });
+    });
+});
diff --git a/test/components/views/rooms/SearchResultTile-test.tsx b/test/components/views/rooms/SearchResultTile-test.tsx
index 159948afd64..9f0e2d85764 100644
--- a/test/components/views/rooms/SearchResultTile-test.tsx
+++ b/test/components/views/rooms/SearchResultTile-test.tsx
@@ -20,12 +20,10 @@ import { SearchResult } from "matrix-js-sdk/src/models/search-result";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 
-import sdk from "../../../skinned-sdk";
 import { createTestClient } from "../../../test-utils";
 import EventTile from "../../../../src/components/views/rooms/EventTile";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-
-const SearchResultTile = sdk.getComponent("views.rooms.SearchResultTile");
+import SearchResultTile from "../../../../src/components/views/rooms/SearchResultTile";
 
 describe("SearchResultTile", () => {
     beforeAll(() => {
@@ -81,6 +79,7 @@ describe("SearchResultTile", () => {
         const tiles = wrapper.find(EventTile);
         expect(tiles.length).toEqual(2);
         expect(tiles.at(0).prop("mxEvent").getId()).toBe("$1:server");
+        // @ts-ignore accessing private property
         expect(tiles.at(0).prop("callEventGrouper").events.size).toBe(2);
         expect(tiles.at(1).prop("mxEvent").getId()).toBe("$144429830826TWwbB:localhost");
     });
diff --git a/test/components/views/rooms/SendMessageComposer-test.tsx b/test/components/views/rooms/SendMessageComposer-test.tsx
index cd985933854..5ab7a1705e5 100644
--- a/test/components/views/rooms/SendMessageComposer-test.tsx
+++ b/test/components/views/rooms/SendMessageComposer-test.tsx
@@ -17,10 +17,9 @@ limitations under the License.
 import React from "react";
 import { act } from "react-dom/test-utils";
 import { sleep } from "matrix-js-sdk/src/utils";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { mount } from 'enzyme';
-import { RelationType } from 'matrix-js-sdk/src/@types/event';
 
-import '../../../skinned-sdk'; // Must be first for skinning to work
 import SendMessageComposer, {
     createMessageContent,
     isQuickReaction,
@@ -31,16 +30,25 @@ import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/Roo
 import EditorModel from "../../../../src/editor/model";
 import { createPartCreator, createRenderer } from "../../../editor/mock";
 import { createTestClient, mkEvent, mkStubRoom } from "../../../test-utils";
-import BasicMessageComposer from "../../../../src/components/views/rooms/BasicMessageComposer";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import MatrixToPermalinkConstructor from "../../../../src/utils/permalinks/MatrixToPermalinkConstructor";
 import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
 import DocumentOffset from '../../../../src/editor/offset';
 import { Layout } from '../../../../src/settings/enums/Layout';
-import PlatformPeg from "../../../../src/PlatformPeg";
+import { IRoomState } from "../../../../src/components/structures/RoomView";
+import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
+import { mockPlatformPeg } from "../../../test-utils/platform";
+
+const WrapWithProviders: React.FC<{
+    roomContext: IRoomState;
+    client: MatrixClient;
+}> = ({ children, roomContext, client }) => <MatrixClientContext.Provider value={client}>
+    <RoomContext.Provider value={roomContext}>
+        { children }
+    </RoomContext.Provider>
+</MatrixClientContext.Provider>;
 
 describe('<SendMessageComposer/>', () => {
-    const roomContext = {
+    const defaultRoomContext = {
         roomLoading: true,
         peekLoading: false,
         shouldPeek: true,
@@ -65,7 +73,7 @@ describe('<SendMessageComposer/>', () => {
         showTwelveHourTimestamps: false,
         readMarkerInViewThresholdMs: 3000,
         readMarkerOutOfViewThresholdMs: 30000,
-        showHiddenEventsInTimeline: false,
+        showHiddenEvents: false,
         showReadReceipts: true,
         showRedactions: true,
         showJoinLeaves: true,
@@ -83,7 +91,7 @@ describe('<SendMessageComposer/>', () => {
             const documentOffset = new DocumentOffset(11, true);
             model.update("hello world", "insertText", documentOffset);
 
-            const content = createMessageContent(model, null, false, permalinkCreator);
+            const content = createMessageContent(model, null, undefined, permalinkCreator);
 
             expect(content).toEqual({
                 body: "hello world",
@@ -96,7 +104,7 @@ describe('<SendMessageComposer/>', () => {
             const documentOffset = new DocumentOffset(13, true);
             model.update("hello *world*", "insertText", documentOffset);
 
-            const content = createMessageContent(model, null, false, permalinkCreator);
+            const content = createMessageContent(model, null, undefined, permalinkCreator);
 
             expect(content).toEqual({
                 body: "hello *world*",
@@ -111,7 +119,7 @@ describe('<SendMessageComposer/>', () => {
             const documentOffset = new DocumentOffset(22, true);
             model.update("/me blinks __quickly__", "insertText", documentOffset);
 
-            const content = createMessageContent(model, null, false, permalinkCreator);
+            const content = createMessageContent(model, null, undefined, permalinkCreator);
 
             expect(content).toEqual({
                 body: "blinks __quickly__",
@@ -121,13 +129,27 @@ describe('<SendMessageComposer/>', () => {
             });
         });
 
+        it("allows emoting with non-text parts", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            const documentOffset = new DocumentOffset(16, true);
+            model.update("/me ✨sparkles✨", "insertText", documentOffset);
+            expect(model.parts.length).toEqual(4); // Emoji count as non-text
+
+            const content = createMessageContent(model, null, undefined, permalinkCreator);
+
+            expect(content).toEqual({
+                body: "✨sparkles✨",
+                msgtype: "m.emote",
+            });
+        });
+
         it("allows sending double-slash escaped slash commands correctly", () => {
             const model = new EditorModel([], createPartCreator(), createRenderer());
             const documentOffset = new DocumentOffset(32, true);
 
             model.update("//dev/null is my favourite place", "insertText", documentOffset);
 
-            const content = createMessageContent(model, null, false, permalinkCreator);
+            const content = createMessageContent(model, null, undefined, permalinkCreator);
 
             expect(content).toEqual({
                 body: "/dev/null is my favourite place",
@@ -137,13 +159,14 @@ describe('<SendMessageComposer/>', () => {
     });
 
     describe("functions correctly mounted", () => {
-        const mockClient = MatrixClientPeg.matrixClient = createTestClient();
-        const mockRoom = mkStubRoom('myfakeroom') as any;
+        const mockClient = createTestClient();
+        jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
+        const mockRoom = mkStubRoom('myfakeroom', 'myfakeroom', mockClient) as any;
         const mockEvent = mkEvent({
             type: "m.room.message",
             room: 'myfakeroom',
             user: 'myfakeuser',
-            content: "Replying to this",
+            content: { "msgtype": "m.text", "body": "Replying to this" },
             event: true,
         });
         mockRoom.findEventById = jest.fn(eventId => {
@@ -157,45 +180,48 @@ describe('<SendMessageComposer/>', () => {
             spyDispatcher.mockReset();
         });
 
+        const addTextToComposer = (wrapper, text) => act(() => {
+            // couldn't get input event on contenteditable to work
+            // paste works without illegal private method access
+            const pasteEvent = {
+                clipboardData: {
+                    types: [],
+                    files: [],
+                    getData: type => type === "text/plain" ? text : undefined,
+                },
+            };
+            wrapper.find('[role="textbox"]').simulate('paste', pasteEvent);
+            wrapper.update();
+        });
+
+        const defaultProps = {
+            room: mockRoom,
+            toggleStickerPickerOpen: jest.fn(),
+            permalinkCreator: new RoomPermalinkCreator(mockRoom),
+        };
+        const getComponent = (props = {}, roomContext = defaultRoomContext, client = mockClient) => {
+            return mount(<SendMessageComposer {...defaultProps} {...props} />, {
+                wrappingComponent: WrapWithProviders,
+                wrappingComponentProps: { roomContext, client },
+            });
+        };
+
         it("renders text and placeholder correctly", () => {
-            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <RoomContext.Provider value={roomContext}>
-                    <SendMessageComposer
-                        room={mockRoom as any}
-                        placeholder="placeholder string"
-                        permalinkCreator={new MatrixToPermalinkConstructor() as any}
-                    />
-                </RoomContext.Provider>
-            </MatrixClientContext.Provider>);
+            const wrapper = getComponent({ placeholder: "placeholder string" });
 
             expect(wrapper.find('[aria-label="placeholder string"]')).toHaveLength(1);
 
-            act(() => {
-                wrapper.find(BasicMessageComposer).instance().insertText("Test Text");
-                wrapper.update();
-            });
+            addTextToComposer(wrapper, "Test Text");
 
             expect(wrapper.text()).toBe("Test Text");
         });
 
         it("correctly persists state to and from localStorage", () => {
-            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <RoomContext.Provider value={roomContext}>
-
-                    <SendMessageComposer
-                        room={mockRoom as any}
-                        placeholder=""
-                        permalinkCreator={new MatrixToPermalinkConstructor() as any}
-                        replyToEvent={mockEvent}
-                    />
-                </RoomContext.Provider>
-            </MatrixClientContext.Provider>);
+            const wrapper = getComponent({ replyToEvent: mockEvent });
 
-            act(() => {
-                wrapper.find(BasicMessageComposer).instance().insertText("Test Text");
-                wrapper.update();
-            });
+            addTextToComposer(wrapper, "Test Text");
 
+            // @ts-ignore
             const key = wrapper.find(SendMessageComposerClass).instance().editorStateKey;
 
             expect(wrapper.text()).toBe("Test Text");
@@ -225,22 +251,11 @@ describe('<SendMessageComposer/>', () => {
         });
 
         it("persists state correctly without replyToEvent onbeforeunload", () => {
-            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <RoomContext.Provider value={roomContext}>
-
-                    <SendMessageComposer
-                        room={mockRoom as any}
-                        placeholder=""
-                        permalinkCreator={new MatrixToPermalinkConstructor() as any}
-                    />
-                </RoomContext.Provider>
-            </MatrixClientContext.Provider>);
+            const wrapper = getComponent();
 
-            act(() => {
-                wrapper.find(BasicMessageComposer).instance().insertText("Hello World");
-                wrapper.update();
-            });
+            addTextToComposer(wrapper, "Hello World");
 
+            // @ts-ignore
             const key = wrapper.find(SendMessageComposerClass).instance().editorStateKey;
 
             expect(wrapper.text()).toBe("Hello World");
@@ -254,22 +269,12 @@ describe('<SendMessageComposer/>', () => {
         });
 
         it("persists to session history upon sending", async () => {
-            PlatformPeg.get = () => ({ overrideBrowserShortcuts: () => false });
-
-            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <RoomContext.Provider value={roomContext}>
+            mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
 
-                    <SendMessageComposer
-                        room={mockRoom as any}
-                        placeholder="placeholder"
-                        permalinkCreator={new MatrixToPermalinkConstructor() as any}
-                        replyToEvent={mockEvent}
-                    />
-                </RoomContext.Provider>
-            </MatrixClientContext.Provider>);
+            const wrapper = getComponent({ replyToEvent: mockEvent });
 
+            addTextToComposer(wrapper, "This is a message");
             act(() => {
-                wrapper.find(BasicMessageComposer).instance().insertText("This is a message");
                 wrapper.find(".mx_SendMessageComposer").simulate("keydown", { key: "Enter" });
                 wrapper.update();
             });
@@ -290,22 +295,14 @@ describe('<SendMessageComposer/>', () => {
         });
 
         it('correctly sets the editorStateKey for threads', () => {
-            const wrapper = mount(<MatrixClientContext.Provider value={mockClient}>
-                <RoomContext.Provider value={roomContext}>
-
-                    <SendMessageComposer
-                        room={mockRoom as any}
-                        placeholder=""
-                        permalinkCreator={new MatrixToPermalinkConstructor() as any}
-                        relation={{
-                            rel_type: RelationType.Thread,
-                            event_id: "myFakeThreadId",
-                        }}
-                        includeReplyLegacyFallback={false}
-                    />
-                </RoomContext.Provider>
-            </MatrixClientContext.Provider>);
+            const relation = {
+                rel_type: "m.thread",
+                event_id: "myFakeThreadId",
+            };
+            const includeReplyLegacyFallback = false;
+            const wrapper = getComponent({ relation, includeReplyLegacyFallback });
             const instance = wrapper.find(SendMessageComposerClass).instance();
+            // @ts-ignore
             const key = instance.editorStateKey;
             expect(key).toEqual('mx_cider_state_myfakeroom_myFakeThreadId');
         });
diff --git a/test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap b/test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
index 23824baa159..6a455dc148d 100644
--- a/test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
+++ b/test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
@@ -54,11 +54,11 @@ exports[`<RoomPreviewBar /> with an error renders other errors 1`] = `
     RoomPreviewBar-test-room is not accessible at this time.
   </h3>
   <p>
-    Try again later, or ask a room admin to check if you have access.
+    Try again later, or ask a room or space admin to check if you have access.
   </p>
   <p>
     <span>
-      Something_else was returned while trying to access the room. If you think you're seeing this message in error, please 
+      Something_else was returned while trying to access the room or space. If you think you're seeing this message in error, please 
       <a
         href="https://github.com/vector-im/element-web/issues/new/choose"
         rel="noreferrer noopener"
@@ -80,7 +80,7 @@ exports[`<RoomPreviewBar /> with an error renders room not found error 1`] = `
     RoomPreviewBar-test-room does not exist.
   </h3>
   <p>
-    This room doesn't exist. Are you sure you're at the right place?
+    Are you sure you're at the right place?
   </p>
 </div>
 `;
@@ -93,7 +93,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client fai
     Something went wrong with your invite to RoomPreviewBar-test-room
   </h3>
   <p>
-    An error (unknown error code) was returned while trying to validate your invite. You could try to pass this information on to a room admin.
+    An error (unknown error code) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.
   </p>
 </div>
 `;
diff --git a/test/components/views/settings/CryptographyPanel-test.tsx b/test/components/views/settings/CryptographyPanel-test.tsx
index c3bf816bd72..6748d6858f2 100644
--- a/test/components/views/settings/CryptographyPanel-test.tsx
+++ b/test/components/views/settings/CryptographyPanel-test.tsx
@@ -1,5 +1,3 @@
-import '../../../skinned-sdk';
-
 import React, { ReactElement } from 'react';
 import ReactDOM from 'react-dom';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';
diff --git a/test/components/views/settings/FontScalingPanel-test.tsx b/test/components/views/settings/FontScalingPanel-test.tsx
index 3c3a68e2746..f18830b3481 100644
--- a/test/components/views/settings/FontScalingPanel-test.tsx
+++ b/test/components/views/settings/FontScalingPanel-test.tsx
@@ -17,11 +17,8 @@ limitations under the License.
 import React from 'react';
 import { mount } from "enzyme";
 
-import '../../../skinned-sdk';
 import * as TestUtils from "../../../test-utils";
-import _FontScalingPanel from '../../../../src/components/views/settings/FontScalingPanel';
-
-const FontScalingPanel = TestUtils.wrapInMatrixClientContext(_FontScalingPanel);
+import FontScalingPanel from '../../../../src/components/views/settings/FontScalingPanel';
 
 // Fake random strings to give a predictable snapshot
 jest.mock(
diff --git a/test/components/views/settings/KeyboardShortcut-test.tsx b/test/components/views/settings/KeyboardShortcut-test.tsx
new file mode 100644
index 00000000000..0163544f527
--- /dev/null
+++ b/test/components/views/settings/KeyboardShortcut-test.tsx
@@ -0,0 +1,73 @@
+
+/*
+Copyright 2022 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { mount, ReactWrapper } from "enzyme";
+
+import { Key } from "../../../../src/Keyboard";
+import { mockPlatformPeg, unmockPlatformPeg } from "../../../test-utils/platform";
+
+const PATH_TO_COMPONENT = "../../../../src/components/views/settings/KeyboardShortcut.tsx";
+
+const renderKeyboardShortcut = async (component, props?): Promise<ReactWrapper> => {
+    const Component = (await import(PATH_TO_COMPONENT))[component];
+    return mount(<Component {...props} />);
+};
+
+describe("KeyboardShortcut", () => {
+    beforeEach(() => {
+        jest.resetModules();
+        unmockPlatformPeg();
+    });
+
+    it("renders key icon", async () => {
+        const body = await renderKeyboardShortcut("KeyboardKey", { name: Key.ARROW_DOWN });
+        expect(body).toMatchSnapshot();
+    });
+
+    it("renders alternative key name", async () => {
+        const body = await renderKeyboardShortcut("KeyboardKey", { name: Key.PAGE_DOWN });
+        expect(body).toMatchSnapshot();
+    });
+
+    it("doesn't render + if last", async () => {
+        const body = await renderKeyboardShortcut("KeyboardKey", { name: Key.A, last: true });
+        expect(body).toMatchSnapshot();
+    });
+
+    it("doesn't render same modifier twice", async () => {
+        mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
+        const body1 = await renderKeyboardShortcut("KeyboardShortcut", {
+            value: {
+                key: Key.A,
+                ctrlOrCmdKey: true,
+                metaKey: true,
+            },
+        });
+        expect(body1).toMatchSnapshot();
+
+        const body2 = await renderKeyboardShortcut("KeyboardShortcut", {
+            value: {
+                key: Key.A,
+                ctrlOrCmdKey: true,
+                ctrlKey: true,
+            },
+        });
+        expect(body2).toMatchSnapshot();
+        jest.resetModules();
+    });
+});
diff --git a/test/components/views/settings/Notifications-test.tsx b/test/components/views/settings/Notifications-test.tsx
index 87ca86681e7..b1abbebed4b 100644
--- a/test/components/views/settings/Notifications-test.tsx
+++ b/test/components/views/settings/Notifications-test.tsx
@@ -14,15 +14,14 @@ limitations under the License.
 
 import React from 'react';
 import { mount } from 'enzyme';
-import '../../../skinned-sdk';
-import { IPushRule, IPushRules, RuleId } from 'matrix-js-sdk/src/matrix';
-import { ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
+import { IPushRule, IPushRules, RuleId, IPusher } from 'matrix-js-sdk/src/matrix';
+import { IThreepid, ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
 import { act } from 'react-dom/test-utils';
 
 import Notifications from '../../../../src/components/views/settings/Notifications';
 import SettingsStore from "../../../../src/settings/SettingsStore";
-import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { StandardActions } from '../../../../src/notifications/StandardActions';
+import { getMockClientWithEventEmitter } from '../../../test-utils';
 
 jest.mock('../../../../src/settings/SettingsStore', () => ({
     monitorSetting: jest.fn(),
@@ -64,7 +63,7 @@ describe('<Notifications />', () => {
         return component;
     };
 
-    const mockClient = {
+    const mockClient = getMockClientWithEventEmitter({
         getPushRules: jest.fn(),
         getPushers: jest.fn(),
         getThreePids: jest.fn(),
@@ -72,15 +71,11 @@ describe('<Notifications />', () => {
         setPushRuleEnabled: jest.fn(),
         setPushRuleActions: jest.fn(),
         getRooms: jest.fn().mockReturnValue([]),
-    };
+    });
     mockClient.getPushRules.mockResolvedValue(pushRules);
 
     const findByTestId = (component, id) => component.find(`[data-test-id="${id}"]`);
 
-    beforeAll(() => {
-        MatrixClientPeg.get = () => mockClient;
-    });
-
     beforeEach(() => {
         mockClient.getPushRules.mockClear().mockResolvedValue(pushRules);
         mockClient.getPushers.mockClear().mockResolvedValue({ pushers: [] });
@@ -124,7 +119,7 @@ describe('<Notifications />', () => {
                     ...pushRules.global,
                     override: [{ ...masterRule, enabled: true }],
                 },
-            };
+            } as unknown as IPushRules;
             mockClient.getPushRules.mockClear().mockResolvedValue(disableNotificationsPushRules);
             const component = await getComponentAndWait();
 
@@ -148,7 +143,7 @@ describe('<Notifications />', () => {
                         {
                             medium: ThreepidMedium.Email,
                             address: testEmail,
-                        },
+                        } as unknown as IThreepid,
                     ],
                 });
             });
@@ -160,7 +155,11 @@ describe('<Notifications />', () => {
             });
 
             it('renders email switches correctly when notifications are on for email', async () => {
-                mockClient.getPushers.mockResolvedValue({ pushers: [{ kind: 'email', pushkey: testEmail }] });
+                mockClient.getPushers.mockResolvedValue({
+                    pushers: [
+                        { kind: 'email', pushkey: testEmail } as unknown as IPusher,
+                    ],
+                });
                 const component = await getComponentAndWait();
 
                 expect(findByTestId(component, 'notif-email-switch').props().value).toEqual(true);
@@ -205,7 +204,7 @@ describe('<Notifications />', () => {
             });
 
             it('enables email notification when toggling off', async () => {
-                const testPusher = { kind: 'email', pushkey: 'tester@test.com' };
+                const testPusher = { kind: 'email', pushkey: 'tester@test.com' } as unknown as IPusher;
                 mockClient.getPushers.mockResolvedValue({ pushers: [testPusher] });
                 const component = await getComponentAndWait();
 
diff --git a/test/components/views/settings/ThemeChoicePanel-test.tsx b/test/components/views/settings/ThemeChoicePanel-test.tsx
index 89dbba0cb54..0d0a71c86c1 100644
--- a/test/components/views/settings/ThemeChoicePanel-test.tsx
+++ b/test/components/views/settings/ThemeChoicePanel-test.tsx
@@ -17,11 +17,8 @@ limitations under the License.
 import React from 'react';
 import { mount } from "enzyme";
 
-import '../../../skinned-sdk';
 import * as TestUtils from "../../../test-utils";
-import _ThemeChoicePanel from '../../../../src/components/views/settings/ThemeChoicePanel';
-
-const ThemeChoicePanel = TestUtils.wrapInMatrixClientContext(_ThemeChoicePanel);
+import ThemeChoicePanel from '../../../../src/components/views/settings/ThemeChoicePanel';
 
 // Fake random strings to give a predictable snapshot
 jest.mock(
diff --git a/test/components/views/settings/UiFeatureSettingWrapper-test.tsx b/test/components/views/settings/UiFeatureSettingWrapper-test.tsx
index 5d6e2ff87ec..08688819362 100644
--- a/test/components/views/settings/UiFeatureSettingWrapper-test.tsx
+++ b/test/components/views/settings/UiFeatureSettingWrapper-test.tsx
@@ -25,7 +25,7 @@ jest.mock('../../../../src/settings/SettingsStore');
 
 describe('<UiFeatureSettingWrapper>', () => {
     const defaultProps = {
-        uiFeature: UIFeature.Flair,
+        uiFeature: UIFeature.Feedback,
         children: <div>test</div>,
     };
     const getComponent = (props = {}) => mount(<UiFeatureSettingWrapper {...defaultProps} {...props} />);
diff --git a/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
index 656144721d1..b39eeb2873c 100644
--- a/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/FontScalingPanel-test.tsx.snap
@@ -1,313 +1,311 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FontScalingPanel renders the font scaling UI 1`] = `
-<Wrapper>
-  <FontScalingPanel>
-    <div
-      className="mx_SettingsTab_section mx_FontScalingPanel"
+<FontScalingPanel>
+  <div
+    className="mx_SettingsTab_section mx_FontScalingPanel"
+  >
+    <span
+      className="mx_SettingsTab_subheading"
     >
-      <span
-        className="mx_SettingsTab_subheading"
-      >
-        Font size
-      </span>
-      <EventTilePreview
-        avatarUrl={null}
-        className="mx_FontScalingPanel_fontSlider_preview"
-        displayName={null}
-        layout="group"
-        message="Hey you. You're the best!"
-        userId={null}
+      Font size
+    </span>
+    <EventTilePreview
+      avatarUrl={null}
+      className="mx_FontScalingPanel_fontSlider_preview"
+      displayName={null}
+      layout="group"
+      message="Hey you. You're the best!"
+      userId={null}
+    >
+      <div
+        className="mx_FontScalingPanel_fontSlider_preview mx_GroupLayout mx_EventTilePreview_loader"
       >
-        <div
-          className="mx_FontScalingPanel_fontSlider_preview mx_GroupLayout mx_EventTilePreview_loader"
+        <Spinner
+          h={32}
+          w={32}
         >
-          <Spinner
-            h={32}
-            w={32}
+          <div
+            className="mx_Spinner"
           >
             <div
-              className="mx_Spinner"
-            >
-              <div
-                aria-label="Loading..."
-                className="mx_Spinner_icon"
-                style={
-                  Object {
-                    "height": 32,
-                    "width": 32,
-                  }
+              aria-label="Loading..."
+              className="mx_Spinner_icon"
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
                 }
-              />
-            </div>
-          </Spinner>
-        </div>
-      </EventTilePreview>
+              }
+            />
+          </div>
+        </Spinner>
+      </div>
+    </EventTilePreview>
+    <div
+      className="mx_FontScalingPanel_fontSlider"
+    >
       <div
-        className="mx_FontScalingPanel_fontSlider"
+        className="mx_FontScalingPanel_fontSlider_smallText"
+      >
+        Aa
+      </div>
+      <Slider
+        disabled={false}
+        displayFunc={[Function]}
+        onSelectionChange={[Function]}
+        value={15}
+        values={
+          Array [
+            13,
+            14,
+            15,
+            16,
+            18,
+          ]
+        }
       >
         <div
-          className="mx_FontScalingPanel_fontSlider_smallText"
-        >
-          Aa
-        </div>
-        <Slider
-          disabled={false}
-          displayFunc={[Function]}
-          onSelectionChange={[Function]}
-          value={15}
-          values={
-            Array [
-              13,
-              14,
-              15,
-              16,
-              18,
-            ]
-          }
+          className="mx_Slider"
         >
-          <div
-            className="mx_Slider"
-          >
-            <div>
+          <div>
+            <div
+              className="mx_Slider_bar"
+            >
+              <hr
+                onClick={[Function]}
+              />
               <div
-                className="mx_Slider_bar"
+                className="mx_Slider_selection"
               >
-                <hr
-                  onClick={[Function]}
-                />
                 <div
-                  className="mx_Slider_selection"
+                  className="mx_Slider_selectionDot"
+                  style={
+                    Object {
+                      "left": "calc(-1.195em + 50%)",
+                    }
+                  }
                 >
                   <div
-                    className="mx_Slider_selectionDot"
-                    style={
-                      Object {
-                        "left": "calc(-1.195em + 50%)",
-                      }
-                    }
+                    className="mx_Slider_selectionText"
                   >
-                    <div
-                      className="mx_Slider_selectionText"
-                    >
-                      15
-                    </div>
+                    15
                   </div>
-                  <hr
-                    style={
-                      Object {
-                        "width": "50%",
-                      }
-                    }
-                  />
                 </div>
+                <hr
+                  style={
+                    Object {
+                      "width": "50%",
+                    }
+                  }
+                />
               </div>
-              <div
-                className="mx_Slider_dotContainer"
+            </div>
+            <div
+              className="mx_Slider_dotContainer"
+            >
+              <Dot
+                active={true}
+                disabled={false}
+                key="13"
+                label=""
+                onClick={[Function]}
               >
-                <Dot
-                  active={true}
-                  disabled={false}
-                  key="13"
-                  label=""
+                <span
+                  className="mx_Slider_dotValue"
                   onClick={[Function]}
                 >
-                  <span
-                    className="mx_Slider_dotValue"
-                    onClick={[Function]}
+                  <div
+                    className="mx_Slider_dot mx_Slider_dotActive"
+                  />
+                  <div
+                    className="mx_Slider_labelContainer"
                   >
                     <div
-                      className="mx_Slider_dot mx_Slider_dotActive"
+                      className="mx_Slider_label"
                     />
-                    <div
-                      className="mx_Slider_labelContainer"
-                    >
-                      <div
-                        className="mx_Slider_label"
-                      />
-                    </div>
-                  </span>
-                </Dot>
-                <Dot
-                  active={true}
-                  disabled={false}
-                  key="14"
-                  label=""
+                  </div>
+                </span>
+              </Dot>
+              <Dot
+                active={true}
+                disabled={false}
+                key="14"
+                label=""
+                onClick={[Function]}
+              >
+                <span
+                  className="mx_Slider_dotValue"
                   onClick={[Function]}
                 >
-                  <span
-                    className="mx_Slider_dotValue"
-                    onClick={[Function]}
+                  <div
+                    className="mx_Slider_dot mx_Slider_dotActive"
+                  />
+                  <div
+                    className="mx_Slider_labelContainer"
                   >
                     <div
-                      className="mx_Slider_dot mx_Slider_dotActive"
+                      className="mx_Slider_label"
                     />
-                    <div
-                      className="mx_Slider_labelContainer"
-                    >
-                      <div
-                        className="mx_Slider_label"
-                      />
-                    </div>
-                  </span>
-                </Dot>
-                <Dot
-                  active={true}
-                  disabled={false}
-                  key="15"
-                  label=""
+                  </div>
+                </span>
+              </Dot>
+              <Dot
+                active={true}
+                disabled={false}
+                key="15"
+                label=""
+                onClick={[Function]}
+              >
+                <span
+                  className="mx_Slider_dotValue"
                   onClick={[Function]}
                 >
-                  <span
-                    className="mx_Slider_dotValue"
-                    onClick={[Function]}
+                  <div
+                    className="mx_Slider_dot mx_Slider_dotActive"
+                  />
+                  <div
+                    className="mx_Slider_labelContainer"
                   >
                     <div
-                      className="mx_Slider_dot mx_Slider_dotActive"
+                      className="mx_Slider_label"
                     />
-                    <div
-                      className="mx_Slider_labelContainer"
-                    >
-                      <div
-                        className="mx_Slider_label"
-                      />
-                    </div>
-                  </span>
-                </Dot>
-                <Dot
-                  active={false}
-                  disabled={false}
-                  key="16"
-                  label=""
+                  </div>
+                </span>
+              </Dot>
+              <Dot
+                active={false}
+                disabled={false}
+                key="16"
+                label=""
+                onClick={[Function]}
+              >
+                <span
+                  className="mx_Slider_dotValue"
                   onClick={[Function]}
                 >
-                  <span
-                    className="mx_Slider_dotValue"
-                    onClick={[Function]}
+                  <div
+                    className="mx_Slider_dot"
+                  />
+                  <div
+                    className="mx_Slider_labelContainer"
                   >
                     <div
-                      className="mx_Slider_dot"
+                      className="mx_Slider_label"
                     />
-                    <div
-                      className="mx_Slider_labelContainer"
-                    >
-                      <div
-                        className="mx_Slider_label"
-                      />
-                    </div>
-                  </span>
-                </Dot>
-                <Dot
-                  active={false}
-                  disabled={false}
-                  key="18"
-                  label=""
+                  </div>
+                </span>
+              </Dot>
+              <Dot
+                active={false}
+                disabled={false}
+                key="18"
+                label=""
+                onClick={[Function]}
+              >
+                <span
+                  className="mx_Slider_dotValue"
                   onClick={[Function]}
                 >
-                  <span
-                    className="mx_Slider_dotValue"
-                    onClick={[Function]}
+                  <div
+                    className="mx_Slider_dot"
+                  />
+                  <div
+                    className="mx_Slider_labelContainer"
                   >
                     <div
-                      className="mx_Slider_dot"
+                      className="mx_Slider_label"
                     />
-                    <div
-                      className="mx_Slider_labelContainer"
-                    >
-                      <div
-                        className="mx_Slider_label"
-                      />
-                    </div>
-                  </span>
-                </Dot>
-              </div>
+                  </div>
+                </span>
+              </Dot>
             </div>
           </div>
-        </Slider>
-        <div
-          className="mx_FontScalingPanel_fontSlider_largeText"
-        >
-          Aa
         </div>
-      </div>
-      <SettingsFlag
-        level="account"
-        name="useCustomFontSize"
-        onChange={[Function]}
-        useCheckbox={true}
+      </Slider>
+      <div
+        className="mx_FontScalingPanel_fontSlider_largeText"
       >
-        <StyledCheckbox
-          checked={false}
-          className=""
-          disabled={false}
-          onChange={[Function]}
-        >
-          <span
-            className="mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
-          >
-            <input
-              checked={false}
-              disabled={false}
-              id="checkbox_abdefghi"
-              onChange={[Function]}
-              type="checkbox"
-            />
-            <label
-              htmlFor="checkbox_abdefghi"
-            >
-              <div
-                className="mx_Checkbox_background"
-              >
-                <div
-                  className="mx_Checkbox_checkmark"
-                />
-              </div>
-              <div>
-                Use custom size
-              </div>
-            </label>
-          </span>
-        </StyledCheckbox>
-      </SettingsFlag>
-      <Field
-        autoComplete="off"
-        className="mx_FontScalingPanel_customFontSizeField"
-        disabled={true}
-        element="input"
-        id="font_size_field"
-        label="Font size"
+        Aa
+      </div>
+    </div>
+    <SettingsFlag
+      level="account"
+      name="useCustomFontSize"
+      onChange={[Function]}
+      useCheckbox={true}
+    >
+      <StyledCheckbox
+        checked={false}
+        className=""
+        disabled={false}
         onChange={[Function]}
-        onValidate={[Function]}
-        placeholder="15"
-        type="number"
-        validateOnBlur={true}
-        validateOnChange={true}
-        validateOnFocus={true}
-        value="15"
       >
-        <div
-          className="mx_Field mx_Field_input mx_FontScalingPanel_customFontSizeField"
+        <span
+          className="mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
         >
           <input
-            autoComplete="off"
-            disabled={true}
-            id="font_size_field"
-            label="Font size"
-            onBlur={[Function]}
+            checked={false}
+            disabled={false}
+            id="checkbox_abdefghi"
             onChange={[Function]}
-            onFocus={[Function]}
-            placeholder="15"
-            type="number"
-            value="15"
+            type="checkbox"
           />
           <label
-            htmlFor="font_size_field"
+            htmlFor="checkbox_abdefghi"
           >
-            Font size
+            <div
+              className="mx_Checkbox_background"
+            >
+              <div
+                className="mx_Checkbox_checkmark"
+              />
+            </div>
+            <div>
+              Use custom size
+            </div>
           </label>
-        </div>
-      </Field>
-    </div>
-  </FontScalingPanel>
-</Wrapper>
+        </span>
+      </StyledCheckbox>
+    </SettingsFlag>
+    <Field
+      autoComplete="off"
+      className="mx_FontScalingPanel_customFontSizeField"
+      disabled={true}
+      element="input"
+      id="font_size_field"
+      label="Font size"
+      onChange={[Function]}
+      onValidate={[Function]}
+      placeholder="15"
+      type="number"
+      validateOnBlur={true}
+      validateOnChange={true}
+      validateOnFocus={true}
+      value="15"
+    >
+      <div
+        className="mx_Field mx_Field_input mx_FontScalingPanel_customFontSizeField"
+      >
+        <input
+          autoComplete="off"
+          disabled={true}
+          id="font_size_field"
+          label="Font size"
+          onBlur={[Function]}
+          onChange={[Function]}
+          onFocus={[Function]}
+          placeholder="15"
+          type="number"
+          value="15"
+        />
+        <label
+          htmlFor="font_size_field"
+        >
+          Font size
+        </label>
+      </div>
+    </Field>
+  </div>
+</FontScalingPanel>
 `;
diff --git a/test/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap b/test/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap
new file mode 100644
index 00000000000..e4468c802f0
--- /dev/null
+++ b/test/components/views/settings/__snapshots__/KeyboardShortcut-test.tsx.snap
@@ -0,0 +1,116 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`KeyboardShortcut doesn't render + if last 1`] = `
+<KeyboardKey
+  last={true}
+  name="a"
+>
+  <kbd>
+     
+    a
+     
+  </kbd>
+</KeyboardKey>
+`;
+
+exports[`KeyboardShortcut doesn't render same modifier twice 1`] = `
+<KeyboardShortcut
+  value={
+    Object {
+      "ctrlOrCmdKey": true,
+      "key": "a",
+      "metaKey": true,
+    }
+  }
+>
+  <div
+    className="mx_KeyboardShortcut"
+  >
+    <KeyboardKey
+      key="ctrlOrCmdKey"
+      name="Control"
+    >
+      <kbd>
+         
+        missing translation: en|Ctrl
+         
+      </kbd>
+      +
+    </KeyboardKey>
+    <KeyboardKey
+      last={true}
+      name="a"
+    >
+      <kbd>
+         
+        a
+         
+      </kbd>
+    </KeyboardKey>
+  </div>
+</KeyboardShortcut>
+`;
+
+exports[`KeyboardShortcut doesn't render same modifier twice 2`] = `
+<KeyboardShortcut
+  value={
+    Object {
+      "ctrlKey": true,
+      "ctrlOrCmdKey": true,
+      "key": "a",
+    }
+  }
+>
+  <div
+    className="mx_KeyboardShortcut"
+  >
+    <KeyboardKey
+      key="ctrlOrCmdKey"
+      name="Control"
+    >
+      <kbd>
+         
+        missing translation: en|Ctrl
+         
+      </kbd>
+      +
+    </KeyboardKey>
+    <KeyboardKey
+      last={true}
+      name="a"
+    >
+      <kbd>
+         
+        a
+         
+      </kbd>
+    </KeyboardKey>
+  </div>
+</KeyboardShortcut>
+`;
+
+exports[`KeyboardShortcut renders alternative key name 1`] = `
+<KeyboardKey
+  name="PageDown"
+>
+  <kbd>
+     
+    missing translation: en|Page Down
+     
+  </kbd>
+  +
+</KeyboardKey>
+`;
+
+exports[`KeyboardShortcut renders key icon 1`] = `
+<KeyboardKey
+  name="ArrowDown"
+>
+  <kbd>
+     
+    ↓
+     
+  </kbd>
+  +
+</KeyboardKey>
+`;
diff --git a/test/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap b/test/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
index cc2c61f06be..9da88e1d0fc 100644
--- a/test/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/ThemeChoicePanel-test.tsx.snap
@@ -1,115 +1,113 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ThemeChoicePanel renders the theme choice UI 1`] = `
-<Wrapper>
-  <ThemeChoicePanel>
+<ThemeChoicePanel>
+  <div
+    className="mx_SettingsTab_section mx_ThemeChoicePanel"
+  >
+    <span
+      className="mx_SettingsTab_subheading"
+    >
+      Theme
+    </span>
     <div
-      className="mx_SettingsTab_section mx_ThemeChoicePanel"
+      className="mx_ThemeSelectors"
     >
-      <span
-        className="mx_SettingsTab_subheading"
-      >
-        Theme
-      </span>
-      <div
-        className="mx_ThemeSelectors"
+      <StyledRadioGroup
+        definitions={
+          Array [
+            Object {
+              "className": "mx_ThemeSelector_light",
+              "disabled": true,
+              "label": "Light",
+              "value": "light",
+            },
+            Object {
+              "className": "mx_ThemeSelector_dark",
+              "disabled": true,
+              "label": "Dark",
+              "value": "dark",
+            },
+          ]
+        }
+        name="theme"
+        onChange={[Function]}
+        outlined={true}
       >
-        <StyledRadioGroup
-          definitions={
-            Array [
-              Object {
-                "className": "mx_ThemeSelector_light",
-                "disabled": true,
-                "label": "Light",
-                "value": "light",
-              },
-              Object {
-                "className": "mx_ThemeSelector_dark",
-                "disabled": true,
-                "label": "Dark",
-                "value": "dark",
-              },
-            ]
-          }
+        <StyledRadioButton
+          checked={false}
+          childrenInLabel={true}
+          className="mx_ThemeSelector_light"
+          disabled={true}
+          id="theme-light"
           name="theme"
           onChange={[Function]}
           outlined={true}
+          value="light"
         >
-          <StyledRadioButton
-            checked={false}
-            childrenInLabel={true}
-            className="mx_ThemeSelector_light"
-            disabled={true}
-            id="theme-light"
-            name="theme"
-            onChange={[Function]}
-            outlined={true}
-            value="light"
+          <label
+            className="mx_StyledRadioButton mx_ThemeSelector_light mx_StyledRadioButton_disabled mx_StyledRadioButton_outlined"
           >
-            <label
-              className="mx_StyledRadioButton mx_ThemeSelector_light mx_StyledRadioButton_disabled mx_StyledRadioButton_outlined"
+            <input
+              checked={false}
+              disabled={true}
+              id="theme-light"
+              name="theme"
+              onChange={[Function]}
+              type="radio"
+              value="light"
+            />
+            <div>
+              <div />
+            </div>
+            <div
+              className="mx_StyledRadioButton_content"
             >
-              <input
-                checked={false}
-                disabled={true}
-                id="theme-light"
-                name="theme"
-                onChange={[Function]}
-                type="radio"
-                value="light"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                className="mx_StyledRadioButton_content"
-              >
-                Light
-              </div>
-              <div
-                className="mx_StyledRadioButton_spacer"
-              />
-            </label>
-          </StyledRadioButton>
-          <StyledRadioButton
-            checked={false}
-            childrenInLabel={true}
-            className="mx_ThemeSelector_dark"
-            disabled={true}
-            id="theme-dark"
-            name="theme"
-            onChange={[Function]}
-            outlined={true}
-            value="dark"
+              Light
+            </div>
+            <div
+              className="mx_StyledRadioButton_spacer"
+            />
+          </label>
+        </StyledRadioButton>
+        <StyledRadioButton
+          checked={false}
+          childrenInLabel={true}
+          className="mx_ThemeSelector_dark"
+          disabled={true}
+          id="theme-dark"
+          name="theme"
+          onChange={[Function]}
+          outlined={true}
+          value="dark"
+        >
+          <label
+            className="mx_StyledRadioButton mx_ThemeSelector_dark mx_StyledRadioButton_disabled mx_StyledRadioButton_outlined"
           >
-            <label
-              className="mx_StyledRadioButton mx_ThemeSelector_dark mx_StyledRadioButton_disabled mx_StyledRadioButton_outlined"
+            <input
+              checked={false}
+              disabled={true}
+              id="theme-dark"
+              name="theme"
+              onChange={[Function]}
+              type="radio"
+              value="dark"
+            />
+            <div>
+              <div />
+            </div>
+            <div
+              className="mx_StyledRadioButton_content"
             >
-              <input
-                checked={false}
-                disabled={true}
-                id="theme-dark"
-                name="theme"
-                onChange={[Function]}
-                type="radio"
-                value="dark"
-              />
-              <div>
-                <div />
-              </div>
-              <div
-                className="mx_StyledRadioButton_content"
-              >
-                Dark
-              </div>
-              <div
-                className="mx_StyledRadioButton_spacer"
-              />
-            </label>
-          </StyledRadioButton>
-        </StyledRadioGroup>
-      </div>
+              Dark
+            </div>
+            <div
+              className="mx_StyledRadioButton_spacer"
+            />
+          </label>
+        </StyledRadioButton>
+      </StyledRadioGroup>
     </div>
-  </ThemeChoicePanel>
-</Wrapper>
+  </div>
+</ThemeChoicePanel>
 `;
diff --git a/test/components/views/settings/__snapshots__/UiFeatureSettingWrapper-test.tsx.snap b/test/components/views/settings/__snapshots__/UiFeatureSettingWrapper-test.tsx.snap
index 6c6c7fd1f32..27b787aeb98 100644
--- a/test/components/views/settings/__snapshots__/UiFeatureSettingWrapper-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/UiFeatureSettingWrapper-test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`<UiFeatureSettingWrapper> renders children when setting is truthy 1`] = `
 <UiFeatureSettingWrapper
-  uiFeature="UIFeature.flair"
+  uiFeature="UIFeature.feedback"
 >
   <div>
     test
diff --git a/test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx b/test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx
index 2a94da0eb4d..3838ce26656 100644
--- a/test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx
@@ -21,6 +21,7 @@ import { mount, ReactWrapper } from "enzyme";
 import { Key } from "../../../../../../src/Keyboard";
 
 const PATH_TO_KEYBOARD_SHORTCUTS = "../../../../../../src/accessibility/KeyboardShortcuts";
+const PATH_TO_KEYBOARD_SHORTCUT_UTILS = "../../../../../../src/accessibility/KeyboardShortcutUtils";
 const PATH_TO_COMPONENT = "../../../../../../src/components/views/settings/tabs/user/KeyboardUserSettingsTab";
 
 const mockKeyboardShortcuts = (override) => {
@@ -33,9 +34,19 @@ const mockKeyboardShortcuts = (override) => {
     });
 };
 
-const renderKeyboardUserSettingsTab = async (component, props?): Promise<ReactWrapper> => {
+const mockKeyboardShortcutUtils = (override) => {
+    jest.doMock(PATH_TO_KEYBOARD_SHORTCUT_UTILS, () => {
+        const original = jest.requireActual(PATH_TO_KEYBOARD_SHORTCUT_UTILS);
+        return {
+            ...original,
+            ...override,
+        };
+    });
+};
+
+const renderKeyboardUserSettingsTab = async (component): Promise<ReactWrapper> => {
     const Component = (await import(PATH_TO_COMPONENT))[component];
-    return mount(<Component {...props} />);
+    return mount(<Component />);
 };
 
 describe("KeyboardUserSettingsTab", () => {
@@ -43,79 +54,8 @@ describe("KeyboardUserSettingsTab", () => {
         jest.resetModules();
     });
 
-    it("renders key icon", async () => {
-        const body = await renderKeyboardUserSettingsTab("KeyboardKey", { name: Key.ARROW_DOWN });
-        expect(body).toMatchSnapshot();
-    });
-
-    it("renders alternative key name", async () => {
-        const body = await renderKeyboardUserSettingsTab("KeyboardKey", { name: Key.PAGE_DOWN });
-        expect(body).toMatchSnapshot();
-    });
-
-    it("doesn't render + if last", async () => {
-        const body = await renderKeyboardUserSettingsTab("KeyboardKey", { name: Key.A, last: true });
-        expect(body).toMatchSnapshot();
-    });
-
-    it("doesn't render same modifier twice", async () => {
-        mockKeyboardShortcuts({
-            "getKeyboardShortcutsForUI": () => ({
-                "keybind1": {
-                    default: {
-                        key: Key.A,
-                        ctrlOrCmdKey: true,
-                        metaKey: true,
-                    },
-                    displayName: "Cancel replying to a message",
-                },
-            }),
-        });
-        const body1 = await renderKeyboardUserSettingsTab("KeyboardShortcut", { name: "keybind1" });
-        expect(body1).toMatchSnapshot();
-        jest.resetModules();
-
-        mockKeyboardShortcuts({
-            "getKeyboardShortcutsForUI": () => ({
-                "keybind1": {
-                    default: {
-                        key: Key.A,
-                        ctrlOrCmdKey: true,
-                        ctrlKey: true,
-                    },
-                    displayName: "Cancel replying to a message",
-                },
-            }),
-        });
-        const body2 = await renderKeyboardUserSettingsTab("KeyboardShortcut", { name: "keybind1" });
-        expect(body2).toMatchSnapshot();
-        jest.resetModules();
-    });
-
     it("renders list of keyboard shortcuts", async () => {
         mockKeyboardShortcuts({
-            "getKeyboardShortcutsForUI": () => ({
-                "keybind1": {
-                    default: {
-                        key: Key.A,
-                        ctrlKey: true,
-                    },
-                    displayName: "Cancel replying to a message",
-                },
-                "keybind2": {
-                    default: {
-                        key: Key.B,
-                        ctrlKey: true,
-                    },
-                    displayName: "Toggle Bold",
-                },
-                "keybind3": {
-                    default: {
-                        key: Key.ENTER,
-                    },
-                    displayName: "Select room from the room list",
-                },
-            }),
             "CATEGORIES": {
                 "Composer": {
                     settingNames: ["keybind1", "keybind2"],
@@ -127,6 +67,38 @@ describe("KeyboardUserSettingsTab", () => {
                 },
             },
         });
+        mockKeyboardShortcutUtils({
+            "getKeyboardShortcutValue": (name) => {
+                switch (name) {
+                    case "keybind1":
+                        return {
+                            key: Key.A,
+                            ctrlKey: true,
+                        };
+                    case "keybind2": {
+                        return {
+                            key: Key.B,
+                            ctrlKey: true };
+                    }
+                    case "keybind3": {
+                        return {
+                            key: Key.ENTER,
+                        };
+                    }
+                }
+            },
+            "getKeyboardShortcutDisplayName": (name) => {
+                switch (name) {
+                    case "keybind1":
+                        return "Cancel replying to a message";
+                    case "keybind2":
+                        return "Toggle Bold";
+
+                    case "keybind3":
+                        return "Select room from the room list";
+                }
+            },
+        });
 
         const body = await renderKeyboardUserSettingsTab("default");
         expect(body).toMatchSnapshot();
diff --git a/test/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
index 99a97a72d0a..caeea350f7b 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/KeyboardUserSettingsTab-test.tsx.snap
@@ -1,104 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`KeyboardUserSettingsTab doesn't render + if last 1`] = `
-<KeyboardKey
-  last={true}
-  name="a"
->
-  <kbd>
-     
-    a
-     
-  </kbd>
-</KeyboardKey>
-`;
-
-exports[`KeyboardUserSettingsTab doesn't render same modifier twice 1`] = `
-<KeyboardShortcut
-  name="keybind1"
->
-  <div>
-    <KeyboardKey
-      key="ctrlOrCmdKey"
-      name="Control"
-    >
-      <kbd>
-         
-        missing translation: en|Ctrl
-         
-      </kbd>
-      +
-    </KeyboardKey>
-    <KeyboardKey
-      last={true}
-      name="a"
-    >
-      <kbd>
-         
-        a
-         
-      </kbd>
-    </KeyboardKey>
-  </div>
-</KeyboardShortcut>
-`;
-
-exports[`KeyboardUserSettingsTab doesn't render same modifier twice 2`] = `
-<KeyboardShortcut
-  name="keybind1"
->
-  <div>
-    <KeyboardKey
-      key="ctrlOrCmdKey"
-      name="Control"
-    >
-      <kbd>
-         
-        missing translation: en|Ctrl
-         
-      </kbd>
-      +
-    </KeyboardKey>
-    <KeyboardKey
-      last={true}
-      name="a"
-    >
-      <kbd>
-         
-        a
-         
-      </kbd>
-    </KeyboardKey>
-  </div>
-</KeyboardShortcut>
-`;
-
-exports[`KeyboardUserSettingsTab renders alternative key name 1`] = `
-<KeyboardKey
-  name="PageDown"
->
-  <kbd>
-     
-    missing translation: en|Page Down
-     
-  </kbd>
-  +
-</KeyboardKey>
-`;
-
-exports[`KeyboardUserSettingsTab renders key icon 1`] = `
-<KeyboardKey
-  name="ArrowDown"
->
-  <kbd>
-     
-    ↓
-     
-  </kbd>
-  +
-</KeyboardKey>
-`;
-
 exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
 <KeyboardUserSettingsTab>
   <div
@@ -140,11 +41,18 @@ exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
             <div
               className="mx_KeyboardShortcut_shortcutRow"
             >
-              missing translation: en|Cancel replying to a message
+              Cancel replying to a message
               <KeyboardShortcut
-                name="keybind1"
+                value={
+                  Object {
+                    "ctrlKey": true,
+                    "key": "a",
+                  }
+                }
               >
-                <div>
+                <div
+                  className="mx_KeyboardShortcut"
+                >
                   <KeyboardKey
                     key="ctrlKey"
                     name="Control"
@@ -177,11 +85,18 @@ exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
             <div
               className="mx_KeyboardShortcut_shortcutRow"
             >
-              missing translation: en|Toggle Bold
+              Toggle Bold
               <KeyboardShortcut
-                name="keybind2"
+                value={
+                  Object {
+                    "ctrlKey": true,
+                    "key": "b",
+                  }
+                }
               >
-                <div>
+                <div
+                  className="mx_KeyboardShortcut"
+                >
                   <KeyboardKey
                     key="ctrlKey"
                     name="Control"
@@ -241,11 +156,17 @@ exports[`KeyboardUserSettingsTab renders list of keyboard shortcuts 1`] = `
             <div
               className="mx_KeyboardShortcut_shortcutRow"
             >
-              missing translation: en|Select room from the room list
+              Select room from the room list
               <KeyboardShortcut
-                name="keybind3"
+                value={
+                  Object {
+                    "key": "Enter",
+                  }
+                }
               >
-                <div>
+                <div
+                  className="mx_KeyboardShortcut"
+                >
                   <KeyboardKey
                     last={true}
                     name="Enter"
diff --git a/test/components/views/spaces/QuickThemeSwitcher-test.tsx b/test/components/views/spaces/QuickThemeSwitcher-test.tsx
index 2631dbebddf..c443963778e 100644
--- a/test/components/views/spaces/QuickThemeSwitcher-test.tsx
+++ b/test/components/views/spaces/QuickThemeSwitcher-test.tsx
@@ -19,7 +19,6 @@ import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
 
-import '../../../skinned-sdk';
 import QuickThemeSwitcher from '../../../../src/components/views/spaces/QuickThemeSwitcher';
 import { getOrderedThemes } from '../../../../src/theme';
 import ThemeChoicePanel from '../../../../src/components/views/settings/ThemeChoicePanel';
@@ -28,7 +27,7 @@ import { findById } from '../../../test-utils';
 import { SettingLevel } from '../../../../src/settings/SettingLevel';
 import dis from '../../../../src/dispatcher/dispatcher';
 import { Action } from '../../../../src/dispatcher/actions';
-import PlatformPeg from "../../../../src/PlatformPeg";
+import { mockPlatformPeg } from '../../../test-utils/platform';
 
 jest.mock('../../../../src/theme');
 jest.mock('../../../../src/components/views/settings/ThemeChoicePanel', () => ({
@@ -45,7 +44,7 @@ jest.mock('../../../../src/dispatcher/dispatcher', () => ({
     register: jest.fn(),
 }));
 
-PlatformPeg.get = () => ({ overrideBrowserShortcuts: () => false });
+mockPlatformPeg({ overrideBrowserShortcuts: jest.fn().mockReturnValue(false) });
 
 describe('<QuickThemeSwitcher />', () => {
     const defaultProps = {
diff --git a/test/components/views/spaces/SpacePanel-test.tsx b/test/components/views/spaces/SpacePanel-test.tsx
index 7f2c3a95b73..e328c51188a 100644
--- a/test/components/views/spaces/SpacePanel-test.tsx
+++ b/test/components/views/spaces/SpacePanel-test.tsx
@@ -20,7 +20,6 @@ import { mocked } from 'jest-mock';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { act } from "react-dom/test-utils";
 
-import '../../../skinned-sdk';
 import SpacePanel from '../../../../src/components/views/spaces/SpacePanel';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { SpaceKey } from '../../../../src/stores/spaces';
diff --git a/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx b/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
index 0d7518a2a35..78cc6028631 100644
--- a/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
+++ b/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
@@ -1,6 +1,5 @@
-// skinned-sdk should be the first import in most tests
-import '../../../skinned-sdk';
 import React from "react";
+import { mocked } from 'jest-mock';
 import {
     renderIntoDocument,
     Simulate,
@@ -53,11 +52,10 @@ describe('<SpaceSettingsVisibilityTab />', () => {
         ];
         const space = mkSpace(client, mockSpaceId);
         const getStateEvents = mockStateEventImplementation(events);
-        space.currentState.getStateEvents.mockImplementation(getStateEvents);
-        space.currentState.mayClientSendStateEvent.mockReturnValue(false);
-        const mockGetJoinRule = jest.fn().mockReturnValue(joinRule);
-        space.getJoinRule = mockGetJoinRule;
-        space.currentState.getJoinRule = mockGetJoinRule;
+        mocked(space.currentState).getStateEvents.mockImplementation(getStateEvents);
+        mocked(space.currentState).mayClientSendStateEvent.mockReturnValue(false);
+        space.getJoinRule.mockReturnValue(joinRule);
+        mocked(space.currentState).getJoinRule.mockReturnValue(joinRule);
         return space as unknown as Room;
     };
     const defaultProps = {
diff --git a/test/components/views/typography/Heading-test.tsx b/test/components/views/typography/Heading-test.tsx
index 7f8561bfae3..186d15ff90f 100644
--- a/test/components/views/typography/Heading-test.tsx
+++ b/test/components/views/typography/Heading-test.tsx
@@ -25,4 +25,8 @@ describe('<Heading />', () => {
     it('renders h3 with correct attributes', () => {
         expect(getComponent({ size: 'h3' })).toMatchSnapshot();
     });
+
+    it('renders h4 with correct attributes', () => {
+        expect(getComponent({ size: 'h4' })).toMatchSnapshot();
+    });
 });
diff --git a/test/components/views/typography/__snapshots__/Heading-test.tsx.snap b/test/components/views/typography/__snapshots__/Heading-test.tsx.snap
index 592ee050e8e..d9511fd4d97 100644
--- a/test/components/views/typography/__snapshots__/Heading-test.tsx.snap
+++ b/test/components/views/typography/__snapshots__/Heading-test.tsx.snap
@@ -32,3 +32,14 @@ exports[`<Heading /> renders h3 with correct attributes 1`] = `
   </div>
 </h3>
 `;
+
+exports[`<Heading /> renders h4 with correct attributes 1`] = `
+<h4
+  class="mx_Heading_h4 test"
+  data-test-id="test"
+>
+  <div>
+    test
+  </div>
+</h4>
+`;
diff --git a/test/components/views/voip/VideoLobby-test.tsx b/test/components/views/voip/VideoLobby-test.tsx
new file mode 100644
index 00000000000..2d69709dc76
--- /dev/null
+++ b/test/components/views/voip/VideoLobby-test.tsx
@@ -0,0 +1,192 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { mount } from "enzyme";
+import { act } from "react-dom/test-utils";
+import { mocked } from "jest-mock";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+
+import {
+    stubClient,
+    stubVideoChannelStore,
+    StubVideoChannelStore,
+    mkRoom,
+    mkVideoChannelMember,
+    mockStateEventImplementation,
+} from "../../../test-utils";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import FacePile from "../../../../src/components/views/elements/FacePile";
+import MemberAvatar from "../../../../src/components/views/avatars/MemberAvatar";
+import VideoLobby from "../../../../src/components/views/voip/VideoLobby";
+
+describe("VideoLobby", () => {
+    Object.defineProperty(navigator, "mediaDevices", {
+        value: {
+            enumerateDevices: jest.fn(),
+            getUserMedia: () => null,
+        },
+    });
+    jest.spyOn(HTMLMediaElement.prototype, "play").mockImplementation(async () => {});
+
+    let cli: MatrixClient;
+    let store: StubVideoChannelStore;
+    let room: Room;
+    beforeEach(() => {
+        stubClient();
+        cli = MatrixClientPeg.get();
+        store = stubVideoChannelStore();
+        room = mkRoom(cli, "!1:example.org");
+        mocked(navigator.mediaDevices.enumerateDevices).mockResolvedValue([]);
+    });
+
+    describe("connected members", () => {
+        it("hides when no one is connected", async () => {
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            expect(lobby.find(".mx_VideoLobby_connectedMembers").exists()).toEqual(false);
+        });
+
+        it("is shown when someone is connected", async () => {
+            mocked(room.currentState).getStateEvents.mockImplementation(mockStateEventImplementation([
+                // A user connected from 2 devices
+                mkVideoChannelMember("@alice:example.org", ["device 1", "device 2"]),
+                // A disconnected user
+                mkVideoChannelMember("@bob:example.org", []),
+                // A user that claims to have a connected device, but has left the room
+                mkVideoChannelMember("@chris:example.org", ["device 1"]),
+            ]));
+
+            mocked(room).getMember.mockImplementation(userId => ({
+                userId,
+                membership: userId === "@chris:example.org" ? "leave" : "join",
+                name: userId,
+                rawDisplayName: userId,
+                roomId: "!1:example.org",
+                getAvatarUrl: () => {},
+                getMxcAvatarUrl: () => {},
+            }) as unknown as RoomMember);
+
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            // Only Alice should display as connected
+            const memberText = lobby.find(".mx_VideoLobby_connectedMembers").children().at(0).text();
+            expect(memberText).toEqual("1 person connected");
+            expect(lobby.find(FacePile).find(MemberAvatar).props().member.userId).toEqual("@alice:example.org");
+        });
+
+        it("doesn't include remote echo of this device being connected", async () => {
+            mocked(room.currentState).getStateEvents.mockImplementation(mockStateEventImplementation([
+                // Make the remote echo claim that we're connected, while leaving the store disconnected
+                mkVideoChannelMember(cli.getUserId(), [cli.getDeviceId()]),
+            ]));
+
+            mocked(room).getMember.mockImplementation(userId => ({
+                userId,
+                membership: "join",
+                name: userId,
+                rawDisplayName: userId,
+                roomId: "!1:example.org",
+                getAvatarUrl: () => {},
+                getMxcAvatarUrl: () => {},
+            }) as unknown as RoomMember);
+
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            // Because of our local echo, we should still appear as disconnected
+            expect(lobby.find(".mx_VideoLobby_connectedMembers").exists()).toEqual(false);
+        });
+    });
+
+    describe("device buttons", () => {
+        it("hides when no devices are available", async () => {
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            expect(lobby.find("DeviceButton").children().exists()).toEqual(false);
+        });
+
+        it("hides device list when only one device is available", async () => {
+            mocked(navigator.mediaDevices.enumerateDevices).mockResolvedValue([{
+                deviceId: "1",
+                groupId: "1",
+                label: "Webcam",
+                kind: "videoinput",
+                toJSON: () => {},
+            }]);
+
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            expect(lobby.find(".mx_VideoLobby_deviceListButton").exists()).toEqual(false);
+        });
+
+        it("shows device list when multiple devices are available", async () => {
+            mocked(navigator.mediaDevices.enumerateDevices).mockResolvedValue([
+                {
+                    deviceId: "1",
+                    groupId: "1",
+                    label: "Front camera",
+                    kind: "videoinput",
+                    toJSON: () => {},
+                },
+                {
+                    deviceId: "2",
+                    groupId: "1",
+                    label: "Back camera",
+                    kind: "videoinput",
+                    toJSON: () => {},
+                },
+            ]);
+
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            expect(lobby.find(".mx_VideoLobby_deviceListButton").exists()).toEqual(true);
+        });
+    });
+
+    describe("join button", () => {
+        it("works", async () => {
+            const lobby = mount(<VideoLobby room={room} />);
+            // Wait for state to settle
+            await act(() => Promise.resolve());
+            lobby.update();
+
+            act(() => {
+                lobby.find("AccessibleButton.mx_VideoLobby_joinButton").simulate("click");
+            });
+            expect(store.connect).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/test/createRoom-test.ts b/test/createRoom-test.ts
new file mode 100644
index 00000000000..5846823cfd0
--- /dev/null
+++ b/test/createRoom-test.ts
@@ -0,0 +1,100 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { mocked } from "jest-mock";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import { IDevice } from "matrix-js-sdk/src/crypto/deviceinfo";
+import { RoomType } from "matrix-js-sdk/src/@types/event";
+
+import { stubClient, setupAsyncStoreWithClient } from "./test-utils";
+import { MatrixClientPeg } from "../src/MatrixClientPeg";
+import WidgetStore from "../src/stores/WidgetStore";
+import WidgetUtils from "../src/utils/WidgetUtils";
+import { VIDEO_CHANNEL, VIDEO_CHANNEL_MEMBER } from "../src/utils/VideoChannelUtils";
+import createRoom, { canEncryptToAllUsers } from '../src/createRoom';
+
+describe("createRoom", () => {
+    let client: MatrixClient;
+    beforeEach(() => {
+        stubClient();
+        client = MatrixClientPeg.get();
+    });
+
+    it("sets up video rooms correctly", async () => {
+        setupAsyncStoreWithClient(WidgetStore.instance, client);
+        jest.spyOn(WidgetUtils, "waitForRoomWidget").mockResolvedValue();
+
+        const userId = client.getUserId();
+        const roomId = await createRoom({ roomType: RoomType.ElementVideo });
+
+        const [[{
+            power_level_content_override: {
+                users: {
+                    [userId]: userPower,
+                },
+                events: {
+                    "im.vector.modular.widgets": widgetPower,
+                    [VIDEO_CHANNEL_MEMBER]: videoMemberPower,
+                },
+            },
+        }]] = mocked(client.createRoom).mock.calls as any;
+        const [[widgetRoomId, widgetStateKey, , widgetId]] = mocked(client.sendStateEvent).mock.calls;
+
+        // We should have had enough power to be able to set up the Jitsi widget
+        expect(userPower).toBeGreaterThanOrEqual(widgetPower);
+        // and should have actually set it up
+        expect(widgetRoomId).toEqual(roomId);
+        expect(widgetStateKey).toEqual("im.vector.modular.widgets");
+        expect(widgetId).toEqual(VIDEO_CHANNEL);
+
+        // All members should be able to update their connected devices
+        expect(videoMemberPower).toEqual(0);
+        // Jitsi widget should be immutable for admins
+        expect(widgetPower).toBeGreaterThan(100);
+        // and we should have been reset back to admin
+        expect(client.setPowerLevel).toHaveBeenCalledWith(roomId, userId, 100, undefined);
+    });
+});
+
+describe("canEncryptToAllUsers", () => {
+    const trueUser = {
+        "@goodUser:localhost": {
+            "DEV1": {} as unknown as IDevice,
+            "DEV2": {} as unknown as IDevice,
+        },
+    };
+    const falseUser = {
+        "@badUser:localhost": {},
+    };
+
+    let client: MatrixClient;
+    beforeEach(() => {
+        stubClient();
+        client = MatrixClientPeg.get();
+    });
+
+    it("returns true if all devices have crypto", async () => {
+        mocked(client.downloadKeys).mockResolvedValue(trueUser);
+        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost"]);
+        expect(response).toBe(true);
+    });
+
+    it("returns false if not all users have crypto", async () => {
+        mocked(client.downloadKeys).mockResolvedValue({ ...trueUser, ...falseUser });
+        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost", "@badUser:localhost"]);
+        expect(response).toBe(false);
+    });
+});
diff --git a/test/editor/__snapshots__/deserialize-test.ts.snap b/test/editor/__snapshots__/deserialize-test.ts.snap
new file mode 100644
index 00000000000..721ebc3211c
--- /dev/null
+++ b/test/editor/__snapshots__/deserialize-test.ts.snap
@@ -0,0 +1,178 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`editor/deserialize html messages escapes angle brackets 1`] = `
+Array [
+  Object {
+    "text": "\\\\> \\\\\\\\<del>no formatting here\\\\\\\\</del>",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes asterisks 1`] = `
+Array [
+  Object {
+    "text": "\\\\*hello\\\\*",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes backslashes 1`] = `
+Array [
+  Object {
+    "text": "C:\\\\\\\\My Documents",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes backticks in code blocks 1`] = `
+Array [
+  Object {
+    "text": "\`\`this → \` is a backtick\`\`",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "\`\`\`\`",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "and here are 3 of them:",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "\`\`\`",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "\`\`\`\`",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes backticks outside of code blocks 1`] = `
+Array [
+  Object {
+    "text": "some \\\\\`backticks\\\\\`",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes square brackets 1`] = `
+Array [
+  Object {
+    "text": "\\\\[not an actual link\\\\](https://example.org)",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages escapes underscores 1`] = `
+Array [
+  Object {
+    "text": "\\\\_\\\\_emphasis\\\\_\\\\_",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages preserves nested formatting 1`] = `
+Array [
+  Object {
+    "text": "a<sub>b_c**d<u>e</u>**_</sub>",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages preserves nested quotes 1`] = `
+Array [
+  Object {
+    "text": "> foo",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "> ",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "> > bar",
+    "type": "plain",
+  },
+]
+`;
+
+exports[`editor/deserialize html messages surrounds lists with newlines 1`] = `
+Array [
+  Object {
+    "text": "foo",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "- bar",
+    "type": "plain",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "
+",
+    "type": "newline",
+  },
+  Object {
+    "text": "baz",
+    "type": "plain",
+  },
+]
+`;
diff --git a/test/editor/caret-test.js b/test/editor/caret-test.ts
similarity index 96%
rename from test/editor/caret-test.js
rename to test/editor/caret-test.ts
index 33b40e1c640..2e7ba0ba053 100644
--- a/test/editor/caret-test.js
+++ b/test/editor/caret-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import { getLineAndNodePosition } from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";
@@ -25,7 +24,7 @@ describe('editor/caret: DOM position for caret', function() {
             const pc = createPartCreator();
             const model = new EditorModel([
                 pc.plain("hello"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 5 });
             expect(lineIndex).toBe(0);
@@ -36,7 +35,7 @@ describe('editor/caret: DOM position for caret', function() {
             const pc = createPartCreator();
             const model = new EditorModel([
                 pc.plain("hello"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 0 });
             expect(lineIndex).toBe(0);
@@ -47,7 +46,7 @@ describe('editor/caret: DOM position for caret', function() {
             const pc = createPartCreator();
             const model = new EditorModel([
                 pc.plain("hello"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 2 });
             expect(lineIndex).toBe(0);
@@ -62,7 +61,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.plain("hello"),
                 pc.newline(),
                 pc.plain("world"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 2, offset: 5 });
             expect(lineIndex).toBe(1);
@@ -75,7 +74,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.plain("hello"),
                 pc.newline(),
                 pc.plain("world"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 2, offset: 0 });
             expect(lineIndex).toBe(1);
@@ -89,7 +88,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.newline(),
                 pc.plain("world"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 1, offset: 1 });
             expect(lineIndex).toBe(1);
@@ -103,7 +102,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.newline(),
                 pc.newline(),
                 pc.plain("world"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 3, offset: 0 });
             expect(lineIndex).toBe(2);
@@ -118,7 +117,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.plain("hello"),
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.plain("!"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 1, offset: 0 });
             expect(lineIndex).toBe(0);
@@ -131,7 +130,7 @@ describe('editor/caret: DOM position for caret', function() {
                 pc.plain("hello"),
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.plain("!"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 1, offset: 2 });
             expect(lineIndex).toBe(0);
@@ -142,7 +141,7 @@ describe('editor/caret: DOM position for caret', function() {
             const pc = createPartCreator();
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 0 });
             expect(lineIndex).toBe(0);
@@ -154,7 +153,7 @@ describe('editor/caret: DOM position for caret', function() {
             const pc = createPartCreator();
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 1 });
             expect(lineIndex).toBe(0);
@@ -167,7 +166,7 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 0, offset: 1 });
             expect(lineIndex).toBe(0);
@@ -180,7 +179,7 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 1, offset: 0 });
             expect(lineIndex).toBe(0);
@@ -193,7 +192,7 @@ describe('editor/caret: DOM position for caret', function() {
             const model = new EditorModel([
                 pc.userPill("Alice", "@alice:hs.tld"),
                 pc.userPill("Bob", "@bob:hs.tld"),
-            ]);
+            ], pc);
             const { offset, lineIndex, nodeIndex } =
                 getLineAndNodePosition(model, { index: 1, offset: 1 });
             expect(lineIndex).toBe(0);
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.ts
similarity index 69%
rename from test/editor/deserialize-test.js
rename to test/editor/deserialize-test.ts
index 5526ff3df4d..a6713b3139a 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.ts
@@ -13,14 +13,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
 
-import '../skinned-sdk'; // Must be first for skinning to work
 import { parseEvent } from "../../src/editor/deserialize";
 import { createPartCreator } from "./mock";
 
 const FOUR_SPACES = " ".repeat(4);
 
-function htmlMessage(formattedBody, msgtype = "m.text") {
+function htmlMessage(formattedBody: string, msgtype = "m.text") {
     return {
         getContent() {
             return {
@@ -29,10 +29,10 @@ function htmlMessage(formattedBody, msgtype = "m.text") {
                 formatted_body: formattedBody,
             };
         },
-    };
+    } as unknown as MatrixEvent;
 }
 
-function textMessage(body, msgtype = "m.text") {
+function textMessage(body: string, msgtype = "m.text") {
     return {
         getContent() {
             return {
@@ -40,7 +40,14 @@ function textMessage(body, msgtype = "m.text") {
                 body,
             };
         },
-    };
+    } as unknown as MatrixEvent;
+}
+
+function textMessageReply(body: string, msgtype = "m.text") {
+    return {
+        ...textMessage(body, msgtype),
+        replyEventId: "!foo:bar",
+    } as unknown as MatrixEvent;
 }
 
 function mergeAdjacentParts(parts) {
@@ -237,18 +244,6 @@ describe('editor/deserialize', function() {
             expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
             expect(parts[4]).toStrictEqual({ type: "plain", text: "3. Finish" });
         });
-        it('non tight lists', () => {
-            const html = "<ol><li><p>Start</p></li><li><p>Continue</p></li><li><p>Finish</p></li></ol>";
-            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
-            expect(parts.length).toBe(8);
-            expect(parts[0]).toStrictEqual({ type: "plain", text: "1. Start" });
-            expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
-            expect(parts[2]).toStrictEqual({ type: "newline", text: "\n" });
-            expect(parts[3]).toStrictEqual({ type: "plain", text: "2. Continue" });
-            expect(parts[4]).toStrictEqual({ type: "newline", text: "\n" });
-            expect(parts[5]).toStrictEqual({ type: "newline", text: "\n" });
-            expect(parts[6]).toStrictEqual({ type: "plain", text: "3. Finish" });
-        });
         it('nested unordered lists', () => {
             const html = "<ul><li>Oak<ul><li>Spruce<ul><li>Birch</li></ul></li></ul></li></ul>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
@@ -269,13 +264,13 @@ describe('editor/deserialize', function() {
             expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
             expect(parts[4]).toStrictEqual({ type: "plain", text: `${FOUR_SPACES.repeat(2)}1. Birch` });
         });
-        it('nested tight lists', () => {
+        it('nested lists', () => {
             const html = "<ol><li>Oak\n<ol><li>Spruce\n<ol><li>Birch</li></ol></li></ol></li></ol>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(5);
-            expect(parts[0]).toStrictEqual({ type: "plain", text: "1. Oak" });
+            expect(parts[0]).toStrictEqual({ type: "plain", text: "1. Oak\n" });
             expect(parts[1]).toStrictEqual({ type: "newline", text: "\n" });
-            expect(parts[2]).toStrictEqual({ type: "plain", text: `${FOUR_SPACES}1. Spruce` });
+            expect(parts[2]).toStrictEqual({ type: "plain", text: `${FOUR_SPACES}1. Spruce\n` });
             expect(parts[3]).toStrictEqual({ type: "newline", text: "\n" });
             expect(parts[4]).toStrictEqual({ type: "plain", text: `${FOUR_SPACES.repeat(2)}1. Birch` });
         });
@@ -291,5 +286,139 @@ describe('editor/deserialize', function() {
             expect(parts.length).toBe(1);
             expect(parts[0]).toStrictEqual({ type: "plain", text: "/me says _DON'T SHOUT_!" });
         });
+        it('preserves nested quotes', () => {
+            const html = "<blockquote>foo<blockquote>bar</blockquote></blockquote>";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('surrounds lists with newlines', () => {
+            const html = "foo<ul><li>bar</li></ul>baz";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('preserves nested formatting', () => {
+            const html = "a<sub>b<em>c<strong>d<u>e</u></strong></em></sub>";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes backticks in code blocks', () => {
+            const html = "<p><code>this → ` is a backtick</code></p>" +
+                "<pre><code>and here are 3 of them:\n```</code></pre>";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes backticks outside of code blocks', () => {
+            const html = "some `backticks`";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes backslashes', () => {
+            const html = "C:\\My Documents";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes asterisks', () => {
+            const html = "*hello*";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes underscores', () => {
+            const html = "__emphasis__";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes square brackets', () => {
+            const html = "[not an actual link](https://example.org)";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+        it('escapes angle brackets', () => {
+            const html = "> \\<del>no formatting here\\</del>";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts).toMatchSnapshot();
+        });
+    });
+    describe('plaintext messages', function() {
+        it('turns html tags back into markdown', function() {
+            const html = "<strong>bold</strong> and <em>emphasized</em> text <a href=\"http://example.com/\">this</a>!";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "**bold** and _emphasized_ text [this](http://example.com/)!",
+            });
+        });
+        it('keeps backticks unescaped', () => {
+            const html = "this → ` is a backtick and here are 3 of them:\n```";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "this → ` is a backtick and here are 3 of them:\n```",
+            });
+        });
+        it('keeps backticks outside of code blocks', () => {
+            const html = "some `backticks`";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "some `backticks`",
+            });
+        });
+        it('keeps backslashes', () => {
+            const html = "C:\\My Documents";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "C:\\My Documents",
+            });
+        });
+        it('keeps asterisks', () => {
+            const html = "*hello*";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "*hello*",
+            });
+        });
+        it('keeps underscores', () => {
+            const html = "__emphasis__";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "__emphasis__",
+            });
+        });
+        it('keeps square brackets', () => {
+            const html = "[not an actual link](https://example.org)";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "[not an actual link](https://example.org)",
+            });
+        });
+        it('escapes angle brackets', () => {
+            const html = "> &lt;del&gt;no formatting here&lt;/del&gt;";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "> <del>no formatting here</del>",
+            });
+        });
+        it("it strips plaintext replies", () => {
+            const body = "> Sender: foo\n\nMessage";
+            const parts = normalize(parseEvent(textMessageReply(body), createPartCreator(), { shouldEscape: false }));
+            expect(parts.length).toBe(1);
+            expect(parts[0]).toStrictEqual({
+                type: "plain",
+                text: "Message",
+            });
+        });
     });
 });
diff --git a/test/editor/diff-test.js b/test/editor/diff-test.ts
similarity index 100%
rename from test/editor/diff-test.js
rename to test/editor/diff-test.ts
diff --git a/test/editor/history-test.js b/test/editor/history-test.ts
similarity index 59%
rename from test/editor/history-test.js
rename to test/editor/history-test.ts
index e3ae3e16f6c..94e22ed290a 100644
--- a/test/editor/history-test.js
+++ b/test/editor/history-test.ts
@@ -15,35 +15,37 @@ limitations under the License.
 */
 
 import HistoryManager, { MAX_STEP_LENGTH } from "../../src/editor/history";
+import EditorModel from "../../src/editor/model";
+import DocumentPosition from "../../src/editor/position";
 
 describe('editor/history', function() {
     it('push, then undo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        const caret1 = {};
-        const result1 = history.tryPush(model, caret1);
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        const caret1 = new DocumentPosition(0, 0);
+        const result1 = history.tryPush(model, caret1, 'insertText', {});
         expect(result1).toEqual(true);
         parts[0] = "hello world";
-        history.tryPush(model, {});
+        history.tryPush(model, new DocumentPosition(0, 0), 'insertText', {});
         expect(history.canUndo()).toEqual(true);
         const undoState = history.undo(model);
-        expect(undoState.caret).toEqual(caret1);
+        expect(undoState.caret).toBe(caret1);
         expect(undoState.parts).toEqual(["hello"]);
         expect(history.canUndo()).toEqual(false);
     });
     it('push, undo, then redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        history.tryPush(model, {});
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        history.tryPush(model, new DocumentPosition(0, 0), 'insertText', {});
         parts[0] = "hello world";
-        const caret2 = {};
-        history.tryPush(model, caret2);
+        const caret2 = new DocumentPosition(0, 0);
+        history.tryPush(model, caret2, 'insertText', {});
         history.undo(model);
         expect(history.canRedo()).toEqual(true);
         const redoState = history.redo();
-        expect(redoState.caret).toEqual(caret2);
+        expect(redoState.caret).toBe(caret2);
         expect(redoState.parts).toEqual(["hello world"]);
         expect(history.canRedo()).toEqual(false);
         expect(history.canUndo()).toEqual(true);
@@ -51,52 +53,53 @@ describe('editor/history', function() {
     it('push, undo, push, ensure you can`t redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        history.tryPush(model, {});
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        history.tryPush(model, new DocumentPosition(0, 0), "insertText", {});
         parts[0] = "hello world";
-        history.tryPush(model, {});
+        history.tryPush(model, new DocumentPosition(0, 0), "insertText", {});
         history.undo(model);
         parts[0] = "hello world!!";
-        history.tryPush(model, {});
+        history.tryPush(model, new DocumentPosition(0, 0), "insertText", {});
         expect(history.canRedo()).toEqual(false);
     });
     it('not every keystroke stores a history step', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        const firstCaret = {};
-        history.tryPush(model, firstCaret);
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        const firstCaret = new DocumentPosition(0, 0);
+        history.tryPush(model, firstCaret, "insertText", {});
         const diff = { added: "o" };
         let keystrokeCount = 0;
         do {
             parts[0] = parts[0] + diff.added;
             keystrokeCount += 1;
-        } while (!history.tryPush(model, {}, "insertText", diff));
+        } while (!history.tryPush(model, new DocumentPosition(0, 0), "insertText", diff));
         const undoState = history.undo(model);
-        expect(undoState.caret).toEqual(firstCaret);
+        expect(undoState.caret).toBe(firstCaret);
         expect(undoState.parts).toEqual(["hello"]);
         expect(history.canUndo()).toEqual(false);
         expect(keystrokeCount).toEqual(MAX_STEP_LENGTH + 1); // +1 before we type before checking
     });
     it('history step is added at word boundary', function() {
         const history = new HistoryManager();
-        const model = { serializeParts: () => parts.slice() };
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
         const parts = ["h"];
         let diff = { added: "h" };
-        expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
+        const blankCaret = new DocumentPosition(0, 0);
+        expect(history.tryPush(model, blankCaret, "insertText", diff)).toEqual(false);
         diff = { added: "i" };
         parts[0] = "hi";
-        expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
+        expect(history.tryPush(model, blankCaret, "insertText", diff)).toEqual(false);
         diff = { added: " " };
         parts[0] = "hi ";
-        const spaceCaret = {};
+        const spaceCaret = new DocumentPosition(1, 1);
         expect(history.tryPush(model, spaceCaret, "insertText", diff)).toEqual(true);
         diff = { added: "y" };
         parts[0] = "hi y";
-        expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
+        expect(history.tryPush(model, blankCaret, "insertText", diff)).toEqual(false);
         diff = { added: "o" };
         parts[0] = "hi yo";
-        expect(history.tryPush(model, {}, "insertText", diff)).toEqual(false);
+        expect(history.tryPush(model, blankCaret, "insertText", diff)).toEqual(false);
         diff = { added: "u" };
         parts[0] = "hi you";
 
@@ -108,11 +111,11 @@ describe('editor/history', function() {
     it('keystroke that didn\'t add a step can undo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        const firstCaret = {};
-        history.tryPush(model, {});
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        const firstCaret = new DocumentPosition(0, 0);
+        history.tryPush(model, firstCaret, "insertText", {});
         parts[0] = "helloo";
-        const result = history.tryPush(model, {}, "insertText", { added: "o" });
+        const result = history.tryPush(model, new DocumentPosition(0, 0), "insertText", { added: "o" });
         expect(result).toEqual(false);
         expect(history.canUndo()).toEqual(true);
         const undoState = history.undo(model);
@@ -122,25 +125,27 @@ describe('editor/history', function() {
     it('undo after keystroke that didn\'t add a step is able to redo', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        history.tryPush(model, {});
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        history.tryPush(model, new DocumentPosition(0, 0), "insertText", {});
         parts[0] = "helloo";
-        const caret = { last: true };
+        const caret = new DocumentPosition(1, 1);
         history.tryPush(model, caret, "insertText", { added: "o" });
         history.undo(model);
         expect(history.canRedo()).toEqual(true);
         const redoState = history.redo();
-        expect(redoState.caret).toEqual(caret);
+        expect(redoState.caret).toBe(caret);
         expect(redoState.parts).toEqual(["helloo"]);
     });
+
     it('overwriting text always stores a step', function() {
         const history = new HistoryManager();
         const parts = ["hello"];
-        const model = { serializeParts: () => parts.slice() };
-        const firstCaret = {};
-        history.tryPush(model, firstCaret);
+        const model = { serializeParts: () => parts.slice() } as unknown as EditorModel;
+        const firstCaret = new DocumentPosition(0, 0);
+        history.tryPush(model, firstCaret, 'insertText', {});
         const diff = { at: 1, added: "a", removed: "e" };
-        const result = history.tryPush(model, {}, "insertText", diff);
+        const secondCaret = new DocumentPosition(1, 1);
+        const result = history.tryPush(model, secondCaret, "insertText", diff);
         expect(result).toEqual(true);
     });
 });
diff --git a/test/editor/mock.js b/test/editor/mock.ts
similarity index 74%
rename from test/editor/mock.js
rename to test/editor/mock.ts
index 2d82d220335..bc6eafc8cc0 100644
--- a/test/editor/mock.js
+++ b/test/editor/mock.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,9 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { Room, MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import AutocompleteWrapperModel from "../../src/editor/autocomplete";
 import { PartCreator } from "../../src/editor/parts";
 
 class MockAutoComplete {
+    public _updateCallback;
+    public _partCreator;
+    public _completions;
+    public _part;
+
     constructor(updateCallback, partCreator, completions) {
         this._updateCallback = updateCallback;
         this._partCreator = partCreator;
@@ -52,20 +60,21 @@ class MockAutoComplete {
 
 // MockClient & MockRoom are only used for avatars in room and user pills,
 // which is not tested
-class MockClient {
-    getRooms() { return []; }
-    getRoom() { return null; }
-}
-
 class MockRoom {
     getMember() { return null; }
 }
 
 export function createPartCreator(completions = []) {
     const autoCompleteCreator = (partCreator) => {
-        return (updateCallback) => new MockAutoComplete(updateCallback, partCreator, completions);
+        return (updateCallback) =>
+            new MockAutoComplete(updateCallback, partCreator, completions) as unknown as AutocompleteWrapperModel;
     };
-    return new PartCreator(new MockRoom(), new MockClient(), autoCompleteCreator);
+    const room = new MockRoom() as unknown as Room;
+    const client = {
+        getRooms: jest.fn().mockReturnValue([]),
+        getRoom: jest.fn().mockReturnValue(null),
+    } as unknown as MatrixClient;
+    return new PartCreator(room, client, autoCompleteCreator);
 }
 
 export function createRenderer() {
diff --git a/test/editor/model-test.js b/test/editor/model-test.ts
similarity index 88%
rename from test/editor/model-test.js
rename to test/editor/model-test.ts
index 3d0aa5cf641..6b3bd8fb2ca 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.ts
@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
+import DocumentOffset from "../../src/editor/offset";
 
 describe('editor/model', function() {
     describe('plain text manipulation', function() {
         it('insert text into empty document', function() {
             const renderer = createRenderer();
             const model = new EditorModel([], createPartCreator(), renderer);
-            model.update("hello", "insertText", { offset: 5, atNodeEnd: true });
+            model.update("hello", "insertText", new DocumentOffset(5, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(5);
@@ -35,7 +35,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello world", "insertText", { offset: 11, atNodeEnd: true });
+            model.update("hello world", "insertText", new DocumentOffset(11, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(11);
@@ -47,7 +47,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("world")], pc, renderer);
-            model.update("hello world", "insertText", { offset: 6, atNodeEnd: false });
+            model.update("hello world", "insertText", new DocumentOffset(6, false));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(6);
@@ -61,7 +61,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello\n", "insertText", { offset: 6, atNodeEnd: true });
+            model.update("hello\n", "insertText", new DocumentOffset(6, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
             expect(renderer.caret.offset).toBe(1);
@@ -75,7 +75,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.plain("hello")], pc, renderer);
-            model.update("hello\n\n\nworld!", "insertText", { offset: 14, atNodeEnd: true });
+            model.update("hello\n\n\nworld!", "insertText", new DocumentOffset(14, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(4);
             expect(renderer.caret.offset).toBe(6);
@@ -100,7 +100,7 @@ describe('editor/model', function() {
                 pc.newline(),
                 pc.plain("world"),
             ], pc, renderer);
-            model.update("hello\nwarm\nworld", "insertText", { offset: 10, atNodeEnd: true });
+            model.update("hello\nwarm\nworld", "insertText", new DocumentOffset(10, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(2);
             expect(renderer.caret.offset).toBe(4);
@@ -125,7 +125,7 @@ describe('editor/model', function() {
                 pc.plain("try "),
                 pc.roomPill("#someroom"),
             ], pc, renderer);
-            model.update("try foo#someroom", "insertText", { offset: 7, atNodeEnd: false });
+            model.update("try foo#someroom", "insertText", new DocumentOffset(7, false));
             expect(renderer.caret.index).toBe(0);
             expect(renderer.caret.offset).toBe(7);
             expect(model.parts.length).toBe(2);
@@ -142,7 +142,7 @@ describe('editor/model', function() {
                 pc.roomPill("#someroom"),
                 pc.plain("?"),
             ], pc, renderer);
-            model.update("try #some perhapsroom?", "insertText", { offset: 17, atNodeEnd: false });
+            model.update("try #some perhapsroom?", "insertText", new DocumentOffset(17, false));
             expect(renderer.caret.index).toBe(2);
             expect(renderer.caret.offset).toBe(8);
             expect(model.parts.length).toBe(3);
@@ -157,7 +157,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.roomPill("#someroom")], pc, renderer);
-            model.update("#someroo", "deleteContentBackward", { offset: 8, atNodeEnd: true });
+            model.update("#someroo", "deleteContentBackward", new DocumentOffset(8, true));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(-1);
             expect(renderer.caret.offset).toBe(0);
@@ -167,7 +167,7 @@ describe('editor/model', function() {
             const renderer = createRenderer();
             const pc = createPartCreator();
             const model = new EditorModel([pc.roomPill("#someroom")], pc, renderer);
-            model.update("someroom", "deleteContentForward", { offset: 0, atNodeEnd: false });
+            model.update("someroom", "deleteContentForward", new DocumentOffset(0, false));
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(-1);
             expect(renderer.caret.offset).toBe(0);
@@ -180,7 +180,7 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "@alice", label: "Alice" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello @a", "insertText", { offset: 8, atNodeEnd: true });
+            model.update("hello @a", "insertText", new DocumentOffset(8, true));
 
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
@@ -191,6 +191,8 @@ describe('editor/model', function() {
             expect(model.parts[1].type).toBe("pill-candidate");
             expect(model.parts[1].text).toBe("@a");
 
+            // this is a hacky mock function
+            // @ts-ignore
             model.autoComplete.tryComplete(); // see MockAutoComplete
 
             expect(renderer.count).toBe(2);
@@ -208,7 +210,7 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "#riot-dev" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello #r", "insertText", { offset: 8, atNodeEnd: true });
+            model.update("hello #r", "insertText", new DocumentOffset(8, true));
 
             expect(renderer.count).toBe(1);
             expect(renderer.caret.index).toBe(1);
@@ -219,6 +221,8 @@ describe('editor/model', function() {
             expect(model.parts[1].type).toBe("pill-candidate");
             expect(model.parts[1].text).toBe("#r");
 
+            // this is a hacky mock function
+            // @ts-ignore
             model.autoComplete.tryComplete(); // see MockAutoComplete
 
             expect(renderer.count).toBe(2);
@@ -236,9 +240,11 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "#riot-dev" }]);
             const model = new EditorModel([pc.plain("hello ")], pc, renderer);
 
-            model.update("hello #r", "insertText", { offset: 8, atNodeEnd: true });
+            model.update("hello #r", "insertText", new DocumentOffset(8, true));
+            // this is a hacky mock function
+            // @ts-ignore
             model.autoComplete.tryComplete(); // see MockAutoComplete
-            model.update("hello #riot-dev!!", "insertText", { offset: 17, atNodeEnd: true });
+            model.update("hello #riot-dev!!", "insertText", new DocumentOffset(17, true));
 
             expect(renderer.count).toBe(3);
             expect(renderer.caret.index).toBe(2);
@@ -257,7 +263,7 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "#define-room" }]);
             const model = new EditorModel([pc.plain("try ")], pc, renderer);
 
-            model.update("try #define", "insertFromPaste", { offset: 11, atNodeEnd: true });
+            model.update("try #define", "insertFromPaste", new DocumentOffset(11, true));
 
             expect(model.autoComplete).toBeFalsy();
             expect(renderer.caret.index).toBe(0);
@@ -272,7 +278,7 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "#define-room" }]);
             const model = new EditorModel([pc.plain("try ")], pc, renderer);
 
-            model.update("try #define", "insertFromDrop", { offset: 11, atNodeEnd: true });
+            model.update("try #define", "insertFromDrop", new DocumentOffset(11, true));
 
             expect(model.autoComplete).toBeFalsy();
             expect(renderer.caret.index).toBe(0);
@@ -287,14 +293,14 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "#room:server" }]);
             const model = new EditorModel([], pc, renderer);
 
-            model.update("#roo", "insertText", { offset: 4, atNodeEnd: true });
+            model.update("#roo", "insertText", new DocumentOffset(4, true));
 
             expect(renderer.count).toBe(1);
             expect(model.parts.length).toBe(1);
             expect(model.parts[0].type).toBe("pill-candidate");
             expect(model.parts[0].text).toBe("#roo");
 
-            model.update("#room:s", "insertText", { offset: 7, atNodeEnd: true });
+            model.update("#room:s", "insertText", new DocumentOffset(7, true));
 
             expect(renderer.count).toBe(2);
             expect(model.parts.length).toBe(1);
@@ -307,7 +313,7 @@ describe('editor/model', function() {
             const pc = createPartCreator([{ resourceId: "@alice", label: "Alice" }]);
             const model = new EditorModel([], pc, renderer);
 
-            model.update("foo@a", "insertText", { offset: 5, atNodeEnd: true });
+            model.update("foo@a", "insertText", new DocumentOffset(5, true));
 
             expect(renderer.count).toBe(1);
             expect(model.parts.length).toBe(1);
diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
deleted file mode 100644
index cbf62d0717a..00000000000
--- a/test/editor/operations-test.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import "../skinned-sdk"; // Must be first for skinning to work
-import EditorModel from "../../src/editor/model";
-import { createPartCreator, createRenderer } from "./mock";
-import { toggleInlineFormat } from "../../src/editor/operations";
-
-const SERIALIZED_NEWLINE = { "text": "\n", "type": "newline" };
-
-describe('editor/operations: formatting operations', () => {
-    describe('toggleInlineFormat', () => {
-        it('works for words', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.plain("hello world!"),
-            ], pc, renderer);
-
-            const range = model.startRange(model.positionForOffset(6, false),
-                model.positionForOffset(11, false));  // around "world"
-
-            expect(range.parts[0].text).toBe("world");
-            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
-            toggleInlineFormat(range, "_");
-            expect(model.serializeParts()).toEqual([{ "text": "hello _world_!", "type": "plain" }]);
-        });
-
-        it('works for parts of words', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.plain("hello world!"),
-            ], pc, renderer);
-
-            const range = model.startRange(model.positionForOffset(7, false),
-                model.positionForOffset(10, false));  // around "orl"
-
-            expect(range.parts[0].text).toBe("orl");
-            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
-            toggleInlineFormat(range, "*");
-            expect(model.serializeParts()).toEqual([{ "text": "hello w*orl*d!", "type": "plain" }]);
-        });
-
-        it('works for around pills', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.plain("hello there "),
-                pc.atRoomPill("@room"),
-                pc.plain(", how are you doing?"),
-            ], pc, renderer);
-
-            const range = model.startRange(model.positionForOffset(6, false),
-                model.positionForOffset(30, false));  // around "there @room, how are you"
-
-            expect(range.parts.map(p => p.text).join("")).toBe("there @room, how are you");
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello there ", "type": "plain" },
-                { "text": "@room", "type": "at-room-pill" },
-                { "text": ", how are you doing?", "type": "plain" },
-            ]);
-            toggleInlineFormat(range, "_");
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello _there ", "type": "plain" },
-                { "text": "@room", "type": "at-room-pill" },
-                { "text": ", how are you_ doing?", "type": "plain" },
-            ]);
-        });
-
-        it('works for a paragraph', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.plain("hello world,"),
-                pc.newline(),
-                pc.plain("how are you doing?"),
-            ], pc, renderer);
-
-            const range = model.startRange(model.positionForOffset(6, false),
-                model.positionForOffset(16, false));  // around "world,\nhow"
-
-            expect(range.parts.map(p => p.text).join("")).toBe("world,\nhow");
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?", "type": "plain" },
-            ]);
-            toggleInlineFormat(range, "**");
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello **world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how** are you doing?", "type": "plain" },
-            ]);
-        });
-
-        it('works for a paragraph with spurious breaks around it in selected range', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.newline(),
-                pc.newline(),
-                pc.plain("hello world,"),
-                pc.newline(),
-                pc.plain("how are you doing?"),
-                pc.newline(),
-                pc.newline(),
-            ], pc, renderer);
-
-            const range = model.startRange(model.positionForOffset(0, false), model.getPositionAtEnd());  // select-all
-
-            expect(range.parts.map(p => p.text).join("")).toBe("\n\nhello world,\nhow are you doing?\n\n");
-            expect(model.serializeParts()).toEqual([
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-                { "text": "hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-            ]);
-            toggleInlineFormat(range, "**");
-            expect(model.serializeParts()).toEqual([
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-                { "text": "**hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?**", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-            ]);
-        });
-
-        it('works for multiple paragraph', () => {
-            const renderer = createRenderer();
-            const pc = createPartCreator();
-            const model = new EditorModel([
-                pc.plain("hello world,"),
-                pc.newline(),
-                pc.plain("how are you doing?"),
-                pc.newline(),
-                pc.newline(),
-                pc.plain("new paragraph"),
-            ], pc, renderer);
-
-            let range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
-
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-                { "text": "new paragraph", "type": "plain" },
-            ]);
-            toggleInlineFormat(range, "__");
-            expect(model.serializeParts()).toEqual([
-                { "text": "__hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?__", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-                { "text": "__new paragraph__", "type": "plain" },
-            ]);
-            range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
-            toggleInlineFormat(range, "__");
-            expect(model.serializeParts()).toEqual([
-                { "text": "hello world,", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                { "text": "how are you doing?", "type": "plain" },
-                SERIALIZED_NEWLINE,
-                SERIALIZED_NEWLINE,
-                { "text": "new paragraph", "type": "plain" },
-            ]);
-        });
-    });
-});
diff --git a/test/editor/operations-test.ts b/test/editor/operations-test.ts
new file mode 100644
index 00000000000..3e4de224179
--- /dev/null
+++ b/test/editor/operations-test.ts
@@ -0,0 +1,466 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EditorModel from "../../src/editor/model";
+import { createPartCreator, createRenderer } from "./mock";
+import {
+    toggleInlineFormat,
+    selectRangeOfWordAtCaret,
+    formatRange,
+    formatRangeAsCode,
+} from "../../src/editor/operations";
+import { Formatting } from "../../src/components/views/rooms/MessageComposerFormatBar";
+import { longestBacktickSequence } from '../../src/editor/deserialize';
+
+const SERIALIZED_NEWLINE = { "text": "\n", "type": "newline" };
+
+describe('editor/operations: formatting operations', () => {
+    describe('toggleInlineFormat', () => {
+        it('works for words', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world!"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(11, false));  // around "world"
+
+            expect(range.parts[0].text).toBe("world");
+            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
+            formatRange(range, Formatting.Italics);
+            expect(model.serializeParts()).toEqual([{ "text": "hello _world_!", "type": "plain" }]);
+        });
+
+        describe('escape backticks', () => {
+            it('works for escaping backticks in between texts', () => {
+                const renderer = createRenderer();
+                const pc = createPartCreator();
+                const model = new EditorModel([
+                    pc.plain("hello ` world!"),
+                ], pc, renderer);
+
+                const range = model.startRange(model.positionForOffset(0, false),
+                    model.positionForOffset(13, false));  // hello ` world
+
+                expect(range.parts[0].text.trim().includes("`")).toBeTruthy();
+                expect(longestBacktickSequence(range.parts[0].text.trim())).toBe(1);
+                expect(model.serializeParts()).toEqual([{ "text": "hello ` world!", "type": "plain" }]);
+                formatRangeAsCode(range);
+                expect(model.serializeParts()).toEqual([{ "text": "``hello ` world``!", "type": "plain" }]);
+            });
+
+            it('escapes longer backticks in between text', () => {
+                const renderer = createRenderer();
+                const pc = createPartCreator();
+                const model = new EditorModel([
+                    pc.plain("hello```world"),
+                ], pc, renderer);
+
+                const range = model.startRange(model.positionForOffset(0, false),
+                    model.getPositionAtEnd());  // hello```world
+
+                expect(range.parts[0].text.includes("`")).toBeTruthy();
+                expect(longestBacktickSequence(range.parts[0].text)).toBe(3);
+                expect(model.serializeParts()).toEqual([{ "text": "hello```world", "type": "plain" }]);
+                formatRangeAsCode(range);
+                expect(model.serializeParts()).toEqual([{ "text": "````hello```world````", "type": "plain" }]);
+            });
+
+            it('escapes non-consecutive with varying length backticks in between text', () => {
+                const renderer = createRenderer();
+                const pc = createPartCreator();
+                const model = new EditorModel([
+                    pc.plain("hell```o`w`o``rld"),
+                ], pc, renderer);
+
+                const range = model.startRange(model.positionForOffset(0, false),
+                    model.getPositionAtEnd());  // hell```o`w`o``rld
+                expect(range.parts[0].text.includes("`")).toBeTruthy();
+                expect(longestBacktickSequence(range.parts[0].text)).toBe(3);
+                expect(model.serializeParts()).toEqual([{ "text": "hell```o`w`o``rld", "type": "plain" }]);
+                formatRangeAsCode(range);
+                expect(model.serializeParts()).toEqual([{ "text": "````hell```o`w`o``rld````", "type": "plain" }]);
+            });
+
+            it('untoggles correctly if its already formatted', () => {
+                const renderer = createRenderer();
+                const pc = createPartCreator();
+                const model = new EditorModel([
+                    pc.plain("```hello``world```"),
+                ], pc, renderer);
+
+                const range = model.startRange(model.positionForOffset(0, false),
+                    model.getPositionAtEnd());  // hello``world
+                expect(range.parts[0].text.includes("`")).toBeTruthy();
+                expect(longestBacktickSequence(range.parts[0].text)).toBe(3);
+                expect(model.serializeParts()).toEqual([{ "text": "```hello``world```", "type": "plain" }]);
+                formatRangeAsCode(range);
+                expect(model.serializeParts()).toEqual([{ "text": "hello``world", "type": "plain" }]);
+            });
+            it('untoggles correctly it contains varying length of backticks between text', () => {
+                const renderer = createRenderer();
+                const pc = createPartCreator();
+                const model = new EditorModel([
+                    pc.plain("````hell```o`w`o``rld````"),
+                ], pc, renderer);
+
+                const range = model.startRange(model.positionForOffset(0, false),
+                    model.getPositionAtEnd());  // hell```o`w`o``rld
+                expect(range.parts[0].text.includes("`")).toBeTruthy();
+                expect(longestBacktickSequence(range.parts[0].text)).toBe(4);
+                expect(model.serializeParts()).toEqual([{ "text": "````hell```o`w`o``rld````", "type": "plain" }]);
+                formatRangeAsCode(range);
+                expect(model.serializeParts()).toEqual([{ "text": "hell```o`w`o``rld", "type": "plain" }]);
+            });
+        });
+
+        it('works for parts of words', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world!"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(7, false),
+                model.positionForOffset(10, false));  // around "orl"
+
+            expect(range.parts[0].text).toBe("orl");
+            expect(model.serializeParts()).toEqual([{ "text": "hello world!", "type": "plain" }]);
+            toggleInlineFormat(range, "*");
+            expect(model.serializeParts()).toEqual([{ "text": "hello w*orl*d!", "type": "plain" }]);
+        });
+
+        it('works for around pills', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello there "),
+                pc.atRoomPill("@room"),
+                pc.plain(", how are you doing?"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(30, false));  // around "there @room, how are you"
+
+            expect(range.parts.map(p => p.text).join("")).toBe("there @room, how are you");
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello there ", "type": "plain" },
+                { "text": "@room", "type": "at-room-pill" },
+                { "text": ", how are you doing?", "type": "plain" },
+            ]);
+            formatRange(range, Formatting.Italics);
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello _there ", "type": "plain" },
+                { "text": "@room", "type": "at-room-pill" },
+                { "text": ", how are you_ doing?", "type": "plain" },
+            ]);
+        });
+
+        it('works for a paragraph', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(16, false));  // around "world,\nhow"
+
+            expect(range.parts.map(p => p.text).join("")).toBe("world,\nhow");
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?", "type": "plain" },
+            ]);
+            formatRange(range, Formatting.Bold);
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello **world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how** are you doing?", "type": "plain" },
+            ]);
+        });
+
+        it('works for a paragraph with spurious breaks around it in selected range', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.newline(),
+                pc.newline(),
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+                pc.newline(),
+                pc.newline(),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(0, false), model.getPositionAtEnd());  // select-all
+
+            expect(range.parts.map(p => p.text).join("")).toBe("\n\nhello world,\nhow are you doing?\n\n");
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+            ]);
+            formatRange(range, Formatting.Bold);
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "**hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?**", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+            ]);
+        });
+
+        it('works for multiple paragraph', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+                pc.newline(),
+                pc.newline(),
+                pc.plain("new paragraph"),
+            ], pc, renderer);
+
+            let range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "new paragraph", "type": "plain" },
+            ]);
+            toggleInlineFormat(range, "__");
+            expect(model.serializeParts()).toEqual([
+                { "text": "__hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?__", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "__new paragraph__", "type": "plain" },
+            ]);
+            range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
+            toggleInlineFormat(range, "__");
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello world,", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "how are you doing?", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "new paragraph", "type": "plain" },
+            ]);
+        });
+
+        it('format word at caret position at beginning of new line without previous selection', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.newline(),
+                pc.plain("hello!"),
+            ], pc, renderer);
+
+            let range = model.startRange(model.positionForOffset(1, false));
+
+            // Initial position should equal start and end since we did not select anything
+            expect(range.getLastStartingPosition()).toBe(range.start);
+            expect(range.getLastStartingPosition()).toBe(range.end);
+
+            formatRange(range, Formatting.Bold); // Toggle
+
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                { "text": "**hello!**", "type": "plain" },
+            ]);
+
+            formatRange(range, Formatting.Bold); // Untoggle
+
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                { "text": "hello!", "type": "plain" },
+            ]);
+
+            // Check if it also works for code as it uses toggleInlineFormatting only indirectly
+            range = model.startRange(model.positionForOffset(1, false));
+            selectRangeOfWordAtCaret(range);
+
+            formatRange(range, Formatting.Code); // Toggle
+
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                { "text": "`hello!`", "type": "plain" },
+            ]);
+
+            formatRange(range, Formatting.Code); // Untoggle
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                { "text": "hello!", "type": "plain" },
+            ]);
+        });
+
+        it('caret resets correctly to current line when untoggling formatting while caret at line end', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello **hello!**"),
+                pc.newline(),
+                pc.plain("world"),
+            ], pc, renderer);
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello **hello!**", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "world", "type": "plain" },
+            ]);
+
+            const endOfFirstLine = 16;
+            const range = model.startRange(model.positionForOffset(endOfFirstLine, true));
+
+            formatRange(range, Formatting.Bold); // Untoggle
+            formatRange(range, Formatting.Italics); // Toggle
+
+            // We expect formatting to still happen in the first line as the caret should not jump down
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello _hello!_", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "world", "type": "plain" },
+            ]);
+        });
+
+        it('format link in front of new line part', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello!"),
+                pc.newline(),
+                pc.plain("world!"),
+                pc.newline(),
+            ], pc, renderer);
+
+            let range = model.startRange(model.getPositionAtEnd().asOffset(model).add(-1).asPosition(model)); // select-all
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello!", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "world!", "type": "plain" },
+                SERIALIZED_NEWLINE,
+            ]);
+
+            formatRange(range, Formatting.InsertLink); // Toggle
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello!", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "[world!]()", "type": "plain" },
+                SERIALIZED_NEWLINE,
+            ]);
+
+            range = model.startRange(model.getPositionAtEnd().asOffset(model).add(-1).asPosition(model)); // select-all
+            formatRange(range, Formatting.InsertLink); // Untoggle
+            expect(model.serializeParts()).toEqual([
+                { "text": "hello!", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "world!", "type": "plain" },
+                SERIALIZED_NEWLINE,
+            ]);
+        });
+
+        it('format multi line code', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("int x = 1;"),
+                pc.newline(),
+                pc.newline(),
+                pc.plain("int y = 42;"),
+            ], pc, renderer);
+
+            let range = model.startRange(model.positionForOffset(0), model.getPositionAtEnd()); // select-all
+
+            expect(range.parts.map(p => p.text).join("")).toBe("int x = 1;\n\nint y = 42;");
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "int x = 1;", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "int y = 42;", "type": "plain" },
+            ]);
+
+            formatRange(range, Formatting.Code); // Toggle
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "```", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "int x = 1;", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "int y = 42;", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                { "text": "```", "type": "plain" },
+            ]);
+
+            range = model.startRange(model.positionForOffset(0, false), model.getPositionAtEnd()); // select-all
+            formatRange(range, Formatting.Code); // Untoggle
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "int x = 1;", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "int y = 42;", "type": "plain" },
+            ]);
+        });
+
+        it('does not format pure white space', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("       "),
+                pc.newline(),
+                pc.newline(),
+                pc.plain("         "),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(0), model.getPositionAtEnd()); // select-all
+            expect(range.parts.map(p => p.text).join("")).toBe("       \n\n         ");
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "       ", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "         ", "type": "plain" },
+            ]);
+
+            formatRange(range, Formatting.Bold);
+
+            expect(model.serializeParts()).toEqual([
+                { "text": "       ", "type": "plain" },
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                { "text": "         ", "type": "plain" },
+            ]);
+        });
+    });
+});
diff --git a/test/editor/position-test.js b/test/editor/position-test.ts
similarity index 96%
rename from test/editor/position-test.js
rename to test/editor/position-test.ts
index ea8658b216f..fe7395fdc44 100644
--- a/test/editor/position-test.js
+++ b/test/editor/position-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator } from "./mock";
 
@@ -38,7 +37,7 @@ describe('editor/position', function() {
     it('move first position forwards in empty model', function() {
         const model = new EditorModel([], createPartCreator(), createRenderer());
         const pos = model.positionForOffset(0, true);
-        const pos2 = pos.forwardsWhile(() => true);
+        const pos2 = pos.forwardsWhile(model, () => true);
         expect(pos).toBe(pos2);
     });
     it('move forwards within one part', function() {
diff --git a/test/editor/range-test.js b/test/editor/range-test.ts
similarity index 88%
rename from test/editor/range-test.js
rename to test/editor/range-test.ts
index 87c5b06e44f..d0122146a5f 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import EditorModel from "../../src/editor/model";
 import { createPartCreator, createRenderer } from "./mock";
 
@@ -104,4 +103,21 @@ describe('editor/range', function() {
         range.trim();
         expect(range.parts[0].text).toBe("abc");
     });
+    // test for edge case when the selection just consists of whitespace
+    it('range trim just whitespace', () => {
+        const renderer = createRenderer();
+        const pc = createPartCreator();
+        const whitespace = "  \n    \n\n";
+        const model = new EditorModel([
+            pc.plain(whitespace),
+        ], pc, renderer);
+        const range = model.startRange(
+            model.positionForOffset(0, false),
+            model.getPositionAtEnd(),
+        );
+
+        expect(range.text).toBe(whitespace);
+        range.trim();
+        expect(range.text).toBe("");
+    });
 });
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
deleted file mode 100644
index 085a8afdbae..00000000000
--- a/test/editor/serialize-test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import "../skinned-sdk"; // Must be first for skinning to work
-import EditorModel from "../../src/editor/model";
-import { htmlSerializeIfNeeded } from "../../src/editor/serialize";
-import { createPartCreator } from "./mock";
-
-describe('editor/serialize', function() {
-    it('user pill turns message into html', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.userPill("Alice", "@alice:hs.tld")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@alice:hs.tld\">Alice</a>");
-    });
-    it('room pill turns message into html', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.roomPill("#room:hs.tld")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/#room:hs.tld\">#room:hs.tld</a>");
-    });
-    it('@room pill turns message into html', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.atRoomPill("@room")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBeFalsy();
-    });
-    it('any markdown turns message into html', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.plain("*hello* world")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<em>hello</em> world");
-    });
-    it('displaynames ending in a backslash work', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.userPill("Displayname\\", "@user:server")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\\</a>");
-    });
-    it('displaynames containing an opening square bracket work', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.userPill("Displayname[[", "@user:server")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname[[</a>");
-    });
-    it('displaynames containing a closing square bracket work', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.userPill("Displayname]", "@user:server")]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname]</a>");
-    });
-    it('escaped markdown should not retain backslashes', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.plain('\\*hello\\* world')]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe('*hello* world');
-    });
-    it('escaped markdown should convert HTML entities', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.plain('\\*hello\\* world < hey world!')]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe('*hello* world &lt; hey world!');
-    });
-});
diff --git a/test/editor/serialize-test.ts b/test/editor/serialize-test.ts
new file mode 100644
index 00000000000..d9482859015
--- /dev/null
+++ b/test/editor/serialize-test.ts
@@ -0,0 +1,98 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EditorModel from "../../src/editor/model";
+import { htmlSerializeIfNeeded } from "../../src/editor/serialize";
+import { createPartCreator } from "./mock";
+
+describe('editor/serialize', function() {
+    describe('with markdown', function() {
+        it('user pill turns message into html', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.userPill("Alice", "@alice:hs.tld")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<a href=\"https://matrix.to/#/@alice:hs.tld\">Alice</a>");
+        });
+        it('room pill turns message into html', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.roomPill("#room:hs.tld")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<a href=\"https://matrix.to/#/#room:hs.tld\">#room:hs.tld</a>");
+        });
+        it('@room pill turns message into html', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.atRoomPill("@room")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBeFalsy();
+        });
+        it('any markdown turns message into html', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain("*hello* world")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<em>hello</em> world");
+        });
+        it('displaynames ending in a backslash work', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.userPill("Displayname\\", "@user:server")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\\</a>");
+        });
+        it('displaynames containing an opening square bracket work', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.userPill("Displayname[[", "@user:server")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname[[</a>");
+        });
+        it('displaynames containing a closing square bracket work', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.userPill("Displayname]", "@user:server")], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname]</a>");
+        });
+        it('escaped markdown should not retain backslashes', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain('\\*hello\\* world')], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe('*hello* world');
+        });
+        it('escaped markdown should convert HTML entities', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain('\\*hello\\* world < hey world!')], pc);
+            const html = htmlSerializeIfNeeded(model, {});
+            expect(html).toBe('*hello* world &lt; hey world!');
+        });
+    });
+    describe('with plaintext', function() {
+        it('markdown remains plaintext', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain("*hello* world")], pc);
+            const html = htmlSerializeIfNeeded(model, { useMarkdown: false });
+            expect(html).toBe("*hello* world");
+        });
+        it('markdown should retain backslashes', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain('\\*hello\\* world')], pc);
+            const html = htmlSerializeIfNeeded(model, { useMarkdown: false });
+            expect(html).toBe('\\*hello\\* world');
+        });
+        it('markdown should convert HTML entities', function() {
+            const pc = createPartCreator();
+            const model = new EditorModel([pc.plain('\\*hello\\* world < hey world!')], pc);
+            const html = htmlSerializeIfNeeded(model, { useMarkdown: false });
+            expect(html).toBe('\\*hello\\* world &lt; hey world!');
+        });
+    });
+});
diff --git a/test/end-to-end-tests/.gitignore b/test/end-to-end-tests/.gitignore
index 528c296f931..a604178f5fd 100644
--- a/test/end-to-end-tests/.gitignore
+++ b/test/end-to-end-tests/.gitignore
@@ -4,3 +4,4 @@ element/env
 performance-entries.json
 lib
 logs
+homeserver.log
diff --git a/test/end-to-end-tests/README.md b/test/end-to-end-tests/README.md
index b173fb86c2d..dc5022b405e 100644
--- a/test/end-to-end-tests/README.md
+++ b/test/end-to-end-tests/README.md
@@ -32,6 +32,12 @@ start.js accepts these parameters (and more, see `node start.js --help`) that ca
  - `--windowed` run the tests in an actual browser window Try to limit interacting with the windows while the tests are running. Hovering over the window tends to fail the tests, dragging the title bar should be fine though.
  - `--dev-tools` open the devtools in the browser window, only applies if `--windowed` is set as well.
 
+For god level debug (e.g. for debugging slow tests):
+
+`env DEBUG="puppeteer:*" ./test/end-to-end-tests/run.sh --app-url http://localhost:8080 --log-directory `pwd`/logs --dev-tools --windowed` 2>&1 | cat
+
+(piping everything through cat means you get proper timestamps on the debugging, and the chromiums hang around at the end)
+
 Developer Guide
 ===============
 
@@ -40,3 +46,4 @@ https://github.com/matrix-org/synapse/tree/master/CONTRIBUTING.rst
 
 Please follow the Matrix JS/React code style as per:
 https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md
+
diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
index f276843d170..4fbf42d1603 100644
--- a/test/end-to-end-tests/Windows.md
+++ b/test/end-to-end-tests/Windows.md
@@ -24,8 +24,7 @@ and start following these steps to get going:
    sudo dpkg -i google-chrome-stable_current_amd64.deb
    sudo apt -f install
    ```
-8. Get the IP of your host machine out of WSL: `cat /etc/resolv.conf` - use the nameserver IP.
-9. Run:
+8. Run:
    ```bash
    cd ./test/end-to-end-tests
    ./synapse/install.sh
diff --git a/test/end-to-end-tests/element/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh
index 7551888f1c7..ffc57c60c9f 100755
--- a/test/end-to-end-tests/element/install-webserver.sh
+++ b/test/end-to-end-tests/element/install-webserver.sh
@@ -10,10 +10,7 @@ cd $BASE_DIR
     source env/bin/activate
 
     pip install --upgrade pip
-
-    # Pin setuptools to work around crash bug in v60
-    # See https://github.com/vector-im/element-web/issues/20287
-    pip install setuptools==v59.8.0
+    pip install --upgrade setuptools
 
     pip install ComplexHttpServer
 
diff --git a/test/end-to-end-tests/pick-synapse-log-file.js b/test/end-to-end-tests/pick-synapse-log-file.js
new file mode 100644
index 00000000000..aaefd0dfd2d
--- /dev/null
+++ b/test/end-to-end-tests/pick-synapse-log-file.js
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+const path = require('path');
+
+// used from run.sh as getopts doesn't support long parameters
+const idx = process.argv.indexOf("--log-directory");
+if (idx !== -1) {
+    const value = process.argv[idx + 1];
+    process.stdout.write(path.join(path.resolve(value), 'homeserver.log'));
+} else {
+    process.stdout.write(path.join(process.cwd(), 'homeserver.log'));
+}
diff --git a/test/end-to-end-tests/run.sh b/test/end-to-end-tests/run.sh
index b65ce2a9567..f60a2cb30d7 100755
--- a/test/end-to-end-tests/run.sh
+++ b/test/end-to-end-tests/run.sh
@@ -10,6 +10,8 @@ echo "Please first run $BASE_DIR/install.sh"
 fi
 
 has_custom_app=$(node has-custom-app.js $@)
+synapse_log_file=$(node pick-synapse-log-file.js $@)
+touch $synapse_log_file
 
 if [ ! -d "element/element-web" ] && [ $has_custom_app -ne "1" ]; then
     echo "Please provide an instance of Element to test against by passing --app-url <url> or running $BASE_DIR/element/install.sh"
@@ -25,13 +27,14 @@ stop_servers() {
 
 handle_error() {
 	EXIT_CODE=$?
+	echo "Tests fell over with a non-zero exit code: stopping servers"
 	stop_servers
 	exit $EXIT_CODE
 }
 
 trap 'handle_error' ERR
 
-./synapse/start.sh
+LOGFILE=$synapse_log_file ./synapse/start.sh
 reg_secret=`./synapse/getcfg.sh registration_shared_secret`
 if [ $has_custom_app -ne "1" ]; then
     ./element/start.sh
diff --git a/test/end-to-end-tests/src/logger.ts b/test/end-to-end-tests/src/logger.ts
index 99c1acef098..194cd3761f4 100644
--- a/test/end-to-end-tests/src/logger.ts
+++ b/test/end-to-end-tests/src/logger.ts
@@ -24,7 +24,7 @@ export class Logger {
     public startGroup(description: string): Logger {
         if (!this.muted) {
             const indent = " ".repeat(this.indent * 2);
-            console.log(`${indent} * ${this.username} ${description}:`);
+            console.log(`${new Date().toISOString()} ${indent} * ${this.username} ${description}:`);
         }
         this.indent += 1;
         return this;
@@ -38,7 +38,7 @@ export class Logger {
     public step(description: string): Logger {
         if (!this.muted) {
             const indent = " ".repeat(this.indent * 2);
-            process.stdout.write(`${indent} * ${this.username} ${description} ... `);
+            process.stdout.write(`${new Date().toISOString()} ${indent} * ${this.username} ${description} ... `);
         }
         return this;
     }
diff --git a/test/end-to-end-tests/src/rest/room.ts b/test/end-to-end-tests/src/rest/room.ts
index da5f91a6070..2261f959936 100644
--- a/test/end-to-end-tests/src/rest/room.ts
+++ b/test/end-to-end-tests/src/rest/room.ts
@@ -20,19 +20,19 @@ import uuidv4 = require('uuid/v4');
 import { RestSession } from "./session";
 import { Logger } from "../logger";
 
-/* no pun intented */
+/* no pun intended */
 export class RestRoom {
     constructor(readonly session: RestSession, readonly roomId: string, readonly log: Logger) {}
 
-    async talk(message: string): Promise<void> {
+    async talk(message: string): Promise<string> {
         this.log.step(`says "${message}" in ${this.roomId}`);
         const txId = uuidv4();
-        await this.session.put(`/rooms/${this.roomId}/send/m.room.message/${txId}`, {
+        const { event_id: eventId } = await this.session.put(`/rooms/${this.roomId}/send/m.room.message/${txId}`, {
             "msgtype": "m.text",
             "body": message,
         });
         this.log.done();
-        return txId;
+        return eventId;
     }
 
     async leave(): Promise<void> {
diff --git a/test/end-to-end-tests/src/rest/session.ts b/test/end-to-end-tests/src/rest/session.ts
index 3e5245f3e0a..a6536ac3a6e 100644
--- a/test/end-to-end-tests/src/rest/session.ts
+++ b/test/end-to-end-tests/src/rest/session.ts
@@ -42,7 +42,7 @@ export class RestSession {
     }
 
     userName(): string {
-        return this.credentials.userId.split(":")[0].substr(1);
+        return this.credentials.userId.split(":")[0].slice(1);
     }
 
     displayName(): string {
diff --git a/test/end-to-end-tests/src/scenario.ts b/test/end-to-end-tests/src/scenario.ts
index e6a588eac96..4ce762f36f4 100644
--- a/test/end-to-end-tests/src/scenario.ts
+++ b/test/end-to-end-tests/src/scenario.ts
@@ -30,6 +30,8 @@ import { stickerScenarios } from './scenarios/sticker';
 import { userViewScenarios } from "./scenarios/user-view";
 import { ssoCustomisationScenarios } from "./scenarios/sso-customisations";
 import { updateScenarios } from "./scenarios/update";
+import { threadsScenarios } from "./scenarios/threads";
+import { enableThreads } from "./usecases/threads";
 
 export async function scenario(createSession: (s: string) => Promise<ElementSession>,
     restCreator: RestSessionCreator): Promise<void> {
@@ -41,6 +43,7 @@ export async function scenario(createSession: (s: string) => Promise<ElementSess
             console.log(`running tests on ${await session.browser.version()} ...`);
             firstUser = false;
         }
+        // ported to cyprus (registration test)
         await signup(session, session.username, 'testsarefun!!!', session.hsUrl);
         return session;
     }
@@ -48,6 +51,12 @@ export async function scenario(createSession: (s: string) => Promise<ElementSess
     const alice = await createUser("alice");
     const bob = await createUser("bob");
 
+    // Enable threads for Alice & Bob before going any further as it requires refreshing the app
+    // which otherwise loses all performance ticks.
+    console.log("Enabling threads: ");
+    await enableThreads(alice);
+    await enableThreads(bob);
+
     await toastScenarios(alice, bob);
     await userViewScenarios(alice, bob);
     await roomDirectoryScenarios(alice, bob);
@@ -55,6 +64,7 @@ export async function scenario(createSession: (s: string) => Promise<ElementSess
     console.log("create REST users:");
     const charlies = await createRestUsers(restCreator);
     await lazyLoadingScenarios(alice, bob, charlies);
+    await threadsScenarios(alice, bob);
     // do spaces scenarios last as the rest of the alice/bob tests may get confused by spaces
     await spacesScenarios(alice, bob);
 
diff --git a/test/end-to-end-tests/src/scenarios/threads.ts b/test/end-to-end-tests/src/scenarios/threads.ts
new file mode 100644
index 00000000000..acc228b6d3c
--- /dev/null
+++ b/test/end-to-end-tests/src/scenarios/threads.ts
@@ -0,0 +1,83 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ElementSession } from "../session";
+import {
+    assertTimelineThreadSummary,
+    clickTimelineThreadSummary,
+    editThreadMessage,
+    reactThreadMessage,
+    redactThreadMessage,
+    sendThreadMessage,
+    startThread,
+} from "../usecases/threads";
+import { sendMessage } from "../usecases/send-message";
+import {
+    assertThreadListHasUnreadIndicator,
+    clickLatestThreadInThreadListPanel,
+    closeRoomRightPanel,
+    openThreadListPanel,
+} from "../usecases/rightpanel";
+
+export async function threadsScenarios(alice: ElementSession, bob: ElementSession): Promise<void> {
+    console.log(" threads tests:");
+
+    // Alice sends message
+    await sendMessage(alice, "Hey bob, what do you think about X?");
+
+    // Bob responds via a thread
+    await startThread(bob, "I think its Y!");
+
+    // Alice sees thread summary and opens thread panel
+    await assertTimelineThreadSummary(alice, "bob", "I think its Y!");
+    await assertTimelineThreadSummary(bob, "bob", "I think its Y!");
+    await clickTimelineThreadSummary(alice);
+
+    // Bob closes right panel
+    await closeRoomRightPanel(bob);
+
+    // Alice responds in thread
+    await sendThreadMessage(alice, "Great!");
+    await assertTimelineThreadSummary(alice, "alice", "Great!");
+    await assertTimelineThreadSummary(bob, "alice", "Great!");
+
+    // Alice reacts to Bob's message instead
+    await reactThreadMessage(alice, "😁");
+    await assertTimelineThreadSummary(alice, "alice", "Great!");
+    await assertTimelineThreadSummary(bob, "alice", "Great!");
+    await redactThreadMessage(alice);
+    await assertTimelineThreadSummary(alice, "bob", "I think its Y!");
+    await assertTimelineThreadSummary(bob, "bob", "I think its Y!");
+
+    // Bob sees notification dot on the thread header icon
+    await assertThreadListHasUnreadIndicator(bob);
+
+    // Bob opens thread list and inspects it
+    await openThreadListPanel(bob);
+
+    // Bob opens thread in right panel via thread list
+    await clickLatestThreadInThreadListPanel(bob);
+
+    // Bob responds to thread
+    await sendThreadMessage(bob, "Testing threads s'more :)");
+    await assertTimelineThreadSummary(alice, "bob", "Testing threads s'more :)");
+    await assertTimelineThreadSummary(bob, "bob", "Testing threads s'more :)");
+
+    // Bob edits thread response
+    await editThreadMessage(bob, "Testing threads some more :)");
+    await assertTimelineThreadSummary(alice, "bob", "Testing threads some more :)");
+    await assertTimelineThreadSummary(bob, "bob", "Testing threads some more :)");
+}
diff --git a/test/end-to-end-tests/src/scenarios/toast.ts b/test/end-to-end-tests/src/scenarios/toast.ts
index c8f094f840b..bf7dbe809b6 100644
--- a/test/end-to-end-tests/src/scenarios/toast.ts
+++ b/test/end-to-end-tests/src/scenarios/toast.ts
@@ -21,10 +21,6 @@ export async function toastScenarios(alice: ElementSession, bob: ElementSession)
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    alice.log.step(`reject desktop notifications toast`);
-    await rejectToast(alice, "Notifications");
-    alice.log.done();
-
     alice.log.step(`accepts analytics toast`);
     await acceptToast(alice, "Help improve Element");
     alice.log.done();
@@ -35,10 +31,6 @@ export async function toastScenarios(alice: ElementSession, bob: ElementSession)
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    bob.log.step(`reject desktop notifications toast`);
-    await rejectToast(bob, "Notifications");
-    bob.log.done();
-
     bob.log.step(`reject analytics toast`);
     await rejectToast(bob, "Help improve Element");
     bob.log.done();
diff --git a/test/end-to-end-tests/src/scenarios/update.ts b/test/end-to-end-tests/src/scenarios/update.ts
index 0e6b08f89a7..30d21c5feba 100644
--- a/test/end-to-end-tests/src/scenarios/update.ts
+++ b/test/end-to-end-tests/src/scenarios/update.ts
@@ -19,6 +19,8 @@ import { strict as assert } from 'assert';
 
 import { ElementSession } from "../session";
 
+const NEW_VERSION = "some-new-version";
+
 async function mockVersionHTTPResponse(session: ElementSession) {
     // Mock the HTTP response to return a new version to trigger auto-update behaviour
     await session.page.setRequestInterception(true);
@@ -29,7 +31,7 @@ async function mockVersionHTTPResponse(session: ElementSession) {
             request.respond({
                 contentType: "text/html",
                 status: 200,
-                body: "some-new-version",
+                body: NEW_VERSION,
             });
         } else {
             request.continue();
@@ -43,5 +45,5 @@ export async function updateScenarios(session: ElementSession) {
     await session.goto(session.url('/'));
     await session.waitForReload();
     const newUrl = new URL(session.page.url());
-    assert.equal(newUrl.searchParams.get("updated"), "1");
+    assert.equal(newUrl.searchParams.get("updated"), NEW_VERSION);
 }
diff --git a/test/end-to-end-tests/src/session.ts b/test/end-to-end-tests/src/session.ts
index 84f22c4b0cb..86f612b0afa 100644
--- a/test/end-to-end-tests/src/session.ts
+++ b/test/end-to-end-tests/src/session.ts
@@ -40,7 +40,8 @@ export class ElementSession {
             "requestfinished", async (req: puppeteer.HTTPRequest) => {
                 const type = req.resourceType();
                 const response = await req.response();
-                return `${type} ${response.status()} ${req.method()} ${req.url()} \n`;
+                return new Date().toISOString() +
+                       ` ${type} ${response?.status() ?? '<no response>'} ${req.method()} ${req.url()} \n`;
             });
         this.log = new Logger(this.username);
     }
@@ -130,11 +131,18 @@ export class ElementSession {
         await input.type(text);
     }
 
-    public query(selector: string, timeout: number = DEFAULT_TIMEOUT,
-        hidden = false): Promise<puppeteer.ElementHandle> {
+    public query(
+        selector: string,
+        timeout: number = DEFAULT_TIMEOUT,
+        hidden = false,
+    ): Promise<puppeteer.ElementHandle> {
         return this.page.waitForSelector(selector, { visible: true, timeout, hidden });
     }
 
+    public queryWithoutWaiting(selector: string): Promise<puppeteer.ElementHandle> {
+        return this.page.$(selector);
+    }
+
     public async queryAll(selector: string): Promise<puppeteer.ElementHandle[]> {
         const timeout = DEFAULT_TIMEOUT;
         await this.query(selector, timeout);
diff --git a/test/end-to-end-tests/src/usecases/accept-invite.ts b/test/end-to-end-tests/src/usecases/accept-invite.ts
index 76510af8b93..727497dad61 100644
--- a/test/end-to-end-tests/src/usecases/accept-invite.ts
+++ b/test/end-to-end-tests/src/usecases/accept-invite.ts
@@ -21,7 +21,7 @@ import { ElementSession } from "../session";
 export async function acceptInvite(session: ElementSession, name: string): Promise<void> {
     session.log.step(`accepts "${name}" invite`);
     const inviteSublist = await findSublist(session, "invites");
-    const invitesHandles = await inviteSublist.$$(".mx_RoomTile_name");
+    const invitesHandles = await inviteSublist.$$(".mx_RoomTile_title");
     const invitesWithText = await Promise.all(invitesHandles.map(async (inviteHandle) => {
         const text = await session.innerText(inviteHandle);
         return { inviteHandle, text };
diff --git a/test/end-to-end-tests/src/usecases/create-room.ts b/test/end-to-end-tests/src/usecases/create-room.ts
index 8736e785bac..b0e7738fb4e 100644
--- a/test/end-to-end-tests/src/usecases/create-room.ts
+++ b/test/end-to-end-tests/src/usecases/create-room.ts
@@ -36,7 +36,7 @@ export async function createRoom(session: ElementSession, roomName: string, encr
     const addRoomButton = await roomsSublist.$(".mx_RoomSublist_auxButton");
     await addRoomButton.click();
 
-    const createRoomButton = await session.query('.mx_AccessibleButton[aria-label="Create new room"]');
+    const createRoomButton = await session.query('.mx_AccessibleButton[aria-label="New room"]');
     await createRoomButton.click();
 
     const roomNameInput = await session.query('.mx_CreateRoomDialog_name input');
diff --git a/test/end-to-end-tests/src/usecases/create-space.ts b/test/end-to-end-tests/src/usecases/create-space.ts
index 7d3dad2788a..3fa2730f57d 100644
--- a/test/end-to-end-tests/src/usecases/create-space.ts
+++ b/test/end-to-end-tests/src/usecases/create-space.ts
@@ -64,7 +64,9 @@ export async function inviteSpace(session: ElementSession, spaceName: string, us
     await inviteButton.click();
 
     try {
-        const button = await session.query('.mx_SpacePublicShare_inviteButton');
+        // You only get this interstitial if it's a public space, so give up after 200ms
+        // if it hasn't appeared
+        const button = await session.query('.mx_SpacePublicShare_inviteButton', 200);
         await button.click();
     } catch (e) {
         // ignore
diff --git a/test/end-to-end-tests/src/usecases/rightpanel.ts b/test/end-to-end-tests/src/usecases/rightpanel.ts
index 5a023178806..83417ccb1af 100644
--- a/test/end-to-end-tests/src/usecases/rightpanel.ts
+++ b/test/end-to-end-tests/src/usecases/rightpanel.ts
@@ -16,12 +16,37 @@ limitations under the License.
 
 import { ElementSession } from "../session";
 
+export async function closeRoomRightPanel(session: ElementSession): Promise<void> {
+    const button = await session.query(".mx_BaseCard_close");
+    await button.click();
+}
+
+export async function openThreadListPanel(session: ElementSession): Promise<void> {
+    await session.query('.mx_RoomHeader .mx_AccessibleButton[aria-label="Threads"]');
+    const button = await session.queryWithoutWaiting('.mx_RoomHeader .mx_AccessibleButton[aria-label="Threads"]' +
+        ':not(.mx_RightPanel_headerButton_highlight)');
+    await button?.click();
+}
+
+export async function assertThreadListHasUnreadIndicator(session: ElementSession): Promise<void> {
+    await session.query('.mx_RoomHeader .mx_AccessibleButton[aria-label="Threads"] ' +
+        '.mx_RightPanel_headerButton_unreadIndicator');
+}
+
+export async function clickLatestThreadInThreadListPanel(session: ElementSession): Promise<void> {
+    const threads = await session.queryAll(".mx_ThreadPanel .mx_EventTile");
+    await threads[threads.length - 1].click();
+}
+
 export async function openRoomRightPanel(session: ElementSession): Promise<void> {
-    try {
-        await session.query('.mx_RoomHeader .mx_RightPanel_headerButton_highlight[aria-label="Room Info"]');
-    } catch (e) {
+    // block until we have a roomSummaryButton
+    const roomSummaryButton = await session.query('.mx_RoomHeader .mx_AccessibleButton[aria-label="Room Info"]');
+    // check if it's highlighted
+    const highlightedRoomSummaryButton = await session.queryWithoutWaiting(
+        '.mx_RoomHeader .mx_RightPanel_headerButton_highlight[aria-label="Room Info"]',
+    );
+    if (!highlightedRoomSummaryButton) {
         // If the room summary is not yet open, open it
-        const roomSummaryButton = await session.query('.mx_RoomHeader .mx_AccessibleButton[aria-label="Room Info"]');
         await roomSummaryButton.click();
     }
 }
diff --git a/test/end-to-end-tests/src/usecases/room-settings.ts b/test/end-to-end-tests/src/usecases/room-settings.ts
index 72faa93a383..11fe69e46fe 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.ts
+++ b/test/end-to-end-tests/src/usecases/room-settings.ts
@@ -156,7 +156,8 @@ export async function checkRoomSettings(session: ElementSession, expectedSetting
 
 async function getValidationError(session: ElementSession): Promise<string | undefined> {
     try {
-        const validationDetail = await session.query(".mx_Validation_detail");
+        // give it 500ms to fail to produce a validation error
+        const validationDetail = await session.query(".mx_Validation_detail", 500);
         return session.innerText(validationDetail);
     } catch (e) {
         // no validation tooltips
diff --git a/test/end-to-end-tests/src/usecases/select-room.ts b/test/end-to-end-tests/src/usecases/select-room.ts
index 10a37fe5458..29bb726c5c8 100644
--- a/test/end-to-end-tests/src/usecases/select-room.ts
+++ b/test/end-to-end-tests/src/usecases/select-room.ts
@@ -20,7 +20,7 @@ import { ElementSession } from "../session";
 export async function selectRoom(session: ElementSession, name: string): Promise<void> {
     session.log.step(`select "${name}" room`);
     const inviteSublist = await findSublist(session, "rooms");
-    const invitesHandles = await inviteSublist.$$(".mx_RoomTile_name");
+    const invitesHandles = await inviteSublist.$$(".mx_RoomTile_title");
     const invitesWithText = await Promise.all(invitesHandles.map(async (roomHandle) => {
         const text = await session.innerText(roomHandle);
         return { roomHandle, text };
diff --git a/test/end-to-end-tests/src/usecases/signup.ts b/test/end-to-end-tests/src/usecases/signup.ts
index 55301c3108c..86d27205356 100644
--- a/test/end-to-end-tests/src/usecases/signup.ts
+++ b/test/end-to-end-tests/src/usecases/signup.ts
@@ -19,8 +19,12 @@ import { strict as assert } from 'assert';
 
 import { ElementSession } from "../session";
 
-export async function signup(session: ElementSession, username: string, password: string,
-    homeserver: string): Promise<void> {
+export async function signup(
+    session: ElementSession,
+    username: string,
+    password: string,
+    homeserver: string,
+): Promise<void> {
     session.log.step("signs up");
     await session.goto(session.url('/#/register'));
     // change the homeserver by clicking the advanced section
diff --git a/test/end-to-end-tests/src/usecases/threads.ts b/test/end-to-end-tests/src/usecases/threads.ts
new file mode 100644
index 00000000000..24ccd7064a8
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/threads.ts
@@ -0,0 +1,154 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { strict as assert } from "assert";
+
+import { ElementSession } from "../session";
+
+export async function enableThreads(session: ElementSession): Promise<void> {
+    session.log.step(`enables threads`);
+    await session.page.evaluate(() => {
+        window.localStorage.setItem("mx_seen_feature_thread_experimental", "1"); // inhibit dialog
+        window["mxSettingsStore"].setValue("feature_thread", null, "device", true);
+    });
+    session.log.done();
+}
+
+async function clickReplyInThread(session: ElementSession): Promise<void> {
+    const events = await session.queryAll(".mx_EventTile_line");
+    const event = events[events.length - 1];
+    await event.hover();
+    const button = await event.$(".mx_MessageActionBar_threadButton");
+    await button.click();
+}
+
+export async function sendThreadMessage(session: ElementSession, message: string): Promise<void> {
+    session.log.step(`sends thread response "${message}"`);
+    const composer = await session.query(".mx_ThreadView .mx_BasicMessageComposer_input");
+    await composer.click();
+    await composer.type(message);
+
+    const text = await session.innerText(composer);
+    assert.equal(text.trim(), message.trim());
+    await composer.press("Enter");
+    // wait for the message to appear sent
+    await session.query(".mx_ThreadView .mx_EventTile_last:not(.mx_EventTile_sending)");
+    session.log.done();
+}
+
+export async function editThreadMessage(session: ElementSession, message: string): Promise<void> {
+    session.log.step(`edits thread response "${message}"`);
+    const events = await session.queryAll(".mx_EventTile_line");
+    const event = events[events.length - 1];
+    await event.hover();
+    const button = await event.$(".mx_MessageActionBar_editButton");
+    await button.click();
+
+    const composer = await session.query(".mx_ThreadView .mx_EditMessageComposer .mx_BasicMessageComposer_input");
+    await composer.click({ clickCount: 3 });
+    await composer.type(message);
+
+    const text = await session.innerText(composer);
+    assert.equal(text.trim(), message.trim());
+    await composer.press("Enter");
+    // wait for the edit to appear sent
+    await session.query(".mx_ThreadView .mx_EventTile_last:not(.mx_EventTile_sending)");
+    session.log.done();
+}
+
+export async function redactThreadMessage(session: ElementSession): Promise<void> {
+    session.log.startGroup(`redacts latest thread response`);
+
+    const events = await session.queryAll(".mx_ThreadView .mx_EventTile_line");
+    const event = events[events.length - 1];
+    await event.hover();
+
+    session.log.step(`clicks the ... button`);
+    let button = await event.$('.mx_MessageActionBar [aria-label="Options"]');
+    await button.click();
+    session.log.done();
+
+    session.log.step(`clicks the remove option`);
+    button = await session.query('.mx_IconizedContextMenu_item[aria-label="Remove"]');
+    await button.click();
+    session.log.done();
+
+    session.log.step(`confirms in the dialog`);
+    button = await session.query(".mx_Dialog_primary");
+    await button.click();
+    session.log.done();
+
+    await session.query(".mx_ThreadView .mx_RedactedBody");
+    await session.delay(1000); // give the app a chance to settle
+
+    session.log.endGroup();
+}
+
+export async function reactThreadMessage(session: ElementSession, reaction: string): Promise<void> {
+    session.log.startGroup(`reacts to latest thread response`);
+
+    const events = await session.queryAll(".mx_ThreadView .mx_EventTile_line");
+    const event = events[events.length - 1];
+    await event.hover();
+
+    session.log.step(`clicks the reaction button`);
+    let button = await event.$('.mx_MessageActionBar [aria-label="React"]');
+    await button.click();
+    session.log.done();
+
+    session.log.step(`selects reaction`);
+    button = await session.query(`.mx_EmojiPicker_item_wrapper[aria-label=${reaction}]`);
+    await button.click;
+    session.log.done();
+
+    session.log.step(`clicks away`);
+    button = await session.query(".mx_ContextualMenu_background");
+    await button.click();
+    session.log.done();
+
+    session.log.endGroup();
+}
+
+export async function startThread(session: ElementSession, response: string): Promise<void> {
+    session.log.startGroup(`creates thread on latest message`);
+
+    await clickReplyInThread(session);
+    await sendThreadMessage(session, response);
+
+    session.log.endGroup();
+}
+
+export async function assertTimelineThreadSummary(
+    session: ElementSession,
+    sender: string,
+    content: string,
+): Promise<void> {
+    session.log.step("asserts the timeline thread summary is as expected");
+    const summaries = await session.queryAll(".mx_MainSplit_timeline .mx_ThreadSummary");
+    const summary = summaries[summaries.length - 1];
+    assert.equal(await session.innerText(await summary.$(".mx_ThreadSummary_sender")), sender);
+    assert.equal(await session.innerText(await summary.$(".mx_ThreadSummary_content")), content);
+    session.log.done();
+}
+
+export async function clickTimelineThreadSummary(session: ElementSession): Promise<void> {
+    session.log.step(`clicks the latest thread summary in the timeline`);
+
+    const summaries = await session.queryAll(".mx_MainSplit_timeline .mx_ThreadSummary");
+    await summaries[summaries.length - 1].click();
+
+    session.log.done();
+}
diff --git a/test/end-to-end-tests/src/usecases/timeline.ts b/test/end-to-end-tests/src/usecases/timeline.ts
index e0b3710b423..d12ccf9e19d 100644
--- a/test/end-to-end-tests/src/usecases/timeline.ts
+++ b/test/end-to-end-tests/src/usecases/timeline.ts
@@ -132,7 +132,7 @@ function getAllEventTiles(session: ElementSession): Promise<ElementHandle[]> {
 }
 
 async function getMessageFromEventTile(eventTile: ElementHandle): Promise<Message> {
-    const senderElement = await eventTile.$(".mx_SenderProfile_displayName");
+    const senderElement = await eventTile.$(".mx_DisambiguatedProfile_displayName");
     const className: string = await (await eventTile.getProperty("className")).jsonValue();
     const classNames = className.split(" ");
     const bodyElement = await eventTile.$(".mx_EventTile_body");
diff --git a/test/end-to-end-tests/src/util.ts b/test/end-to-end-tests/src/util.ts
index 1c4e78933aa..f45b23afcb0 100644
--- a/test/end-to-end-tests/src/util.ts
+++ b/test/end-to-end-tests/src/util.ts
@@ -57,11 +57,17 @@ export async function applyConfigChange(session: ElementSession, config: any): P
 
 export async function serializeLog(msg: ConsoleMessage): Promise<string> {
     // 9 characters padding is somewhat arbitrary ("warning".length + some)
-    let s = `${padEnd(msg.type(), 9, ' ')}| ${msg.text()} `; // trailing space is intentional
+    let s = `${new Date().toISOString()} | ${ padEnd(msg.type(), 9, ' ')}| ${msg.text()} `; // trailing space is intentional
     const args = msg.args();
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
-        const val = await arg.jsonValue();
+
+        let val;
+        try {
+            val = await arg.jsonValue();
+        } catch (error) {
+            val = `<error: ${error}>`;
+        }
 
         // We handle strings a bit differently because the `jsonValue` will be in a weird-looking
         // shape ("JSHandle:words are here"). Weirdly, `msg.text()` also catches text nodes that
@@ -84,7 +90,8 @@ export async function serializeLog(msg: ConsoleMessage): Promise<string> {
         // Note: we have to run the checks against the object in the page context, so call
         // evaluate instead of just doing it ourselves.
         const stringyArg: string = await arg.evaluate((argInContext: any) => {
-            if (argInContext.stack || (argInContext instanceof Error)) {
+            // sometimes the argument will be `null` or similar - treat it safely.
+            if (argInContext?.stack || (argInContext instanceof Error)) {
                 // probably an error - toString it and append any properties which might not be
                 // caught. For example, on HTTP errors the JSON stringification will capture the
                 // status code.
@@ -95,7 +102,13 @@ export async function serializeLog(msg: ConsoleMessage): Promise<string> {
             }
 
             // not an error, as far as we're concerned - return it as human-readable JSON
-            return JSON.stringify(argInContext, null, 4);
+            let ret;
+            try {
+                ret = JSON.stringify(argInContext, null, 4);
+            } catch (error) {
+                ret = `<error: ${error}>`;
+            }
+            return ret;
         });
         s += `${stringyArg} `; // trailing space is intentional
     }
diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index 13aea8d18dc..9aa67b22209 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -633,6 +633,12 @@ uploads_path: "{{SYNAPSE_ROOT}}uploads"
 #
 enable_registration: true
 
+# Enable registration without email or captcha verification. Note: this option is *not* recommended,
+# as registration without verification is a known vector for spam and abuse. Defaults to false. Has no effect
+# unless `enable_registration` is also enabled.
+#
+enable_registration_without_verification: true
+
 # The user must provide all of the below types of 3PID when registering.
 #
 #registrations_require_3pid:
@@ -792,13 +798,50 @@ signing_key_path: "{{SYNAPSE_ROOT}}localhost.signing.key"
 
 # The trusted servers to download signing keys from.
 #
-#perspectives:
-#  servers:
-#    "matrix.org":
-#      verify_keys:
-#        "ed25519:auto":
-#          key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
+# When we need to fetch a signing key, each server is tried in parallel.
+#
+# Normally, the connection to the key server is validated via TLS certificates.
+# Additional security can be provided by configuring a `verify key`, which
+# will make synapse check that the response is signed by that key.
+#
+# This setting supercedes an older setting named `perspectives`. The old format
+# is still supported for backwards-compatibility, but it is deprecated.
+#
+# 'trusted_key_servers' defaults to matrix.org, but using it will generate a
+# warning on start-up. To suppress this warning, set
+# 'suppress_key_server_warning' to true.
+#
+# Options for each entry in the list include:
+#
+#    server_name: the name of the server. required.
+#
+#    verify_keys: an optional map from key id to base64-encoded public key.
+#       If specified, we will check that the response is signed by at least
+#       one of the given keys.
+#
+#    accept_keys_insecurely: a boolean. Normally, if `verify_keys` is unset,
+#       and federation_verify_certificates is not `true`, synapse will refuse
+#       to start, because this would allow anyone who can spoof DNS responses
+#       to masquerade as the trusted key server. If you know what you are doing
+#       and are sure that your network environment provides a secure connection
+#       to the key server, you can set this to `true` to override this
+#       behaviour.
+#
+# An example configuration might look like:
+#
+#trusted_key_servers:
+#  - server_name: "my_trusted_server.example.com"
+#    verify_keys:
+#      "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr"
+#  - server_name: "my_other_trusted_server.example.com"
+#
+trusted_key_servers:
+    - server_name: "matrix.org"
 
+# Uncomment the following to disable the warning that is emitted when the
+# trusted_key_servers include 'matrix.org'. See above.
+#
+suppress_key_server_warning: true
 
 # Enable SAML2 for registration and login. Uses pysaml2.
 #
diff --git a/test/end-to-end-tests/synapse/install.sh b/test/end-to-end-tests/synapse/install.sh
index b145fb3e1b7..a85fdea26d1 100755
--- a/test/end-to-end-tests/synapse/install.sh
+++ b/test/end-to-end-tests/synapse/install.sh
@@ -22,17 +22,8 @@ virtualenv -p python3 env
 source env/bin/activate
 
 pip install --upgrade pip
-
-# Pin setuptools to work around crash bug in v60
-# See https://github.com/vector-im/element-web/issues/20287
-pip install setuptools==v59.8.0
-
+pip install --upgrade setuptools
 pip install https://codeload.github.com/matrix-org/synapse/zip/$SYNAPSE_BRANCH
-
-# reivilibre: Suspected bug in frozendict 2.1.2 leading to a core dump...
-# See https://github.com/vector-im/element-web/issues/20287
-pip install frozendict==2.0.2
-
 # apply configuration
 pushd env/bin/
 cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./
diff --git a/test/end-to-end-tests/synapse/start.sh b/test/end-to-end-tests/synapse/start.sh
index 2ff6ae69d00..f17047afd08 100755
--- a/test/end-to-end-tests/synapse/start.sh
+++ b/test/end-to-end-tests/synapse/start.sh
@@ -5,11 +5,5 @@ BASE_DIR=$(cd $(dirname $0) && pwd)
 cd $BASE_DIR
 cd installations/consent/env/bin/
 source activate
-LOGFILE=$(mktemp)
 echo "Synapse log file at $LOGFILE"
 ./synctl start 2> $LOGFILE
-EXIT_CODE=$?
-if [ $EXIT_CODE -ne 0 ]; then
-	cat $LOGFILE
-fi
-exit $EXIT_CODE
diff --git a/test/end-to-end-tests/tsconfig.json b/test/end-to-end-tests/tsconfig.json
index 7c818bd8669..e4ab37b5684 100644
--- a/test/end-to-end-tests/tsconfig.json
+++ b/test/end-to-end-tests/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
+    "experimentalDecorators": false,
+    "emitDecoratorMetadata": false,
     "resolveJsonModule": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/test/end-to-end-tests/yarn.lock b/test/end-to-end-tests/yarn.lock
index 75be63fb557..f730e7003ae 100644
--- a/test/end-to-end-tests/yarn.lock
+++ b/test/end-to-end-tests/yarn.lock
@@ -3,14 +3,14 @@
 
 
 "@types/node@*":
-  version "11.12.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.1.tgz#d90123f6c61fdf2f7cddd286ddae891586dd3488"
-  integrity sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==
+  version "17.0.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
+  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
 
 "@types/puppeteer@^5.4.4":
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-5.4.4.tgz#e92abeccc4f46207c3e1b38934a1246be080ccd0"
-  integrity sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-5.4.5.tgz#154e3850a77bfd3967f036680de8ddc88eb3a12b"
+  integrity sha512-lxCjpDEY+DZ66+W3x5Af4oHnEmUXt0HuaRzkBGE2UZiZEp/V1d3StpLPlmNVu/ea091bdNmVPl44lu8Wy/0ZCA==
   dependencies:
     "@types/node" "*"
 
diff --git a/test/images/animated-logo.apng b/test/images/animated-logo.apng
new file mode 100644
index 00000000000..0252cf43bda
Binary files /dev/null and b/test/images/animated-logo.apng differ
diff --git a/test/images/animated-logo.gif b/test/images/animated-logo.gif
new file mode 100644
index 00000000000..e3ee4f62062
Binary files /dev/null and b/test/images/animated-logo.gif differ
diff --git a/test/images/animated-logo.webp b/test/images/animated-logo.webp
new file mode 100644
index 00000000000..a49c9363810
Binary files /dev/null and b/test/images/animated-logo.webp differ
diff --git a/test/images/static-logo.gif b/test/images/static-logo.gif
new file mode 100644
index 00000000000..8108b87f6f2
Binary files /dev/null and b/test/images/static-logo.gif differ
diff --git a/test/images/static-logo.png b/test/images/static-logo.png
new file mode 100644
index 00000000000..14b8f0ec31c
Binary files /dev/null and b/test/images/static-logo.png differ
diff --git a/test/images/static-logo.webp b/test/images/static-logo.webp
new file mode 100644
index 00000000000..41014183421
Binary files /dev/null and b/test/images/static-logo.webp differ
diff --git a/test/linkify-matrix-test.ts b/test/linkify-matrix-test.ts
index a651252ea65..8918854960c 100644
--- a/test/linkify-matrix-test.ts
+++ b/test/linkify-matrix-test.ts
@@ -19,7 +19,6 @@ describe('linkify-matrix', () => {
     const linkTypesByInitialCharacter = {
         '#': 'roomalias',
         '@': 'userid',
-        '+': 'groupid',
     };
 
     /**
@@ -269,10 +268,6 @@ describe('linkify-matrix', () => {
         genTests('#');
     });
 
-    describe('groupid plugin', () => {
-        genTests('+');
-    });
-
     describe('userid plugin', () => {
         genTests('@');
     });
diff --git a/test/notifications/ContentRules-test.js b/test/notifications/ContentRules-test.ts
similarity index 81%
rename from test/notifications/ContentRules-test.js
rename to test/notifications/ContentRules-test.ts
index 2b18a18488f..9881a1c1498 100644
--- a/test/notifications/ContentRules-test.js
+++ b/test/notifications/ContentRules-test.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const notifications = require('../../src/notifications');
+import { TweakName, PushRuleActionName, TweakHighlight, TweakSound } from "matrix-js-sdk/src/matrix";
 
-const ContentRules = notifications.ContentRules;
-const PushRuleVectorState = notifications.PushRuleVectorState;
+import { ContentRules, PushRuleVectorState } from "../../src/notifications";
 
 const NORMAL_RULE = {
     actions: [
-        "notify",
-        { set_tweak: "highlight", value: false },
+        PushRuleActionName.Notify,
+        { set_tweak: TweakName.Highlight, value: false } as TweakHighlight,
     ],
+    default: false,
     enabled: true,
     pattern: "vdh2",
     rule_id: "vdh2",
@@ -31,10 +32,11 @@ const NORMAL_RULE = {
 
 const LOUD_RULE = {
     actions: [
-        "notify",
-        { set_tweak: "highlight" },
-        { set_tweak: "sound", value: "default" },
+        PushRuleActionName.Notify,
+        { set_tweak: TweakName.Highlight } as TweakHighlight,
+        { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
     ],
+    default: false,
     enabled: true,
     pattern: "vdh2",
     rule_id: "vdh2",
@@ -42,9 +44,9 @@ const LOUD_RULE = {
 
 const USERNAME_RULE = {
     actions: [
-        "notify",
-        { set_tweak: "sound", value: "default" },
-        { set_tweak: "highlight" },
+        PushRuleActionName.Notify,
+        { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+        { set_tweak: TweakName.Highlight } as TweakHighlight,
     ],
     default: true,
     enabled: true,
diff --git a/test/notifications/PushRuleVectorState-test.js b/test/notifications/PushRuleVectorState-test.js
deleted file mode 100644
index 1127675791b..00000000000
--- a/test/notifications/PushRuleVectorState-test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-const notifications = require('../../src/notifications');
-
-const prvs = notifications.PushRuleVectorState;
-
-describe("PushRuleVectorState", function() {
-    describe("contentRuleVectorStateKind", function() {
-        it("should understand normal notifications", function() {
-            const rule = {
-                actions: [
-                    "notify",
-                ],
-            };
-
-            expect(prvs.contentRuleVectorStateKind(rule)).
-                toEqual(prvs.ON);
-        });
-
-        it("should handle loud notifications", function() {
-            const rule = {
-                actions: [
-                    "notify",
-                    { set_tweak: "highlight", value: true },
-                    { set_tweak: "sound", value: "default" },
-                ],
-            };
-
-            expect(prvs.contentRuleVectorStateKind(rule)).
-                toEqual(prvs.LOUD);
-        });
-
-        it("should understand missing highlight.value", function() {
-            const rule = {
-                actions: [
-                    "notify",
-                    { set_tweak: "highlight" },
-                    { set_tweak: "sound", value: "default" },
-                ],
-            };
-
-            expect(prvs.contentRuleVectorStateKind(rule)).
-                toEqual(prvs.LOUD);
-        });
-    });
-});
diff --git a/test/notifications/PushRuleVectorState-test.ts b/test/notifications/PushRuleVectorState-test.ts
new file mode 100644
index 00000000000..031944b84ce
--- /dev/null
+++ b/test/notifications/PushRuleVectorState-test.ts
@@ -0,0 +1,75 @@
+/*
+Copyright 2016 OpenMarket Ltd
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+    PushRuleActionName,
+    TweakHighlight,
+    TweakName,
+    TweakSound,
+} from "matrix-js-sdk/src/matrix";
+
+import { PushRuleVectorState } from "../../src/notifications";
+
+describe("PushRuleVectorState", function() {
+    describe("contentRuleVectorStateKind", function() {
+        it("should understand normal notifications", function() {
+            const rule = {
+                actions: [
+                    PushRuleActionName.Notify,
+                ],
+                default: false,
+                enabled: false,
+                rule_id: '1',
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).
+                toEqual(PushRuleVectorState.ON);
+        });
+
+        it("should handle loud notifications", function() {
+            const rule = {
+                actions: [
+                    PushRuleActionName.Notify,
+                    { set_tweak: TweakName.Highlight, value: true } as TweakHighlight,
+                    { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+                ],
+                default: false,
+                enabled: false,
+                rule_id: '1',
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).
+                toEqual(PushRuleVectorState.LOUD);
+        });
+
+        it("should understand missing highlight.value", function() {
+            const rule = {
+                actions: [
+                    PushRuleActionName.Notify,
+                    { set_tweak: TweakName.Highlight } as TweakHighlight,
+                    { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+                ],
+                default: false,
+                enabled: false,
+                rule_id: '1',
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).
+                toEqual(PushRuleVectorState.LOUD);
+        });
+    });
+});
diff --git a/test/settings/controllers/FontSizeController-test.ts b/test/settings/controllers/FontSizeController-test.ts
new file mode 100644
index 00000000000..d42ec487ed2
--- /dev/null
+++ b/test/settings/controllers/FontSizeController-test.ts
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Action } from "../../../src/dispatcher/actions";
+import dis from "../../../src/dispatcher/dispatcher";
+import FontSizeController from "../../../src/settings/controllers/FontSizeController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+
+const dispatchSpy = jest.spyOn(dis, 'dispatch');
+
+describe('FontSizeController', () => {
+    it('dispatches a font size action on change', () => {
+        const controller = new FontSizeController();
+
+        controller.onChange(SettingLevel.ACCOUNT, '$room:server', 12);
+
+        expect(dispatchSpy).toHaveBeenCalledWith({
+            action: Action.UpdateFontSize,
+            size: 12,
+        });
+    });
+});
diff --git a/test/settings/controllers/IncompatibleController-test.ts b/test/settings/controllers/IncompatibleController-test.ts
new file mode 100644
index 00000000000..8003f4e7a3b
--- /dev/null
+++ b/test/settings/controllers/IncompatibleController-test.ts
@@ -0,0 +1,91 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import IncompatibleController from "../../../src/settings/controllers/IncompatibleController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import SettingsStore from "../../../src/settings/SettingsStore";
+
+describe('IncompatibleController', () => {
+    const settingsGetValueSpy = jest.spyOn(SettingsStore, 'getValue');
+    beforeEach(() => {
+        settingsGetValueSpy.mockClear();
+    });
+
+    describe('incompatibleSetting', () => {
+        describe('when incompatibleValue is not set', () => {
+            it('returns true when setting value is true', () => {
+                // no incompatible value set, defaulted to true
+                const controller = new IncompatibleController("feature_spotlight", { key: null });
+                settingsGetValueSpy.mockReturnValue(true);
+                // true === true
+                expect(controller.incompatibleSetting).toBe(true);
+                expect(controller.settingDisabled).toEqual(true);
+                expect(settingsGetValueSpy).toHaveBeenCalledWith("feature_spotlight");
+            });
+
+            it('returns false when setting value is not true', () => {
+                // no incompatible value set, defaulted to true
+                const controller = new IncompatibleController("feature_spotlight", { key: null });
+                settingsGetValueSpy.mockReturnValue('test');
+                expect(controller.incompatibleSetting).toBe(false);
+            });
+        });
+
+        describe('when incompatibleValue is set to a value', () => {
+            it('returns true when setting value matches incompatible value', () => {
+                const controller = new IncompatibleController("feature_spotlight", { key: null }, 'test');
+                settingsGetValueSpy.mockReturnValue('test');
+                expect(controller.incompatibleSetting).toBe(true);
+            });
+
+            it('returns false when setting value is not true', () => {
+                const controller = new IncompatibleController("feature_spotlight", { key: null }, 'test');
+                settingsGetValueSpy.mockReturnValue('not test');
+                expect(controller.incompatibleSetting).toBe(false);
+            });
+        });
+
+        describe('when incompatibleValue is set to a function', () => {
+            it('returns result from incompatibleValue function', () => {
+                const incompatibleValueFn = jest.fn().mockReturnValue(false);
+                const controller = new IncompatibleController("feature_spotlight", { key: null }, incompatibleValueFn);
+                settingsGetValueSpy.mockReturnValue('test');
+                expect(controller.incompatibleSetting).toBe(false);
+                expect(incompatibleValueFn).toHaveBeenCalledWith('test');
+            });
+        });
+    });
+
+    describe('getValueOverride()', () => {
+        it('returns forced value when setting is incompatible', () => {
+            settingsGetValueSpy.mockReturnValue(true);
+            const forcedValue = { key: null };
+            const controller = new IncompatibleController("feature_spotlight", forcedValue);
+            expect(controller.getValueOverride(
+                SettingLevel.ACCOUNT, '$room:server', true, SettingLevel.ACCOUNT,
+            )).toEqual(forcedValue);
+        });
+
+        it('returns null when setting is not incompatible', () => {
+            settingsGetValueSpy.mockReturnValue(false);
+            const forcedValue = { key: null };
+            const controller = new IncompatibleController("feature_spotlight", forcedValue);
+            expect(controller.getValueOverride(
+                SettingLevel.ACCOUNT, '$room:server', true, SettingLevel.ACCOUNT,
+            )).toEqual(null);
+        });
+    });
+});
diff --git a/test/settings/controllers/SystemFontController-test.ts b/test/settings/controllers/SystemFontController-test.ts
new file mode 100644
index 00000000000..a330661231d
--- /dev/null
+++ b/test/settings/controllers/SystemFontController-test.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Action } from "../../../src/dispatcher/actions";
+import dis from "../../../src/dispatcher/dispatcher";
+import SystemFontController from "../../../src/settings/controllers/SystemFontController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import SettingsStore from "../../../src/settings/SettingsStore";
+
+const dispatchSpy = jest.spyOn(dis, 'dispatch');
+
+describe('SystemFontController', () => {
+    it('dispatches a font size action on change', () => {
+        const getValueSpy = jest.spyOn(SettingsStore, 'getValue').mockReturnValue(true);
+        const controller = new SystemFontController();
+
+        controller.onChange(SettingLevel.ACCOUNT, '$room:server', 12);
+
+        expect(dispatchSpy).toHaveBeenCalledWith({
+            action: Action.UpdateSystemFont,
+            useSystemFont: true,
+            font: 12,
+        });
+
+        expect(getValueSpy).toHaveBeenCalledWith("useSystemFont");
+    });
+});
diff --git a/test/settings/controllers/ThemeController-test.ts b/test/settings/controllers/ThemeController-test.ts
new file mode 100644
index 00000000000..a90531b6b85
--- /dev/null
+++ b/test/settings/controllers/ThemeController-test.ts
@@ -0,0 +1,75 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import ThemeController from "../../../src/settings/controllers/ThemeController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import SettingsStore from "../../../src/settings/SettingsStore";
+import { DEFAULT_THEME } from "../../../src/theme";
+
+describe('ThemeController', () => {
+    jest.spyOn(SettingsStore, 'getValue').mockReturnValue([]);
+
+    afterEach(() => {
+        // reset
+        ThemeController.isLogin = false;
+    });
+
+    it('returns null when calculatedValue is falsy', () => {
+        const controller = new ThemeController();
+
+        expect(controller.getValueOverride(
+            SettingLevel.ACCOUNT,
+            '$room:server',
+            undefined, /* calculatedValue */
+            SettingLevel.ACCOUNT,
+        )).toEqual(null);
+    });
+
+    it('returns light when login flag is set', () => {
+        const controller = new ThemeController();
+
+        ThemeController.isLogin = true;
+
+        expect(controller.getValueOverride(
+            SettingLevel.ACCOUNT,
+            '$room:server',
+            'dark',
+            SettingLevel.ACCOUNT,
+        )).toEqual('light');
+    });
+
+    it('returns default theme when value is not a valid theme', () => {
+        const controller = new ThemeController();
+
+        expect(controller.getValueOverride(
+            SettingLevel.ACCOUNT,
+            '$room:server',
+            'my-test-theme',
+            SettingLevel.ACCOUNT,
+        )).toEqual(DEFAULT_THEME);
+    });
+
+    it('returns null when value is a valid theme', () => {
+        const controller = new ThemeController();
+
+        expect(controller.getValueOverride(
+            SettingLevel.ACCOUNT,
+            '$room:server',
+            'dark',
+            SettingLevel.ACCOUNT,
+        )).toEqual(null);
+    });
+});
diff --git a/test/settings/controllers/UseSystemFontController-test.ts b/test/settings/controllers/UseSystemFontController-test.ts
new file mode 100644
index 00000000000..725bd1a442c
--- /dev/null
+++ b/test/settings/controllers/UseSystemFontController-test.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Action } from "../../../src/dispatcher/actions";
+import dis from "../../../src/dispatcher/dispatcher";
+import UseSystemFontController from "../../../src/settings/controllers/UseSystemFontController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import SettingsStore from "../../../src/settings/SettingsStore";
+
+const dispatchSpy = jest.spyOn(dis, 'dispatch');
+
+describe('UseSystemFontController', () => {
+    it('dispatches a font size action on change', () => {
+        const getValueSpy = jest.spyOn(SettingsStore, 'getValue').mockReturnValue(12);
+        const controller = new UseSystemFontController();
+
+        controller.onChange(SettingLevel.ACCOUNT, '$room:server', true);
+
+        expect(dispatchSpy).toHaveBeenCalledWith({
+            action: Action.UpdateSystemFont,
+            useSystemFont: true,
+            font: 12,
+        });
+
+        expect(getValueSpy).toHaveBeenCalledWith("systemFont");
+    });
+});
diff --git a/test/settings/enums/ImageSize-test.ts b/test/settings/enums/ImageSize-test.ts
new file mode 100644
index 00000000000..55de23f9241
--- /dev/null
+++ b/test/settings/enums/ImageSize-test.ts
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ImageSize, suggestedSize } from "../../../src/settings/enums/ImageSize";
+
+describe("ImageSize", () => {
+    describe("suggestedSize", () => {
+        it("constrains width", () => {
+            const size = suggestedSize(ImageSize.Normal, { w: 648, h: 162 });
+            expect(size).toStrictEqual({ w: 324, h: 81 });
+        });
+        it("constrains height", () => {
+            const size = suggestedSize(ImageSize.Normal, { w: 162, h: 648 });
+            expect(size).toStrictEqual({ w: 81, h: 324 });
+        });
+        it("constrains width in large mode", () => {
+            const size = suggestedSize(ImageSize.Large, { w: 2400, h: 1200 });
+            expect(size).toStrictEqual({ w: 800, h: 400 });
+        });
+        it("returns max values if content size is not specified", () => {
+            const size = suggestedSize(ImageSize.Normal, { w: null, h: null });
+            expect(size).toStrictEqual({ w: 324, h: 324 });
+        });
+        it("returns integer values", () => {
+            const size = suggestedSize(ImageSize.Normal, { w: 642, h: 350 }); // does not divide evenly
+            expect(size).toStrictEqual({ w: 324, h: 176 });
+        });
+    });
+});
diff --git a/test/setup/setupConfig.ts b/test/setup/setupConfig.ts
new file mode 100644
index 00000000000..e67493412d0
--- /dev/null
+++ b/test/setup/setupConfig.ts
@@ -0,0 +1,21 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SdkConfig, { DEFAULTS } from '../../src/SdkConfig';
+
+// uninitialised SdkConfig causes lots of warnings in console
+// init with defaults
+SdkConfig.put(DEFAULTS);
diff --git a/test/setup/setupLanguage.ts b/test/setup/setupLanguage.ts
new file mode 100644
index 00000000000..5c6834d0123
--- /dev/null
+++ b/test/setup/setupLanguage.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as languageHandler from "../../src/languageHandler";
+
+languageHandler.setLanguage('en');
+languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
diff --git a/test/setup/setupManualMocks.ts b/test/setup/setupManualMocks.ts
new file mode 100644
index 00000000000..162529ef641
--- /dev/null
+++ b/test/setup/setupManualMocks.ts
@@ -0,0 +1,55 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { TextDecoder, TextEncoder } from "util";
+
+// jest 27 removes setImmediate from jsdom
+// polyfill until setImmediate use in client can be removed
+// @ts-ignore - we know the contract is wrong. That's why we're stubbing it.
+global.setImmediate = callback => setTimeout(callback, 0);
+
+// Stub ResizeObserver
+// @ts-ignore - we know it's a duplicate (that's why we're stubbing it)
+class ResizeObserver {
+    observe() {} // do nothing
+    unobserve() {} // do nothing
+    disconnect() {} // do nothing
+}
+window.ResizeObserver = ResizeObserver;
+
+// matchMedia is not included in jsdom
+const mockMatchMedia = jest.fn().mockImplementation(query => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // Deprecated
+    removeListener: jest.fn(), // Deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+}));
+global.matchMedia = mockMatchMedia;
+
+// maplibre requires a createObjectURL mock
+global.URL.createObjectURL = jest.fn();
+
+// polyfilling TextEncoder as it is not available on JSDOM
+// view https://github.com/facebook/jest/issues/9983
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;
+
+// prevent errors whenever a component tries to manually scroll.
+window.HTMLElement.prototype.scrollIntoView = jest.fn();
diff --git a/test/setupTests.js b/test/setupTests.js
index 6ce8ad94918..649a914c096 100644
--- a/test/setupTests.js
+++ b/test/setupTests.js
@@ -1,52 +1,17 @@
-import { TextEncoder, TextDecoder } from 'util';
 import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 import { configure } from "enzyme";
+import "blob-polyfill"; // https://github.com/jsdom/jsdom/issues/2555
 
-import * as languageHandler from "../src/languageHandler";
-import SdkConfig, { DEFAULTS } from '../src/SdkConfig';
-
-languageHandler.setLanguage('en');
-languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
-
-// uninitialised SdkConfig causes lots of warnings in console
-// init with defaults
-SdkConfig.put(DEFAULTS);
-
+// Enable the jest & enzyme mocks
 require('jest-fetch-mock').enableMocks();
-
-// jest 27 removes setImmediate from jsdom
-// polyfill until setImmediate use in client can be removed
-global.setImmediate = callback => setTimeout(callback, 0);
-
-// Stub ResizeObserver
-class ResizeObserver {
-    observe() {} // do nothing
-    unobserve() {} // do nothing
-    disconnect() {} // do nothing
-}
-window.ResizeObserver = ResizeObserver;
-
-// polyfilling TextEncoder as it is not available on JSDOM
-// view https://github.com/facebook/jest/issues/9983
-global.TextEncoder = TextEncoder;
-global.TextDecoder = TextDecoder;
-
 configure({ adapter: new Adapter() });
 
-// maplibre requires a createObjectURL mock
-global.URL.createObjectURL = jest.fn();
-
-// matchMedia is not included in jsdom
-const mockMatchMedia = jest.fn().mockImplementation(query => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: jest.fn(), // Deprecated
-    removeListener: jest.fn(), // Deprecated
-    addEventListener: jest.fn(),
-    removeEventListener: jest.fn(),
-    dispatchEvent: jest.fn(),
-}));
-global.matchMedia = mockMatchMedia;
-
-window.HTMLElement.prototype.scrollIntoView = jest.fn();
+// Very carefully enable the mocks for everything else in
+// a specific order. We use this order to ensure we properly
+// establish an application state that actually works.
+//
+// These are also require() calls to make sure they get called
+// synchronously.
+require("./setup/setupManualMocks"); // must be first
+require("./setup/setupLanguage");
+require("./setup/setupConfig");
diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
deleted file mode 100644
index 0a3cc85a3b5..00000000000
--- a/test/skinned-sdk.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * skinned-sdk.js
- *
- * Skins the react-sdk with a few stub components which we expect the
- * application to provide
- */
-
-/* this is a convenient place to ensure we load the compatibility libraries we expect our
- * app to provide
- */
-
-import * as sdk from "../src/index";
-import stubComponent from "./components/stub-component";
-
-const components = {};
-components['structures.LeftPanel'] = stubComponent();
-components['structures.RightPanel'] = stubComponent();
-components['structures.RoomDirectory'] = stubComponent();
-components['views.globals.GuestWarningBar'] = stubComponent();
-components['views.globals.NewVersionBar'] = stubComponent();
-components['views.elements.Spinner'] = stubComponent({ displayName: 'Spinner' });
-components['views.messages.MessageTimestamp'] = stubComponent({ displayName: 'MessageTimestamp' });
-components['views.messages.SenderProfile'] = stubComponent({ displayName: 'SenderProfile' });
-components['views.rooms.SearchBar'] = stubComponent();
-
-sdk.loadSkin({ components });
-
-export default sdk;
diff --git a/test/stores/ActiveWidgetStore-test.ts b/test/stores/ActiveWidgetStore-test.ts
new file mode 100644
index 00000000000..ec7374838da
--- /dev/null
+++ b/test/stores/ActiveWidgetStore-test.ts
@@ -0,0 +1,53 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import ActiveWidgetStore from "../../src/stores/ActiveWidgetStore";
+
+describe("ActiveWidgetStore", () => {
+    const store = ActiveWidgetStore.instance;
+
+    it("tracks docked and live tiles correctly", () => {
+        expect(store.isDocked("1", "r1")).toEqual(false);
+        expect(store.isLive("1", "r1")).toEqual(false);
+
+        // Try undocking the widget before it gets docked
+        store.undockWidget("1", "r1");
+        expect(store.isDocked("1", "r1")).toEqual(false);
+        expect(store.isLive("1", "r1")).toEqual(false);
+
+        store.dockWidget("1", "r1");
+        expect(store.isDocked("1", "r1")).toEqual(true);
+        expect(store.isLive("1", "r1")).toEqual(true);
+
+        store.dockWidget("1", "r1");
+        expect(store.isDocked("1", "r1")).toEqual(true);
+        expect(store.isLive("1", "r1")).toEqual(true);
+
+        store.undockWidget("1", "r1");
+        expect(store.isDocked("1", "r1")).toEqual(true);
+        expect(store.isLive("1", "r1")).toEqual(true);
+
+        // Ensure that persistent widgets remain live even while undocked
+        store.setWidgetPersistence("1", "r1", true);
+        store.undockWidget("1", "r1");
+        expect(store.isDocked("1", "r1")).toEqual(false);
+        expect(store.isLive("1", "r1")).toEqual(true);
+
+        store.setWidgetPersistence("1", "r1", false);
+        expect(store.isDocked("1", "r1")).toEqual(false);
+        expect(store.isLive("1", "r1")).toEqual(false);
+    });
+});
diff --git a/test/stores/OwnBeaconStore-test.ts b/test/stores/OwnBeaconStore-test.ts
new file mode 100644
index 00000000000..66204580fc1
--- /dev/null
+++ b/test/stores/OwnBeaconStore-test.ts
@@ -0,0 +1,1351 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+    Room,
+    Beacon,
+    BeaconEvent,
+    getBeaconInfoIdentifier,
+    MatrixEvent,
+    RoomStateEvent,
+    RoomMember,
+} from "matrix-js-sdk/src/matrix";
+import { makeBeaconContent, makeBeaconInfoContent } from "matrix-js-sdk/src/content-helpers";
+import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { OwnBeaconStore, OwnBeaconStoreEvent } from "../../src/stores/OwnBeaconStore";
+import {
+    advanceDateAndTime,
+    flushPromisesWithFakeTimers,
+    makeMembershipEvent,
+    resetAsyncStoreWithClient,
+    setupAsyncStoreWithClient,
+} from "../test-utils";
+import {
+    makeBeaconInfoEvent,
+    mockGeolocation,
+    watchPositionMockImplementation,
+} from "../test-utils/beacon";
+import { getMockClientWithEventEmitter } from "../test-utils/client";
+
+// modern fake timers and lodash.debounce are a faff
+// short circuit it
+jest.mock("lodash", () => ({
+    debounce: jest.fn().mockImplementation(callback => callback),
+}));
+
+jest.useFakeTimers();
+
+describe('OwnBeaconStore', () => {
+    let geolocation;
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    const HOUR_MS = 3600000;
+
+    const aliceId = '@alice:server.org';
+    const bobId = '@bob:server.org';
+    const mockClient = getMockClientWithEventEmitter({
+        getUserId: jest.fn().mockReturnValue(aliceId),
+        getVisibleRooms: jest.fn().mockReturnValue([]),
+        unstable_setLiveBeacon: jest.fn().mockResolvedValue({ event_id: '1' }),
+        sendEvent: jest.fn().mockResolvedValue({ event_id: '1' }),
+        unstable_createLiveBeacon: jest.fn().mockResolvedValue({ event_id: '1' }),
+    });
+    const room1Id = '$room1:server.org';
+    const room2Id = '$room2:server.org';
+
+    // returned by default geolocation mocks
+    const defaultLocationUri = 'geo:54.001927,-8.253491;u=1';
+
+    // beacon_info events
+    // created 'an hour ago'
+    // with timeout of 3 hours
+
+    // event creation sets timestamp to Date.now()
+    jest.spyOn(global.Date, 'now').mockReturnValue(now - HOUR_MS);
+    const alicesRoom1BeaconInfo = makeBeaconInfoEvent(aliceId,
+        room1Id,
+        { isLive: true },
+        '$alice-room1-1',
+    );
+    const alicesRoom2BeaconInfo = makeBeaconInfoEvent(aliceId,
+        room2Id,
+        { isLive: true },
+        '$alice-room2-1',
+    );
+    const alicesOldRoomIdBeaconInfo = makeBeaconInfoEvent(aliceId,
+        room1Id,
+        { isLive: false },
+        '$alice-room1-2',
+    );
+    const bobsRoom1BeaconInfo = makeBeaconInfoEvent(bobId,
+        room1Id,
+        { isLive: true },
+        '$bob-room1-1',
+    );
+    const bobsOldRoom1BeaconInfo = makeBeaconInfoEvent(bobId,
+        room1Id,
+        { isLive: false },
+        '$bob-room1-2',
+    );
+
+    // make fresh rooms every time
+    // as we update room state
+    const makeRoomsWithStateEvents = (stateEvents = []): [Room, Room] => {
+        const room1 = new Room(room1Id, mockClient, aliceId);
+        const room2 = new Room(room2Id, mockClient, aliceId);
+
+        room1.currentState.setStateEvents(stateEvents);
+        room2.currentState.setStateEvents(stateEvents);
+        mockClient.getVisibleRooms.mockReturnValue([room1, room2]);
+
+        return [room1, room2];
+    };
+
+    const makeOwnBeaconStore = async () => {
+        const store = OwnBeaconStore.instance;
+
+        await setupAsyncStoreWithClient(store, mockClient);
+        return store;
+    };
+
+    const expireBeaconAndEmit = (store, beaconInfoEvent: MatrixEvent): void => {
+        const beacon = store.getBeaconById(getBeaconInfoIdentifier(beaconInfoEvent));
+        // time travel until beacon is expired
+        advanceDateAndTime(beacon.beaconInfo.timeout + 100);
+
+        // force an update on the beacon
+        // @ts-ignore
+        beacon.setBeaconInfo(beaconInfoEvent);
+
+        mockClient.emit(BeaconEvent.LivenessChange, false, beacon);
+    };
+
+    const updateBeaconLivenessAndEmit = (store, beaconInfoEvent: MatrixEvent, isLive: boolean): void => {
+        const beacon = store.getBeaconById(getBeaconInfoIdentifier(beaconInfoEvent));
+        // matches original state of event content
+        // except for live property
+        const updateEvent = makeBeaconInfoEvent(
+            beaconInfoEvent.getSender(),
+            beaconInfoEvent.getRoomId(),
+            { isLive, timeout: beacon.beaconInfo.timeout },
+            'update-event-id',
+        );
+        beacon.update(updateEvent);
+
+        mockClient.emit(BeaconEvent.Update, beaconInfoEvent, beacon);
+        mockClient.emit(BeaconEvent.LivenessChange, false, beacon);
+    };
+
+    const addNewBeaconAndEmit = (beaconInfoEvent: MatrixEvent): void => {
+        const beacon = new Beacon(beaconInfoEvent);
+        mockClient.emit(BeaconEvent.New, beaconInfoEvent, beacon);
+    };
+
+    const localStorageGetSpy = jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(undefined);
+    const localStorageSetSpy = jest.spyOn(localStorage.__proto__, 'setItem').mockImplementation(() => {});
+
+    beforeEach(() => {
+        geolocation = mockGeolocation();
+        mockClient.getVisibleRooms.mockReturnValue([]);
+        mockClient.unstable_setLiveBeacon.mockClear().mockResolvedValue({ event_id: '1' });
+        mockClient.sendEvent.mockReset().mockResolvedValue({ event_id: '1' });
+        jest.spyOn(global.Date, 'now').mockReturnValue(now);
+        jest.spyOn(OwnBeaconStore.instance, 'emit').mockRestore();
+        jest.spyOn(logger, 'error').mockRestore();
+
+        localStorageGetSpy.mockClear().mockReturnValue(undefined);
+        localStorageSetSpy.mockClear();
+    });
+
+    afterEach(async () => {
+        await resetAsyncStoreWithClient(OwnBeaconStore.instance);
+
+        jest.clearAllTimers();
+    });
+
+    afterAll(() => {
+        localStorageGetSpy.mockRestore();
+    });
+
+    describe('onReady()', () => {
+        it('initialises correctly with no beacons', async () => {
+            makeRoomsWithStateEvents();
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons()).toBe(false);
+            expect(store.getLiveBeaconIds()).toEqual([]);
+        });
+
+        it('does not add other users beacons to beacon state', async () => {
+            makeRoomsWithStateEvents([bobsRoom1BeaconInfo, bobsOldRoom1BeaconInfo]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons()).toBe(false);
+            expect(store.getLiveBeaconIds()).toEqual([]);
+        });
+
+        it('adds own users beacons to state', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.beaconsByRoomId.get(room1Id)).toEqual(new Set([
+                getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+            ]));
+            expect(store.beaconsByRoomId.get(room2Id)).toEqual(new Set([
+                getBeaconInfoIdentifier(alicesRoom2BeaconInfo),
+            ]));
+        });
+
+        it('updates live beacon ids when users own beacons were created on device', async () => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons(room1Id)).toBeTruthy();
+            expect(store.getLiveBeaconIds()).toEqual([
+                getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+                getBeaconInfoIdentifier(alicesRoom2BeaconInfo),
+            ]);
+        });
+
+        it('does not do any geolocation when user has no live beacons', async () => {
+            makeRoomsWithStateEvents([bobsRoom1BeaconInfo, bobsOldRoom1BeaconInfo]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons()).toBe(false);
+
+            await flushPromisesWithFakeTimers();
+
+            expect(geolocation.watchPosition).not.toHaveBeenCalled();
+            expect(mockClient.sendEvent).not.toHaveBeenCalled();
+        });
+
+        it('does geolocation and sends location immediately when user has live beacons', async () => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+            ]);
+            await makeOwnBeaconStore();
+            await flushPromisesWithFakeTimers();
+
+            expect(geolocation.watchPosition).toHaveBeenCalled();
+            expect(mockClient.sendEvent).toHaveBeenCalledWith(
+                room1Id,
+                M_BEACON.name,
+                makeBeaconContent(defaultLocationUri, now, alicesRoom1BeaconInfo.getId()),
+            );
+            expect(mockClient.sendEvent).toHaveBeenCalledWith(
+                room2Id,
+                M_BEACON.name,
+                makeBeaconContent(defaultLocationUri, now, alicesRoom2BeaconInfo.getId()),
+            );
+        });
+    });
+
+    describe('onNotReady()', () => {
+        it('removes listeners', async () => {
+            const store = await makeOwnBeaconStore();
+            const removeSpy = jest.spyOn(mockClient, 'removeListener');
+            // @ts-ignore
+            store.onNotReady();
+
+            expect(removeSpy.mock.calls[0]).toEqual(expect.arrayContaining([BeaconEvent.LivenessChange]));
+            expect(removeSpy.mock.calls[1]).toEqual(expect.arrayContaining([BeaconEvent.New]));
+            expect(removeSpy.mock.calls[2]).toEqual(expect.arrayContaining([BeaconEvent.Update]));
+            expect(removeSpy.mock.calls[3]).toEqual(expect.arrayContaining([BeaconEvent.Destroy]));
+            expect(removeSpy.mock.calls[4]).toEqual(expect.arrayContaining([RoomStateEvent.Members]));
+        });
+
+        it('destroys beacons', async () => {
+            const [room1] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const beacon = room1.currentState.beacons.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+            const destroySpy = jest.spyOn(beacon, 'destroy');
+            // @ts-ignore
+            store.onNotReady();
+
+            expect(destroySpy).toHaveBeenCalled();
+        });
+    });
+
+    describe('hasLiveBeacons()', () => {
+        beforeEach(() => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+        });
+
+        it('returns true when user has live beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons()).toBe(true);
+        });
+
+        it('returns false when user does not have live beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesOldRoomIdBeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons()).toBe(false);
+        });
+
+        it('returns true when user has live beacons for roomId', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons(room1Id)).toBe(true);
+        });
+
+        it('returns false when user does not have live beacons for roomId', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.hasLiveBeacons(room2Id)).toBe(false);
+        });
+    });
+
+    describe('getLiveBeaconIds()', () => {
+        beforeEach(() => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+        });
+
+        it('returns live beacons when user has live beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.getLiveBeaconIds()).toEqual([
+                getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+            ]);
+        });
+
+        it('returns empty array when user does not have live beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesOldRoomIdBeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.getLiveBeaconIds()).toEqual([]);
+        });
+
+        it('returns beacon ids for room when user has live beacons for roomId', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.getLiveBeaconIds(room1Id)).toEqual([
+                getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+            ]);
+            expect(store.getLiveBeaconIds(room2Id)).toEqual([
+                getBeaconInfoIdentifier(alicesRoom2BeaconInfo),
+            ]);
+        });
+
+        it('returns empty array when user does not have live beacons for roomId', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                bobsRoom1BeaconInfo,
+                bobsOldRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            expect(store.getLiveBeaconIds(room2Id)).toEqual([]);
+        });
+    });
+
+    describe('on new beacon event', () => {
+        // assume all beacons were created on this device
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+        });
+        it('ignores events for irrelevant beacons', async () => {
+            makeRoomsWithStateEvents([]);
+            const store = await makeOwnBeaconStore();
+            const bobsLiveBeacon = new Beacon(bobsRoom1BeaconInfo);
+            const monitorSpy = jest.spyOn(bobsLiveBeacon, 'monitorLiveness');
+
+            mockClient.emit(BeaconEvent.New, bobsRoom1BeaconInfo, bobsLiveBeacon);
+
+            // we dont care about bob
+            expect(monitorSpy).not.toHaveBeenCalled();
+            expect(store.hasLiveBeacons()).toBe(false);
+        });
+
+        it('adds users beacons to state and monitors liveness', async () => {
+            makeRoomsWithStateEvents([]);
+            const store = await makeOwnBeaconStore();
+            const alicesLiveBeacon = new Beacon(alicesRoom1BeaconInfo);
+            const monitorSpy = jest.spyOn(alicesLiveBeacon, 'monitorLiveness');
+
+            mockClient.emit(BeaconEvent.New, alicesRoom1BeaconInfo, alicesLiveBeacon);
+
+            expect(monitorSpy).toHaveBeenCalled();
+            expect(store.hasLiveBeacons()).toBe(true);
+            expect(store.hasLiveBeacons(room1Id)).toBe(true);
+        });
+
+        it('emits a liveness change event when new beacons change live state', async () => {
+            makeRoomsWithStateEvents([]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const alicesLiveBeacon = new Beacon(alicesRoom1BeaconInfo);
+
+            mockClient.emit(BeaconEvent.New, alicesRoom1BeaconInfo, alicesLiveBeacon);
+
+            expect(emitSpy).toHaveBeenCalledWith(OwnBeaconStoreEvent.LivenessChange, [alicesLiveBeacon.identifier]);
+        });
+
+        it('emits a liveness change event when new beacons do not change live state', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom2BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            // already live
+            expect(store.hasLiveBeacons()).toBe(true);
+            const emitSpy = jest.spyOn(store, 'emit');
+            const alicesLiveBeacon = new Beacon(alicesRoom1BeaconInfo);
+
+            mockClient.emit(BeaconEvent.New, alicesRoom1BeaconInfo, alicesLiveBeacon);
+
+            expect(emitSpy).toHaveBeenCalled();
+        });
+    });
+
+    describe('on liveness change event', () => {
+        // assume all beacons were created on this device
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+                alicesOldRoomIdBeaconInfo.getId(),
+                'update-event-id',
+            ]));
+        });
+
+        it('ignores events for irrelevant beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const oldLiveBeaconIds = store.getLiveBeaconIds();
+            const bobsLiveBeacon = new Beacon(bobsRoom1BeaconInfo);
+
+            mockClient.emit(BeaconEvent.LivenessChange, true, bobsLiveBeacon);
+
+            expect(emitSpy).not.toHaveBeenCalled();
+            // strictly equal
+            expect(store.getLiveBeaconIds()).toBe(oldLiveBeaconIds);
+        });
+
+        it('updates state and emits beacon liveness changes from true to false', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            // live before
+            expect(store.hasLiveBeacons()).toBe(true);
+            const emitSpy = jest.spyOn(store, 'emit');
+
+            await expireBeaconAndEmit(store, alicesRoom1BeaconInfo);
+
+            expect(store.hasLiveBeacons()).toBe(false);
+            expect(store.hasLiveBeacons(room1Id)).toBe(false);
+            expect(emitSpy).toHaveBeenCalledWith(OwnBeaconStoreEvent.LivenessChange, []);
+        });
+
+        it('stops beacon when liveness changes from true to false and beacon is expired', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const prevEventContent = alicesRoom1BeaconInfo.getContent();
+
+            await expireBeaconAndEmit(store, alicesRoom1BeaconInfo);
+
+            // matches original state of event content
+            // except for live property
+            const expectedUpdateContent = {
+                ...prevEventContent,
+                live: false,
+            };
+            expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
+                room1Id,
+                expectedUpdateContent,
+            );
+        });
+
+        it('updates state and when beacon liveness changes from false to true', async () => {
+            makeRoomsWithStateEvents([
+                alicesOldRoomIdBeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            // not live before
+            expect(store.hasLiveBeacons()).toBe(false);
+            const emitSpy = jest.spyOn(store, 'emit');
+
+            updateBeaconLivenessAndEmit(store, alicesOldRoomIdBeaconInfo, true);
+
+            expect(store.hasLiveBeacons()).toBe(true);
+            expect(store.hasLiveBeacons(room1Id)).toBe(true);
+            expect(emitSpy).toHaveBeenCalledWith(
+                OwnBeaconStoreEvent.LivenessChange,
+                [getBeaconInfoIdentifier(alicesOldRoomIdBeaconInfo)],
+            );
+        });
+    });
+
+    describe('on room membership changes', () => {
+        // assume all beacons were created on this device
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+        });
+        it('ignores events for rooms without beacons', async () => {
+            const membershipEvent = makeMembershipEvent(room2Id, aliceId);
+            // no beacons for room2
+            const [, room2] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const oldLiveBeaconIds = store.getLiveBeaconIds();
+
+            mockClient.emit(
+                RoomStateEvent.Members,
+                membershipEvent,
+                room2.currentState,
+                new RoomMember(room2Id, aliceId),
+            );
+
+            expect(emitSpy).not.toHaveBeenCalled();
+            // strictly equal
+            expect(store.getLiveBeaconIds()).toBe(oldLiveBeaconIds);
+        });
+
+        it('ignores events for membership changes that are not current user', async () => {
+            // bob joins room1
+            const membershipEvent = makeMembershipEvent(room1Id, bobId);
+            const member = new RoomMember(room1Id, bobId);
+            member.setMembershipEvent(membershipEvent);
+
+            const [room1] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const oldLiveBeaconIds = store.getLiveBeaconIds();
+
+            mockClient.emit(
+                RoomStateEvent.Members,
+                membershipEvent,
+                room1.currentState,
+                member,
+            );
+
+            expect(emitSpy).not.toHaveBeenCalled();
+            // strictly equal
+            expect(store.getLiveBeaconIds()).toBe(oldLiveBeaconIds);
+        });
+
+        it('ignores events for membership changes that are not leave/ban', async () => {
+            // alice joins room1
+            const membershipEvent = makeMembershipEvent(room1Id, aliceId);
+            const member = new RoomMember(room1Id, aliceId);
+            member.setMembershipEvent(membershipEvent);
+
+            const [room1] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const oldLiveBeaconIds = store.getLiveBeaconIds();
+
+            mockClient.emit(
+                RoomStateEvent.Members,
+                membershipEvent,
+                room1.currentState,
+                member,
+            );
+
+            expect(emitSpy).not.toHaveBeenCalled();
+            // strictly equal
+            expect(store.getLiveBeaconIds()).toBe(oldLiveBeaconIds);
+        });
+
+        it('destroys and removes beacons when current user leaves room', async () => {
+            // alice leaves room1
+            const membershipEvent = makeMembershipEvent(room1Id, aliceId, 'leave');
+            const member = new RoomMember(room1Id, aliceId);
+            member.setMembershipEvent(membershipEvent);
+
+            const [room1] = makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesRoom2BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const room1BeaconInstance = store.beacons.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+            const beaconDestroySpy = jest.spyOn(room1BeaconInstance, 'destroy');
+            const emitSpy = jest.spyOn(store, 'emit');
+
+            mockClient.emit(
+                RoomStateEvent.Members,
+                membershipEvent,
+                room1.currentState,
+                member,
+            );
+
+            expect(emitSpy).toHaveBeenCalledWith(
+                OwnBeaconStoreEvent.LivenessChange,
+                // other rooms beacons still live
+                [getBeaconInfoIdentifier(alicesRoom2BeaconInfo)],
+            );
+            expect(beaconDestroySpy).toHaveBeenCalledTimes(1);
+            expect(store.getLiveBeaconIds(room1Id)).toEqual([]);
+        });
+    });
+
+    describe('on destroy event', () => {
+        // assume all beacons were created on this device
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+                alicesOldRoomIdBeaconInfo.getId(),
+                'update-event-id',
+            ]));
+        });
+
+        it('ignores events for irrelevant beacons', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const oldLiveBeaconIds = store.getLiveBeaconIds();
+            const bobsLiveBeacon = new Beacon(bobsRoom1BeaconInfo);
+
+            mockClient.emit(BeaconEvent.Destroy, bobsLiveBeacon.identifier);
+
+            expect(emitSpy).not.toHaveBeenCalled();
+            // strictly equal
+            expect(store.getLiveBeaconIds()).toBe(oldLiveBeaconIds);
+        });
+
+        it('updates state and emits beacon liveness changes from true to false', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            // live before
+            expect(store.hasLiveBeacons()).toBe(true);
+            const emitSpy = jest.spyOn(store, 'emit');
+
+            const beacon = store.getBeaconById(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+            beacon.destroy();
+            mockClient.emit(BeaconEvent.Destroy, beacon.identifier);
+
+            expect(store.hasLiveBeacons()).toBe(false);
+            expect(store.hasLiveBeacons(room1Id)).toBe(false);
+            expect(emitSpy).toHaveBeenCalledWith(OwnBeaconStoreEvent.LivenessChange, []);
+        });
+    });
+
+    describe('stopBeacon()', () => {
+        beforeEach(() => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+                alicesOldRoomIdBeaconInfo,
+            ]);
+        });
+
+        it('does nothing for an unknown beacon id', async () => {
+            const store = await makeOwnBeaconStore();
+            await store.stopBeacon('randomBeaconId');
+            expect(mockClient.unstable_setLiveBeacon).not.toHaveBeenCalled();
+        });
+
+        it('does nothing for a beacon that is already not live', async () => {
+            const store = await makeOwnBeaconStore();
+            await store.stopBeacon(getBeaconInfoIdentifier(alicesOldRoomIdBeaconInfo));
+            expect(mockClient.unstable_setLiveBeacon).not.toHaveBeenCalled();
+        });
+
+        it('updates beacon to live:false when it is unexpired', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            const prevEventContent = alicesRoom1BeaconInfo.getContent();
+
+            await store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+            // matches original state of event content
+            // except for live property
+            const expectedUpdateContent = {
+                ...prevEventContent,
+                live: false,
+            };
+            expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
+                room1Id,
+                expectedUpdateContent,
+            );
+        });
+
+        it('records error when stopping beacon event fails to send', async () => {
+            jest.spyOn(logger, 'error').mockImplementation(() => {});
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const error = new Error('oups');
+            mockClient.unstable_setLiveBeacon.mockRejectedValue(error);
+
+            await expect(store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).rejects.toEqual(error);
+
+            expect(store.beaconUpdateErrors.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toEqual(error);
+            expect(emitSpy).toHaveBeenCalledWith(
+                OwnBeaconStoreEvent.BeaconUpdateError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), true,
+            );
+        });
+
+        it('clears previous error and emits when stopping beacon works on retry', async () => {
+            jest.spyOn(logger, 'error').mockImplementation(() => {});
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            const error = new Error('oups');
+            mockClient.unstable_setLiveBeacon.mockRejectedValueOnce(error);
+
+            await expect(store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).rejects.toEqual(error);
+            expect(store.beaconUpdateErrors.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toEqual(error);
+
+            await store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+            // error cleared
+            expect(store.beaconUpdateErrors.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBeFalsy();
+
+            // emit called for error clearing
+            expect(emitSpy).toHaveBeenCalledWith(
+                OwnBeaconStoreEvent.BeaconUpdateError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), false,
+            );
+        });
+
+        it('does not emit BeaconUpdateError when stopping succeeds and beacon did not have errors', async () => {
+            jest.spyOn(logger, 'error').mockImplementation(() => {});
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            const emitSpy = jest.spyOn(store, 'emit');
+            // error cleared
+            expect(store.beaconUpdateErrors.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBeFalsy();
+
+            // emit called for error clearing
+            expect(emitSpy).not.toHaveBeenCalledWith(
+                OwnBeaconStoreEvent.BeaconUpdateError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), false,
+            );
+        });
+
+        it('updates beacon to live:false when it is expired but live property is true', async () => {
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            const prevEventContent = alicesRoom1BeaconInfo.getContent();
+
+            // time travel until beacon is expired
+            advanceDateAndTime(HOUR_MS * 3);
+
+            await store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+            // matches original state of event content
+            // except for live property
+            const expectedUpdateContent = {
+                ...prevEventContent,
+                live: false,
+            };
+            expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
+                room1Id,
+                expectedUpdateContent,
+            );
+        });
+
+        it('removes beacon event id from local store', async () => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+            ]));
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+
+            await store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+            expect(localStorageSetSpy).toHaveBeenCalledWith(
+                'mx_live_beacon_created_id',
+                // stopped beacon's event_id was removed
+                JSON.stringify([alicesRoom2BeaconInfo.getId()]),
+            );
+        });
+    });
+
+    describe('publishing positions', () => {
+        // assume all beacons were created on this device
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+                alicesRoom2BeaconInfo.getId(),
+                alicesOldRoomIdBeaconInfo.getId(),
+                'update-event-id',
+            ]));
+        });
+
+        it('stops watching position when user has no more live beacons', async () => {
+            // geolocation is only going to emit 1 position
+            geolocation.watchPosition.mockImplementation(
+                watchPositionMockImplementation([0]),
+            );
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            const store = await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+            // two locations were published
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(1);
+
+            // expire the beacon
+            // user now has no live beacons
+            await expireBeaconAndEmit(store, alicesRoom1BeaconInfo);
+
+            // stop watching location
+            expect(geolocation.clearWatch).toHaveBeenCalled();
+            expect(store.isMonitoringLiveLocation).toEqual(false);
+        });
+
+        describe('when store is initialised with live beacons', () => {
+            it('starts watching position', async () => {
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                expect(geolocation.watchPosition).toHaveBeenCalled();
+                expect(store.isMonitoringLiveLocation).toEqual(true);
+            });
+
+            it('kills live beacon when geolocation is unavailable', async () => {
+                const errorLogSpy = jest.spyOn(logger, 'error').mockImplementation(() => { });
+                // remove the mock we set
+                // @ts-ignore
+                navigator.geolocation = undefined;
+
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                expect(store.isMonitoringLiveLocation).toEqual(false);
+                expect(errorLogSpy).toHaveBeenCalledWith('Geolocation failed', "Unavailable");
+            });
+
+            it('kills live beacon when geolocation permissions are not granted', async () => {
+                // similar case to the test above
+                // but these errors are handled differently
+                // above is thrown by element, this passed to error callback by geolocation
+                // return only a permission denied error
+                geolocation.watchPosition.mockImplementation(watchPositionMockImplementation(
+                    [0], [1]),
+                );
+
+                const errorLogSpy = jest.spyOn(logger, 'error').mockImplementation(() => { });
+
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                expect(store.isMonitoringLiveLocation).toEqual(false);
+                expect(errorLogSpy).toHaveBeenCalledWith('Geolocation failed', "PermissionDenied");
+            });
+        });
+
+        describe('adding a new beacon', () => {
+            it('publishes position for new beacon immediately', async () => {
+                makeRoomsWithStateEvents([]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                addNewBeaconAndEmit(alicesRoom1BeaconInfo);
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                expect(mockClient.sendEvent).toHaveBeenCalled();
+                expect(store.isMonitoringLiveLocation).toEqual(true);
+            });
+
+            it('kills live beacons when geolocation is unavailable', async () => {
+                jest.spyOn(logger, 'error').mockImplementation(() => { });
+                // @ts-ignore
+                navigator.geolocation = undefined;
+                makeRoomsWithStateEvents([]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                addNewBeaconAndEmit(alicesRoom1BeaconInfo);
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                // stop beacon
+                expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalled();
+                expect(store.isMonitoringLiveLocation).toEqual(false);
+            });
+
+            it('publishes position for new beacon immediately when there were already live beacons', async () => {
+                makeRoomsWithStateEvents([alicesRoom2BeaconInfo]);
+                await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(1);
+
+                addNewBeaconAndEmit(alicesRoom1BeaconInfo);
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                expect(geolocation.getCurrentPosition).toHaveBeenCalled();
+                // once for original event,
+                // then both live beacons get current position published
+                // after new beacon is added
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(3);
+            });
+        });
+
+        describe('when publishing position fails', () => {
+            beforeEach(() => {
+                geolocation.watchPosition.mockImplementation(
+                    watchPositionMockImplementation([0, 1000, 3000, 3000, 3000]),
+                );
+
+                // eat expected console error logs
+                jest.spyOn(logger, 'error').mockImplementation(() => { });
+            });
+
+            // we need to advance time and then flush promises
+            // individually for each call to sendEvent
+            // otherwise the sendEvent doesn't reject/resolve and update state
+            // before the next call
+            // advance and flush every 1000ms
+            // until given ms is 'elapsed'
+            const advanceAndFlushPromises = async (timeMs: number) => {
+                while (timeMs > 0) {
+                    jest.advanceTimersByTime(1000);
+                    await flushPromisesWithFakeTimers();
+                    timeMs -= 1000;
+                }
+            };
+
+            it('continues publishing positions after one publish error', async () => {
+                // fail to send first event, then succeed
+                mockClient.sendEvent.mockRejectedValueOnce(new Error('oups')).mockResolvedValue({ event_id: '1' });
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                await advanceAndFlushPromises(50000);
+
+                // called for each position from watchPosition
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(5);
+                expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false);
+                expect(store.getLiveBeaconIdsWithLocationPublishError()).toEqual([]);
+                expect(store.hasLocationPublishErrors()).toBe(false);
+            });
+
+            it('continues publishing positions when a beacon fails intermittently', async () => {
+                // every second event rejects
+                // meaning this beacon has more errors than the threshold
+                // but they are not consecutive
+                mockClient.sendEvent
+                    .mockRejectedValueOnce(new Error('oups'))
+                    .mockResolvedValueOnce({ event_id: '1' })
+                    .mockRejectedValueOnce(new Error('oups'))
+                    .mockResolvedValueOnce({ event_id: '1' })
+                    .mockRejectedValueOnce(new Error('oups'));
+
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                const emitSpy = jest.spyOn(store, 'emit');
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                await advanceAndFlushPromises(50000);
+
+                // called for each position from watchPosition
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(5);
+                expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false);
+                expect(store.hasLocationPublishErrors()).toBe(false);
+                expect(emitSpy).not.toHaveBeenCalledWith(
+                    OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+                );
+            });
+
+            it('stops publishing positions when a beacon fails consistently', async () => {
+                // always fails to send events
+                mockClient.sendEvent.mockRejectedValue(new Error('oups'));
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                const emitSpy = jest.spyOn(store, 'emit');
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                // 5 positions from watchPosition in this period
+                await advanceAndFlushPromises(50000);
+
+                // only two allowed failures
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(2);
+                expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true);
+                expect(store.getLiveBeaconIdsWithLocationPublishError()).toEqual(
+                    [getBeaconInfoIdentifier(alicesRoom1BeaconInfo)],
+                );
+                expect(store.getLiveBeaconIdsWithLocationPublishError(room1Id)).toEqual(
+                    [getBeaconInfoIdentifier(alicesRoom1BeaconInfo)],
+                );
+                expect(store.hasLocationPublishErrors()).toBe(true);
+                expect(emitSpy).toHaveBeenCalledWith(
+                    OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+                );
+            });
+
+            it('stops publishing positions when a beacon has a stopping error', async () => {
+                // reject stopping beacon
+                const error = new Error('oups');
+                mockClient.unstable_setLiveBeacon.mockRejectedValue(error);
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                // 2 positions from watchPosition in this period
+                await advanceAndFlushPromises(5000);
+
+                // attempt to stop the beacon
+                await expect(store.stopBeacon(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).rejects.toEqual(error);
+                expect(store.beaconUpdateErrors.get(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toEqual(error);
+
+                // 2 more positions in this period
+                await advanceAndFlushPromises(50000);
+
+                // only two positions pre-stopping were sent
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(3);
+            });
+
+            it('restarts publishing a beacon after resetting location publish error', async () => {
+                // always fails to send events
+                mockClient.sendEvent.mockRejectedValue(new Error('oups'));
+                makeRoomsWithStateEvents([
+                    alicesRoom1BeaconInfo,
+                ]);
+                const store = await makeOwnBeaconStore();
+                const emitSpy = jest.spyOn(store, 'emit');
+                // wait for store to settle
+                await flushPromisesWithFakeTimers();
+
+                // 3 positions from watchPosition in this period
+                await advanceAndFlushPromises(4000);
+
+                // only two allowed failures
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(2);
+                expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true);
+                expect(store.hasLocationPublishErrors()).toBe(true);
+                expect(store.hasLocationPublishErrors(room1Id)).toBe(true);
+                expect(emitSpy).toHaveBeenCalledWith(
+                    OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+                );
+
+                // reset emitSpy mock counts to assert on locationPublishError again
+                emitSpy.mockClear();
+                store.resetLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo));
+
+                expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false);
+
+                // 2 more positions from watchPosition in this period
+                await advanceAndFlushPromises(10000);
+
+                // 2 from before, 2 new ones
+                expect(mockClient.sendEvent).toHaveBeenCalledTimes(4);
+                expect(emitSpy).toHaveBeenCalledWith(
+                    OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo),
+                );
+            });
+        });
+
+        it('publishes subsequent positions', async () => {
+            // modern fake timers + debounce + promises are not friends
+            // just testing that positions are published
+            // not that the debounce works
+
+            geolocation.watchPosition.mockImplementation(
+                watchPositionMockImplementation([0, 1000, 3000]),
+            );
+
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(0);
+            await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+
+            jest.advanceTimersByTime(5000);
+
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(3);
+        });
+
+        it('stops live beacons when geolocation permissions are revoked', async () => {
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+            // return two good positions, then a permission denied error
+            geolocation.watchPosition.mockImplementation(watchPositionMockImplementation(
+                [0, 1000, 3000], [0, 0, 1]),
+            );
+
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(0);
+            const store = await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+
+            jest.advanceTimersByTime(5000);
+
+            // first two events were sent successfully
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(2);
+
+            // stop beacon
+            expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalled();
+            expect(store.isMonitoringLiveLocation).toEqual(false);
+        });
+
+        it('keeps sharing positions when geolocation has a non fatal error', async () => {
+            const errorLogSpy = jest.spyOn(logger, 'error').mockImplementation(() => { });
+            // return good position, timeout error, good position
+            geolocation.watchPosition.mockImplementation(watchPositionMockImplementation(
+                [0, 1000, 3000], [0, 3, 0]),
+            );
+
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(0);
+            const store = await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+
+            jest.advanceTimersByTime(5000);
+
+            // two good locations were sent
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(2);
+
+            // still sharing
+            expect(mockClient.unstable_setLiveBeacon).not.toHaveBeenCalled();
+            expect(store.isMonitoringLiveLocation).toEqual(true);
+            expect(errorLogSpy).toHaveBeenCalledWith('Geolocation failed', 'error message');
+        });
+
+        it('publishes last known position after 30s of inactivity', async () => {
+            geolocation.watchPosition.mockImplementation(
+                watchPositionMockImplementation([0]),
+            );
+
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+            // published first location
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(1);
+
+            advanceDateAndTime(31000);
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+
+            // republished latest location
+            expect(mockClient.sendEvent).toHaveBeenCalledTimes(2);
+        });
+
+        it('does not try to publish anything if there is no known position after 30s of inactivity', async () => {
+            // no position ever returned from geolocation
+            geolocation.watchPosition.mockImplementation(
+                watchPositionMockImplementation([]),
+            );
+            geolocation.getCurrentPosition.mockImplementation(
+                watchPositionMockImplementation([]),
+            );
+
+            makeRoomsWithStateEvents([
+                alicesRoom1BeaconInfo,
+            ]);
+            await makeOwnBeaconStore();
+            // wait for store to settle
+            await flushPromisesWithFakeTimers();
+
+            advanceDateAndTime(31000);
+
+            // no locations published
+            expect(mockClient.sendEvent).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('createLiveBeacon', () => {
+        const newEventId = 'new-beacon-event-id';
+        const loggerErrorSpy = jest.spyOn(logger, 'error').mockImplementation(() => {});
+        beforeEach(() => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify([
+                alicesRoom1BeaconInfo.getId(),
+            ]));
+
+            localStorageSetSpy.mockClear();
+
+            mockClient.unstable_createLiveBeacon.mockResolvedValue({ event_id: newEventId });
+        });
+
+        it('creates a live beacon', async () => {
+            const store = await makeOwnBeaconStore();
+            const content = makeBeaconInfoContent(100);
+            await store.createLiveBeacon(room1Id, content);
+            expect(mockClient.unstable_createLiveBeacon).toHaveBeenCalledWith(room1Id, content);
+        });
+
+        it('sets new beacon event id in local storage', async () => {
+            const store = await makeOwnBeaconStore();
+            const content = makeBeaconInfoContent(100);
+            await store.createLiveBeacon(room1Id, content);
+
+            expect(localStorageSetSpy).toHaveBeenCalledWith(
+                'mx_live_beacon_created_id',
+                JSON.stringify([
+                    alicesRoom1BeaconInfo.getId(),
+                    newEventId,
+                ]),
+            );
+        });
+
+        it('handles saving beacon event id when local storage has bad value', async () => {
+            localStorageGetSpy.mockReturnValue(JSON.stringify({ id: '1' }));
+            const store = await makeOwnBeaconStore();
+            const content = makeBeaconInfoContent(100);
+            await store.createLiveBeacon(room1Id, content);
+
+            // stored successfully
+            expect(localStorageSetSpy).toHaveBeenCalledWith(
+                'mx_live_beacon_created_id',
+                JSON.stringify([
+                    newEventId,
+                ]),
+            );
+        });
+
+        it('creates a live beacon without error when no beacons exist for room', async () => {
+            const store = await makeOwnBeaconStore();
+            const content = makeBeaconInfoContent(100);
+            await store.createLiveBeacon(room1Id, content);
+
+            // didn't throw, no error log
+            expect(loggerErrorSpy).not.toHaveBeenCalled();
+        });
+    });
+});
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 6c9e8d47f99..d948fa64969 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import '../skinned-sdk'; // Must be first for skinning to work
-import RoomViewStore from '../../src/stores/RoomViewStore';
+import { RoomViewStore } from '../../src/stores/RoomViewStore';
 import { Action } from '../../src/dispatcher/actions';
 import { MatrixClientPeg as peg } from '../../src/MatrixClientPeg';
 import * as testUtils from '../test-utils';
 
-const dispatch = testUtils.getDispatchForStore(RoomViewStore);
+const dispatch = testUtils.getDispatchForStore(RoomViewStore.instance);
 
 jest.mock('../../src/utils/DMRoomMap', () => {
     const mock = {
@@ -42,7 +41,7 @@ describe('RoomViewStore', function() {
         peg.get().off = jest.fn();
 
         // Reset the state of the store
-        RoomViewStore.reset();
+        RoomViewStore.instance.reset();
     });
 
     it('can be used to view a room by ID and join', function(done) {
@@ -53,16 +52,16 @@ describe('RoomViewStore', function() {
 
         dispatch({ action: Action.ViewRoom, room_id: '!randomcharacters:aser.ver' });
         dispatch({ action: 'join_room' });
-        expect(RoomViewStore.isJoining()).toBe(true);
+        expect(RoomViewStore.instance.isJoining()).toBe(true);
     });
 
     it('can be used to view a room by alias and join', function(done) {
-        const token = RoomViewStore.addListener(() => {
+        const token = RoomViewStore.instance.addListener(() => {
             // Wait until the room alias has resolved and the room ID is
-            if (!RoomViewStore.isRoomLoading()) {
-                expect(RoomViewStore.getRoomId()).toBe("!randomcharacters:aser.ver");
+            if (!RoomViewStore.instance.isRoomLoading()) {
+                expect(RoomViewStore.instance.getRoomId()).toBe("!randomcharacters:aser.ver");
                 dispatch({ action: 'join_room' });
-                expect(RoomViewStore.isJoining()).toBe(true);
+                expect(RoomViewStore.instance.isJoining()).toBe(true);
             }
         });
 
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 5b6e776d31d..47c3f974b23 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { mocked } from 'jest-mock';
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 import { defer } from "matrix-js-sdk/src/utils";
+import { ClientEvent, RoomEvent, MatrixEvent } from 'matrix-js-sdk/src/matrix';
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import SpaceStore from "../../src/stores/spaces/SpaceStore";
 import {
     MetaSpace,
@@ -101,8 +102,8 @@ describe("SpaceStore", () => {
     const viewRoom = roomId => defaultDispatcher.dispatch({ action: Action.ViewRoom, room_id: roomId }, true);
 
     const run = async () => {
-        client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
-        client.getRoomUpgradeHistory.mockImplementation(roomId => [rooms.find(room => room.roomId === roomId)]);
+        mocked(client).getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
+        mocked(client).getRoomUpgradeHistory.mockImplementation(roomId => [rooms.find(room => room.roomId === roomId)]);
         await testUtils.setupAsyncStoreWithClient(store, client);
         jest.runOnlyPendingTimers();
     };
@@ -117,7 +118,7 @@ describe("SpaceStore", () => {
 
     beforeEach(async () => {
         jest.runOnlyPendingTimers(); // run async dispatch
-        client.getVisibleRooms.mockReturnValue(rooms = []);
+        mocked(client).getVisibleRooms.mockReturnValue(rooms = []);
 
         await SettingsStore.setValue("Spaces.enabledMetaSpaces", null, SettingLevel.DEVICE, {
             [MetaSpace.Home]: true,
@@ -318,7 +319,7 @@ describe("SpaceStore", () => {
                 mkSpace(space3, [invite2]);
                 mkSpace(space4, [room4, fav2, space2, space3]);
 
-                client.getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
+                mocked(client).getRoom.mockImplementation(roomId => rooms.find(room => room.roomId === roomId));
 
                 [fav1, fav2, fav3].forEach(roomId => {
                     client.getRoom(roomId).tags = {
@@ -329,7 +330,7 @@ describe("SpaceStore", () => {
                 });
 
                 [invite1, invite2].forEach(roomId => {
-                    client.getRoom(roomId).getMyMembership.mockReturnValue("invite");
+                    mocked(client.getRoom(roomId)).getMyMembership.mockReturnValue("invite");
                 });
 
                 // have dmPartner1 be in space1 with you
@@ -350,7 +351,7 @@ describe("SpaceStore", () => {
 
                 // room 2 claims to be a child of space2 and is so via a valid m.space.parent
                 const cliRoom2 = client.getRoom(room2);
-                cliRoom2.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+                const room2MockStateEvents = testUtils.mockStateEventImplementation([
                     mkEvent({
                         event: true,
                         type: EventType.SpaceParent,
@@ -359,36 +360,40 @@ describe("SpaceStore", () => {
                         skey: space2,
                         content: { via: [], canonical: true },
                         ts: Date.now(),
-                    }),
-                ]));
+                    }) as MatrixEvent,
+                ]);
+                mocked(cliRoom2.currentState).getStateEvents.mockImplementation(room2MockStateEvents);
                 const cliSpace2 = client.getRoom(space2);
-                cliSpace2.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
-                    if (evType === EventType.SpaceChild) {
-                        return userId === client.getUserId();
-                    }
-                    return true;
-                });
+                mocked(cliSpace2.currentState).maySendStateEvent.mockImplementation(
+                    (evType: string, userId: string) => {
+                        if (evType === EventType.SpaceChild) {
+                            return userId === client.getUserId();
+                        }
+                        return true;
+                    });
 
                 // room 3 claims to be a child of space3 but is not due to invalid m.space.parent (permissions)
                 const cliRoom3 = client.getRoom(room3);
-                cliRoom3.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
-                    mkEvent({
-                        event: true,
-                        type: EventType.SpaceParent,
-                        room: room3,
-                        user: client.getUserId(),
-                        skey: space3,
-                        content: { via: [], canonical: true },
-                        ts: Date.now(),
-                    }),
-                ]));
+                mocked(cliRoom3.currentState).getStateEvents.mockImplementation(
+                    testUtils.mockStateEventImplementation([
+                        mkEvent({
+                            event: true,
+                            type: EventType.SpaceParent,
+                            room: room3,
+                            user: client.getUserId(),
+                            skey: space3,
+                            content: { via: [], canonical: true },
+                            ts: Date.now(),
+                        }),
+                    ]));
                 const cliSpace3 = client.getRoom(space3);
-                cliSpace3.currentState.maySendStateEvent.mockImplementation((evType: string, userId: string) => {
-                    if (evType === EventType.SpaceChild) {
-                        return false;
-                    }
-                    return true;
-                });
+                mocked(cliSpace3.currentState).maySendStateEvent.mockImplementation(
+                    (evType: string, userId: string) => {
+                        if (evType === EventType.SpaceChild) {
+                            return false;
+                        }
+                        return true;
+                    });
 
                 await run();
             });
@@ -598,7 +603,7 @@ describe("SpaceStore", () => {
             expect(store.spacePanelSpaces).toStrictEqual([]);
             const space = mkSpace(space1);
             const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
-            client.emit("Room", space);
+            client.emit(ClientEvent.Room, space);
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([space]);
             expect(store.invitedSpaces).toStrictEqual([]);
@@ -611,7 +616,7 @@ describe("SpaceStore", () => {
             expect(store.spacePanelSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("leave");
             const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
-            client.emit("Room.myMembership", space, "leave", "join");
+            client.emit(RoomEvent.MyMembership, space, "leave", "join");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
         });
@@ -623,7 +628,7 @@ describe("SpaceStore", () => {
             const space = mkSpace(space1);
             space.getMyMembership.mockReturnValue("invite");
             const prom = testUtils.emitPromise(store, UPDATE_INVITED_SPACES);
-            client.emit("Room", space);
+            client.emit(ClientEvent.Room, space);
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
             expect(store.invitedSpaces).toStrictEqual([space]);
@@ -638,7 +643,7 @@ describe("SpaceStore", () => {
             expect(store.invitedSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("join");
             const prom = testUtils.emitPromise(store, UPDATE_TOP_LEVEL_SPACES);
-            client.emit("Room.myMembership", space, "join", "invite");
+            client.emit(RoomEvent.MyMembership, space, "join", "invite");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([space]);
             expect(store.invitedSpaces).toStrictEqual([]);
@@ -653,7 +658,7 @@ describe("SpaceStore", () => {
             expect(store.invitedSpaces).toStrictEqual([space]);
             space.getMyMembership.mockReturnValue("leave");
             const prom = testUtils.emitPromise(store, UPDATE_INVITED_SPACES);
-            client.emit("Room.myMembership", space, "leave", "invite");
+            client.emit(RoomEvent.MyMembership, space, "leave", "invite");
             await prom;
             expect(store.spacePanelSpaces).toStrictEqual([]);
             expect(store.invitedSpaces).toStrictEqual([]);
@@ -673,7 +678,7 @@ describe("SpaceStore", () => {
             const invite = mkRoom(invite1);
             invite.getMyMembership.mockReturnValue("invite");
             const prom = testUtils.emitPromise(store, space1);
-            client.emit("Room", space);
+            client.emit(ClientEvent.Room, space);
             await prom;
 
             expect(store.spacePanelSpaces).toStrictEqual([space]);
@@ -705,11 +710,11 @@ describe("SpaceStore", () => {
                     ts: Date.now(),
                 });
                 const spaceRoom = client.getRoom(spaceId);
-                spaceRoom.currentState.getStateEvents.mockImplementation(
+                mocked(spaceRoom.currentState).getStateEvents.mockImplementation(
                     testUtils.mockStateEventImplementation([childEvent]),
                 );
 
-                client.emit("RoomState.events", childEvent);
+                client.emit(RoomStateEvent.Events, childEvent, spaceRoom.currentState, undefined);
             };
 
             const addMember = (spaceId, user: RoomMember) => {
@@ -723,12 +728,12 @@ describe("SpaceStore", () => {
                     ts: Date.now(),
                 });
                 const spaceRoom = client.getRoom(spaceId);
-                spaceRoom.currentState.getStateEvents.mockImplementation(
+                mocked(spaceRoom.currentState).getStateEvents.mockImplementation(
                     testUtils.mockStateEventImplementation([memberEvent]),
                 );
-                spaceRoom.getMember.mockReturnValue(user);
+                mocked(spaceRoom).getMember.mockReturnValue(user);
 
-                client.emit("RoomState.members", memberEvent);
+                client.emit(RoomStateEvent.Members, memberEvent, spaceRoom.currentState, user);
             };
 
             it('emits events for parent spaces when child room is added', async () => {
@@ -857,8 +862,8 @@ describe("SpaceStore", () => {
 
         await run();
 
-        const deferred = defer<void>();
-        (space.loadMembersIfNeeded as jest.Mock).mockImplementation(() => {
+        const deferred = defer<boolean>();
+        space.loadMembersIfNeeded.mockImplementation(() => {
             const event = mkEvent({
                 event: true,
                 type: EventType.RoomMember,
@@ -876,7 +881,7 @@ describe("SpaceStore", () => {
             });
 
             client.emit(RoomStateEvent.Members, event, null, null);
-            deferred.resolve();
+            return deferred.resolve(true) as unknown as Promise<boolean>;
         });
 
         spyDispatcher.mockClear();
@@ -1000,7 +1005,7 @@ describe("SpaceStore", () => {
             mkSpace(space2, [room1, room2]);
 
             const cliRoom2 = client.getRoom(room2);
-            cliRoom2.currentState.getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
+            mocked(cliRoom2.currentState).getStateEvents.mockImplementation(testUtils.mockStateEventImplementation([
                 mkEvent({
                     event: true,
                     type: EventType.SpaceParent,
@@ -1123,14 +1128,14 @@ describe("SpaceStore", () => {
         // receive invite to space
         const rootSpace = mkSpace(space1, [room1, room2, space2]);
         rootSpace.getMyMembership.mockReturnValue("invite");
-        client.emit("Room", rootSpace);
+        client.emit(ClientEvent.Room, rootSpace);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([rootSpace]);
         expect(SpaceStore.instance.spacePanelSpaces).toStrictEqual([]);
 
         // accept invite to space
         rootSpace.getMyMembership.mockReturnValue("join");
-        client.emit("Room.myMembership", rootSpace, "join", "invite");
+        client.emit(RoomEvent.MyMembership, rootSpace, "join", "invite");
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([]);
         expect(SpaceStore.instance.spacePanelSpaces).toStrictEqual([rootSpace]);
@@ -1139,7 +1144,7 @@ describe("SpaceStore", () => {
         expect(SpaceStore.instance.isRoomInSpace(space1, room1)).toBeFalsy();
         const rootSpaceRoom1 = mkRoom(room1);
         rootSpaceRoom1.getMyMembership.mockReturnValue("join");
-        client.emit("Room", rootSpaceRoom1);
+        client.emit(ClientEvent.Room, rootSpaceRoom1);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([]);
         expect(SpaceStore.instance.spacePanelSpaces).toStrictEqual([rootSpace]);
@@ -1153,7 +1158,7 @@ describe("SpaceStore", () => {
         expect(SpaceStore.instance.isRoomInSpace(space1, room2)).toBeFalsy();
         const rootSpaceRoom2 = mkRoom(room2);
         rootSpaceRoom2.getMyMembership.mockReturnValue("invite");
-        client.emit("Room", rootSpaceRoom2);
+        client.emit(ClientEvent.Room, rootSpaceRoom2);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([]);
         expect(SpaceStore.instance.spacePanelSpaces).toStrictEqual([rootSpace]);
@@ -1181,7 +1186,7 @@ describe("SpaceStore", () => {
             }
         });
         expect(SpaceStore.instance.getSpaceFilteredUserIds(space1).has(dm1Partner.userId)).toBeFalsy();
-        client.emit("RoomState.members", mkEvent({
+        const memberEvent = mkEvent({
             event: true,
             type: EventType.RoomMember,
             content: {
@@ -1190,12 +1195,13 @@ describe("SpaceStore", () => {
             skey: dm1Partner.userId,
             user: dm1Partner.userId,
             room: space1,
-        }));
+        });
+        client.emit(RoomStateEvent.Members, memberEvent, undefined, undefined);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.getSpaceFilteredUserIds(space1).has(dm1Partner.userId)).toBeTruthy();
         const dm1Room = mkRoom(dm1);
         dm1Room.getMyMembership.mockReturnValue("join");
-        client.emit("Room", dm1Room);
+        client.emit(ClientEvent.Room, dm1Room);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([]);
         expect(SpaceStore.instance.spacePanelSpaces).toStrictEqual([rootSpace]);
@@ -1209,7 +1215,7 @@ describe("SpaceStore", () => {
         const subspace = mkSpace(space2);
         subspace.getMyMembership.mockReturnValue("join");
         const prom = testUtils.emitPromise(SpaceStore.instance, space1);
-        client.emit("Room", subspace);
+        client.emit(ClientEvent.Room, subspace);
         jest.runOnlyPendingTimers();
         expect(SpaceStore.instance.invitedSpaces).toStrictEqual([]);
         expect(SpaceStore.instance.spacePanelSpaces.map(r => r.roomId)).toStrictEqual([rootSpace.roomId]);
diff --git a/test/stores/VideoChannelStore-test.ts b/test/stores/VideoChannelStore-test.ts
new file mode 100644
index 00000000000..fc8752ec76f
--- /dev/null
+++ b/test/stores/VideoChannelStore-test.ts
@@ -0,0 +1,140 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { mocked } from "jest-mock";
+import { Widget, ClientWidgetApi, MatrixWidgetType, IWidgetApiRequest } from "matrix-widget-api";
+
+import { stubClient, setupAsyncStoreWithClient } from "../test-utils";
+import { MatrixClientPeg } from "../../src/MatrixClientPeg";
+import WidgetStore, { IApp } from "../../src/stores/WidgetStore";
+import { WidgetMessagingStore } from "../../src/stores/widgets/WidgetMessagingStore";
+import { ElementWidgetActions } from "../../src/stores/widgets/ElementWidgetActions";
+import VideoChannelStore, { VideoChannelEvent } from "../../src/stores/VideoChannelStore";
+import { VIDEO_CHANNEL } from "../../src/utils/VideoChannelUtils";
+
+describe("VideoChannelStore", () => {
+    const store = VideoChannelStore.instance;
+
+    const widget = { id: VIDEO_CHANNEL } as unknown as Widget;
+    const app = {
+        id: VIDEO_CHANNEL,
+        eventId: "$1:example.org",
+        roomId: "!1:example.org",
+        type: MatrixWidgetType.JitsiMeet,
+        url: "",
+        name: "Video channel",
+        creatorUserId: "@alice:example.org",
+        avatar_url: null,
+    } as IApp;
+
+    // Set up mocks to simulate the remote end of the widget API
+    let messageSent: Promise<void>;
+    let messageSendMock: () => void;
+    let onMock: (action: string, listener: (ev: CustomEvent<IWidgetApiRequest>) => void) => void;
+    let onceMock: (action: string, listener: (ev: CustomEvent<IWidgetApiRequest>) => void) => void;
+    let messaging: ClientWidgetApi;
+    beforeEach(() => {
+        stubClient();
+        const cli = MatrixClientPeg.get();
+        setupAsyncStoreWithClient(WidgetMessagingStore.instance, cli);
+        setupAsyncStoreWithClient(store, cli);
+
+        let resolveMessageSent: () => void;
+        messageSent = new Promise(resolve => resolveMessageSent = resolve);
+        messageSendMock = jest.fn().mockImplementation(() => resolveMessageSent());
+        onMock = jest.fn();
+        onceMock = jest.fn();
+
+        jest.spyOn(WidgetStore.instance, "getApps").mockReturnValue([app]);
+        messaging = {
+            on: onMock,
+            off: () => {},
+            stop: () => {},
+            once: onceMock,
+            transport: {
+                send: messageSendMock,
+                reply: () => {},
+            },
+        } as unknown as ClientWidgetApi;
+    });
+
+    const widgetReady = () => {
+        // Tell the WidgetStore that the widget is ready
+        const [, ready] = mocked(onceMock).mock.calls.find(([action]) =>
+            action === `action:${ElementWidgetActions.WidgetReady}`,
+        );
+        ready({ detail: {} } as unknown as CustomEvent<IWidgetApiRequest>);
+    };
+
+    const confirmConnect = async () => {
+        // Wait for the store to contact the widget API
+        await messageSent;
+        // Then, locate the callback that will confirm the join
+        const [, join] = mocked(onMock).mock.calls.find(([action]) =>
+            action === `action:${ElementWidgetActions.JoinCall}`,
+        );
+        // Confirm the join, and wait for the store to update
+        const waitForConnect = new Promise<void>(resolve =>
+            store.once(VideoChannelEvent.Connect, resolve),
+        );
+        join({ detail: {} } as unknown as CustomEvent<IWidgetApiRequest>);
+        await waitForConnect;
+    };
+
+    const confirmDisconnect = async () => {
+        // Locate the callback that will perform the hangup
+        const [, hangup] = mocked(onceMock).mock.calls.find(([action]) =>
+            action === `action:${ElementWidgetActions.HangupCall}`,
+        );
+        // Hangup and wait for the store, once again
+        const waitForHangup = new Promise<void>(resolve =>
+            store.once(VideoChannelEvent.Disconnect, resolve),
+        );
+        hangup({ detail: {} } as unknown as CustomEvent<IWidgetApiRequest>);
+        await waitForHangup;
+    };
+
+    it("connects and disconnects", async () => {
+        WidgetMessagingStore.instance.storeMessaging(widget, "!1:example.org", messaging);
+        widgetReady();
+        expect(store.roomId).toBeFalsy();
+        expect(store.connected).toEqual(false);
+
+        store.connect("!1:example.org", null, null);
+        await confirmConnect();
+        expect(store.roomId).toEqual("!1:example.org");
+        expect(store.connected).toEqual(true);
+
+        store.disconnect();
+        await confirmDisconnect();
+        expect(store.roomId).toBeFalsy();
+        expect(store.connected).toEqual(false);
+        WidgetMessagingStore.instance.stopMessaging(widget, "!1:example.org");
+    });
+
+    it("waits for messaging when connecting", async () => {
+        store.connect("!1:example.org", null, null);
+        WidgetMessagingStore.instance.storeMessaging(widget, "!1:example.org", messaging);
+        widgetReady();
+        await confirmConnect();
+        expect(store.roomId).toEqual("!1:example.org");
+        expect(store.connected).toEqual(true);
+
+        store.disconnect();
+        await confirmDisconnect();
+        WidgetMessagingStore.instance.stopMessaging(widget, "!1:example.org");
+    });
+});
diff --git a/test/stores/VoiceRecordingStore-test.ts b/test/stores/VoiceRecordingStore-test.ts
index 1c8bb86cb3d..7be07bed6f2 100644
--- a/test/stores/VoiceRecordingStore-test.ts
+++ b/test/stores/VoiceRecordingStore-test.ts
@@ -17,7 +17,6 @@ limitations under the License.
 
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import { VoiceRecording } from '../../src/audio/VoiceRecording';
 import { VoiceRecordingStore } from '../../src/stores/VoiceRecordingStore';
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
diff --git a/test/stores/WidgetLayoutStore-test.ts b/test/stores/WidgetLayoutStore-test.ts
index 139c31b1764..eb41d1231a7 100644
--- a/test/stores/WidgetLayoutStore-test.ts
+++ b/test/stores/WidgetLayoutStore-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../skinned-sdk"; // Must be first for skinning to work
 import { Room } from "matrix-js-sdk/src/matrix";
 
 import WidgetStore, { IApp } from "../../src/stores/WidgetStore";
diff --git a/test/stores/notifications/RoomNotificationState-test.ts b/test/stores/notifications/RoomNotificationState-test.ts
index 76600dfd2ca..904e0689092 100644
--- a/test/stores/notifications/RoomNotificationState-test.ts
+++ b/test/stores/notifications/RoomNotificationState-test.ts
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEventEvent, MatrixEvent } from "matrix-js-sdk/src/matrix";
 
-import "../../skinned-sdk";
 import { stubClient } from "../../test-utils";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { RoomNotificationState } from "../../../src/stores/notifications/RoomNotificationState";
@@ -28,16 +28,16 @@ describe("RoomNotificationState", () => {
     const client = MatrixClientPeg.get();
 
     it("Updates on event decryption", () => {
-        const testRoom = testUtils.mkStubRoom(client, "$aroomid", "Test room");
+        const testRoom = testUtils.mkStubRoom("$aroomid", "Test room", client);
 
         const roomNotifState = new RoomNotificationState(testRoom as any as Room);
         const listener = jest.fn();
         roomNotifState.addListener(NotificationStateEvents.Update, listener);
         const testEvent = {
             getRoomId: () => testRoom.roomId,
-        };
+        } as unknown as MatrixEvent;
         testRoom.getUnreadNotificationCount = jest.fn().mockReturnValue(1);
-        client.emit("Event.decrypted", testEvent);
+        client.emit(MatrixEventEvent.Decrypted, testEvent);
         expect(listener).toHaveBeenCalled();
     });
 });
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
index 74c58fc359f..9664c9dd8cb 100644
--- a/test/stores/room-list/SpaceWatcher-test.ts
+++ b/test/stores/room-list/SpaceWatcher-test.ts
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+import { mocked } from 'jest-mock';
 
-import "../../skinned-sdk"; // Must be first for skinning to work
 import { SpaceWatcher } from "../../../src/stores/room-list/SpaceWatcher";
 import type { RoomListStoreClass } from "../../../src/stores/room-list/RoomListStore";
 import SettingsStore from "../../../src/settings/SettingsStore";
@@ -49,7 +49,7 @@ const space2 = "!space2:server";
 describe("SpaceWatcher", () => {
     stubClient();
     const store = SpaceStore.instance;
-    const client = MatrixClientPeg.get();
+    const client = mocked(MatrixClientPeg.get());
 
     let rooms = [];
     const mkSpaceForRooms = (spaceId: string, children: string[] = []) => mkSpace(client, spaceId, rooms, children);
diff --git a/test/stores/room-list/algorithms/Algorithm-test.ts b/test/stores/room-list/algorithms/Algorithm-test.ts
new file mode 100644
index 00000000000..d83f6ccca6c
--- /dev/null
+++ b/test/stores/room-list/algorithms/Algorithm-test.ts
@@ -0,0 +1,64 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { stubClient, stubVideoChannelStore, mkRoom } from "../../../test-utils";
+import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
+import { DefaultTagID } from "../../../../src/stores/room-list/models";
+import { SortAlgorithm, ListAlgorithm } from "../../../../src/stores/room-list/algorithms/models";
+import "../../../../src/stores/room-list/RoomListStore"; // must be imported before Algorithm to avoid cycles
+import { Algorithm } from "../../../../src/stores/room-list/algorithms/Algorithm";
+
+describe("Algorithm", () => {
+    let videoChannelStore;
+    let algorithm;
+    let textRoom;
+    let videoRoom;
+    beforeEach(() => {
+        stubClient();
+        const cli = MatrixClientPeg.get();
+        DMRoomMap.makeShared();
+        videoChannelStore = stubVideoChannelStore();
+        algorithm = new Algorithm();
+        algorithm.start();
+
+        textRoom = mkRoom(cli, "!text:example.org");
+        videoRoom = mkRoom(cli, "!video:example.org");
+        videoRoom.isElementVideoRoom.mockReturnValue(true);
+        algorithm.populateTags(
+            { [DefaultTagID.Untagged]: SortAlgorithm.Alphabetic },
+            { [DefaultTagID.Untagged]: ListAlgorithm.Natural },
+        );
+        algorithm.setKnownRooms([textRoom, videoRoom]);
+    });
+
+    afterEach(() => {
+        algorithm.stop();
+    });
+
+    it("sticks video rooms to the top when they connect", () => {
+        expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([textRoom, videoRoom]);
+        videoChannelStore.connect("!video:example.org");
+        expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([videoRoom, textRoom]);
+    });
+
+    it("unsticks video rooms from the top when they disconnect", () => {
+        videoChannelStore.connect("!video:example.org");
+        expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([videoRoom, textRoom]);
+        videoChannelStore.disconnect();
+        expect(algorithm.getOrderedRooms()[DefaultTagID.Untagged]).toEqual([textRoom, videoRoom]);
+    });
+});
diff --git a/test/stores/room-list/filters/SpaceFilterCondition-test.ts b/test/stores/room-list/filters/SpaceFilterCondition-test.ts
index 0f1586dcd7c..ae9aab135c2 100644
--- a/test/stores/room-list/filters/SpaceFilterCondition-test.ts
+++ b/test/stores/room-list/filters/SpaceFilterCondition-test.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { mocked } from 'jest-mock';
+import { Room } from "matrix-js-sdk/src/matrix";
 
 import SettingsStore from "../../../../src/settings/SettingsStore";
 import { FILTER_CHANGED } from "../../../../src/stores/room-list/filters/IFilterCondition";
diff --git a/test/stores/room-list/previews/PollStartEventPreview-test.ts b/test/stores/room-list/previews/PollStartEventPreview-test.ts
index a24de59cccf..b69e7da9767 100644
--- a/test/stores/room-list/previews/PollStartEventPreview-test.ts
+++ b/test/stores/room-list/previews/PollStartEventPreview-test.ts
@@ -14,59 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { POLL_ANSWER, M_TEXT, M_POLL_KIND_DISCLOSED, M_POLL_START } from "matrix-events-sdk";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { PollStartEventPreview } from "../../../../src/stores/room-list/previews/PollStartEventPreview";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
+import { makePollStartEvent } from "../../../test-utils";
 
-MatrixClientPeg.matrixClient = {
+jest.spyOn(MatrixClientPeg, 'get').mockReturnValue({
     getUserId: () => "@me:example.com",
-};
+} as unknown as MatrixClient);
 
 describe("PollStartEventPreview", () => {
     it("shows the question for a poll I created", async () => {
-        const pollStartEvent = newPollStartEvent("My Question", "@me:example.com");
+        const pollStartEvent = makePollStartEvent("My Question", "@me:example.com");
         const preview = new PollStartEventPreview();
         expect(preview.getTextFor(pollStartEvent)).toBe("My Question");
     });
 
     it("shows the sender and question for a poll created by someone else", async () => {
-        const pollStartEvent = newPollStartEvent("Your Question", "@yo:example.com");
+        const pollStartEvent = makePollStartEvent("Your Question", "@yo:example.com");
         const preview = new PollStartEventPreview();
         expect(preview.getTextFor(pollStartEvent)).toBe("@yo:example.com: Your Question");
     });
 });
 
-function newPollStartEvent(
-    question: string,
-    sender: string,
-    answers?: POLL_ANSWER[],
-): MatrixEvent {
-    if (!answers) {
-        answers = [
-            { "id": "socks", [M_TEXT.name]: "Socks" },
-            { "id": "shoes", [M_TEXT.name]: "Shoes" },
-        ];
-    }
-
-    return new MatrixEvent(
-        {
-            "event_id": "$mypoll",
-            "room_id": "#myroom:example.com",
-            "sender": sender,
-            "type": M_POLL_START.name,
-            "content": {
-                [M_POLL_START.name]: {
-                    "question": {
-                        [M_TEXT.name]: question,
-                    },
-                    "kind": M_POLL_KIND_DISCLOSED.name,
-                    "answers": answers,
-                },
-                [M_TEXT.name]: `${question}: answers`,
-            },
-        },
-    );
-}
-
diff --git a/test/test-utils/beacon.ts b/test/test-utils/beacon.ts
new file mode 100644
index 00000000000..3eee57b39f5
--- /dev/null
+++ b/test/test-utils/beacon.ts
@@ -0,0 +1,209 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MockedObject } from "jest-mock";
+import { makeBeaconInfoContent, makeBeaconContent } from "matrix-js-sdk/src/content-helpers";
+import {
+    MatrixClient,
+    MatrixEvent,
+    Beacon,
+    getBeaconInfoIdentifier,
+} from "matrix-js-sdk/src/matrix";
+import { M_BEACON, M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+import { LocationAssetType } from "matrix-js-sdk/src/@types/location";
+
+import { getMockGeolocationPositionError } from "./location";
+import { makeRoomWithStateEvents } from "./room";
+
+type InfoContentProps = {
+    timeout: number;
+    isLive?: boolean;
+    assetType?: LocationAssetType;
+    description?: string;
+    timestamp?: number;
+};
+const DEFAULT_INFO_CONTENT_PROPS: InfoContentProps = {
+    timeout: 3600000,
+};
+
+/**
+ * Create an m.beacon_info event
+ * all required properties are mocked
+ * override with contentProps
+ */
+export const makeBeaconInfoEvent = (
+    sender: string,
+    roomId: string,
+    contentProps: Partial<InfoContentProps> = {},
+    eventId?: string,
+): MatrixEvent => {
+    const {
+        timeout,
+        isLive,
+        description,
+        assetType,
+        timestamp,
+    } = {
+        ...DEFAULT_INFO_CONTENT_PROPS,
+        ...contentProps,
+    };
+    const event = new MatrixEvent({
+        type: M_BEACON_INFO.name,
+        room_id: roomId,
+        state_key: sender,
+        sender,
+        content: makeBeaconInfoContent(timeout, isLive, description, assetType, timestamp),
+    });
+
+    event.event.origin_server_ts = Date.now();
+
+    // live beacons use the beacon_info event id
+    // set or default this
+    event.replaceLocalEventId(eventId || `$${Math.random()}-${Math.random()}`);
+
+    return event;
+};
+
+type ContentProps = {
+    geoUri: string;
+    timestamp: number;
+    beaconInfoId: string;
+    description?: string;
+};
+const DEFAULT_CONTENT_PROPS: ContentProps = {
+    geoUri: 'geo:-36.24484561954707,175.46884959563613;u=10',
+    timestamp: 123,
+    beaconInfoId: '$123',
+};
+
+/**
+ * Create an m.beacon event
+ * all required properties are mocked
+ * override with contentProps
+ */
+export const makeBeaconEvent = (
+    sender: string,
+    contentProps: Partial<ContentProps> = {},
+): MatrixEvent => {
+    const { geoUri, timestamp, beaconInfoId, description } = {
+        ...DEFAULT_CONTENT_PROPS,
+        ...contentProps,
+    };
+
+    return new MatrixEvent({
+        type: M_BEACON.name,
+        sender,
+        content: makeBeaconContent(geoUri, timestamp, beaconInfoId, description),
+    });
+};
+
+/**
+ * Create a mock geolocation position
+ * defaults all required properties
+ */
+export const makeGeolocationPosition = (
+    { timestamp, coords }:
+        { timestamp?: number, coords?: Partial<GeolocationCoordinates> },
+): GeolocationPosition => ({
+    timestamp: timestamp ?? 1647256791840,
+    coords: {
+        accuracy: 1,
+        latitude: 54.001927,
+        longitude: -8.253491,
+        altitude: null,
+        altitudeAccuracy: null,
+        heading: null,
+        speed: null,
+        ...coords,
+    },
+});
+
+/**
+ * Creates a basic mock of Geolocation
+ * sets navigator.geolocation to the mock
+ * and returns mock
+ */
+export const mockGeolocation = (): MockedObject<Geolocation> => {
+    const mockGeolocation = {
+        clearWatch: jest.fn(),
+        getCurrentPosition: jest.fn().mockImplementation(callback => callback(makeGeolocationPosition({}))),
+        watchPosition: jest.fn().mockImplementation(callback => callback(makeGeolocationPosition({}))),
+    } as unknown as MockedObject<Geolocation>;
+
+    // jest jsdom does not provide geolocation
+    // @ts-ignore illegal assignment to readonly property
+    navigator.geolocation = mockGeolocation;
+
+    return mockGeolocation;
+};
+
+/**
+ * Creates a mock watchPosition implementation
+ * that calls success callback at the provided delays
+ * ```
+ * geolocation.watchPosition.mockImplementation([0, 1000, 5000, 50])
+ * ```
+ * will call the provided handler with a mock position at
+ * next tick, 1000ms, 6000ms, 6050ms
+ *
+ * to produce errors provide an array of error codes
+ * that will be applied to the delay with the same index
+ * eg:
+ * ```
+ * // return two good positions, then a permission denied error
+ * geolocation.watchPosition.mockImplementation(watchPositionMockImplementation(
+ *      [0, 1000, 3000], [0, 0, 1]),
+ * );
+ * ```
+ * See for error codes: https://developer.mozilla.org/en-US/docs/Web/API/GeolocationPositionError
+ */
+export const watchPositionMockImplementation = (delays: number[], errorCodes: number[] = []) => {
+    return (callback: PositionCallback, error: PositionErrorCallback) => {
+        const position = makeGeolocationPosition({});
+
+        let totalDelay = 0;
+        delays.map((delayMs, index) => {
+            totalDelay += delayMs;
+            const timeout = setTimeout(() => {
+                if (errorCodes[index]) {
+                    error(getMockGeolocationPositionError(errorCodes[index], 'error message'));
+                } else {
+                    callback({ ...position, timestamp: position.timestamp + totalDelay });
+                }
+            }, totalDelay);
+            return timeout;
+        });
+    };
+};
+
+/**
+ * Creates a room with beacon events
+ * sets given locations on beacons
+ * returns beacons
+ */
+export const makeRoomWithBeacons = (
+    roomId: string,
+    mockClient: MockedObject<MatrixClient>,
+    beaconInfoEvents: MatrixEvent[],
+    locationEvents?: MatrixEvent[],
+): Beacon[] => {
+    const room = makeRoomWithStateEvents(beaconInfoEvents, { roomId, mockClient });
+    const beacons = beaconInfoEvents.map(event => room.currentState.beacons.get(getBeaconInfoIdentifier(event)));
+    if (locationEvents) {
+        beacons.forEach(beacon => beacon.addLocations(locationEvents));
+    }
+    return beacons;
+};
diff --git a/test/test-utils/client.ts b/test/test-utils/client.ts
new file mode 100644
index 00000000000..bd7b832f728
--- /dev/null
+++ b/test/test-utils/client.ts
@@ -0,0 +1,55 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from "events";
+import { MethodKeysOf, mocked, MockedObject } from "jest-mock";
+import { MatrixClient } from "matrix-js-sdk/src/matrix";
+
+import { MatrixClientPeg } from "../../src/MatrixClientPeg";
+
+/**
+ * Mock client with real event emitter
+ * useful for testing code that listens
+ * to MatrixClient events
+ */
+export class MockClientWithEventEmitter extends EventEmitter {
+    constructor(mockProperties: Partial<Record<MethodKeysOf<MatrixClient>, unknown>> = {}) {
+        super();
+
+        Object.assign(this, mockProperties);
+    }
+}
+
+/**
+ * - make a mock client
+ * - cast the type to mocked(MatrixClient)
+ * - spy on MatrixClientPeg.get to return the mock
+ * eg
+ * ```
+ * const mockClient = getMockClientWithEventEmitter({
+        getUserId: jest.fn().mockReturnValue(aliceId),
+    });
+ * ```
+ */
+export const getMockClientWithEventEmitter = (
+    mockProperties: Partial<Record<MethodKeysOf<MatrixClient>, unknown>>,
+): MockedObject<MatrixClient> => {
+    const mock = mocked(new MockClientWithEventEmitter(mockProperties) as unknown as MatrixClient);
+
+    jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mock);
+    return mock;
+};
+
diff --git a/test/test-utils/index.ts b/test/test-utils/index.ts
index 68fc4c74140..44ea28c9660 100644
--- a/test/test-utils/index.ts
+++ b/test/test-utils/index.ts
@@ -1,3 +1,10 @@
+export * from './beacon';
+export * from './client';
+export * from './location';
+export * from './platform';
+export * from './poll';
+export * from './room';
 export * from './test-utils';
+export * from './video';
 export * from './wrappers';
 export * from './utilities';
diff --git a/test/test-utils/location.ts b/test/test-utils/location.ts
new file mode 100644
index 00000000000..05bba669582
--- /dev/null
+++ b/test/test-utils/location.ts
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { LocationAssetType, M_LOCATION } from "matrix-js-sdk/src/@types/location";
+import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+let id = 1;
+export const makeLegacyLocationEvent = (geoUri: string): MatrixEvent => {
+    return new MatrixEvent(
+        {
+            "event_id": `$${++id}`,
+            "type": M_LOCATION.name,
+            "content": {
+                "body": "Something about where I am",
+                "msgtype": "m.location",
+                "geo_uri": geoUri,
+            },
+        },
+    );
+};
+
+export const makeLocationEvent = (geoUri: string, assetType?: LocationAssetType): MatrixEvent => {
+    return new MatrixEvent(
+        {
+            "event_id": `$${++id}`,
+            "type": M_LOCATION.name,
+            "content": makeLocationContent(
+                `Found at ${geoUri} at 2021-12-21T12:22+0000`,
+                geoUri,
+                252523,
+                "Human-readable label",
+                assetType,
+            ),
+        },
+    );
+};
+
+// https://developer.mozilla.org/en-US/docs/Web/API/GeolocationPositionError
+export const getMockGeolocationPositionError = (code: number, message: string): GeolocationPositionError => ({
+    code, message,
+    PERMISSION_DENIED: 1,
+    POSITION_UNAVAILABLE: 2,
+    TIMEOUT: 3,
+});
diff --git a/test/test-utils/platform.ts b/test/test-utils/platform.ts
new file mode 100644
index 00000000000..7b82a67a564
--- /dev/null
+++ b/test/test-utils/platform.ts
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MethodKeysOf, mocked, MockedObject } from "jest-mock";
+
+import BasePlatform from "../../src/BasePlatform";
+import PlatformPeg from "../../src/PlatformPeg";
+
+// doesn't implement abstract
+// @ts-ignore
+class MockPlatform extends BasePlatform {
+    constructor(platformMocks: Partial<Record<MethodKeysOf<BasePlatform>, unknown>>) {
+        super();
+        Object.assign(this, platformMocks);
+    }
+}
+/**
+ * Mock Platform Peg
+ * Creates a mock BasePlatform class
+ * spys on PlatformPeg.get and returns mock platform
+ * @returns MockPlatform instance
+ */
+export const mockPlatformPeg = (
+    platformMocks: Partial<Record<MethodKeysOf<BasePlatform>, unknown>> = {},
+): MockedObject<BasePlatform> => {
+    const mockPlatform = new MockPlatform(platformMocks);
+    jest.spyOn(PlatformPeg, 'get').mockReturnValue(mockPlatform);
+    return mocked(mockPlatform);
+};
+
+export const unmockPlatformPeg = () => {
+    jest.spyOn(PlatformPeg, 'get').mockRestore();
+};
diff --git a/test/test-utils/poll.ts b/test/test-utils/poll.ts
new file mode 100644
index 00000000000..ca25b9eaa0a
--- /dev/null
+++ b/test/test-utils/poll.ts
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { M_TEXT, M_POLL_START, POLL_ANSWER, M_POLL_KIND_DISCLOSED } from "matrix-events-sdk";
+
+export const makePollStartEvent = (
+    question: string,
+    sender: string,
+    answers?: POLL_ANSWER[],
+): MatrixEvent => {
+    if (!answers) {
+        answers = [
+            { "id": "socks", [M_TEXT.name]: "Socks" },
+            { "id": "shoes", [M_TEXT.name]: "Shoes" },
+        ];
+    }
+
+    return new MatrixEvent(
+        {
+            "event_id": "$mypoll",
+            "room_id": "#myroom:example.com",
+            "sender": sender,
+            "type": M_POLL_START.name,
+            "content": {
+                [M_POLL_START.name]: {
+                    "question": {
+                        [M_TEXT.name]: question,
+                    },
+                    "kind": M_POLL_KIND_DISCLOSED.name,
+                    "answers": answers,
+                },
+                [M_TEXT.name]: `${question}: answers`,
+            },
+        },
+    );
+};
diff --git a/test/test-utils/room.ts b/test/test-utils/room.ts
new file mode 100644
index 00000000000..b9224e38710
--- /dev/null
+++ b/test/test-utils/room.ts
@@ -0,0 +1,52 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MockedObject } from "jest-mock";
+import {
+    MatrixClient,
+    MatrixEvent,
+    EventType,
+    Room,
+} from "matrix-js-sdk/src/matrix";
+
+import { mkEvent } from "./test-utils";
+
+export const makeMembershipEvent = (
+    roomId: string, userId: string, membership = 'join',
+) => mkEvent({
+    event: true,
+    type: EventType.RoomMember,
+    room: roomId,
+    user: userId,
+    skey: userId,
+    content: { membership },
+    ts: Date.now(),
+});
+
+/**
+ * Creates a room
+ * sets state events on the room
+ * Sets client getRoom to return room
+ * returns room
+ */
+export const makeRoomWithStateEvents = (
+    stateEvents: MatrixEvent[] = [],
+    { roomId, mockClient }: { roomId: string, mockClient: MockedObject<MatrixClient>}): Room => {
+    const room1 = new Room(roomId, mockClient, '@user:server.org');
+    room1.currentState.setStateEvents(stateEvents);
+    mockClient.getRoom.mockReturnValue(room1);
+    return room1;
+};
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
index 6eb65aa5f55..a590474ffed 100644
--- a/test/test-utils/test-utils.ts
+++ b/test/test-utils/test-utils.ts
@@ -1,5 +1,5 @@
 import EventEmitter from "events";
-import { mocked } from 'jest-mock';
+import { mocked, MockedObject } from 'jest-mock';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { JoinRule } from 'matrix-js-sdk/src/@types/partials';
 import {
@@ -21,6 +21,7 @@ import dis from '../../src/dispatcher/dispatcher';
 import { makeType } from "../../src/utils/TypeUtils";
 import { ValidatedServerConfig } from "../../src/utils/AutoDiscoveryUtils";
 import { EnhancedMap } from "../../src/utils/maps";
+import { AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
 import MatrixClientBackedSettingsHandler from "../../src/settings/handlers/MatrixClientBackedSettingsHandler";
 
 /**
@@ -38,11 +39,9 @@ export function stubClient() {
     //
     // 'sandbox.restore()' doesn't work correctly on inherited methods,
     // so we do this for each method
-    const methods = ['get', 'unset', 'replaceUsingCreds'];
-    for (let i = 0; i < methods.length; i++) {
-        const methodName = methods[i];
-        peg[methods[i]] = jest.spyOn(peg, methodName);
-    }
+    jest.spyOn(peg, 'get');
+    jest.spyOn(peg, 'unset');
+    jest.spyOn(peg, 'replaceUsingCreds');
     // MatrixClientPeg.get() is called a /lot/, so implement it with our own
     // fast stub function rather than a sinon stub
     peg.get = function() { return client; };
@@ -54,7 +53,7 @@ export function stubClient() {
  *
  * @returns {object} MatrixClient stub
  */
-export function createTestClient() {
+export function createTestClient(): MatrixClient {
     const eventEmitter = new EventEmitter();
 
     return {
@@ -63,20 +62,20 @@ export function createTestClient() {
         getDomain: jest.fn().mockReturnValue("matrix.rog"),
         getUserId: jest.fn().mockReturnValue("@userId:matrix.rog"),
         getUser: jest.fn().mockReturnValue({ on: jest.fn() }),
+        getDeviceId: jest.fn().mockReturnValue("ABCDEFGHI"),
         credentials: { userId: "@userId:matrix.rog" },
 
         getPushActionsForEvent: jest.fn(),
         getRoom: jest.fn().mockImplementation(mkStubRoom),
         getRooms: jest.fn().mockReturnValue([]),
         getVisibleRooms: jest.fn().mockReturnValue([]),
-        getGroups: jest.fn().mockReturnValue([]),
         loginFlows: jest.fn(),
         on: eventEmitter.on.bind(eventEmitter),
         off: eventEmitter.off.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
         emit: eventEmitter.emit.bind(eventEmitter),
         isRoomEncrypted: jest.fn().mockReturnValue(false),
-        peekInRoom: jest.fn().mockResolvedValue(mkStubRoom()),
+        peekInRoom: jest.fn().mockResolvedValue(mkStubRoom(undefined, undefined, undefined)),
 
         paginateEventTimeline: jest.fn().mockResolvedValue(undefined),
         sendReadReceipt: jest.fn().mockResolvedValue(undefined),
@@ -86,10 +85,12 @@ export function createTestClient() {
         getThirdpartyProtocols: jest.fn().mockResolvedValue({}),
         getClientWellKnown: jest.fn().mockReturnValue(null),
         supportsVoip: jest.fn().mockReturnValue(true),
-        getTurnServersExpiry: jest.fn().mockReturnValue(2^32),
+        getTurnServersExpiry: jest.fn().mockReturnValue(2 ^ 32),
         getThirdpartyUser: jest.fn().mockResolvedValue([]),
         getAccountData: (type) => {
             return mkEvent({
+                user: undefined,
+                room: undefined,
                 type,
                 event: true,
                 content: {},
@@ -100,14 +101,15 @@ export function createTestClient() {
         setRoomAccountData: jest.fn(),
         sendTyping: jest.fn().mockResolvedValue({}),
         sendMessage: () => jest.fn().mockResolvedValue({}),
-        sendStateEvent: jest.fn().mockResolvedValue(),
+        sendStateEvent: jest.fn().mockResolvedValue(undefined),
         getSyncState: () => "SYNCING",
         generateClientSecret: () => "t35tcl1Ent5ECr3T",
         isGuest: jest.fn().mockReturnValue(false),
-        isCryptoEnabled: () => false,
         getRoomHierarchy: jest.fn().mockReturnValue({
             rooms: [],
         }),
+        createRoom: jest.fn().mockResolvedValue({ room_id: "!1:example.org" }),
+        setPowerLevel: jest.fn().mockResolvedValue(undefined),
 
         // Used by various internal bits we aren't concerned with (yet)
         sessionStore: {
@@ -122,23 +124,27 @@ export function createTestClient() {
         getCapabilities: jest.fn().mockResolvedValue({}),
         supportsExperimentalThreads: () => false,
         getRoomUpgradeHistory: jest.fn().mockReturnValue([]),
-        getOpenIdToken: jest.fn().mockResolvedValue(),
+        getOpenIdToken: jest.fn().mockResolvedValue(undefined),
         registerWithIdentityServer: jest.fn().mockResolvedValue({}),
         getIdentityAccount: jest.fn().mockResolvedValue({}),
-        getTerms: jest.fn().mockResolvedValueOnce(),
-        doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(),
-        getPushRules: jest.fn().mockResolvedValue(),
+        getTerms: jest.fn().mockResolvedValueOnce(undefined),
+        doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(undefined),
+        getPushRules: jest.fn().mockResolvedValue(undefined),
         getPushers: jest.fn().mockResolvedValue({ pushers: [] }),
         getThreePids: jest.fn().mockResolvedValue({ threepids: [] }),
-        setPusher: jest.fn().mockResolvedValue(),
-        setPushRuleEnabled: jest.fn().mockResolvedValue(),
-        setPushRuleActions: jest.fn().mockResolvedValue(),
+        setPusher: jest.fn().mockResolvedValue(undefined),
+        setPushRuleEnabled: jest.fn().mockResolvedValue(undefined),
+        setPushRuleActions: jest.fn().mockResolvedValue(undefined),
+        relations: jest.fn().mockRejectedValue(undefined),
         isCryptoEnabled: jest.fn().mockReturnValue(false),
-    };
+        downloadKeys: jest.fn(),
+        fetchRoomEvent: jest.fn(),
+    } as unknown as MatrixClient;
 }
 
 type MakeEventPassThruProps = {
     user: User["userId"];
+    relatesTo?: IEventRelation;
     event?: boolean;
     ts?: number;
     skey?: string;
@@ -189,7 +195,20 @@ export function mkEvent(opts: MakeEventProps): MatrixEvent {
     ].indexOf(opts.type) !== -1) {
         event.state_key = "";
     }
-    return opts.event ? new MatrixEvent(event) : event as unknown as MatrixEvent;
+
+    const mxEvent = opts.event ? new MatrixEvent(event) : event as unknown as MatrixEvent;
+    if (!mxEvent.sender && opts.user && opts.room) {
+        mxEvent.sender = {
+            userId: opts.user,
+            membership: "join",
+            name: opts.user,
+            rawDisplayName: opts.user,
+            roomId: opts.room,
+            getAvatarUrl: () => {},
+            getMxcAvatarUrl: () => {},
+        } as unknown as RoomMember;
+    }
+    return mxEvent;
 }
 
 /**
@@ -282,9 +301,10 @@ export type MessageEventProps = MakeEventPassThruProps & {
  * @param {string=} opts.msg Optional. The content.body for the event.
  * @return {Object|MatrixEvent} The event
  */
-export function mkMessage({
-    msg, relatesTo, ...opts
-}: MessageEventProps): MatrixEvent {
+export function mkMessage({ msg, relatesTo, ...opts }: MakeEventPassThruProps & {
+    room: Room["roomId"];
+    msg?: string;
+}): MatrixEvent {
     if (!opts.room || !opts.user) {
         throw new Error("Missing .room or .user from options");
     }
@@ -302,7 +322,7 @@ export function mkMessage({
     return mkEvent(event);
 }
 
-export function mkStubRoom(roomId = null, name: string, client: MatrixClient): Room {
+export function mkStubRoom(roomId: string = null, name: string, client: MatrixClient): Room {
     const stubTimeline = { getEvents: () => [] } as unknown as EventTimeline;
     return {
         roomId,
@@ -349,7 +369,8 @@ export function mkStubRoom(roomId = null, name: string, client: MatrixClient): R
         name,
         getAvatarUrl: () => 'mxc://avatar.url/room.png',
         getMxcAvatarUrl: () => 'mxc://avatar.url/room.png',
-        isSpaceRoom: jest.fn(() => false),
+        isSpaceRoom: jest.fn().mockReturnValue(false),
+        isElementVideoRoom: jest.fn().mockReturnValue(false),
         getUnreadNotificationCount: jest.fn(() => 0),
         getEventReadUpTo: jest.fn(() => null),
         getCanonicalAlias: jest.fn(),
@@ -358,6 +379,8 @@ export function mkStubRoom(roomId = null, name: string, client: MatrixClient): R
         getJoinRule: jest.fn().mockReturnValue("invite"),
         loadMembersIfNeeded: jest.fn(),
         client,
+        myUserId: client?.getUserId(),
+        canInvite: jest.fn(),
     } as unknown as Room;
 }
 
@@ -385,34 +408,42 @@ export function getDispatchForStore(store) {
 // These methods make some use of some private methods on the AsyncStoreWithClient to simplify getting into a consistent
 // ready state without needing to wire up a dispatcher and pretend to be a js-sdk client.
 
-export const setupAsyncStoreWithClient = async (store: AsyncStoreWithClient<any>, client: MatrixClient) => {
+export const setupAsyncStoreWithClient = async <T = unknown>(store: AsyncStoreWithClient<T>, client: MatrixClient) => {
     // @ts-ignore
     store.readyStore.useUnitTestClient(client);
     // @ts-ignore
     await store.onReady();
 };
 
-export const resetAsyncStoreWithClient = async (store: AsyncStoreWithClient<any>) => {
+export const resetAsyncStoreWithClient = async <T = unknown>(store: AsyncStoreWithClient<T>) => {
     // @ts-ignore
     await store.onNotReady();
 };
 
-export const mockStateEventImplementation = (events: MatrixEvent[]): typeof RoomState['getStateEvents'] => {
+export const mockStateEventImplementation = (events: MatrixEvent[]) => {
     const stateMap = new EnhancedMap<string, Map<string, MatrixEvent>>();
     events.forEach(event => {
         stateMap.getOrCreate(event.getType(), new Map()).set(event.getStateKey(), event);
     });
 
-    return (eventType: string, stateKey?: string) => {
+    // recreate the overloading in RoomState
+    function getStateEvents(eventType: EventType | string): MatrixEvent[];
+    function getStateEvents(eventType: EventType | string, stateKey: string): MatrixEvent;
+    function getStateEvents(eventType: EventType | string, stateKey?: string) {
         if (stateKey || stateKey === "") {
             return stateMap.get(eventType)?.get(stateKey) || null;
         }
         return Array.from(stateMap.get(eventType)?.values() || []);
-    };
+    }
+    return getStateEvents;
 };
 
-export const mkRoom = (client: MatrixClient, roomId: string, rooms?: ReturnType<typeof mkStubRoom>[]) => {
-    const room = mkStubRoom(roomId, roomId, client);
+export const mkRoom = (
+    client: MatrixClient,
+    roomId: string,
+    rooms?: ReturnType<typeof mkStubRoom>[],
+): MockedObject<Room> => {
+    const room = mocked(mkStubRoom(roomId, roomId, client));
     mocked(room.currentState).getStateEvents.mockImplementation(mockStateEventImplementation([]));
     rooms?.push(room);
     return room;
@@ -441,9 +472,9 @@ export const mkSpace = (
     spaceId: string,
     rooms?: ReturnType<typeof mkStubRoom>[],
     children: string[] = [],
-) => {
-    const space = mkRoom(client, spaceId, rooms);
-    mocked(space).isSpaceRoom.mockReturnValue(true);
+): MockedObject<Room> => {
+    const space = mocked(mkRoom(client, spaceId, rooms));
+    space.isSpaceRoom.mockReturnValue(true);
     mocked(space.currentState).getStateEvents.mockImplementation(mockStateEventImplementation(children.map(roomId =>
         mkEvent({
             event: true,
diff --git a/test/test-utils/threads.ts b/test/test-utils/threads.ts
index 1df62e51d74..ebed292eb50 100644
--- a/test/test-utils/threads.ts
+++ b/test/test-utils/threads.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, MatrixEvent, RelationType, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import { mkMessage, MessageEventProps } from "./test-utils";
@@ -25,7 +25,7 @@ export const makeThreadEvent = ({ rootEventId, replyToEventId, ...props }: Messa
     ...props,
     relatesTo: {
         event_id: rootEventId,
-        rel_type: RelationType.Thread,
+        rel_type: "m.thread",
         ['m.in_reply_to']: {
             event_id: replyToEventId,
         },
@@ -79,7 +79,7 @@ export const makeThreadEvents = ({
 
     rootEvent.setUnsigned({
         "m.relations": {
-            [RelationType.Thread]: {
+            "m.thread": {
                 latest_event: events[events.length - 1],
                 count: length,
                 current_user_participated: [...participantUserIds, authorId].includes(currentUserId),
diff --git a/test/test-utils/utilities.ts b/test/test-utils/utilities.ts
index 9f7941e32a3..a4370fbc9e1 100644
--- a/test/test-utils/utilities.ts
+++ b/test/test-utils/utilities.ts
@@ -23,8 +23,24 @@ const findByAttr = (attr: string) => (component: ReactWrapper, value: string) =>
 export const findByTestId = findByAttr('data-test-id');
 export const findById = findByAttr('id');
 
+const findByTagAndAttr = (attr: string) =>
+    (component: ReactWrapper, value: string, tag: string) =>
+        component.find(`${tag}[${attr}="${value}"]`);
+
+export const findByTagAndTestId = findByTagAndAttr('data-test-id');
+
 export const flushPromises = async () => await new Promise(resolve => setTimeout(resolve));
 
+// with jest's modern fake timers process.nextTick is also mocked,
+// flushing promises in the normal way then waits for some advancement
+// of the fake timers
+// https://gist.github.com/apieceofbart/e6dea8d884d29cf88cdb54ef14ddbcc4?permalink_comment_id=4018174#gistcomment-4018174
+export const flushPromisesWithFakeTimers = async (): Promise<void> => {
+    const promise = new Promise(resolve => process.nextTick(resolve));
+    jest.advanceTimersByTime(1);
+    await promise;
+};
+
 /**
  * Call fn before calling componentDidUpdate on a react component instance, inst.
  * @param {React.Component} inst an instance of a React component.
@@ -51,3 +67,13 @@ export function waitForUpdate(inst: React.Component, updates = 1): Promise<void>
         };
     });
 }
+
+/**
+ * Advance jests fake timers and Date.now mock by ms
+ * Useful for testing code using timeouts or intervals
+ * that also checks timestamps
+ */
+export const advanceDateAndTime = (ms: number) => {
+    jest.spyOn(global.Date, 'now').mockReturnValue(Date.now() + ms);
+    jest.advanceTimersByTime(ms);
+};
diff --git a/test/test-utils/video.ts b/test/test-utils/video.ts
new file mode 100644
index 00000000000..77fdfb8fcc0
--- /dev/null
+++ b/test/test-utils/video.ts
@@ -0,0 +1,61 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { EventEmitter } from "events";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { mkEvent } from "./test-utils";
+import { VIDEO_CHANNEL_MEMBER } from "../../src/utils/VideoChannelUtils";
+import VideoChannelStore, { VideoChannelEvent, IJitsiParticipant } from "../../src/stores/VideoChannelStore";
+
+export class StubVideoChannelStore extends EventEmitter {
+    private _roomId: string;
+    public get roomId(): string { return this._roomId; }
+    private _connected: boolean;
+    public get connected(): boolean { return this._connected; }
+    public get participants(): IJitsiParticipant[] { return []; }
+
+    public startConnect = (roomId: string) => {
+        this._roomId = roomId;
+        this.emit(VideoChannelEvent.StartConnect, roomId);
+    };
+    public connect = jest.fn((roomId: string) => {
+        this._roomId = roomId;
+        this._connected = true;
+        this.emit(VideoChannelEvent.Connect, roomId);
+    });
+    public disconnect = jest.fn(() => {
+        const roomId = this._roomId;
+        this._roomId = null;
+        this._connected = false;
+        this.emit(VideoChannelEvent.Disconnect, roomId);
+    });
+}
+
+export const stubVideoChannelStore = (): StubVideoChannelStore => {
+    const store = new StubVideoChannelStore();
+    jest.spyOn(VideoChannelStore, "instance", "get").mockReturnValue(store as unknown as VideoChannelStore);
+    return store;
+};
+
+export const mkVideoChannelMember = (userId: string, devices: string[]): MatrixEvent => mkEvent({
+    event: true,
+    type: VIDEO_CHANNEL_MEMBER,
+    room: "!1:example.org",
+    user: userId,
+    skey: userId,
+    content: { devices },
+});
diff --git a/test/test-utils/wrappers.tsx b/test/test-utils/wrappers.tsx
index 070e2313ef0..faaf5bf6a73 100644
--- a/test/test-utils/wrappers.tsx
+++ b/test/test-utils/wrappers.tsx
@@ -14,14 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { RefCallback } from "react";
+import React, { RefCallback, ComponentType } from "react";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg as peg } from '../../src/MatrixClientPeg';
 import MatrixClientContext from "../../src/contexts/MatrixClientContext";
 
-export function wrapInMatrixClientContext(WrappedComponent) {
-    class Wrapper extends React.Component<{ wrappedRef?: RefCallback }> {
+type WrapperProps<T> = { wrappedRef?: RefCallback<ComponentType<T>> } & T;
+
+export function wrapInMatrixClientContext<T>(WrappedComponent: ComponentType<T>): ComponentType<WrapperProps<T>> {
+    class Wrapper extends React.Component<WrapperProps<T>> {
         _matrixClient: MatrixClient;
         constructor(props) {
             super(props);
diff --git a/test/utils/DateUtils-test.ts b/test/utils/DateUtils-test.ts
index 78b52d34179..7804fd6e9cf 100644
--- a/test/utils/DateUtils-test.ts
+++ b/test/utils/DateUtils-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { formatSeconds, formatRelativeTime } from "../../src/DateUtils";
+import { formatSeconds, formatRelativeTime, formatDuration } from "../../src/DateUtils";
 
 describe("formatSeconds", () => {
     it("correctly formats time with hours", () => {
@@ -70,3 +70,25 @@ describe("formatRelativeTime", () => {
         expect(formatRelativeTime(date, true)).toBe("Oct 31, 2020");
     });
 });
+
+describe('formatDuration()', () => {
+    type TestCase = [string, string, number];
+
+    const MINUTE_MS = 60000;
+    const HOUR_MS = MINUTE_MS * 60;
+
+    it.each<TestCase>([
+        ['rounds up to nearest day when more than 24h - 40 hours', '2d', 40 * HOUR_MS],
+        ['rounds down to nearest day when more than 24h - 26 hours', '1d', 26 * HOUR_MS],
+        ['24 hours', '1d', 24 * HOUR_MS],
+        ['rounds to nearest hour when less than 24h - 23h', '23h', 23 * HOUR_MS],
+        ['rounds to nearest hour when less than 24h - 6h and 10min', '6h', 6 * HOUR_MS + 10 * MINUTE_MS],
+        ['rounds to nearest hours when less than 24h', '2h', 2 * HOUR_MS + 124234],
+        ['rounds to nearest minute when less than 1h - 59 minutes', '59m', 59 * MINUTE_MS],
+        ['rounds to nearest minute when less than 1h -  1 minute', '1m', MINUTE_MS],
+        ['rounds to nearest second when less than 1min - 59 seconds', '59s', 59000],
+        ['rounds to 0 seconds when less than a second - 123ms', '0s', 123],
+    ])('%s formats to %s', (_description, expectedResult, input) => {
+        expect(formatDuration(input)).toEqual(expectedResult);
+    });
+});
diff --git a/test/utils/EventUtils-test.ts b/test/utils/EventUtils-test.ts
new file mode 100644
index 00000000000..674162f548d
--- /dev/null
+++ b/test/utils/EventUtils-test.ts
@@ -0,0 +1,357 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
+import {
+    EventStatus,
+    EventType,
+    MatrixEvent,
+    MsgType,
+    RelationType,
+} from "matrix-js-sdk/src/matrix";
+
+import { MatrixClientPeg } from "../../src/MatrixClientPeg";
+import {
+    canCancel,
+    canEditContent,
+    canEditOwnEvent,
+    canForward,
+    isContentActionable,
+    isLocationEvent,
+    isVoiceMessage,
+} from "../../src/utils/EventUtils";
+import { getMockClientWithEventEmitter, makeBeaconInfoEvent, makePollStartEvent } from "../test-utils";
+
+describe('EventUtils', () => {
+    const userId = '@user:server';
+    const roomId = '!room:server';
+    const mockClient = getMockClientWithEventEmitter({
+        getUserId: jest.fn().mockReturnValue(userId),
+    });
+
+    beforeEach(() => {
+        mockClient.getUserId.mockClear().mockReturnValue(userId);
+    });
+    afterAll(() => {
+        jest.spyOn(MatrixClientPeg, 'get').mockRestore();
+    });
+
+    // setup events
+    const unsentEvent = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+    });
+    unsentEvent.status = EventStatus.ENCRYPTING;
+
+    const redactedEvent = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+    });
+    redactedEvent.makeRedacted(redactedEvent);
+
+    const stateEvent = makeBeaconInfoEvent(userId, roomId);
+
+    const roomMemberEvent = new MatrixEvent({
+        type: EventType.RoomMember,
+        sender: userId,
+    });
+
+    const stickerEvent = new MatrixEvent({
+        type: EventType.Sticker,
+        sender: userId,
+    });
+
+    const pollStartEvent = makePollStartEvent('What?', userId);
+
+    const notDecryptedEvent = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: 'm.bad.encrypted',
+        },
+    });
+
+    const noMsgType = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: undefined,
+        },
+    });
+
+    const noContentBody = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: MsgType.Image,
+        },
+    });
+
+    const emptyContentBody = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: MsgType.Text,
+            body: '',
+        },
+    });
+
+    const objectContentBody = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: MsgType.File,
+            body: {},
+        },
+    });
+
+    const niceTextMessage = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: userId,
+        content: {
+            msgtype: MsgType.Text,
+            body: 'Hello',
+        },
+    });
+
+    const bobsTextMessage = new MatrixEvent({
+        type: EventType.RoomMessage,
+        sender: '@bob:server',
+        content: {
+            msgtype: MsgType.Text,
+            body: 'Hello from Bob',
+        },
+    });
+
+    describe('isContentActionable()', () => {
+        type TestCase = [string, MatrixEvent];
+        it.each<TestCase>([
+            ['unsent event', unsentEvent],
+            ['redacted event', redactedEvent],
+            ['state event', stateEvent],
+            ['undecrypted event', notDecryptedEvent],
+            ['room member event', roomMemberEvent],
+            ['event without msgtype', noMsgType],
+            ['event without content body property', noContentBody],
+        ])('returns false for %s', (_description, event) => {
+            expect(isContentActionable(event)).toBe(false);
+        });
+
+        it.each<TestCase>([
+            ['sticker event', stickerEvent],
+            ['poll start event', pollStartEvent],
+            ['event with empty content body', emptyContentBody],
+            ['event with a content body', niceTextMessage],
+        ])('returns true for %s', (_description, event) => {
+            expect(isContentActionable(event)).toBe(true);
+        });
+    });
+
+    describe('editable content helpers', () => {
+        const replaceRelationEvent = new MatrixEvent({
+            type: EventType.RoomMessage,
+            sender: userId,
+            content: {
+                msgtype: MsgType.Text,
+                body: 'Hello',
+                ['m.relates_to']: {
+                    rel_type: RelationType.Replace,
+                    event_id: '1',
+                },
+            },
+        });
+
+        const referenceRelationEvent = new MatrixEvent({
+            type: EventType.RoomMessage,
+            sender: userId,
+            content: {
+                msgtype: MsgType.Text,
+                body: 'Hello',
+                ['m.relates_to']: {
+                    rel_type: RelationType.Reference,
+                    event_id: '1',
+                },
+            },
+        });
+
+        const emoteEvent = new MatrixEvent({
+            type: EventType.RoomMessage,
+            sender: userId,
+            content: {
+                msgtype: MsgType.Emote,
+                body: '🧪',
+            },
+        });
+
+        type TestCase = [string, MatrixEvent];
+
+        const uneditableCases: TestCase[] = [
+            ['redacted event', redactedEvent],
+            ['state event', stateEvent],
+            ['event that is not room message', roomMemberEvent],
+            ['event without msgtype', noMsgType],
+            ['event without content body property', noContentBody],
+            ['event with empty content body property', emptyContentBody],
+            ['event with non-string body', objectContentBody],
+            ['event not sent by current user', bobsTextMessage],
+            ['event with a replace relation', replaceRelationEvent],
+        ];
+
+        const editableCases: TestCase[] = [
+            ['event with reference relation', referenceRelationEvent],
+            ['emote event', emoteEvent],
+            ['poll start event', pollStartEvent],
+            ['event with a content body', niceTextMessage],
+        ];
+
+        describe('canEditContent()', () => {
+            it.each<TestCase>(uneditableCases)('returns false for %s', (_description, event) => {
+                expect(canEditContent(event)).toBe(false);
+            });
+
+            it.each<TestCase>(editableCases)('returns true for %s', (_description, event) => {
+                expect(canEditContent(event)).toBe(true);
+            });
+        });
+        describe('canEditOwnContent()', () => {
+            it.each<TestCase>(uneditableCases)('returns false for %s', (_description, event) => {
+                expect(canEditOwnEvent(event)).toBe(false);
+            });
+
+            it.each<TestCase>(editableCases)('returns true for %s', (_description, event) => {
+                expect(canEditOwnEvent(event)).toBe(true);
+            });
+        });
+    });
+
+    describe('isVoiceMessage()', () => {
+        it('returns true for an event with msc2516.voice content', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    ['org.matrix.msc2516.voice']: {},
+                },
+            });
+
+            expect(isVoiceMessage(event)).toBe(true);
+        });
+
+        it('returns true for an event with msc3245.voice content', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    ['org.matrix.msc3245.voice']: {},
+                },
+            });
+
+            expect(isVoiceMessage(event)).toBe(true);
+        });
+
+        it('returns false for an event with voice content', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    body: 'hello',
+                },
+            });
+
+            expect(isVoiceMessage(event)).toBe(false);
+        });
+    });
+
+    describe('isLocationEvent()', () => {
+        it('returns true for an event with m.location stable type', () => {
+            const event = new MatrixEvent({
+                type: M_LOCATION.altName,
+            });
+            expect(isLocationEvent(event)).toBe(true);
+        });
+        it('returns true for an event with m.location unstable prefixed type', () => {
+            const event = new MatrixEvent({
+                type: M_LOCATION.name,
+            });
+            expect(isLocationEvent(event)).toBe(true);
+        });
+        it('returns true for a room message with stable m.location msgtype', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    msgtype: M_LOCATION.altName,
+                },
+            });
+            expect(isLocationEvent(event)).toBe(true);
+        });
+        it('returns true for a room message with unstable m.location msgtype', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    msgtype: M_LOCATION.name,
+                },
+            });
+            expect(isLocationEvent(event)).toBe(true);
+        });
+        it('returns false for a non location event', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    body: 'Hello',
+                },
+            });
+            expect(isLocationEvent(event)).toBe(false);
+        });
+    });
+
+    describe('canForward()', () => {
+        it('returns false for a location event', () => {
+            const event = new MatrixEvent({
+                type: M_LOCATION.name,
+            });
+            expect(canForward(event)).toBe(false);
+        });
+        it('returns false for a poll event', () => {
+            const event = makePollStartEvent('Who?', userId);
+            expect(canForward(event)).toBe(false);
+        });
+        it('returns true for a room message event', () => {
+            const event = new MatrixEvent({
+                type: EventType.RoomMessage,
+                content: {
+                    body: 'Hello',
+                },
+            });
+            expect(canForward(event)).toBe(true);
+        });
+    });
+
+    describe('canCancel()', () => {
+        it.each([
+            [EventStatus.QUEUED],
+            [EventStatus.NOT_SENT],
+            [EventStatus.ENCRYPTING],
+        ])('return true for status %s', (status) => {
+            expect(canCancel(status)).toBe(true);
+        });
+
+        it.each([
+            [EventStatus.SENDING],
+            [EventStatus.CANCELLED],
+            [EventStatus.SENT],
+            ['invalid-status' as unknown as EventStatus],
+        ])('return false for status %s', (status) => {
+            expect(canCancel(status)).toBe(false);
+        });
+    });
+});
diff --git a/test/utils/SnakedObject-test.ts b/test/utils/SnakedObject-test.ts
new file mode 100644
index 00000000000..d1a525773fc
--- /dev/null
+++ b/test/utils/SnakedObject-test.ts
@@ -0,0 +1,63 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { SnakedObject, snakeToCamel } from "../../src/utils/SnakedObject";
+
+describe('snakeToCamel', () => {
+    it('should convert snake_case to camelCase in simple scenarios', () => {
+        expect(snakeToCamel("snake_case")).toBe("snakeCase");
+        expect(snakeToCamel("snake_case_but_longer")).toBe("snakeCaseButLonger");
+        expect(snakeToCamel("numbered_123")).toBe("numbered123"); // not a thing we would see normally
+    });
+
+    // Not really something we expect to see, but it's defined behaviour of the function
+    it('should not camelCase a trailing or leading underscore', () => {
+        expect(snakeToCamel("_snake")).toBe("_snake");
+        expect(snakeToCamel("snake_")).toBe("snake_");
+        expect(snakeToCamel("_snake_case")).toBe("_snakeCase");
+        expect(snakeToCamel("snake_case_")).toBe("snakeCase_");
+    });
+
+    // Another thing we don't really expect to see, but is "defined behaviour"
+    it('should be predictable with double underscores', () => {
+        expect(snakeToCamel("__snake__")).toBe("_Snake_");
+        expect(snakeToCamel("snake__case")).toBe("snake_case");
+    });
+});
+
+describe('SnakedObject', () => {
+    /* eslint-disable camelcase*/
+    const input = {
+        snake_case: "woot",
+        snakeCase: "oh no", // ensure different value from snake_case for tests
+        camelCase: "fallback",
+    };
+    const snake = new SnakedObject(input);
+    /* eslint-enable camelcase*/
+
+    it('should prefer snake_case keys', () => {
+        expect(snake.get("snake_case")).toBe(input.snake_case);
+        expect(snake.get("snake_case", "camelCase")).toBe(input.snake_case);
+    });
+
+    it('should fall back to camelCase keys when needed', () => {
+        // @ts-ignore - we're deliberately supplying a key that doesn't exist
+        expect(snake.get("camel_case")).toBe(input.camelCase);
+
+        // @ts-ignore - we're deliberately supplying a key that doesn't exist
+        expect(snake.get("e_no_exist", "camelCase")).toBe(input.camelCase);
+    });
+});
diff --git a/test/utils/beacon/bounds-test.ts b/test/utils/beacon/bounds-test.ts
new file mode 100644
index 00000000000..bd4b37234b0
--- /dev/null
+++ b/test/utils/beacon/bounds-test.ts
@@ -0,0 +1,95 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Beacon } from "matrix-js-sdk/src/matrix";
+
+import { Bounds, getBeaconBounds } from "../../../src/utils/beacon/bounds";
+import { makeBeaconEvent, makeBeaconInfoEvent } from "../../test-utils";
+
+describe('getBeaconBounds()', () => {
+    const userId = '@user:server';
+    const roomId = '!room:server';
+    const makeBeaconWithLocation = (latLon: {lat: number, lon: number}) => {
+        const geoUri = `geo:${latLon.lat},${latLon.lon}`;
+        const beacon = new Beacon(makeBeaconInfoEvent(userId, roomId, { isLive: true }));
+        // @ts-ignore private prop, sets internal live property so addLocations works
+        beacon.checkLiveness();
+        const location = makeBeaconEvent(userId, {
+            beaconInfoId: beacon.beaconInfoId,
+            geoUri,
+            timestamp: Date.now() + 1,
+        });
+        beacon.addLocations([location]);
+
+        return beacon;
+    };
+
+    const geo = {
+        // northern hemi
+        // west of greenwich
+        london: { lat: 51.5, lon: -0.14 },
+        reykjavik: { lat: 64.08, lon: -21.82 },
+        // east of greenwich
+        paris: { lat: 48.85, lon: 2.29 },
+        // southern hemi
+        // east
+        auckland: { lat: -36.85, lon: 174.76 }, // nz
+        // west
+        lima: { lat: -12.013843, lon: -77.008388 }, // peru
+    };
+
+    const london = makeBeaconWithLocation(geo.london);
+    const reykjavik = makeBeaconWithLocation(geo.reykjavik);
+    const paris = makeBeaconWithLocation(geo.paris);
+    const auckland = makeBeaconWithLocation(geo.auckland);
+    const lima = makeBeaconWithLocation(geo.lima);
+
+    it('should return undefined when there are no beacons', () => {
+        expect(getBeaconBounds([])).toBeUndefined();
+    });
+
+    it('should return undefined when no beacons have locations', () => {
+        const beacon = new Beacon(makeBeaconInfoEvent(userId, roomId));
+        expect(getBeaconBounds([beacon])).toBeUndefined();
+    });
+
+    type TestCase = [string, Beacon[], Bounds];
+    it.each<TestCase>([
+        ['one beacon', [london],
+            { north: geo.london.lat, south: geo.london.lat, east: geo.london.lon, west: geo.london.lon },
+        ],
+        ['beacons in the northern hemisphere, west of meridian',
+            [london, reykjavik],
+            { north: geo.reykjavik.lat, south: geo.london.lat, east: geo.london.lon, west: geo.reykjavik.lon },
+        ],
+        ['beacons in the northern hemisphere, both sides of meridian',
+            [london, reykjavik, paris],
+            // reykjavik northmost and westmost, paris southmost and eastmost
+            { north: geo.reykjavik.lat, south: geo.paris.lat, east: geo.paris.lon, west: geo.reykjavik.lon },
+        ],
+        ['beacons in the southern hemisphere',
+            [auckland, lima],
+            // lima northmost and westmost, auckland southmost and eastmost
+            { north: geo.lima.lat, south: geo.auckland.lat, east: geo.auckland.lon, west: geo.lima.lon },
+        ],
+        ['beacons in both hemispheres',
+            [auckland, lima, paris],
+            { north: geo.paris.lat, south: geo.auckland.lat, east: geo.auckland.lon, west: geo.lima.lon },
+        ],
+    ])('gets correct bounds for %s', (_description, beacons, expectedBounds) => {
+        expect(getBeaconBounds(beacons)).toEqual(expectedBounds);
+    });
+});
diff --git a/test/utils/beacon/duration-test.ts b/test/utils/beacon/duration-test.ts
new file mode 100644
index 00000000000..e8a0d36c633
--- /dev/null
+++ b/test/utils/beacon/duration-test.ts
@@ -0,0 +1,118 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Beacon } from "matrix-js-sdk/src/matrix";
+
+import {
+    msUntilExpiry,
+    sortBeaconsByLatestExpiry,
+    sortBeaconsByLatestCreation,
+} from "../../../src/utils/beacon";
+import { makeBeaconInfoEvent } from "../../test-utils";
+
+describe('beacon utils', () => {
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+    const HOUR_MS = 3600000;
+
+    beforeEach(() => {
+        jest.spyOn(global.Date, 'now').mockReturnValue(now);
+    });
+
+    afterAll(() => {
+        jest.spyOn(global.Date, 'now').mockRestore();
+    });
+
+    describe('msUntilExpiry', () => {
+        it('returns remaining duration', () => {
+            const start = now - HOUR_MS;
+            const durationMs = HOUR_MS * 3;
+
+            expect(msUntilExpiry(start, durationMs)).toEqual(HOUR_MS * 2);
+        });
+
+        it('returns 0 when expiry has already passed', () => {
+            // created 3h ago
+            const start = now - HOUR_MS * 3;
+            // 1h durations
+            const durationMs = HOUR_MS;
+
+            expect(msUntilExpiry(start, durationMs)).toEqual(0);
+        });
+    });
+
+    describe('sortBeaconsByLatestExpiry()', () => {
+        const roomId = '!room:server';
+        const aliceId = '@alive:server';
+
+        // 12h old, 12h left
+        const beacon1 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS * 24, timestamp: now - 12 * HOUR_MS },
+            '$1',
+        ));
+        // 10h left
+        const beacon2 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS * 10, timestamp: now },
+            '$2',
+        ));
+
+        // 1ms left
+        const beacon3 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS + 1, timestamp: now - HOUR_MS },
+            '$3',
+        ));
+
+        it('sorts beacons by descending expiry time', () => {
+            expect([beacon2, beacon3, beacon1].sort(sortBeaconsByLatestExpiry)).toEqual([
+                beacon1, beacon2, beacon3,
+            ]);
+        });
+    });
+
+    describe('sortBeaconsByLatestCreation()', () => {
+        const roomId = '!room:server';
+        const aliceId = '@alive:server';
+
+        // 12h old, 12h left
+        const beacon1 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS * 24, timestamp: now - 12 * HOUR_MS },
+            '$1',
+        ));
+        // 10h left
+        const beacon2 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS * 10, timestamp: now },
+            '$2',
+        ));
+
+        // 1ms left
+        const beacon3 = new Beacon(makeBeaconInfoEvent(aliceId,
+            roomId,
+            { timeout: HOUR_MS + 1, timestamp: now - HOUR_MS },
+            '$3',
+        ));
+
+        it('sorts beacons by descending creation time', () => {
+            expect([beacon1, beacon2, beacon3].sort(sortBeaconsByLatestCreation)).toEqual([
+                beacon2, beacon3, beacon1,
+            ]);
+        });
+    });
+});
diff --git a/test/utils/beacon/geolocation-test.ts b/test/utils/beacon/geolocation-test.ts
new file mode 100644
index 00000000000..9b64105e622
--- /dev/null
+++ b/test/utils/beacon/geolocation-test.ts
@@ -0,0 +1,239 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { logger } from "matrix-js-sdk/src/logger";
+
+import {
+    GeolocationError,
+    getGeoUri,
+    mapGeolocationError,
+    mapGeolocationPositionToTimedGeo,
+    watchPosition,
+} from "../../../src/utils/beacon";
+import { getCurrentPosition } from "../../../src/utils/beacon/geolocation";
+import {
+    makeGeolocationPosition,
+    mockGeolocation,
+    getMockGeolocationPositionError,
+} from "../../test-utils";
+
+describe('geolocation utilities', () => {
+    let geolocation;
+    const defaultPosition = makeGeolocationPosition({});
+
+    // 14.03.2022 16:15
+    const now = 1647270879403;
+
+    beforeEach(() => {
+        geolocation = mockGeolocation();
+        jest.spyOn(Date, 'now').mockReturnValue(now);
+    });
+
+    afterEach(() => {
+        jest.spyOn(Date, 'now').mockRestore();
+        jest.spyOn(logger, 'error').mockRestore();
+    });
+
+    describe('getGeoUri', () => {
+        it("Renders a URI with only lat and lon", () => {
+            const pos = {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: undefined,
+                accuracy: undefined,
+
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
+        });
+
+        it("Nulls in location are not shown in URI", () => {
+            const pos = {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: null,
+                accuracy: null,
+
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
+        });
+
+        it("Renders a URI with 3 coords", () => {
+            const pos = {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: 332.54,
+                accuracy: undefined,
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4,332.54");
+        });
+
+        it("Renders a URI with accuracy", () => {
+            const pos = {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: undefined,
+                accuracy: 21,
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4;u=21");
+        });
+
+        it("Renders a URI with accuracy and altitude", () => {
+            const pos = {
+                latitude: 43.2,
+                longitude: 12.4,
+                altitude: 12.3,
+                accuracy: 21,
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4,12.3;u=21");
+        });
+    });
+
+    describe('mapGeolocationError', () => {
+        beforeEach(() => {
+            // suppress expected errors from test log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+        });
+
+        it('returns default for other error', () => {
+            const error = new Error('oh no..');
+            expect(mapGeolocationError(error)).toEqual(GeolocationError.Default);
+        });
+
+        it('returns unavailable for unavailable error', () => {
+            const error = new Error(GeolocationError.Unavailable);
+            expect(mapGeolocationError(error)).toEqual(GeolocationError.Unavailable);
+        });
+
+        it('maps geo error permissiondenied correctly', () => {
+            const error = getMockGeolocationPositionError(1, 'message');
+            expect(mapGeolocationError(error)).toEqual(GeolocationError.PermissionDenied);
+        });
+
+        it('maps geo position unavailable error correctly', () => {
+            const error = getMockGeolocationPositionError(2, 'message');
+            expect(mapGeolocationError(error)).toEqual(GeolocationError.PositionUnavailable);
+        });
+
+        it('maps geo timeout error correctly', () => {
+            const error = getMockGeolocationPositionError(3, 'message');
+            expect(mapGeolocationError(error)).toEqual(GeolocationError.Timeout);
+        });
+    });
+
+    describe('mapGeolocationPositionToTimedGeo()', () => {
+        it('maps geolocation position correctly', () => {
+            expect(mapGeolocationPositionToTimedGeo(defaultPosition)).toEqual({
+                timestamp: now, geoUri: 'geo:54.001927,-8.253491;u=1',
+            });
+        });
+    });
+
+    describe('watchPosition()', () => {
+        it('throws with unavailable error when geolocation is not available', () => {
+            // suppress expected errors from test log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+
+            // remove the mock we added
+            // @ts-ignore illegal assignment to readonly property
+            navigator.geolocation = undefined;
+
+            const positionHandler = jest.fn();
+            const errorHandler = jest.fn();
+
+            expect(() => watchPosition(positionHandler, errorHandler)).toThrow(GeolocationError.Unavailable);
+        });
+
+        it('sets up position handler with correct options', () => {
+            const positionHandler = jest.fn();
+            const errorHandler = jest.fn();
+            watchPosition(positionHandler, errorHandler);
+
+            const [, , options] = geolocation.watchPosition.mock.calls[0];
+            expect(options).toEqual({
+                maximumAge: 60000,
+                timeout: 10000,
+            });
+        });
+
+        it('returns clearWatch function', () => {
+            const watchId = 1;
+            geolocation.watchPosition.mockReturnValue(watchId);
+            const positionHandler = jest.fn();
+            const errorHandler = jest.fn();
+            const clearWatch = watchPosition(positionHandler, errorHandler);
+
+            clearWatch();
+
+            expect(geolocation.clearWatch).toHaveBeenCalledWith(watchId);
+        });
+
+        it('calls position handler with position', () => {
+            const positionHandler = jest.fn();
+            const errorHandler = jest.fn();
+            watchPosition(positionHandler, errorHandler);
+
+            expect(positionHandler).toHaveBeenCalledWith(defaultPosition);
+        });
+
+        it('maps geolocation position error and calls error handler', () => {
+            // suppress expected errors from test log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+            geolocation.watchPosition.mockImplementation(
+                (_callback, error) => error(getMockGeolocationPositionError(1, 'message')),
+            );
+            const positionHandler = jest.fn();
+            const errorHandler = jest.fn();
+            watchPosition(positionHandler, errorHandler);
+
+            expect(errorHandler).toHaveBeenCalledWith(GeolocationError.PermissionDenied);
+        });
+    });
+
+    describe('getCurrentPosition()', () => {
+        it('throws with unavailable error when geolocation is not available', async () => {
+            // suppress expected errors from test log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+
+            // remove the mock we added
+            // @ts-ignore illegal assignment to readonly property
+            navigator.geolocation = undefined;
+
+            await expect(() => getCurrentPosition()).rejects.toThrow(GeolocationError.Unavailable);
+        });
+
+        it('throws with geolocation error when geolocation.getCurrentPosition fails', async () => {
+            // suppress expected errors from test log
+            jest.spyOn(logger, 'error').mockImplementation(() => { });
+
+            const timeoutError = getMockGeolocationPositionError(3, 'message');
+            geolocation.getCurrentPosition.mockImplementation((callback, error) => error(timeoutError));
+
+            await expect(() => getCurrentPosition()).rejects.toThrow(GeolocationError.Timeout);
+        });
+
+        it('resolves with current location', async () => {
+            geolocation.getCurrentPosition.mockImplementation((callback, error) => callback(defaultPosition));
+
+            const result = await getCurrentPosition();
+            expect(result).toEqual(defaultPosition);
+        });
+    });
+});
diff --git a/test/utils/beacon/timeline-test.ts b/test/utils/beacon/timeline-test.ts
new file mode 100644
index 00000000000..59217d24590
--- /dev/null
+++ b/test/utils/beacon/timeline-test.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+import { shouldDisplayAsBeaconTile } from "../../../src/utils/beacon/timeline";
+import { makeBeaconInfoEvent } from "../../test-utils";
+
+describe('shouldDisplayAsBeaconTile', () => {
+    const userId = '@user:server';
+    const roomId = '!room:server';
+    const liveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: true });
+    const notLiveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false });
+    const memberEvent = new MatrixEvent({ type: EventType.RoomMember });
+
+    it('returns true for a beacon with live property set to true', () => {
+        expect(shouldDisplayAsBeaconTile(liveBeacon)).toBe(true);
+    });
+
+    it('returns false for a beacon with live property set to false', () => {
+        expect(shouldDisplayAsBeaconTile(notLiveBeacon)).toBe(false);
+    });
+
+    it('returns false for a non beacon event', () => {
+        expect(shouldDisplayAsBeaconTile(memberEvent)).toBe(false);
+    });
+});
diff --git a/test/utils/colour-test.ts b/test/utils/colour-test.ts
new file mode 100644
index 00000000000..720c34e07bb
--- /dev/null
+++ b/test/utils/colour-test.ts
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 Emmanuel Ezeka <eec.studies@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { textToHtmlRainbow } from "../../src/utils/colour";
+
+describe("textToHtmlRainbow", () => {
+    it('correctly transform text to html without splitting the emoji in two', () => {
+        expect(textToHtmlRainbow('🐻')).toBe('<font color="#ff00be">🐻</font>');
+        expect(textToHtmlRainbow('🐕‍🦺')).toBe('<font color="#ff00be">🐕‍🦺</font>');
+    });
+});
diff --git a/test/utils/export-test.tsx b/test/utils/export-test.tsx
index c1128d22714..1c09ecf6def 100644
--- a/test/utils/export-test.tsx
+++ b/test/utils/export-test.tsx
@@ -15,11 +15,18 @@ limitations under the License.
 */
 
 import { renderToString } from "react-dom/server";
-import { IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import {
+    IContent,
+    MatrixClient,
+    MatrixEvent,
+    Room,
+    RoomMember,
+    RelationType,
+    EventType,
+} from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import { IExportOptions, ExportType, ExportFormat } from "../../src/utils/exportUtils/exportUtils";
-import '../skinned-sdk';
 import PlainTextExporter from "../../src/utils/exportUtils/PlainTextExport";
 import HTMLExporter from "../../src/utils/exportUtils/HtmlExport";
 import * as TestUtilsMatrix from '../test-utils';
@@ -71,7 +78,7 @@ describe('export', function() {
                     "origin_server_ts": ts0 + i*1000,
                     "redacts": "$9999999999999999999999999999999999999999998",
                     "sender": "@me:here",
-                    "type": "m.room.redaction",
+                    "type": EventType.RoomRedaction,
                     "unsigned": {
                         "age": 94,
                         "transaction_id": "m1111111111.1",
@@ -120,13 +127,16 @@ describe('export', function() {
         }
         // reply events
         for (i = 0; i < 10; i++) {
+            const eventId = "$" + Math.random() + "-" + Math.random();
             matrixEvents.push(TestUtilsMatrix.mkEvent({
                 "content": {
                     "body": "> <@me:here> Hi\n\nTest",
                     "format": "org.matrix.custom.html",
                     "m.relates_to": {
+                        "rel_type": RelationType.Reference,
+                        "event_id": eventId,
                         "m.in_reply_to": {
-                            "event_id": "$" + Math.random() + "-" + Math.random(),
+                            "event_id": eventId,
                         },
                     },
                     "msgtype": "m.text",
@@ -148,7 +158,7 @@ describe('export', function() {
                         return "avatar.jpeg";
                     },
                     getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
-                },
+                } as unknown as RoomMember,
                 ts: ts0 + i*1000,
                 mship: 'join',
                 prevMship: 'join',
diff --git a/test/utils/location/isSelfLocation-test.ts b/test/utils/location/isSelfLocation-test.ts
new file mode 100644
index 00000000000..6fafc5e467b
--- /dev/null
+++ b/test/utils/location/isSelfLocation-test.ts
@@ -0,0 +1,72 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { TEXT_NODE_TYPE } from "matrix-js-sdk/src/@types/extensible_events";
+import {
+    ILocationContent,
+    LocationAssetType,
+    M_ASSET,
+    M_LOCATION,
+    M_TIMESTAMP,
+} from "matrix-js-sdk/src/@types/location";
+import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
+
+import { isSelfLocation } from "../../../src/utils/location";
+
+describe("isSelfLocation", () => {
+    it("Returns true for a full m.asset event", () => {
+        const content = makeLocationContent("", '0');
+        expect(isSelfLocation(content)).toBe(true);
+    });
+
+    it("Returns true for a missing m.asset", () => {
+        const content = {
+            body: "",
+            msgtype: "m.location",
+            geo_uri: "",
+            [M_LOCATION.name]: { uri: "" },
+            [TEXT_NODE_TYPE.name]: "",
+            [M_TIMESTAMP.name]: 0,
+            // Note: no m.asset!
+        };
+        expect(isSelfLocation(content as ILocationContent)).toBe(true);
+    });
+
+    it("Returns true for a missing m.asset type", () => {
+        const content = {
+            body: "",
+            msgtype: "m.location",
+            geo_uri: "",
+            [M_LOCATION.name]: { uri: "" },
+            [TEXT_NODE_TYPE.name]: "",
+            [M_TIMESTAMP.name]: 0,
+            [M_ASSET.name]: {
+                // Note: no type!
+            },
+        };
+        expect(isSelfLocation(content as ILocationContent)).toBe(true);
+    });
+
+    it("Returns false for an unknown asset type", () => {
+        const content = makeLocationContent(
+            undefined, /* text */
+            "geo:foo",
+            0,
+            undefined, /* description */
+            "org.example.unknown" as unknown as LocationAssetType);
+        expect(isSelfLocation(content)).toBe(false);
+    });
+});
diff --git a/test/utils/location/locationEventGeoUri-test.ts b/test/utils/location/locationEventGeoUri-test.ts
new file mode 100644
index 00000000000..52626f98b7c
--- /dev/null
+++ b/test/utils/location/locationEventGeoUri-test.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { locationEventGeoUri } from "../../../src/utils/location";
+import { makeLegacyLocationEvent, makeLocationEvent } from "../../test-utils/location";
+
+describe('locationEventGeoUri()', () => {
+    it('returns m.location uri when available', () => {
+        expect(locationEventGeoUri(makeLocationEvent("geo:51.5076,-0.1276"))).toEqual("geo:51.5076,-0.1276");
+    });
+
+    it('returns legacy uri when m.location content not found', () => {
+        expect(locationEventGeoUri(makeLegacyLocationEvent("geo:51.5076,-0.1276"))).toEqual("geo:51.5076,-0.1276");
+    });
+});
diff --git a/test/utils/location/map-test.ts b/test/utils/location/map-test.ts
new file mode 100644
index 00000000000..f389f12cfdb
--- /dev/null
+++ b/test/utils/location/map-test.ts
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { createMapSiteLink } from "../../../src/utils/location";
+import { mkMessage } from "../../test-utils";
+import { makeLegacyLocationEvent, makeLocationEvent } from "../../test-utils/location";
+
+describe("createMapSiteLink", () => {
+    it("returns null if event does not contain geouri", () => {
+        expect(createMapSiteLink(mkMessage({
+            room: '1', user: '@sender:server', event: true,
+        }))).toBeNull();
+    });
+
+    it("returns OpenStreetMap link if event contains m.location", () => {
+        expect(
+            createMapSiteLink(makeLocationEvent("geo:51.5076,-0.1276")),
+        ).toEqual(
+            "https://www.openstreetmap.org/" +
+            "?mlat=51.5076&mlon=-0.1276" +
+            "#map=16/51.5076/-0.1276",
+        );
+    });
+
+    it("returns OpenStreetMap link if event contains geo_uri", () => {
+        expect(
+            createMapSiteLink(makeLegacyLocationEvent("geo:51.5076,-0.1276")),
+        ).toEqual(
+            "https://www.openstreetmap.org/" +
+            "?mlat=51.5076&mlon=-0.1276" +
+            "#map=16/51.5076/-0.1276",
+        );
+    });
+});
diff --git a/test/utils/location/parseGeoUri-test.ts b/test/utils/location/parseGeoUri-test.ts
new file mode 100644
index 00000000000..b0d36929d2d
--- /dev/null
+++ b/test/utils/location/parseGeoUri-test.ts
@@ -0,0 +1,157 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { parseGeoUri } from "../../../src/utils/location/parseGeoUri";
+
+describe("parseGeoUri", () => {
+    it("fails if the supplied URI is empty", () => {
+        expect(parseGeoUri("")).toBeFalsy();
+    });
+
+    // We use some examples from the spec, but don't check semantics
+    // like two textually-different URIs being equal, since we are
+    // just a humble parser.
+
+    // Note: we do not understand geo URIs with percent-encoded coords
+    // or accuracy.  It is RECOMMENDED in the spec never to percent-encode
+    // these, but it is permitted, and we will fail to parse in that case.
+
+    it("rfc5870 6.1 Simple 3-dimensional", () => {
+        expect(parseGeoUri("geo:48.2010,16.3695,183")).toEqual(
+            {
+                latitude: 48.2010,
+                longitude: 16.3695,
+                altitude: 183,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.2 Explicit CRS and accuracy", () => {
+        expect(parseGeoUri("geo:48.198634,16.371648;crs=wgs84;u=40")).toEqual(
+            {
+                latitude: 48.198634,
+                longitude: 16.371648,
+                altitude: undefined,
+                accuracy: 40,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.4 Negative longitude and explicit CRS", () => {
+        expect(parseGeoUri("geo:90,-22.43;crs=WGS84")).toEqual(
+            {
+                latitude: 90,
+                longitude: -22.43,
+                altitude: undefined,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.4 Integer lat and lon", () => {
+        expect(parseGeoUri("geo:90,46")).toEqual(
+            {
+                latitude: 90,
+                longitude: 46,
+                altitude: undefined,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.4 Percent-encoded param value", () => {
+        expect(parseGeoUri("geo:66,30;u=6.500;FOo=this%2dthat")).toEqual(
+            {
+                latitude: 66,
+                longitude: 30,
+                altitude: undefined,
+                accuracy: 6.500,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.4 Unknown param", () => {
+        expect(parseGeoUri("geo:66.0,30;u=6.5;foo=this-that>")).toEqual(
+            {
+                latitude: 66.0,
+                longitude: 30,
+                altitude: undefined,
+                accuracy: 6.5,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("rfc5870 6.4 Multiple unknown params", () => {
+        expect(parseGeoUri("geo:70,20;foo=1.00;bar=white")).toEqual(
+            {
+                latitude: 70,
+                longitude: 20,
+                altitude: undefined,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("Negative latitude", () => {
+        expect(parseGeoUri("geo:-7.5,20")).toEqual(
+            {
+                latitude: -7.5,
+                longitude: 20,
+                altitude: undefined,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+
+    it("Zero altitude is not unknown", () => {
+        expect(parseGeoUri("geo:-7.5,-20,0")).toEqual(
+            {
+                latitude: -7.5,
+                longitude: -20,
+                altitude: 0,
+                accuracy: undefined,
+                altitudeAccuracy: undefined,
+                heading: undefined,
+                speed: undefined,
+            },
+        );
+    });
+});
diff --git a/test/createRoom-test.js b/test/utils/membership-test.ts
similarity index 55%
rename from test/createRoom-test.js
rename to test/utils/membership-test.ts
index fd37e0091ef..84fa13580c5 100644
--- a/test/createRoom-test.js
+++ b/test/utils/membership-test.ts
@@ -1,7 +1,22 @@
-import './skinned-sdk'; // Must be first for skinning to work
-import { EventEmitter } from 'events';
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
 
-import { waitForMember, canEncryptToAllUsers } from '../src/createRoom';
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { EventEmitter } from "events";
+
+import { waitForMember } from "../../src/utils/membership";
 
 /* Shorter timeout, we've got tests to run */
 const timeout = 30;
@@ -41,31 +56,3 @@ describe("waitForMember", () => {
         client.emit("RoomState.newMember", undefined, undefined, { roomId, userId });
     });
 });
-
-describe("canEncryptToAllUsers", () => {
-    const trueUser = {
-        "@goodUser:localhost": {
-            "DEV1": {},
-            "DEV2": {},
-        },
-    };
-    const falseUser = {
-        "@badUser:localhost": {},
-    };
-
-    it("returns true if all devices have crypto", async () => {
-        const client = {
-            downloadKeys: async function(userIds) { return trueUser; },
-        };
-        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost"]);
-        expect(response).toBe(true);
-    });
-
-    it("returns false if not all users have crypto", async () => {
-        const client = {
-            downloadKeys: async function(userIds) { return { ...trueUser, ...falseUser }; },
-        };
-        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost", "@badUser:localhost"]);
-        expect(response).toBe(false);
-    });
-});
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index e05cf252e4e..ddca34fb766 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -15,7 +15,6 @@ limitations under the License.
 
 import { MatrixClientPeg as peg } from '../../../src/MatrixClientPeg';
 import {
-    makeGroupPermalink,
     makeRoomPermalink,
     makeUserPermalink,
     parsePermalink,
@@ -444,11 +443,6 @@ describe('Permalinks', function() {
         expect(result).toBe("https://matrix.to/#/@someone:example.org");
     });
 
-    it('should generate a group permalink', function() {
-        const result = makeGroupPermalink("+community:example.org");
-        expect(result).toBe("https://matrix.to/#/+community:example.org");
-    });
-
     it('should correctly parse room permalinks with a via argument', () => {
         const result = parsePermalink("https://matrix.to/#/!room_id:server?via=some.org");
         expect(result.roomIdOrAlias).toBe("!room_id:server");
diff --git a/tsconfig.json b/tsconfig.json
index f74079696eb..ec0d70c8e0d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
+    "experimentalDecorators": false,
+    "emitDecoratorMetadata": false,
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2016",
     "noImplicitAny": false,
+    "noUnusedLocals": true,
     "sourceMap": false,
     "outDir": "./lib",
     "declaration": true,
@@ -20,6 +21,11 @@
   },
   "include": [
     "./src/**/*.ts",
-    "./src/**/*.tsx"
+    "./src/**/*.tsx",
+    "./test/**/*.ts",
+    "./test/**/*.tsx",
   ],
+  "exclude": [
+    "./test/end-to-end-tests/"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index 1b462713038..5e5e4838c3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,14 +10,14 @@
     "@actions/http-client" "^1.0.11"
 
 "@actions/github@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz#1754127976c50bd88b2e905f10d204d76d1472f8"
-  integrity sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@actions/github/-/github-5.0.1.tgz#5fdbe371d9a592038668be95d12421361585fba1"
+  integrity sha512-JZGyPM9ektb8NVTTI/2gfJ9DL7Rk98tQ7OVyTlgTuaQroariRBsOnzjy0I2EarX4xUZpK88YyO503fhmjFdyAg==
   dependencies:
     "@actions/http-client" "^1.0.11"
-    "@octokit/core" "^3.4.0"
-    "@octokit/plugin-paginate-rest" "^2.13.3"
-    "@octokit/plugin-rest-endpoint-methods" "^5.1.1"
+    "@octokit/core" "^3.6.0"
+    "@octokit/plugin-paginate-rest" "^2.17.0"
+    "@octokit/plugin-rest-endpoint-methods" "^5.13.0"
 
 "@actions/http-client@^1.0.11":
   version "1.0.11"
@@ -26,18 +26,19 @@
   dependencies:
     tunnel "0.0.6"
 
-"@ampproject/remapping@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23"
-  integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g==
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
 "@babel/cli@^7.12.10":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.0.tgz#9b932d8f08a2e218fcdd9bba456044eb0a2e0b2c"
-  integrity sha512-es10YH/ejXbg551vtnmEzIPe3MQRNOS644o3pf8vUr1tIeNzVNlP8BBvs1Eh7roh5A+k2fEHUas+ZptOWHA1fQ==
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.6.tgz#169e5935f1795f0b62ded5a2accafeedfe5c5363"
+  integrity sha512-l4w608nsDNlxZhiJ5tE3DbNmr61fIKMZ6fTBo171VEFuFMIYuJ3mHRhTLEkKKyvx2Mizkkv/0a8OJOnZqkKYNA==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.4"
     commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
@@ -56,30 +57,30 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
-  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
+  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
 
 "@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337"
-  integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
+  integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
   dependencies:
-    "@ampproject/remapping" "^2.0.0"
+    "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.0"
+    "@babel/generator" "^7.17.9"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-module-transforms" "^7.17.7"
+    "@babel/helpers" "^7.17.9"
+    "@babel/parser" "^7.17.9"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
+    "@babel/traverse" "^7.17.9"
     "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
 "@babel/eslint-parser@^7.12.10":
@@ -92,16 +93,16 @@
     semver "^6.3.0"
 
 "@babel/eslint-plugin@^7.12.10":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.16.5.tgz#d1770685160922059f5d8f101055e799b7cff391"
-  integrity sha512-R1p6RMyU1Xl1U/NNr+D4+HjkQzN5dQOX0MpjW9WLWhHDjhzN9gso96MxxOFvPh0fKF/mMH8TGW2kuqQ2eK2s9A==
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8"
+  integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-"@babel/generator@^7.17.0", "@babel/generator@^7.7.2":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
-  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
+"@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
+  integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
   dependencies:
     "@babel/types" "^7.17.0"
     jsesc "^2.5.1"
@@ -122,25 +123,25 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
-  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
+  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
+    "@babel/compat-data" "^7.17.7"
     "@babel/helper-validator-option" "^7.16.7"
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21"
-  integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
+  integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
     "@babel/helper-optimise-call-expression" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
@@ -181,21 +182,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
@@ -204,12 +197,12 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
-  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
+  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
   version "7.16.7"
@@ -218,19 +211,19 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
+  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
@@ -264,12 +257,12 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
-  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+"@babel/helper-simple-access@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
+  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
@@ -305,28 +298,28 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.17.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
-  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
+"@babel/helpers@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
+  integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
+    "@babel/traverse" "^7.17.9"
     "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
+  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
-  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
+  integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
@@ -362,25 +355,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
-  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
+  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.6"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.12.12":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
-  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.1"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/plugin-syntax-decorators" "^7.17.0"
-    charcodes "^0.2.0"
-
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
@@ -438,11 +420,11 @@
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
-  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
+  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
+    "@babel/compat-data" "^7.17.0"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
@@ -519,13 +501,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
-  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -683,9 +658,9 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
-  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
+  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
@@ -752,22 +727,22 @@
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
+  integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
-  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
+  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
   dependencies:
     "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
@@ -831,15 +806,15 @@
     "@babel/plugin-transform-react-jsx" "^7.16.7"
 
 "@babel/plugin-transform-react-jsx@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4"
-  integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1"
+  integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-jsx" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/plugin-transform-react-pure-annotations@^7.16.7":
   version "7.16.7"
@@ -850,11 +825,11 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
+  integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    regenerator-transform "^0.15.0"
 
 "@babel/plugin-transform-reserved-words@^7.16.7":
   version "7.16.7"
@@ -1048,9 +1023,9 @@
     "@babel/plugin-transform-typescript" "^7.16.7"
 
 "@babel/register@^7.12.10":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.17.0.tgz#8051e0b7cb71385be4909324f072599723a1f084"
-  integrity sha512-UNZsMAZ7uKoGHo1HlEXfteEOYssf64n/PNLHGqOKq/bgYcu/4LrQWAHJwSCb3BRZK8Hi5gkJdRcwrGTO2wtRCg==
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.17.7.tgz#5eef3e0f4afc07e25e847720e7b987ae33f08d0b"
+  integrity sha512-fg56SwvXRifootQEDQAu1mKdjh5uthPzdO0N6t358FktfL4XjAVXuH58ULoiW8mesxiOgNIrxiImqEwv0+hRRA==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -1059,17 +1034,17 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime-corejs3@^7.10.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.2.tgz#fdca2cd05fba63388babe85d349b6801b008fd13"
-  integrity sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055"
+  integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw==
   dependencies:
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
-  integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
+  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1082,18 +1057,18 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.12.12", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.17", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.7.2":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
-  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
+"@babel/traverse@^7.12.12", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.17", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
+  integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
+    "@babel/generator" "^7.17.9"
     "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.0"
+    "@babel/parser" "^7.17.9"
     "@babel/types" "^7.17.0"
     debug "^4.1.0"
     globals "^11.1.0"
@@ -1119,16 +1094,53 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
+"@cypress/request@^2.88.10":
+  version "2.88.10"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
+  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    http-signature "~1.3.6"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^8.3.2"
+
+"@cypress/xvfb@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
+  integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
+  dependencies:
+    debug "^3.1.0"
+    lodash.once "^4.1.1"
+
 "@eslint/eslintrc@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.1.0.tgz#583d12dbec5d4f22f333f9669f7d0b7c7815b4d3"
-  integrity sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
+  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
     espree "^9.3.1"
     globals "^13.9.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.0.4"
@@ -1366,19 +1378,19 @@
     chalk "^4.0.0"
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
-  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
-  integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde"
-  integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==
+"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -1470,14 +1482,14 @@
   dependencies:
     "@octokit/types" "^6.0.3"
 
-"@octokit/core@^3.4.0", "@octokit/core@^3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
-  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
+"@octokit/core@^3.5.1", "@octokit/core@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085"
+  integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==
   dependencies:
     "@octokit/auth-token" "^2.4.4"
     "@octokit/graphql" "^4.5.8"
-    "@octokit/request" "^5.6.0"
+    "@octokit/request" "^5.6.3"
     "@octokit/request-error" "^2.0.5"
     "@octokit/types" "^6.0.3"
     before-after-hook "^2.2.0"
@@ -1506,7 +1518,7 @@
   resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
   integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
 
-"@octokit/plugin-paginate-rest@^2.13.3", "@octokit/plugin-paginate-rest@^2.16.8":
+"@octokit/plugin-paginate-rest@^2.16.8", "@octokit/plugin-paginate-rest@^2.17.0":
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz#32e9c7cab2a374421d3d0de239102287d791bce7"
   integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==
@@ -1518,7 +1530,7 @@
   resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
   integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
-"@octokit/plugin-rest-endpoint-methods@^5.1.1", "@octokit/plugin-rest-endpoint-methods@^5.12.0":
+"@octokit/plugin-rest-endpoint-methods@^5.12.0", "@octokit/plugin-rest-endpoint-methods@^5.13.0":
   version "5.13.0"
   resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
   integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
@@ -1535,7 +1547,7 @@
     deprecation "^2.0.0"
     once "^1.4.0"
 
-"@octokit/request@^5.6.0":
+"@octokit/request@^5.6.0", "@octokit/request@^5.6.3":
   version "5.6.3"
   resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
   integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
@@ -1564,15 +1576,15 @@
   dependencies:
     "@octokit/openapi-types" "^11.2.0"
 
-"@peculiar/asn1-schema@^2.0.44":
-  version "2.0.44"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.44.tgz#dcb1b8f84a4dd5f07f674028beade9c3de43cc06"
-  integrity sha512-uaCnjQ9A9WwQSMuDJcNOCYEPXTahgKbFMvI7eMOMd8lXgx0J1eU7F3BoMsK5PFxa3dVUxjSQbaOjfgGoeHGgoQ==
+"@peculiar/asn1-schema@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.1.0.tgz#b1c185e1bd65c269d693c569534880cedc8aa5fa"
+  integrity sha512-D6g4C5YRKC/iPujMAOXuZ7YGdaoMx8GsvWzfVSyx2LYeL38ECOKNywlYAuwbqQvON64lgsYdAujWQPX8hhoBLw==
   dependencies:
     "@types/asn1js" "^2.0.2"
-    asn1js "^2.1.1"
+    asn1js "^2.3.1"
     pvtsutils "^1.2.1"
-    tslib "^2.3.0"
+    tslib "^2.3.1"
 
 "@peculiar/json-schema@^1.1.12":
   version "1.1.12"
@@ -1582,77 +1594,77 @@
     tslib "^2.0.0"
 
 "@peculiar/webcrypto@^1.1.4":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.2.3.tgz#79268ef0a8068bed2a40fc33bc68b4d3546fe2cc"
-  integrity sha512-q7wDfZy3k/tpnsYB23/MyyDkjn6IdHh8w+xwoVMS5cu6CjVoFzngXDZEOOuSE4zus2yO6ciQhhHxd4XkLpwVnQ==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.3.3.tgz#ccca15d27d64a63df013e6575834563aa5df0dbc"
+  integrity sha512-+jkp16Hp18HkphJlMtqsQKjyDWJBh0AhDuoB+vVakuIRbkBdaFb7v26Ldm25altjiYhCyQnR5NChHxwSTvbXJw==
   dependencies:
-    "@peculiar/asn1-schema" "^2.0.44"
+    "@peculiar/asn1-schema" "^2.1.0"
     "@peculiar/json-schema" "^1.1.12"
-    pvtsutils "^1.2.1"
+    pvtsutils "^1.2.2"
     tslib "^2.3.1"
-    webcrypto-core "^1.4.0"
+    webcrypto-core "^1.7.2"
 
 "@sentry/browser@^6.11.0":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.17.5.tgz#939c2c45f2b9ff7b449eaae270b6d4313b77a6c1"
-  integrity sha512-3xZ+6HgEnnQpXEk+3YJyfHlsJzMbOBEnjs3ImAiJvKJLdPnRjhixbQwsiV9Fm2SG43o2bFABpGSE337rvy4JuA==
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.6.tgz#75be467667fffa1f4745382fc7a695568609c634"
+  integrity sha512-V5QyY1cO1iuFCI78dOFbHV7vckbeQEPPq3a5dGSXlBQNYnd9Ec5xoxp5nRNpWQPOZ8/Ixt9IgRxdqVTkWib51g==
   dependencies:
-    "@sentry/core" "6.17.5"
-    "@sentry/types" "6.17.5"
-    "@sentry/utils" "6.17.5"
+    "@sentry/core" "6.19.6"
+    "@sentry/types" "6.19.6"
+    "@sentry/utils" "6.19.6"
     tslib "^1.9.3"
 
-"@sentry/core@6.17.5":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.17.5.tgz#8455e8b4ba36fc50c0d95b25eba06286389663ee"
-  integrity sha512-G1bYvZsWM5n0QYbnv89a24HCXex3rMWUnHWFysNqcWmw2YfiQ9RX5SakGbesewBj2Br2XpaDH0pED3QBUrC7yA==
+"@sentry/core@6.19.6":
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.6.tgz#7d4649d0148b5d0be1358ab02e2f869bf7363e9a"
+  integrity sha512-biEotGRr44/vBCOegkTfC9rwqaqRKIpFljKGyYU6/NtzMRooktqOhjmjmItNCMRknArdeaQwA8lk2jcZDXX3Og==
   dependencies:
-    "@sentry/hub" "6.17.5"
-    "@sentry/minimal" "6.17.5"
-    "@sentry/types" "6.17.5"
-    "@sentry/utils" "6.17.5"
+    "@sentry/hub" "6.19.6"
+    "@sentry/minimal" "6.19.6"
+    "@sentry/types" "6.19.6"
+    "@sentry/utils" "6.19.6"
     tslib "^1.9.3"
 
-"@sentry/hub@6.17.5":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.17.5.tgz#9985ad61ac71003315ccaca2a2d42eed0e35bf6e"
-  integrity sha512-jBRrG0v3nHrymyj13Dv28aRS6xgQjWup45E0rljeksCxDL9frc734C0QGzGjE2MG7vZWtvd2CgP8uNbgYpwlTw==
+"@sentry/hub@6.19.6":
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.6.tgz#ada83ceca0827c49534edfaba018221bc1eb75e1"
+  integrity sha512-PuEOBZxvx3bjxcXmWWZfWXG+orojQiWzv9LQXjIgroVMKM/GG4QtZbnWl1hOckUj7WtKNl4hEGO2g/6PyCV/vA==
   dependencies:
-    "@sentry/types" "6.17.5"
-    "@sentry/utils" "6.17.5"
+    "@sentry/types" "6.19.6"
+    "@sentry/utils" "6.19.6"
     tslib "^1.9.3"
 
-"@sentry/minimal@6.17.5":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.17.5.tgz#8116de3a4e8619242f4970ccbb7eea303ef88c52"
-  integrity sha512-WY/IQh2tb4XDkvr/2/8LB0mO8W3cgL6S2Uv+YfVRqogGJRdg5wD67aQ9zypNMq+D84cPwRuR/+51Npj6daox4w==
+"@sentry/minimal@6.19.6":
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.6.tgz#b6cced3708e25d322039e68ebdf8fadfa445bf7d"
+  integrity sha512-T1NKcv+HTlmd8EbzUgnGPl4ySQGHWMCyZ8a8kXVMZOPDzphN3fVIzkYzWmSftCWp0rpabXPt9aRF2mfBKU+mAQ==
   dependencies:
-    "@sentry/hub" "6.17.5"
-    "@sentry/types" "6.17.5"
+    "@sentry/hub" "6.19.6"
+    "@sentry/types" "6.19.6"
     tslib "^1.9.3"
 
 "@sentry/tracing@^6.11.0":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.17.5.tgz#3bc25279d370b9771d1f8abe3d7d7e7a0f445c9f"
-  integrity sha512-SVIDFL/QbNAlv+Rhgq14TqtTBp9WGipkjQXXaD/Pbqcj3/Oil7ZHHKYesW8Z+gtKQs73oQ9a0nCgraLFcQ68PQ==
-  dependencies:
-    "@sentry/hub" "6.17.5"
-    "@sentry/minimal" "6.17.5"
-    "@sentry/types" "6.17.5"
-    "@sentry/utils" "6.17.5"
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.19.6.tgz#faa156886afe441730f03cf9ac9c4982044b7135"
+  integrity sha512-STZdlEtTBqRmPw6Vjkzi/1kGkGPgiX0zdHaSOhSeA2HXHwx7Wnfu7veMKxtKWdO+0yW9QZGYOYqp0GVf4Swujg==
+  dependencies:
+    "@sentry/hub" "6.19.6"
+    "@sentry/minimal" "6.19.6"
+    "@sentry/types" "6.19.6"
+    "@sentry/utils" "6.19.6"
     tslib "^1.9.3"
 
-"@sentry/types@6.17.5", "@sentry/types@^6.10.0":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.17.5.tgz#3b6a591c8059d577b51ba2e71f4717aadbea923f"
-  integrity sha512-mn7qKuOvmZRTomJ7BiJEw6DM8femAVQcuHa8hdvK1F6ldMfFVLen5Z2LYGE7iY36GEa1Ba/AGGEKyF8D29y2/Q==
+"@sentry/types@6.19.6", "@sentry/types@^6.10.0":
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.6.tgz#70513f9dca05d23d7ab9c2a6cb08d4db6763ca67"
+  integrity sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ==
 
-"@sentry/utils@6.17.5":
-  version "6.17.5"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.17.5.tgz#8034ac309d5f59ec919c748c6f35d6d831546523"
-  integrity sha512-MMCFCNWW73HRnqPVRGGSaMfSxtvvlNDgu1JFAOT2vnNkuf0mXvH301lyrh4pFJfntrtXOOk4bnGMhyWRlPADdA==
+"@sentry/utils@6.19.6":
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.6.tgz#2ddc9ef036c3847084c43d0e5a55e4646bdf9021"
+  integrity sha512-fAMWcsguL0632eWrROp/vhPgI7sBj/JROWVPzpabwVkm9z3m1rQm6iLFn4qfkZL8Ozy6NVZPXOQ7EXmeU24byg==
   dependencies:
-    "@sentry/types" "6.17.5"
+    "@sentry/types" "6.19.6"
     tslib "^1.9.3"
 
 "@sinonjs/commons@^1.7.0":
@@ -1662,13 +1674,6 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^7.0.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
-  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 "@sinonjs/fake-timers@^8.0.1":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
@@ -1676,6 +1681,13 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sinonjs/fake-timers@^9.1.2":
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
   resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
@@ -1702,9 +1714,9 @@
   integrity sha512-t4YHCgtD+ERvH0FyxvNlYwJ2ezhqw7t+Ygh4urQ7dJER8i185JPv6oIM3ey5YQmGN6Zp9EMbpohkjZi9t3UxwA==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
-  version "7.1.18"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8"
-  integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==
+  version "7.1.19"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1728,9 +1740,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
-  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.0.tgz#7a9b80f712fe2052bc20da153ff1e552404d8e4b"
+  integrity sha512-r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1769,13 +1781,18 @@
   integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A==
 
 "@types/enzyme@^3.10.9":
-  version "3.10.11"
-  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.11.tgz#8924bd92cc63ac1843e215225dfa8f71555fe814"
-  integrity sha512-LEtC7zXsQlbGXWGcnnmOI7rTyP+i1QzQv4Va91RKXDEukLDaNyxu0rXlfMiGEhJwfgTPCTb0R+Pnlj//oM9e/w==
+  version "3.10.12"
+  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.12.tgz#ac4494801b38188935580642f772ad18f72c132f"
+  integrity sha512-xryQlOEIe1TduDWAOphR0ihfebKFSWOXpIsk+70JskCfRfW+xALdnJ0r1ZOTo85F9Qsjk6vtlU7edTYHbls9tA==
   dependencies:
     "@types/cheerio" "*"
     "@types/react" "*"
 
+"@types/escape-html@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.2.tgz#072b7b13784fb3cee9c2450c22f36405983f5e3c"
+  integrity sha512-gaBLT8pdcexFztLSPRtriHeXY/Kn4907uOCZ4Q3lncFBkheAWOuNt53ypsF8szgxbEJ513UeBzcf4utN0EzEwA==
+
 "@types/events@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1799,6 +1816,13 @@
     "@types/fbemitter" "*"
     "@types/react" "*"
 
+"@types/fs-extra@^9.0.13":
+  version "9.0.13"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
+  integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/geojson@^7946.0.8":
   version "7946.0.8"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
@@ -1847,9 +1871,9 @@
     pretty-format "^26.0.0"
 
 "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -1857,9 +1881,9 @@
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
 "@types/lodash@^4.14.168":
-  version "4.14.178"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
-  integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
 
 "@types/mdast@^3.0.0":
   version "3.0.10"
@@ -1879,14 +1903,14 @@
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
 "@types/node@*":
-  version "17.0.16"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.16.tgz#e3733f46797b9df9e853ca9f719c8a6f7b84cd26"
-  integrity sha512-ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA==
+  version "17.0.25"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.25.tgz#527051f3c2f77aa52e5dc74e45a3da5fb2301448"
+  integrity sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==
 
-"@types/node@^14.14.22":
-  version "14.18.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz#774f43868964f3cfe4ced1f5417fe15818a4eaea"
-  integrity sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ==
+"@types/node@^14.14.22", "@types/node@^14.14.31":
+  version "14.18.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.13.tgz#6ad4d9db59e6b3faf98dcfe4ca9d2aec84443277"
+  integrity sha512-Z6/KzgyWOga3pJNS42A+zayjhPbf2zM3hegRQaOPnLOzEi86VV++6FLDWgR1LGrVCRufP/ph2daa3tEa5br1zA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -1909,14 +1933,14 @@
   integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==
 
 "@types/prettier@^2.1.5":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf"
-  integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759"
+  integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==
 
 "@types/prop-types@*":
-  version "15.7.4"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
-  integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
+  version "15.7.5"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
 "@types/qrcode@^1.3.5":
   version "1.4.2"
@@ -1940,15 +1964,22 @@
     "@types/react" "*"
 
 "@types/react-redux@^7.1.20":
-  version "7.1.22"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.22.tgz#0eab76a37ef477cc4b53665aeaf29cb60631b72a"
-  integrity sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==
+  version "7.1.24"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
+  integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
+"@types/react-test-renderer@^17.0.1":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.2.tgz#5f800a39b12ac8d2a2149e7e1885215bcf4edbbf"
+  integrity sha512-+F1KONQTBHDBBhbHuT2GNydeMpPuviduXIVJRB7Y4nma4NR5DrTJfMMZ+jbhEHbpwL+Uqhs1WXh4KHiyrtYTPg==
+  dependencies:
+    "@types/react" "^17"
+
 "@types/react-transition-group@^4.4.0":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
@@ -1956,7 +1987,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.14":
+"@types/react@*", "@types/react@17.0.14", "@types/react@^17":
   version "17.0.14"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f"
   integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==
@@ -1982,6 +2013,16 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
+
+"@types/sizzle@^2.3.2":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
+  integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
+
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
@@ -1993,9 +2034,9 @@
   integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
 
 "@types/yargs-parser@*":
-  version "20.2.1"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
-  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^15.0.0":
   version "15.0.14"
@@ -2011,19 +2052,26 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
+  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/zxcvbn@^4.4.0":
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.1.tgz#46e42cbdcee681b22181478feaf4af2bc4c1abd2"
   integrity sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==
 
 "@typescript-eslint/eslint-plugin@^5.6.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.11.0.tgz#3b866371d8d75c70f9b81535e7f7d3aa26527c7a"
-  integrity sha512-HJh33bgzXe6jGRocOj4FmefD7hRY4itgjzOrSs3JPrTNXsX7j5+nQPciAUj/1nZtwo2kAc3C75jZO+T23gzSGw==
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz#022531a639640ff3faafaf251d1ce00a2ef000a1"
+  integrity sha512-fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/type-utils" "5.11.0"
-    "@typescript-eslint/utils" "5.11.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/type-utils" "5.20.0"
+    "@typescript-eslint/utils" "5.20.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2032,83 +2080,83 @@
     tsutils "^3.21.0"
 
 "@typescript-eslint/parser@^5.6.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.11.0.tgz#b4fcaf65513f9b34bdcbffdda055724a5efb7e04"
-  integrity sha512-x0DCjetHZYBRovJdr3U0zG9OOdNXUaFLJ82ehr1AlkArljJuwEsgnud+Q7umlGDFLFrs8tU8ybQDFocp/eX8mQ==
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.20.0.tgz#4991c4ee0344315c2afc2a62f156565f689c8d0b"
+  integrity sha512-UWKibrCZQCYvobmu3/N8TWbEeo/EPQbS41Ux1F9XqPzGuV7pfg6n50ZrFo6hryynD8qOTTfLHtHjjdQtxJ0h/w==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/typescript-estree" "5.11.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/typescript-estree" "5.20.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.11.0.tgz#f5aef83ff253f457ecbee5f46f762298f0101e4b"
-  integrity sha512-z+K4LlahDFVMww20t/0zcA7gq/NgOawaLuxgqGRVKS0PiZlCTIUtX0EJbC0BK1JtR4CelmkPK67zuCgpdlF4EA==
+"@typescript-eslint/scope-manager@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz#79c7fb8598d2942e45b3c881ced95319818c7980"
+  integrity sha512-h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/visitor-keys" "5.11.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/visitor-keys" "5.20.0"
 
-"@typescript-eslint/type-utils@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.11.0.tgz#58be0ba73d1f6ef8983d79f7f0bc2209b253fefe"
-  integrity sha512-wDqdsYO6ofLaD4DsGZ0jGwxp4HrzD2YKulpEZXmgN3xo4BHJwf7kq49JTRpV0Gx6bxkSUmc9s0EIK1xPbFFpIA==
+"@typescript-eslint/type-utils@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.20.0.tgz#151c21cbe9a378a34685735036e5ddfc00223be3"
+  integrity sha512-WxNrCwYB3N/m8ceyoGCgbLmuZwupvzN0rE8NBuwnl7APgjv24ZJIjkNzoFBXPRCGzLNkoU/WfanW0exvp/+3Iw==
   dependencies:
-    "@typescript-eslint/utils" "5.11.0"
+    "@typescript-eslint/utils" "5.20.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.11.0.tgz#ba345818a2540fdf2755c804dc2158517ab61188"
-  integrity sha512-cxgBFGSRCoBEhvSVLkKw39+kMzUKHlJGVwwMbPcTZX3qEhuXhrjwaZXWMxVfxDgyMm+b5Q5b29Llo2yow8Y7xQ==
+"@typescript-eslint/types@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.20.0.tgz#fa39c3c2aa786568302318f1cb51fcf64258c20c"
+  integrity sha512-+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg==
 
-"@typescript-eslint/typescript-estree@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.11.0.tgz#53f9e09b88368191e52020af77c312a4777ffa43"
-  integrity sha512-yVH9hKIv3ZN3lw8m/Jy5I4oXO4ZBMqijcXCdA4mY8ull6TPTAoQnKKrcZ0HDXg7Bsl0Unwwx7jcXMuNZc0m4lg==
+"@typescript-eslint/typescript-estree@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz#ab73686ab18c8781bbf249c9459a55dc9417d6b0"
+  integrity sha512-36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/visitor-keys" "5.11.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/visitor-keys" "5.20.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.11.0.tgz#d91548ef180d74c95d417950336d9260fdbe1dc5"
-  integrity sha512-g2I480tFE1iYRDyMhxPAtLQ9HAn0jjBtipgTCZmd9I9s11OV8CTsG+YfFciuNDcHqm4csbAgC2aVZCHzLxMSUw==
+"@typescript-eslint/utils@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.20.0.tgz#b8e959ed11eca1b2d5414e12417fd94cae3517a5"
+  integrity sha512-lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/typescript-estree" "5.11.0"
+    "@typescript-eslint/scope-manager" "5.20.0"
+    "@typescript-eslint/types" "5.20.0"
+    "@typescript-eslint/typescript-estree" "5.20.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.11.0.tgz#888542381f1a2ac745b06d110c83c0b261487ebb"
-  integrity sha512-E8w/vJReMGuloGxJDkpPlGwhxocxOpSVgSvjiLO5IxZPmxZF30weOeJYyPSEACwM+X4NziYS9q+WkN/2DHYQwA==
+"@typescript-eslint/visitor-keys@5.20.0":
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz#70236b5c6b67fbaf8b2f58bf3414b76c1e826c2a"
+  integrity sha512-1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
+    "@typescript-eslint/types" "5.20.0"
     eslint-visitor-keys "^3.0.0"
 
 "@wojtekmaj/enzyme-adapter-react-17@^0.6.1":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.6.tgz#2ee3d4956caea4de05e372e5d9f39b31becffe6a"
-  integrity sha512-gSfhg8CiL0Vwc2UgUblGVZIy7M0KyXaZsd8+QwzV8TSVRLkGyzdLtYEcs9wRWyQTsdmOd+oRGqbVgUX7AVJxug==
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.7.tgz#7784bd32f518b186218cebb26c98c852676f30b0"
+  integrity sha512-B+byiwi/T1bx5hcj9wc0fUL5Hlb5giSXJzcnEfJVl2j6dGV2NJfcxDBYX0WWwIxlzNiFz8kAvlkFWI2y/nscZQ==
   dependencies:
-    "@wojtekmaj/enzyme-adapter-utils" "^0.1.2"
+    "@wojtekmaj/enzyme-adapter-utils" "^0.1.4"
     enzyme-shallow-equal "^1.0.0"
     has "^1.0.0"
     prop-types "^15.7.0"
     react-is "^17.0.0"
     react-test-renderer "^17.0.0"
 
-"@wojtekmaj/enzyme-adapter-utils@^0.1.2":
+"@wojtekmaj/enzyme-adapter-utils@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.4.tgz#bcd411ad6e368f17dce5425582c2907104cdb1ad"
   integrity sha512-ARGIQSIIv3oBia1m5Ihn1VU0FGmft6KPe39SBKTb8p7LSXO23YI4kNtc4M/cKoIY7P+IYdrZcgMObvedyjoSQA==
@@ -2119,9 +2167,9 @@
     prop-types "^15.7.0"
 
 abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 acorn-globals@^6.0.0:
   version "6.0.0"
@@ -2158,6 +2206,14 @@ 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-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -2174,9 +2230,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
-  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2202,7 +2258,12 @@ another-json@^0.2.0:
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw=
 
-ansi-escapes@^4.2.1:
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2210,9 +2271,9 @@ ansi-escapes@^4.2.1:
     type-fest "^0.21.3"
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
@@ -2254,6 +2315,11 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+arch@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
+  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2289,7 +2355,7 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-includes@^3.1.3, array-includes@^3.1.4:
+array-includes@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
   integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
@@ -2322,22 +2388,24 @@ array.prototype.filter@^1.0.0:
     is-string "^1.0.7"
 
 array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
-  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
 
 array.prototype.flatmap@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f"
+  integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
 
 arrify@^1.0.1:
   version "1.0.1"
@@ -2356,10 +2424,10 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-asn1js@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.2.0.tgz#d890fcdda86b8a005693df14a986bfb2c2069c57"
-  integrity sha512-oagLNqpfNv7CvmyMoexMDNyVDSiq1rya0AEUgcLlNHdHgNl6U/hi8xY370n5y+ZIFEXOx0J4B1qF2NDjMRxklA==
+asn1js@^2.3.1, asn1js@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.3.2.tgz#1864f859f6e5dfd7350c0543f411e18963f30592"
+  integrity sha512-IYzujqcOk7fHaePpTyvD3KPAA0AjT3qZlaQAw76zmPPAV/XTjhO+tbHjbFbIQZIhw+fk9wCSfb0Z6K+JHe8Q2g==
   dependencies:
     pvutils latest
 
@@ -2383,11 +2451,21 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+async@^3.2.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -2622,15 +2700,25 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.5.0:
+blob-polyfill@^6.0.20211015:
+  version "6.0.20211015"
+  resolved "https://registry.yarnpkg.com/blob-polyfill/-/blob-polyfill-6.0.20211015.tgz#7c47e62347e302e8d1d1ee5e140b881f74bdb23e"
+  integrity sha512-OGL4bm6ZNpdFAvQugRlQy5MNly8gk15aWi/ZhQHimQsrx9WKD05r+v+xNgHCChLER3MH+9KLAhzuFlwFKrH1Yw==
+
+blob-util@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
+  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
+
+bluebird@^3.5.0, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blurhash@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.4.tgz#a7010ceb3019cd2c9809b17c910ebf6175d29244"
-  integrity sha512-MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.5.tgz#3034104cd5dce5a3e5caa871ae2f0f1f2d0ab566"
+  integrity sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==
 
 boolbase@^1.0.0:
   version "1.0.0"
@@ -2661,18 +2749,13 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-browser-encrypt-attachment@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
-  integrity sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw=
-
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
@@ -2683,15 +2766,15 @@ browser-request@^0.3.3:
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
-browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.20.2:
+  version "4.20.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
+  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
   dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
+    caniuse-lite "^1.0.30001317"
+    electron-to-chromium "^1.4.84"
     escalade "^3.1.1"
-    node-releases "^2.0.1"
+    node-releases "^2.0.2"
     picocolors "^1.0.0"
 
 bs58@^4.0.1:
@@ -2721,6 +2804,11 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -2731,7 +2819,7 @@ buffer-from@^1.0.0, buffer-from@^1.1.1:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.4.3:
+buffer@^5.4.3, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2754,6 +2842,11 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cachedir@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
+  integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2786,10 +2879,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286:
-  version "1.0.30001309"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz#e0ee78b9bec0704f67304b00ff3c5c0c768a9f62"
-  integrity sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001317:
+  version "1.0.30001332"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz#39476d3aa8d83ea76359c70302eafdd4a1d727dd"
+  integrity sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2803,7 +2896,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2840,21 +2933,21 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-charcodes@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
-  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+check-more-types@^2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
+  integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
 cheerio-select@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823"
-  integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696"
+  integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==
   dependencies:
-    css-select "^4.1.3"
-    css-what "^5.0.1"
+    css-select "^4.3.0"
+    css-what "^6.0.1"
     domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-    domutils "^2.7.0"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
 
 cheerio@^1.0.0-rc.3, cheerio@^1.0.0-rc.9:
   version "1.0.0-rc.10"
@@ -2914,17 +3007,46 @@ classnames@*, classnames@^2.2.6:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
+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-color@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.1.tgz#93e3491308691f1e46beb78b63d0fb2585e42ba6"
-  integrity sha512-eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.2.tgz#e295addbae470800def0254183c648531cdf4e3f"
+  integrity sha512-g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==
   dependencies:
     d "^1.0.1"
-    es5-ext "^0.10.53"
+    es5-ext "^0.10.59"
     es6-iterator "^2.0.3"
     memoizee "^0.4.15"
     timers-ext "^0.1.7"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-table3@~0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
+  integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
+  dependencies:
+    string-width "^4.2.0"
+  optionalDependencies:
+    "@colors/colors" "1.5.0"
+
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+  dependencies:
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3001,6 +3123,11 @@ color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colorette@^2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3018,6 +3145,16 @@ commander@^4.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+common-tags@^1.8.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -3043,21 +3180,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concurrently@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.3.0.tgz#7500de6410d043c912b2da27de3202cb489b1e7b"
-  integrity sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==
-  dependencies:
-    chalk "^2.4.2"
-    date-fns "^2.0.1"
-    lodash "^4.17.15"
-    read-pkg "^4.0.1"
-    rxjs "^6.5.2"
-    spawn-command "^0.0.2-1"
-    supports-color "^6.1.0"
-    tree-kill "^1.2.2"
-    yargs "^13.3.0"
-
 content-type@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -3076,17 +3198,17 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885"
-  integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.0.tgz#7ce17ab57c378be2c717c7c8ed8f82a50a25b3e4"
+  integrity sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==
   dependencies:
-    browserslist "^4.19.1"
+    browserslist "^4.20.2"
     semver "7.0.0"
 
 core-js-pure@^3.20.2:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.0.tgz#819adc8dfb808205ce25b51d50591becd615db7e"
-  integrity sha512-VaJUunCZLnxuDbo1rNOzwbet9E1K9joiXS5+DQMPtgxd24wfsZbJZMMfQLGYMlCUvSxLfsRUUhoOR2x28mFfeg==
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.0.tgz#0eaa54b6d1f4ebb4d19976bb4916dfad149a3747"
+  integrity sha512-ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -3148,7 +3270,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3164,21 +3286,21 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-select@^4.1.3:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"
-  integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==
+css-select@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^5.1.0"
-    domhandler "^4.3.0"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
-css-what@^5.0.1, css-what@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
+css-what@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 csscolorparser@~1.0.3:
   version "1.0.3"
@@ -3213,9 +3335,57 @@ cssstyle@^2.3.0:
     cssom "~0.3.6"
 
 csstype@^3.0.2:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
-  integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
+  integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
+
+cypress@^9.5.4:
+  version "9.5.4"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.4.tgz#49d9272f62eba12f2314faf29c2a865610e87550"
+  integrity sha512-6AyJAD8phe7IMvOL4oBsI9puRNOWxZjl8z1lgixJMcgJ85JJmyKeP6uqNA0dI1z14lmJ7Qklf2MOgP/xdAqJ/Q==
+  dependencies:
+    "@cypress/request" "^2.88.10"
+    "@cypress/xvfb" "^1.2.4"
+    "@types/node" "^14.14.31"
+    "@types/sinonjs__fake-timers" "8.1.1"
+    "@types/sizzle" "^2.3.2"
+    arch "^2.2.0"
+    blob-util "^2.0.2"
+    bluebird "^3.7.2"
+    buffer "^5.6.0"
+    cachedir "^2.3.0"
+    chalk "^4.1.0"
+    check-more-types "^2.24.0"
+    cli-cursor "^3.1.0"
+    cli-table3 "~0.6.1"
+    commander "^5.1.0"
+    common-tags "^1.8.0"
+    dayjs "^1.10.4"
+    debug "^4.3.2"
+    enquirer "^2.3.6"
+    eventemitter2 "^6.4.3"
+    execa "4.1.0"
+    executable "^4.1.1"
+    extract-zip "2.0.1"
+    figures "^3.2.0"
+    fs-extra "^9.1.0"
+    getos "^3.2.1"
+    is-ci "^3.0.0"
+    is-installed-globally "~0.4.0"
+    lazy-ass "^1.6.0"
+    listr2 "^3.8.3"
+    lodash "^4.17.21"
+    log-symbols "^4.0.0"
+    minimist "^1.2.6"
+    ospath "^1.2.2"
+    pretty-bytes "^5.6.0"
+    proxy-from-env "1.0.0"
+    request-progress "^3.0.0"
+    semver "^7.3.2"
+    supports-color "^8.1.1"
+    tmp "~0.2.1"
+    untildify "^4.0.0"
+    yauzl "^2.10.0"
 
 d@1, d@^1.0.1:
   version "1.0.1"
@@ -3246,20 +3416,20 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-date-fns@^2.0.1:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
-  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
-
 date-names@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
+dayjs@^1.10.4:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz#90b33a3dda3417258d48ad2771b415def6545eb0"
+  integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==
+
 debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
@@ -3270,7 +3440,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.7:
+debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -3316,11 +3486,12 @@ deepmerge@^4.2.2:
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 define-properties@^1.1.3, define-properties@~1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -3432,9 +3603,9 @@ dom-serializer@0:
     entities "^2.0.0"
 
 dom-serializer@^1.0.1, dom-serializer@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.2.0"
@@ -3446,9 +3617,9 @@ domelementtype@1, domelementtype@^1.3.1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -3464,10 +3635,10 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
-  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
+domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
@@ -3479,7 +3650,7 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.5.2, domutils@^2.7.0, domutils@^2.8.0:
+domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
@@ -3501,10 +3672,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.4.17:
-  version "1.4.66"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz#d7453d363dcd7b06ed1757adcde34d724e27b367"
-  integrity sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg==
+electron-to-chromium@^1.4.84:
+  version "1.4.113"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz#b3425c086e2f4fc31e9e53a724c6f239e3adb8b9"
+  integrity sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -3526,15 +3697,20 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojibase-data@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-6.2.0.tgz#db6c75c36905284fa623f4aa5f468d2be6ed364a"
-  integrity sha512-SWKaXD2QeQs06IE7qfJftsI5924Dqzp+V9xaa5RzZIEWhmlrG6Jt2iKwfgOPHu+5S8MEtOI7GdpKsXj46chXOw==
+emojibase-data@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-7.0.0.tgz#5e16ed265871d58b3ca7c3b2bc7d80853a55f34f"
+  integrity sha512-ka3p06egA+jqWnUUjNfOwYAw4j9/+KyUcCpFjSItM0NjbL8n5qZfe1mskmGUP4TkuE5SbiOvG++CC1iN+53jKg==
 
-emojibase-regex@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-5.1.3.tgz#f0ef621ed6ec624becd2326f999fd4ea01b94554"
-  integrity sha512-gT8T9LxLA8VJdI+8KQtyykB9qKzd7WuUL3M2yw6y9tplFeufOUANg3UKVaKUvkMcRNvZsSElWhxcJrx8WPE12g==
+emojibase-regex@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-6.0.0.tgz#2d236f6bd38e6aa69089707eb06fe1f6a3270198"
+  integrity sha512-vpo76XcjjFapY4Q1vZAp8fu07p9lNCZi0TMtpZ3XyHYRqnqYZTzHgSI7tMvpYmnD8xt9o4XC5oUaSJXT4Ky9Tw==
+
+emojibase@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-6.0.2.tgz#1e76996b2bd9e6927e51f54c3995245b03eacb02"
+  integrity sha512-2h2eblOm86tj+lsJLgLYmEni13H74KNNu1NI1ZgMOX9ByWuvjFZLhETEUH1edpcd8srAlzhfJSD892UbpxfwsA==
 
 emojis-list@^3.0.0:
   version "3.0.0"
@@ -3555,6 +3731,13 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+enquirer@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -3622,10 +3805,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2:
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
+  integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -3633,15 +3816,15 @@ es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
     get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
     is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
+    is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
     string.prototype.trimend "^1.0.4"
@@ -3667,6 +3850,13 @@ es-get-iterator@^1.1.2:
     is-string "^1.0.5"
     isarray "^2.0.5"
 
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -3676,16 +3866,16 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.53"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.59, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.60"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.60.tgz#e8060a86472842b93019c31c34865012449883f4"
+  integrity sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==
   dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    next-tick "^1.1.0"
 
-es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+es6-iterator@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -3694,7 +3884,7 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
   integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
@@ -3762,7 +3952,7 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.7.2:
+eslint-module-utils@^2.7.3:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
   integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
@@ -3771,23 +3961,23 @@ eslint-module-utils@^2.7.2:
     find-up "^2.1.0"
 
 eslint-plugin-import@^2.25.4:
-  version "2.25.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
-  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
   dependencies:
     array-includes "^3.1.4"
     array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.2"
+    eslint-module-utils "^2.7.3"
     has "^1.0.3"
-    is-core-module "^2.8.0"
+    is-core-module "^2.8.1"
     is-glob "^4.0.3"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     object.values "^1.1.5"
-    resolve "^1.20.0"
-    tsconfig-paths "^3.12.0"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
 
 eslint-plugin-jsx-a11y@^6.5.1:
   version "6.5.1"
@@ -3813,26 +4003,26 @@ eslint-plugin-matrix-org@^0.4.0:
   integrity sha512-yVkNwtc33qtrQB4PPzpU+PUdFzdkENPan3JF4zhtAQJRUYXyvKEXnYSrXLUWYRXoYFxs9LbyI2CnhJL/RnHJaQ==
 
 eslint-plugin-react-hooks@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172"
-  integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4"
+  integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ==
 
 eslint-plugin-react@^7.28.0:
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf"
-  integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==
+  version "7.29.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2"
+  integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==
   dependencies:
     array-includes "^3.1.4"
     array.prototype.flatmap "^1.2.5"
     doctrine "^2.1.0"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     object.entries "^1.1.5"
     object.fromentries "^2.0.5"
     object.hasown "^1.1.0"
     object.values "^1.1.5"
-    prop-types "^15.7.2"
+    prop-types "^15.8.1"
     resolve "^2.0.0-next.3"
     semver "^6.3.0"
     string.prototype.matchall "^4.0.6"
@@ -3870,12 +4060,7 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
-  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
-
-eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
@@ -3972,6 +4157,11 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+eventemitter2@^6.4.3:
+  version "6.4.5"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
+  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
+
 events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -3989,6 +4179,21 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
+execa@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -4024,6 +4229,13 @@ execall@^2.0.0:
   dependencies:
     clone-regexp "^2.1.0"
 
+executable@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
+  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
+  dependencies:
+    pify "^2.2.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -4106,6 +4318,17 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4195,11 +4418,25 @@ fbjs@^0.8.4:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.30"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  dependencies:
+    pend "~1.2.0"
+
 fflate@^0.4.1:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
   integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
+figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -4344,6 +4581,25 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
+fs-extra@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -4364,7 +4620,7 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototype.name@^1.1.4:
+function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototype.name@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
   integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
@@ -4425,6 +4681,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0, get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -4443,6 +4706,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
+getos@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
+  integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
+  dependencies:
+    async "^3.2.0"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -4491,6 +4761,13 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-dirs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
+  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
+  dependencies:
+    ini "2.0.0"
+
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -4513,9 +4790,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.12.1"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.1.tgz#ec206be932e6c77236677127577aa8e50bf1c5cb"
-  integrity sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==
+  version "13.13.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
+  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
   dependencies:
     type-fest "^0.20.2"
 
@@ -4543,10 +4820,10 @@ gonzales-pe@^4.3.0:
   dependencies:
     minimist "^1.2.5"
 
-graceful-fs@^4.2.4, graceful-fs@^4.2.9:
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
 grid-index@^1.1.0:
   version "1.1.0"
@@ -4586,10 +4863,17 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
@@ -4637,9 +4921,9 @@ has@^1.0.0, has@^1.0.1, has@^1.0.3:
     function-bind "^1.1.1"
 
 highlight.js@^11.3.1:
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.4.0.tgz#34ceadd49e1596ee5aba3d99346cdfd4845ee05a"
-  integrity sha512-nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA==
+  version "11.5.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.5.1.tgz#027c24e4509e2f4dcd00b4a6dda542ce0a1f7aea"
+  integrity sha512-LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q==
 
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
@@ -4686,9 +4970,9 @@ html-escaper@^2.0.0:
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html-tags@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
-  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
+  integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
 
 htmlparser2@^3.10.0:
   version "3.10.1"
@@ -4730,14 +5014,28 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+http-signature@~1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
+  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^2.0.2"
+    sshpk "^1.14.1"
+
 https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -4762,11 +5060,6 @@ ieee754@^1.1.12, ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 ignore@^5.1.8, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
@@ -4831,6 +5124,11 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
 ini@^1.3.5:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -4897,10 +5195,12 @@ is-arrow-function@^2.0.3:
   dependencies:
     is-callable "^1.0.4"
 
-is-async-fn@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-async-fn/-/is-async-fn-1.1.0.tgz#a1a15b11d4a1155cc23b11e91b301b45a3caad16"
-  integrity sha1-oaFbEdShFVzCOxHpGzAbRaPKrRY=
+is-async-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
+  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-bigint@^1.0.1, is-bigint@^1.0.4:
   version "1.0.4"
@@ -4946,7 +5246,14 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1:
+is-ci@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+  dependencies:
+    ci-info "^3.2.0"
+
+is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
   integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
@@ -5041,7 +5348,7 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finalizationregistry@^1.0.1:
+is-finalizationregistry@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
   integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
@@ -5082,6 +5389,14 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
+is-installed-globally@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
+  dependencies:
+    global-dirs "^3.0.0"
+    is-path-inside "^3.0.2"
+
 is-ip@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
@@ -5094,15 +5409,15 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.1:
+is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4, is-number-object@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
-  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
@@ -5118,6 +5433,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-inside@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -5168,10 +5488,12 @@ is-set@^2.0.1, is-set@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
   integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
@@ -5228,7 +5550,7 @@ is-weakmap@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
-is-weakref@^1.0.1:
+is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
@@ -5894,11 +6216,6 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
@@ -5936,12 +6253,19 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+json5@^2.1.2, json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
-    minimist "^1.2.5"
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
 
 jsprim@^1.2.2:
   version "1.4.2"
@@ -5953,18 +6277,28 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
+jsprim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
+  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
-  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c"
+  integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw==
   dependencies:
-    array-includes "^3.1.3"
+    array-includes "^3.1.4"
     object.assign "^4.1.2"
 
 jszip@^3.7.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.9.1.tgz#784e87f328450d1e8151003a9c67733e2b901051"
+  integrity sha512-H9A60xPqJ1CuC4Ka6qxzXZeU8aNmgOeP5IFqwJbQQwtu2EUYxota3LdsiZWplF7Wgd9tkAd0mdu36nceSaPuYw==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -6029,6 +6363,11 @@ language-tags@^1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
+lazy-ass@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
+  integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -6077,6 +6416,20 @@ linkifyjs@^4.0.0-beta.4:
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.0.0-beta.4.tgz#8a03e7a999ed0b578a14d690585a32706525c45e"
   integrity sha512-j8IUYMqyTT0aDrrkA5kf4hn6QurSKjGiQbqjNr4qc8dwEXIniCGp0JrdXmsGcTOEyhKG03GyRnJjp3NDTBBPDQ==
 
+listr2@^3.8.3:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
+  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
+  dependencies:
+    cli-truncate "^2.1.0"
+    colorette "^2.0.16"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rfdc "^1.3.0"
+    rxjs "^7.5.1"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
+
 loader-utils@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
@@ -6134,6 +6487,11 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.once@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -6144,7 +6502,7 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.1.0:
+log-symbols@^4.0.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -6152,6 +6510,16 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+  dependencies:
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
+
 loglevel@^1.7.1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
@@ -6228,9 +6596,9 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 maplibre-gl@^1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.2.tgz#7fb47868b62455af916c090903f2154394450f9c"
-  integrity sha512-uPeV530apb4JfX3cRFfE+awFnbcJTOnCv2QvY4mw4huiInbybElWYkNzTs324YLSADq0f4bidRoYcR81ho3aLA==
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-1.15.3.tgz#eebbdd6b4cba46c61a660d6fa1808fced126e24d"
+  integrity sha512-ZuOhLCNgp7Yl1L9uyKgZeuo7kKdewP0iWtmEXsZ/snp0JiVkR1Kl+m1rsfKT/wpm/O4zZ7mUGxF16cYbMIFDRA==
   dependencies:
     "@mapbox/geojson-rewind" "^0.5.0"
     "@mapbox/geojson-types" "^1.0.2"
@@ -6246,7 +6614,7 @@ maplibre-gl@^1.15.2:
     geojson-vt "^3.2.1"
     gl-matrix "^3.2.1"
     grid-index "^1.1.0"
-    minimist "^1.2.5"
+    minimist "^1.2.6"
     murmurhash-js "^1.0.0"
     pbf "^3.2.1"
     potpack "^1.0.1"
@@ -6261,14 +6629,14 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90":
+"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e":
   version "0.0.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90"
+  resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/4aef17b56798639906f26a8739043a3c5c5fde7e"
 
-matrix-events-sdk@^0.0.1-beta.7:
-  version "0.0.1-beta.7"
-  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
-  integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
+matrix-encrypt-attachment@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b"
+  integrity sha512-NwfoDY/yHL9Zo8KrY5GP8ymAoZJpEFKEK+IgJKdWf5xtsIFf7KIU2pbw8+Eq592j//nSDOC+/Ff4Fk8gVvDZpw==
 
 matrix-events-sdk@^0.0.1-beta.7:
   version "0.0.1-beta.7"
@@ -6276,8 +6644,8 @@ matrix-events-sdk@^0.0.1-beta.7:
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "15.5.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2fd08d72dc905e1159176d6fd3afe834261ac6e0"
+  version "17.1.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3649cf46d3435f5b9ff8f60d17f9402c41638dd4"
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -6429,24 +6797,24 @@ micromatch@^3.1.4:
     to-regex "^3.0.2"
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.51.0"
+    mime-db "1.52.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -6458,10 +6826,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-minimatch@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
-  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
+minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -6474,10 +6842,10 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@>=1.2.2, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@>=1.2.2, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
@@ -6488,9 +6856,9 @@ mixin-deep@^1.2.0:
     is-extendable "^1.0.1"
 
 moo-color@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.2.tgz#837c40758d2d58763825d1359a84e330531eca64"
-  integrity sha512-5iXz5n9LWQzx/C2WesGFfpE6RLamzdHwsn3KpfzShwbfIqs7stnoEpaNErf/7+3mbxwZ4s8Foq7I0tPxw7BWHg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.3.tgz#d56435f8359c8284d83ac58016df7427febece74"
+  integrity sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==
   dependencies:
     color-name "^1.1.4"
 
@@ -6519,10 +6887,10 @@ murmurhash-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
   integrity sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E=
 
-nanoid@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
+nanoid@^3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6561,11 +6929,6 @@ next-tick@1, next-tick@^1.1.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -6591,12 +6954,12 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-releases@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+node-releases@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96"
+  integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -6645,7 +7008,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.1:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -6688,7 +7051,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.1.0, object-inspect@^1.11.0, object-inspect@^1.12.0, object-inspect@^1.7.0, object-inspect@^1.9.0:
+object-inspect@^1.1.0, object-inspect@^1.12.0, object-inspect@^1.7.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
@@ -6701,7 +7064,7 @@ object-is@^1.0.2, object-is@^1.1.2:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
+object-keys@^1.0.9, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -6782,7 +7145,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
@@ -6818,6 +7181,11 @@ opus-recorder@^8.0.3:
   resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.5.tgz#06d3e32e15da57ebc3f57e41b93033475fcb4e3e"
   integrity sha512-tBRXc9Btds7i3bVfA7d5rekAlyOcfsivt5vSIXHxRV1Oa+s6iXFW8omZ0Lm3ABWotVcEyKt96iIIUcgbV07YOw==
 
+ospath@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
+  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -6858,6 +7226,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+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.5.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
@@ -6905,14 +7280,6 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -6988,6 +7355,11 @@ pbf@^3.2.1:
     ieee754 "^1.1.12"
     resolve-protobuf-schema "^2.1.0"
 
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -7003,15 +7375,15 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+pify@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^4.0.1:
   version "4.0.1"
@@ -7106,9 +7478,9 @@ postcss-scss@^2.1.1:
     postcss "^7.0.6"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.5:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
-  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
+  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -7132,11 +7504,11 @@ postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.
     source-map "^0.6.1"
 
 postcss@^8.3.11:
-  version "8.4.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
-  integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
+  version "8.4.12"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
+  integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==
   dependencies:
-    nanoid "^3.2.0"
+    nanoid "^3.3.1"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -7162,6 +7534,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+pretty-bytes@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
+
 pretty-format@^26.0.0, pretty-format@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
@@ -7187,9 +7564,9 @@ process-nextick-args@~2.0.0:
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 promise-polyfill@^8.1.3:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.1.tgz#1fa955b325bee4f6b8a4311e18148d4e5b46d254"
-  integrity sha512-3p9zj0cEHbp7NVUxEYUWjQlffXqnXaZIMPkAO7HhFh8u5636xLRDHOUo2vpWSK0T2mqm6fKLXYn1KP6PAZ2gKg==
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz#2edc7e4b81aff781c88a0d577e5fe9da822107c6"
+  integrity sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg==
 
 promise@^7.0.3, promise@^7.1.1:
   version "7.3.1"
@@ -7206,7 +7583,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2:
+prop-types@^15.6.2, prop-types@^15.7.0, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -7220,6 +7597,11 @@ protocol-buffers-schema@^3.3.1:
   resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03"
   integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==
 
+proxy-from-env@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+
 psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -7243,17 +7625,17 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pvtsutils@^1.2.0, pvtsutils@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.2.1.tgz#8212e846ca9afb21e40cebb0691755649f9f498a"
-  integrity sha512-Q867jEr30lBR2YSFFLZ0/XsEvpweqH6Kj096wmlRAFXrdRGPCNq2iz9B5Tk085EZ+OBZyYAVA5UhPkjSHGrUzQ==
+pvtsutils@^1.2.1, pvtsutils@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.2.2.tgz#62ef6bc0513cbc255ee02574dedeaa41272d6101"
+  integrity sha512-OALo5ZEdqiI127i64+CXwkCOyFHUA+tCQgaUO/MvRDFXWPr53f2sx28ECNztUEzuyu5xvuuD1EB/szg9mwJoGA==
   dependencies:
     tslib "^2.3.1"
 
 pvutils@latest:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
-  integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
+  integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
 
 qrcode@1.4.4:
   version "1.4.4"
@@ -7334,9 +7716,9 @@ raw-loader@^4.0.2:
     schema-utils "^3.0.0"
 
 re-resizable@^6.9.0:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"
-  integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.6.tgz#b95d37e3821481b56ddfb1e12862940a791e827d"
+  integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ==
   dependencies:
     fast-memoize "^2.5.1"
 
@@ -7391,15 +7773,20 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
+"react-is@^16.12.0 || ^17.0.0 || ^18.0.0":
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.0.0.tgz#026f6c4a27dbe33bf4a35655b9e1327c4e55e3f5"
+  integrity sha512-yUcBYdBBbo3QiPsgYDcfQcIkGZHfxOaoE6HLSnr1sPzMhdyxusbfKOSUbSd/ocGi32dxcj366PsTj+5oggeKKw==
+
+react-is@^17.0.0, react-is@^17.0.1, 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-redux@^7.2.0:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
-  integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
+  version "7.2.8"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de"
+  integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"
@@ -7409,12 +7796,12 @@ react-redux@^7.2.0:
     react-is "^17.0.2"
 
 react-shallow-renderer@^16.13.1:
-  version "16.14.1"
-  resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124"
-  integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==
+  version "16.15.0"
+  resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457"
+  integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==
   dependencies:
     object-assign "^4.1.1"
-    react-is "^16.12.0 || ^17.0.0"
+    react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
 react-test-renderer@^17.0.0, react-test-renderer@^17.0.2:
   version "17.0.2"
@@ -7453,15 +7840,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
-  dependencies:
-    normalize-package-data "^2.3.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-
 read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -7510,9 +7888,9 @@ redent@^3.0.0:
     strip-indent "^3.0.0"
 
 redux@^4.0.0, redux@^4.0.4:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
-  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
+  integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
@@ -7544,10 +7922,10 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -7559,13 +7937,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
-  integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
+regexp.prototype.flags@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
 regexpp@^3.2.0:
   version "3.2.0"
@@ -7634,6 +8013,13 @@ repeat-string@^1.0.0, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
+request-progress@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
+  integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=
+  dependencies:
+    throttleit "^1.0.0"
+
 request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -7709,7 +8095,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -7726,6 +8112,14 @@ resolve@^2.0.0-next.3:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -7746,6 +8140,11 @@ rfc4648@^1.4.0:
   resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.5.1.tgz#b0b16756e33d9de8c0c7833e94b28e627ec372a4"
   integrity sha512-60e/YWs2/D3MV1ErdjhJHcmlgnyLUiG4X/14dgsfm9/zmCWLN16xI6YqJYSCd/OANM7bUNzJqPY5B8/02S9Ibw==
 
+rfdc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -7783,12 +8182,12 @@ rw@^1.3.3:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
-rxjs@^6.5.2:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+rxjs@^7.5.1:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
   dependencies:
-    tslib "^1.9.0"
+    tslib "^2.1.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
@@ -7879,9 +8278,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -7970,6 +8369,15 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -8053,11 +8461,6 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -8106,7 +8509,7 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.7.0:
+sshpk@^1.14.1, sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
   integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
@@ -8163,17 +8566,17 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2
     strip-ansi "^6.0.1"
 
 string.prototype.matchall@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d"
+  integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
     get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
+    regexp.prototype.flags "^1.4.1"
     side-channel "^1.0.4"
 
 string.prototype.repeat@^0.2.0:
@@ -8356,9 +8759,9 @@ sugarss@^2.0.0:
     postcss "^7.0.2"
 
 supercluster@^7.1.0:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.4.tgz#6762aabfd985d3390b49f13b815567d5116a828a"
-  integrity sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3"
+  integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==
   dependencies:
     kdbush "^3.0.0"
 
@@ -8369,13 +8772,6 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -8383,7 +8779,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
+supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -8456,6 +8852,16 @@ throat@^6.0.1:
   resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
   integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
 
+throttleit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
+  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
+
+through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
 timers-ext@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
@@ -8479,6 +8885,13 @@ tmatch@^2.0.1:
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
   integrity sha1-DFYkbzPzDaG409colauvFmYPOM8=
 
+tmp@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -8550,11 +8963,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -8565,22 +8973,22 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsconfig-paths@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
-  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.1, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1:
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -8769,6 +9177,11 @@ universalify@^0.1.2:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -8777,6 +9190,11 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -8798,9 +9216,11 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-callback-ref@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
-  integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5"
+  integrity sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==
+  dependencies:
+    tslib "^2.0.0"
 
 use-memo-one@^1.1.1:
   version "1.1.2"
@@ -8808,12 +9228,12 @@ use-memo-one@^1.1.1:
   integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==
 
 use-sidecar@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.5.tgz#ffff2a17c1df42e348624b699ba6e5c220527f2b"
-  integrity sha512-k9jnrjYNwN6xYLj1iaGhonDghfvmeTmYjAiGvOr7clwKfPjMXJf4/HOr7oT5tJwYafgp2tG2l3eZEOfoELiMcA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2"
+  integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==
   dependencies:
     detect-node-es "^1.1.0"
-    tslib "^1.9.3"
+    tslib "^2.0.0"
 
 use@^3.1.0:
   version "3.1.1"
@@ -8830,6 +9250,11 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -8916,15 +9341,15 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.12"
 
-webcrypto-core@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.4.0.tgz#9a395920792bcfa4605dc64aaf264156f79e873e"
-  integrity sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==
+webcrypto-core@^1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.3.tgz#58252c182c5fa88fd6b607b02b5246d087dbc6e3"
+  integrity sha512-8TnMtwwC/hQOyvElAOJ26lJKGgcErUG02KnKS1+QhjV4mDvQetVWU1EUEeLF8ICOrdc42+GypocyBJKRqo2kQg==
   dependencies:
-    "@peculiar/asn1-schema" "^2.0.44"
+    "@peculiar/asn1-schema" "^2.1.0"
     "@peculiar/json-schema" "^1.1.12"
-    asn1js "^2.1.1"
-    pvtsutils "^1.2.0"
+    asn1js "^2.3.2"
+    pvtsutils "^1.2.2"
     tslib "^2.3.1"
 
 webidl-conversions@^3.0.0:
@@ -8998,22 +9423,22 @@ which-boxed-primitive@^1.0.2:
     is-symbol "^1.0.3"
 
 which-builtin-type@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.1.tgz#1d14bb1b69b5680ebdddd7244689574678a1d83c"
-  integrity sha512-zY3bUNzl/unBfSDS6ePT+/dwu6hZ7RMVMqHFvYxZEhisGEwCV/pYnXQ70nd3Hn2X6l8BNOWge5sHk3wAR3L42w==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.2.tgz#254a34f6cd2a546e04d51d9a4ac2c65e9ed31bf4"
+  integrity sha512-2/+MF0XNPySHrIPlIAUB1dmQuWOPfQDR+TvwZs2tayroIA61MvZDJtkvwjv2iDg7h668jocdWsPOQwwAz5QUSg==
   dependencies:
-    function.prototype.name "^1.1.4"
+    function.prototype.name "^1.1.5"
     has-tostringtag "^1.0.0"
-    is-async-fn "^1.1.0"
+    is-async-function "^2.0.0"
     is-date-object "^1.0.5"
-    is-finalizationregistry "^1.0.1"
+    is-finalizationregistry "^1.0.2"
     is-generator-function "^1.0.10"
     is-regex "^1.1.4"
-    is-weakref "^1.0.1"
+    is-weakref "^1.0.2"
     isarray "^2.0.5"
     which-boxed-primitive "^1.0.2"
     which-collection "^1.0.1"
-    which-typed-array "^1.1.5"
+    which-typed-array "^1.1.7"
 
 which-collection@^1.0.1:
   version "1.0.1"
@@ -9030,7 +9455,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which-typed-array@^1.1.5:
+which-typed-array@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793"
   integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==
@@ -9070,6 +9495,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -9143,11 +9577,11 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-parser@^21.0.0:
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
+  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
-yargs@^13.2.4, yargs@^13.3.0:
+yargs@^13.2.4:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -9177,9 +9611,9 @@ yargs@^16.2.0:
     yargs-parser "^20.2.2"
 
 yargs@^17.0.1:
-  version "17.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
-  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
+  version "17.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.1.tgz#ebe23284207bb75cee7c408c33e722bfb27b5284"
+  integrity sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==
   dependencies:
     cliui "^7.0.2"
     escalade "^3.1.1"
@@ -9189,6 +9623,14 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"