v1.10.12

Prepare changelog for v1.10.12
Upgrade matrix-react-sdk to 3.44.0
2022-05-10 15:18:38 +01:00 · 2022-05-10 15:18:37 +01:00 · 2022-05-10 15:14:50 +01:00 · 2022-05-10 15:14:22 +01:00 · 2022-05-06 17:37:01 +01:00 · 2022-05-06 17:37:01 +01:00
80 changed files with 2045 additions and 1573 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,3 @@
 src/vector/modernizr.js
+# Legacy skinning file that some people might still have
 src/component-index.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,6 +12,11 @@ module.exports = {
        // Things we do that break the ideal style
        "quotes": "off",
    },
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
    overrides: [{
        files: ["src/**/*.{ts,tsx}"],
        extends: [
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report a security vulnerability
-    url: https://github.com/vector-im/element-web/security/policy
-    about: Please review our security policy for more details
  - name: Questions & support
    url: https://matrix.to/#/#element-web:matrix.org
    about: Please ask and answer questions here.
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -1,4 +1,4 @@
-name: Move labelled issues to correct boards and columns
+name: Move labelled issues to correct projects

 on:
  issues:
@@ -11,12 +11,13 @@ jobs:
    if: >
        contains(github.event.issue.labels.*.name, 'A-Maths') || 
        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
+        contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
        contains(github.event.issue.labels.*.name, 'Z-IA') ||
        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-        contains(github.event.issue.labels.*.name, 'A-Tags')
+        contains(github.event.issue.labels.*.name, 'A-Tags') ||
+        contains(github.event.issue.labels.*.name, 'A-Video-Rooms')
    steps:
      - uses: actions/github-script@v5
        with:
@@ -98,10 +99,13 @@ jobs:
    name: Delight issues to project board
    runs-on: ubuntu-latest
    if: >
+        contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
        contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
-        contains(github.event.issue.labels.*.name, 'Z-IA')
+        contains(github.event.issue.labels.*.name, 'Team: Delight') ||
+        contains(github.event.issue.labels.*.name, 'Z-IA') ||
+        contains(github.event.issue.labels.*.name, 'Z-NewUserJourney')
    steps:
      - uses: octokit/graphql-action@v2.x
        with:
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -47,7 +47,8 @@ jobs:
        contains(github.event.issue.labels.*.name, 'Z-IA') ||
        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-        contains(github.event.issue.labels.*.name, 'A-Tags')) &&
+        contains(github.event.issue.labels.*.name, 'A-Tags') ||
+        contains(github.event.issue.labels.*.name, 'A-Video-Rooms')) &&
        contains(github.event.issue.labels.*.name, 'Z-Labs')
    steps:
      - uses: actions/github-script@v5
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ electron/pub
 /config.json
 /config.json.*
 /config.local*.json
+# Legacy skinning file that some people might still have
 /src/component-index.js
 /.tmp
 /webpack-stats.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,289 @@
+Changes in [1.10.12](https://github.com/vector-im/element-web/releases/tag/v1.10.12) (2022-05-10)
+=================================================================================================
+
+## ✨ Features
+ * Made the location map change the cursor to a pointer so it looks like it's clickable (https ([\#8451](https://github.com/matrix-org/matrix-react-sdk/pull/8451)). Fixes #21991. Contributed by @Odyssey346.
+ * Implement improved spacing for the thread list and timeline ([\#8337](https://github.com/matrix-org/matrix-react-sdk/pull/8337)). Fixes #21759. Contributed by @luixxiul.
+ * LLS: expose way to enable live sharing labs flag from location dialog ([\#8416](https://github.com/matrix-org/matrix-react-sdk/pull/8416)).
+ * Fix source text boxes in View Source modal should have full width ([\#8425](https://github.com/matrix-org/matrix-react-sdk/pull/8425)). Fixes #21938. Contributed by @EECvision.
+ * Read Receipts: never show +1, if it’s just 4, show all of them ([\#8428](https://github.com/matrix-org/matrix-react-sdk/pull/8428)). Fixes #21935.
+ * Add opt-in analytics to onboarding tasks ([\#8409](https://github.com/matrix-org/matrix-react-sdk/pull/8409)). Fixes #21705.
+ * Allow user to control if they are signed out of all devices when changing password ([\#8259](https://github.com/matrix-org/matrix-react-sdk/pull/8259)). Fixes #2671.
+ * Implement new Read Receipt design ([\#8389](https://github.com/matrix-org/matrix-react-sdk/pull/8389)). Fixes #20574.
+ * Stick connected video rooms to the top of the room list ([\#8353](https://github.com/matrix-org/matrix-react-sdk/pull/8353)).
+ * LLS: fix jumpy maximised map ([\#8387](https://github.com/matrix-org/matrix-react-sdk/pull/8387)).
+ * Persist audio and video mute state in video rooms ([\#8376](https://github.com/matrix-org/matrix-react-sdk/pull/8376)).
+ * Forcefully disconnect from video rooms on logout and tab close ([\#8375](https://github.com/matrix-org/matrix-react-sdk/pull/8375)).
+ * Add local echo of connected devices in video rooms ([\#8368](https://github.com/matrix-org/matrix-react-sdk/pull/8368)).
+ * Improve text of account deactivation dialog ([\#8371](https://github.com/matrix-org/matrix-react-sdk/pull/8371)). Fixes #17421.
+ * Live location sharing: own live beacon status on maximised view ([\#8374](https://github.com/matrix-org/matrix-react-sdk/pull/8374)).
+ * Show a lobby screen in video rooms ([\#8287](https://github.com/matrix-org/matrix-react-sdk/pull/8287)).
+ * Settings toggle to disable Composer Markdown ([\#8358](https://github.com/matrix-org/matrix-react-sdk/pull/8358)). Fixes #20321.
+ * Cache localStorage objects for SettingsStore ([\#8366](https://github.com/matrix-org/matrix-react-sdk/pull/8366)).
+ * Bring `View Source` back from behind developer mode ([\#8369](https://github.com/matrix-org/matrix-react-sdk/pull/8369)). Fixes #21771.
+
+## 🐛 Bug Fixes
+ * Fix Jitsi Meet getting wedged at startup in some cases ([\#21995](https://github.com/vector-im/element-web/pull/21995)).
+ * Fix camera getting muted when disconnecting from a video room ([\#21958](https://github.com/vector-im/element-web/pull/21958)).
+ * Fix race conditions around threads ([\#8448](https://github.com/matrix-org/matrix-react-sdk/pull/8448)). Fixes #21627.
+ * Fix reading of cached room device setting values ([\#8495](https://github.com/matrix-org/matrix-react-sdk/pull/8495)).
+ * Fix issue with dispatch happening mid-dispatch due to js-sdk emit ([\#8473](https://github.com/matrix-org/matrix-react-sdk/pull/8473)). Fixes #22019.
+ * Match MSC behaviour for threads when disabled (thread-aware mode) ([\#8476](https://github.com/matrix-org/matrix-react-sdk/pull/8476)). Fixes #22033.
+ * Specify position of DisambiguatedProfile inside a thread on bubble message layout ([\#8452](https://github.com/matrix-org/matrix-react-sdk/pull/8452)). Fixes #21998. Contributed by @luixxiul.
+ * Location sharing: do not trackuserlocation in location picker ([\#8466](https://github.com/matrix-org/matrix-react-sdk/pull/8466)). Fixes #22013.
+ * fix text and map indent in thread view ([\#8462](https://github.com/matrix-org/matrix-react-sdk/pull/8462)). Fixes #21997.
+ * Live location sharing: don't group beacon info with room creation summary ([\#8468](https://github.com/matrix-org/matrix-react-sdk/pull/8468)).
+ * Don't linkify code blocks ([\#7859](https://github.com/matrix-org/matrix-react-sdk/pull/7859)). Fixes #9613.
+ * read receipts: improve tooltips to show names of users ([\#8438](https://github.com/matrix-org/matrix-react-sdk/pull/8438)). Fixes #21940.
+ * Fix poll overflowing a reply tile on bubble message layout ([\#8459](https://github.com/matrix-org/matrix-react-sdk/pull/8459)). Fixes #22005. Contributed by @luixxiul.
+ * Fix text link buttons on UserInfo panel ([\#8247](https://github.com/matrix-org/matrix-react-sdk/pull/8247)). Fixes #21702. Contributed by @luixxiul.
+ * Clear local storage settings handler cache on logout ([\#8454](https://github.com/matrix-org/matrix-react-sdk/pull/8454)). Fixes #21994.
+ * Fix jump to bottom button being always displayed in non-overflowing timelines ([\#8460](https://github.com/matrix-org/matrix-react-sdk/pull/8460)). Fixes #22003.
+ * fix timeline search with empty text box should do nothing ([\#8262](https://github.com/matrix-org/matrix-react-sdk/pull/8262)). Fixes #21714. Contributed by @EECvision.
+ * Fixes "space panel kebab menu is rendered out of view on sub spaces"  ([\#8350](https://github.com/matrix-org/matrix-react-sdk/pull/8350)). Contributed by @yaya-usman.
+ * Add margin to the location map inside ThreadView ([\#8442](https://github.com/matrix-org/matrix-react-sdk/pull/8442)). Fixes #21982. Contributed by @luixxiul.
+ * Patch: "Reloading the registration page should warn about data loss" ([\#8377](https://github.com/matrix-org/matrix-react-sdk/pull/8377)). Contributed by @yaya-usman.
+ * Live location sharing: fix safari timestamps pt 2 ([\#8443](https://github.com/matrix-org/matrix-react-sdk/pull/8443)).
+ * Fix issue with thread notification state ignoring initial events ([\#8417](https://github.com/matrix-org/matrix-react-sdk/pull/8417)). Fixes #21927.
+ * Fix event text overflow on bubble message layout ([\#8391](https://github.com/matrix-org/matrix-react-sdk/pull/8391)). Fixes #21882. Contributed by @luixxiul.
+ * Disable the message action bar when hovering over the 1px border between threads on the list ([\#8429](https://github.com/matrix-org/matrix-react-sdk/pull/8429)). Fixes #21955. Contributed by @luixxiul.
+ * correctly align read receipts to state events in bubble layout ([\#8419](https://github.com/matrix-org/matrix-react-sdk/pull/8419)). Fixes #21899.
+ * Fix issue with underfilled timelines when barren of content ([\#8432](https://github.com/matrix-org/matrix-react-sdk/pull/8432)). Fixes #21930.
+ * Fix baseline misalignment of thread panel summary by deduplication ([\#8413](https://github.com/matrix-org/matrix-react-sdk/pull/8413)).
+ * Fix editing of non-html replies ([\#8418](https://github.com/matrix-org/matrix-react-sdk/pull/8418)). Fixes #21928.
+ * Read Receipts "Fall from the Sky" ([\#8414](https://github.com/matrix-org/matrix-react-sdk/pull/8414)). Fixes #21888.
+ * Make read receipts handle nullable roomMembers correctly ([\#8410](https://github.com/matrix-org/matrix-react-sdk/pull/8410)). Fixes #21896.
+ * Don't form continuations on either side of a thread root ([\#8408](https://github.com/matrix-org/matrix-react-sdk/pull/8408)). Fixes #20908.
+ * Fix centering issue with sticker placeholder ([\#8404](https://github.com/matrix-org/matrix-react-sdk/pull/8404)). Fixes #18014 and #6449.
+ * Disable download option on <video/> , preferring dedicated download button ([\#8403](https://github.com/matrix-org/matrix-react-sdk/pull/8403)). Fixes #21902.
+ * Fix infinite loop when pinning/unpinning persistent widgets ([\#8396](https://github.com/matrix-org/matrix-react-sdk/pull/8396)). Fixes #21864.
+ * Tweak ReadReceiptGroup to better handle disambiguation ([\#8402](https://github.com/matrix-org/matrix-react-sdk/pull/8402)). Fixes #21897.
+ * stop the bottom edge of buttons getting clipped in devtools ([\#8400](https://github.com/matrix-org/matrix-react-sdk/pull/8400)).
+ * Fix issue with threads timelines with few events cropping events ([\#8392](https://github.com/matrix-org/matrix-react-sdk/pull/8392)). Fixes #20594.
+ * Changed font-weight to 400 to support light weight font ([\#8345](https://github.com/matrix-org/matrix-react-sdk/pull/8345)). Fixes #21171. Contributed by @goelesha.
+ * Fix issue with thread panel not updating when it loads on first render ([\#8382](https://github.com/matrix-org/matrix-react-sdk/pull/8382)). Fixes #21737.
+ * fix: "Mention highlight and cursor hover highlight has different corner radius" ([\#8384](https://github.com/matrix-org/matrix-react-sdk/pull/8384)). Contributed by @yaya-usman.
+ * Fix regression around haveRendererForEvent for hidden events ([\#8379](https://github.com/matrix-org/matrix-react-sdk/pull/8379)). Fixes #21862 and #21725.
+ * Fix regression around the room list treeview keyboard a11y ([\#8385](https://github.com/matrix-org/matrix-react-sdk/pull/8385)). Fixes #21436.
+ * Remove float property to let the margin between events appear on bubble message layout ([\#8373](https://github.com/matrix-org/matrix-react-sdk/pull/8373)). Fixes #21861. Contributed by @luixxiul.
+ * Fix race in Registration between server change and flows fetch ([\#8359](https://github.com/matrix-org/matrix-react-sdk/pull/8359)). Fixes #21800.
+ * fix rainbow breaks compound emojis ([\#8245](https://github.com/matrix-org/matrix-react-sdk/pull/8245)). Fixes #21371. Contributed by @EECvision.
+ * Fix RightPanelStore handling first room on app launch wrong ([\#8370](https://github.com/matrix-org/matrix-react-sdk/pull/8370)). Fixes #21741.
+ * Fix UnknownBody error message unalignment ([\#8346](https://github.com/matrix-org/matrix-react-sdk/pull/8346)). Fixes #21828. Contributed by @luixxiul.
+ * Use -webkit-line-clamp for the room header topic overflow ([\#8367](https://github.com/matrix-org/matrix-react-sdk/pull/8367)). Fixes #21852. Contributed by @luixxiul.
+ * Fix issue with ServerInfo crashing the modal ([\#8364](https://github.com/matrix-org/matrix-react-sdk/pull/8364)).
+ * Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes #21762.
+
+Changes in [1.10.11](https://github.com/vector-im/element-web/releases/tag/v1.10.11) (2022-04-26)
+=================================================================================================
+
+## ✨ Features
+ * Handle forced disconnects from Jitsi ([\#21697](https://github.com/vector-im/element-web/pull/21697)). Fixes #21517.
+ * 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 #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 #21793.
+ * Fix overlapping timestamps on empty messages ([\#8205](https://github.com/matrix-org/matrix-react-sdk/pull/8205)). Fixes #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 #21669.
+ * Avoid looking up settings during timeline rendering ([\#8313](https://github.com/matrix-org/matrix-react-sdk/pull/8313)). Fixes #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 #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 #19302. Contributed by @commonlawfeature.
+ * Fix image preview sizing for edge cases ([\#8322](https://github.com/matrix-org/matrix-react-sdk/pull/8322)). Fixes #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 #21766.
+ * Fix some issues with threads rendering ([\#8305](https://github.com/matrix-org/matrix-react-sdk/pull/8305)). Fixes #21670.
+ * Fix threads rendering issue in Safari ([\#8298](https://github.com/matrix-org/matrix-react-sdk/pull/8298)). Fixes #21757.
+ * Fix space panel width change on hovering over space item ([\#8299](https://github.com/matrix-org/matrix-react-sdk/pull/8299)). Fixes #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 #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 #21743.
+ * Handle thread bundled relationships coming from the server via MSC3666 ([\#8292](https://github.com/matrix-org/matrix-react-sdk/pull/8292)). Fixes #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 #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 #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 #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 #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 #21694.
+ * Fix reporting events not working ([\#8257](https://github.com/matrix-org/matrix-react-sdk/pull/8257)). Fixes #21713.
+ * Make Jitsi widgets in video rooms immutable ([\#8244](https://github.com/matrix-org/matrix-react-sdk/pull/8244)). Fixes #21647.
+ * Fix: Ensure links to events scroll the correct events into view ([\#8250](https://github.com/matrix-org/matrix-react-sdk/pull/8250)). Fixes #19934.
+
+Changes in [1.10.10](https://github.com/vector-im/element-web/releases/tag/v1.10.10) (2022-04-14)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes #21762.
+
+Changes in [1.10.9](https://github.com/vector-im/element-web/releases/tag/v1.10.9) (2022-04-12)
+===============================================================================================
+
+## ✨ Features
+ * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes #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 #21515, #21516 #21519 and #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 #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 #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 #12967.
+ * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes #20908.
+ * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes #16193 and #6684.
+ * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes #21539.
+ * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes #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 #14825. Contributed by @SimonBrandner.
+ * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes #17532.
+ * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes #3546.
+
+## 🐛 Bug Fixes
+ * Avoid flashing the Jitsi prejoin screen at the user before skipping it ([\#21665](https://github.com/vector-im/element-web/pull/21665)).
+ * Fix editing `<ol>` tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes #21625.
+ * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes #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 #21493. Contributed by @luixxiul.
+ * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes #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 #20243 and #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 #21570. Contributed by @SimonBrandner.
+ * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes #21554. Contributed by @luixxiul.
+ * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes #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 #21566. Contributed by @luixxiul.
+ * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes #19769, #18067 #21015 and #10924.
+ * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes #21435.
+ * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes #21534.
+ * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes #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 #21417.
+ * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes #20072.
+
+Changes in [1.10.9-rc.4](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.4) (2022-04-11)
+=========================================================================================================
+
+Changes in [1.10.9-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.3) (2022-04-08)
+=========================================================================================================
+
+Changes in [1.10.9-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.2) (2022-04-06)
+=========================================================================================================
+
+Changes in [1.10.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.9-rc.1) (2022-04-05)
+=========================================================================================================
+
+## ✨ Features
+ * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes #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 #21515, #21516 #21519 and #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 #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 #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 #12967.
+ * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes #20908.
+ * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes #16193 and #6684.
+ * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes #21539.
+ * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes #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 #14825. Contributed by @SimonBrandner.
+ * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes #17532.
+ * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes #3546.
+
+## 🐛 Bug Fixes
+ * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes #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 #21493. Contributed by @luixxiul.
+ * Fix editing <ol> tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes #21625.
+ * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes #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 #20243 and #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 #21570. Contributed by @SimonBrandner.
+ * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes #21554. Contributed by @luixxiul.
+ * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes #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 #21566. Contributed by @luixxiul.
+ * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes #19769, #18067 #21015 and #10924.
+ * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes #21435.
+ * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes #21534.
+ * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes #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 #21417.
+ * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes #20072.
+
+Changes in [1.10.8-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.8-rc.1) (2022-03-22)
+=========================================================================================================
+
+## ✨ Features
+ * Live location sharing: live share warning in room ([\#8100](https://github.com/matrix-org/matrix-react-sdk/pull/8100)).
+ * Add simple live share warning ([\#8066](https://github.com/matrix-org/matrix-react-sdk/pull/8066)).
+ * extract reusable styled live beacon icon ([\#8103](https://github.com/matrix-org/matrix-react-sdk/pull/8103)).
+ * Don't restore MemberInfo from RightPanel history when viewing a room ([\#8090](https://github.com/matrix-org/matrix-react-sdk/pull/8090)). Fixes #21487.
+ * Allow sending files as replies as per MSC3676 ([\#8020](https://github.com/matrix-org/matrix-react-sdk/pull/8020)). Fixes #7156.
+ * kill beacons on expiry ([\#8075](https://github.com/matrix-org/matrix-react-sdk/pull/8075)).
+ * enable geolocation behaviour in location picker for live share type ([\#8068](https://github.com/matrix-org/matrix-react-sdk/pull/8068)).
+ * Improve formatting features in the editor ([\#7104](https://github.com/matrix-org/matrix-react-sdk/pull/7104)). Fixes #19501. Contributed by @alexanderstephan.
+ * Support MSC3026 busy presence ([\#8043](https://github.com/matrix-org/matrix-react-sdk/pull/8043)).
+ * Show displayname in non-narrow thread summeries ([\#8036](https://github.com/matrix-org/matrix-react-sdk/pull/8036)). Fixes #19646.
+ * Tweak search dialog based on new designs ([\#7980](https://github.com/matrix-org/matrix-react-sdk/pull/7980)). Fixes #21285 and #21289.
+ * fallback to event text in location body when map unavailable ([\#7982](https://github.com/matrix-org/matrix-react-sdk/pull/7982)). Fixes #20655.
+ * Send pin drop location share events ([\#7967](https://github.com/matrix-org/matrix-react-sdk/pull/7967)).
+
+## 🐛 Bug Fixes
+ * fix quicktime video thumbnailing ([\#8108](https://github.com/matrix-org/matrix-react-sdk/pull/8108)). Fixes #21505.
+ * Fix scroll behaviour in space panel ([\#8111](https://github.com/matrix-org/matrix-react-sdk/pull/8111)). Fixes #21467.
+ * Fix emoting with emoji or pills ([\#8105](https://github.com/matrix-org/matrix-react-sdk/pull/8105)). Fixes #21497.
+ * Remove padding of InviteDialog & fix visual regression ([\#8076](https://github.com/matrix-org/matrix-react-sdk/pull/8076)). Fixes #20631. Contributed by @luixxiul.
+ * Fixes mx_MLocationBody_markerBorder ([\#8069](https://github.com/matrix-org/matrix-react-sdk/pull/8069)). Fixes #21444. Contributed by @luixxiul.
+ * Make margin and padding of mx_InviteDialog_other consistent ([\#8063](https://github.com/matrix-org/matrix-react-sdk/pull/8063)). Fixes #20631. Contributed by @luixxiul.
+ * Fix freeze/crash when 1:1 calling ([\#8057](https://github.com/matrix-org/matrix-react-sdk/pull/8057)). Fixes #21181.
+ * Don't assume that widget IDs are unique ([\#8052](https://github.com/matrix-org/matrix-react-sdk/pull/8052)). Fixes #21399.
+ * Fix the header of Space landing page ([\#8048](https://github.com/matrix-org/matrix-react-sdk/pull/8048)). Fixes #21402. Contributed by @luixxiul.
+ * Fix buttons alignment of Space list header ([\#8047](https://github.com/matrix-org/matrix-react-sdk/pull/8047)). Fixes #21401. Contributed by @luixxiul.
+ * Fix null-guarding regression around reply_to_event dispatch ([\#8039](https://github.com/matrix-org/matrix-react-sdk/pull/8039)).
+ * Fix clicking on copy link to thread wrongly opening thread ([\#8038](https://github.com/matrix-org/matrix-react-sdk/pull/8038)). Fixes #20653.
+ * Fix regression around replying to search results ([\#8035](https://github.com/matrix-org/matrix-react-sdk/pull/8035)). Fixes #21389.
+ * Share shared history keys in the background ([\#8031](https://github.com/matrix-org/matrix-react-sdk/pull/8031)). Fixes #21192.
+ * Paginate responses to pinned polls ([\#8025](https://github.com/matrix-org/matrix-react-sdk/pull/8025)). Fixes #21382.
+ * Fix incorrect usage of unstable variant of `is_falling_back` ([\#8016](https://github.com/matrix-org/matrix-react-sdk/pull/8016)).
+ * Fix issues with ThreadSummary in msc-enabled mode ([\#8018](https://github.com/matrix-org/matrix-react-sdk/pull/8018)). Fixes matrix-org/element-web-rageshakes#11401 and matrix-org/element-web-rageshakes#11400.
+ * Fix alignment of polls within threads ([\#8017](https://github.com/matrix-org/matrix-react-sdk/pull/8017)). Fixes #21235.
+ * Fix issues with thread summaries being wrong or stale ([\#8015](https://github.com/matrix-org/matrix-react-sdk/pull/8015)). Fixes #21363 and #21204.
+ * Fix button border color of LeaveSpaceDialog ([\#8010](https://github.com/matrix-org/matrix-react-sdk/pull/8010)). Fixes #21365. Contributed by @luixxiul.
+ * Fix room list scroll jumps ([\#7991](https://github.com/matrix-org/matrix-react-sdk/pull/7991)). Fixes #19322.
+ * Fix a variety of issues with HTML → Markdown conversion ([\#8004](https://github.com/matrix-org/matrix-react-sdk/pull/8004)). Fixes #10648, #20718, #10722, #10389, #17610 #9984 and #20140.
+ * Wrap EventTile rather than its children in an error boundary ([\#7945](https://github.com/matrix-org/matrix-react-sdk/pull/7945)).
+ * Normalized shortcut formatting for quote expansion control ([\#7995](https://github.com/matrix-org/matrix-react-sdk/pull/7995)). Fixes #19685. Contributed by @Sinharitik589.
+ * Fix buttons and text layout on Security Key dialog ([\#7996](https://github.com/matrix-org/matrix-react-sdk/pull/7996)). Fixes #21330. Contributed by @luixxiul.
+ * Fix formatting not being applied after links ([\#7990](https://github.com/matrix-org/matrix-react-sdk/pull/7990)). Fixes #20091.
+
 Changes in [1.10.7](https://github.com/vector-im/element-web/releases/tag/v1.10.7) (2022-03-15)
 ===============================================================================================

--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ released version of Element:
 1. Untar the tarball on your web server
 1. Move (or symlink) the `element-x.x.x` directory to an appropriate name
 1. Configure the correct caching headers in your webserver (see below)
-1. If desired, copy `config.sample.json` to `config.json` and edit it
-   as desired. See the [configuration docs](docs/config.md) for details.
+1. Configure the app by copying `config.sample.json` to `config.json` and
+   modifying it. See the [configuration docs](docs/config.md) for details.
 1. Enter the URL into your browser and log into Element!

 Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
@@ -122,7 +122,7 @@ Ensure you have the latest LTS version of Node.js installed.
 Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
 guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it already.

-1. Install or update `node.js` so that your `node` is at least v14.x.
+1. Install or update `node.js` so that your `node` is at least the current recommended LTS.
 1. Install `yarn` if not present already.
 1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`.
 1. Switch to the element-web directory: `cd element-web`.
@@ -264,9 +264,6 @@ top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
 higher and lower level React components useful for building Matrix communication
 apps using React.

-After creating a new component you must run `yarn reskindex` to regenerate
-the `component-index.js` for the app (used in future for skinning).
-
 Please note that Element is intended to run correctly without access to the public
 internet.  So please don't depend on resources (JS libs, CSS, images, fonts)
 hosted by external CDNs or servers but instead please package all dependencies
@@ -305,15 +302,22 @@ yarn install
 popd
 ```

-Finally, build and start Element itself:
+Clone the repo and switch to the `element-web` directory:

 ```bash
 git clone https://github.com/vector-im/element-web.git
 cd element-web
+```
+
+Configure the app by copying `config.sample.json` to `config.json` and
+modifying it. See the [configuration docs](docs/config.md) for details.
+
+Finally, build and start Element itself:
+
+```bash
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn install
-yarn reskindex
 yarn start
 ```

@@ -330,9 +334,6 @@ Wait a few seconds for the initial build to finish; you should see something lik
   and rebuilds source files when they change. This development server also
   disables caching, so do NOT use it in production.

-Configure the app by copying `config.sample.json` to `config.json` and
-modifying it. See the [configuration docs](docs/config.md) for details.
-
 Open <http://127.0.0.1:8080/> in your browser to see your newly built Element.

 **Note**: The build script uses inotify by default on Linux to monitor directories
@@ -364,9 +365,6 @@ ___
 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
 automatically picked up by webpack and built.

-If you add or remove any components from the Element skin, you will need to rebuild
-the skin's index by running, `yarn reskindex`.
-
 If any of these steps error with, `file table overflow`, you are probably on a mac
 which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
 You'll need to do this in each new terminal you open before building Element.
--- 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",
--- a/components.json
+++ b/components.json
@@ -0,0 +1,5 @@
+{
+    "src/components/views/auth/AuthFooter.tsx": "src/components/views/auth/VectorAuthFooter.tsx",
+    "src/components/views/auth/AuthHeaderLogo.tsx": "src/components/views/auth/VectorAuthHeaderLogo.tsx",
+    "src/components/views/auth/AuthPage.tsx": "src/components/views/auth/VectorAuthPage.tsx"
+}
--- a/config.sample.json
+++ b/config.sample.json
@@ -24,31 +24,31 @@
    ],
    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
    "uisi_autorageshake_app": "element-auto-uisi",
-    "defaultCountryCode": "GB",
-    "showLabsSettings": false,
+    "default_country_code": "GB",
+    "show_labs_settings": false,
    "features": { },
    "default_federate": true,
    "default_theme": "light",
-    "roomDirectory": {
+    "room_directory": {
        "servers": [
            "matrix.org"
        ]
    },
    "piwik": {
        "url": "https://piwik.riot.im/",
-        "whitelistedHSUrls": ["https://matrix.org"],
-        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
+        "whitelisted_hs_urls": ["https://matrix.org"],
+        "whitelisted_is_urls": ["https://vector.im", "https://matrix.org"],
        "siteId": 1
    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false,
        "https://matrix-client.matrix.org": false
    },
-    "settingDefaults": {
+    "setting_defaults": {
        "breadcrumbs": true
    },
    "jitsi": {
-        "preferredDomain": "meet.element.io"
+        "preferred_domain": "meet.element.io"
    },
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/docs/app-load.md
+++ b/docs/app-load.md
@@ -1,5 +1,8 @@
 # App load order

+**Dev note**: As of March 2022, the skin is no longer part of the app load order at all. The document's graphs have
+been kept untouched for posterity.
+
 Old slow flow:
 ![image](https://user-images.githubusercontent.com/2403652/73848963-00a2a080-4821-11ea-97d4-1200fc2638f3.png)

--- a/docs/config.md
+++ b/docs/config.md
@@ -1,211 +1,467 @@
-Configuration
-=============
+# Configuration

-You can configure the app by copying `config.sample.json` to
-`config.json` and customising it:
+You can configure the app by copying `config.sample.json` to `config.json` and customising it. The possible options are
+described here. If you run into issues, please visit [#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org)
+on Matrix.

-For a good example, see https://develop.element.io/config.json.
+For a good example of a production-tuned config, see https://app.element.io/config.json

-1. `default_server_config` sets the default homeserver and identity server URL for
-   Element to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),
-   with added support for a `server_name` under the `m.homeserver` section to display
-   a custom homeserver name. Alternatively, the config can contain a `default_server_name`
-   instead which is where Element will go to get that same object, although this option is
-   deprecated - see the `.well-known` link above for more information on using this option.
-   Note that the `default_server_name` is used to get a complete server configuration
-   whereas the `server_name` in the `default_server_config` is for display purposes only.
-   * *Note*: The URLs can also be individually specified as `default_hs_url` and
-     `default_is_url`, however these are deprecated. They are maintained for backwards
-     compatibility with older configurations. `default_is_url` is respected only
-     if `default_hs_url` is used.
-   * Element will fail to load if a mix of `default_server_config`, `default_server_name`, or
-     `default_hs_url` is specified. When multiple sources are specified, it is unclear
-     which should take priority and therefore the application cannot continue.
-   * As of Element 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below.
-1. `sso_redirect_options`: Optionally defines how Element will behave with a server which supports
-   Single Sign On (SSO). By default, Element will do nothing special and simply show a button where
-   needed for the user to click to navigate to the SSO system. This behaviour can be tuned with the
-   config options below (as properties of the `sso_redirect_options` object). None of the options apply
-   if Element thinks the user is already logged in, and similarly Element will assume the default server
-   supports SSO if these redirect options are used.
-   * `immediate`: When `true` (default `false`), Element will automatically redirect all unauthenticated
-     users to the SSO system to log in regardless of how they reached the app. This overrides the use of
-     other redirect options.
-   * `on_welcome_page`: When `true` (default `false`), Element will automatically redirect all unauthenticated
-     users to the SSO to log in if the user lands on the welcome page or no specific page. For example,
-     https://app.element.io/#/welcome and https://app.element.io would redirect if set up to use this option.
-     This can be useful to maintain guest experience until an account is needed.
-1. `logout_redirect_url`: After Element has cleared the user's storage, the user will be redirected to this URL.
-   Typically most useful in environments where the account users will be logging into is managed for them, such
-   as in cases of some SSO deployments. For example: this page might log the user out of the SSO system too.
-1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`).
-   When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings`
-   allows them to. The available optional experimental features vary from release to release and are
-   [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well.
-1. `showLabsSettings`: Shows the "labs" tab of user settings. Useful to allow users to turn on experimental features
-   they might not otherwise have access to.
-1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
-   homeserver know what email template to use when talking to you.
-1. `branding`: Configures various branding and logo details, such as:
-    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
-       during authentication flows. If an array is passed, an image is chosen randomly for each visit.
-    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
-       authentication flows
-    1. `authFooterLinks`: a list of links to show in the authentication page footer:
-      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
-1. `reportEvent`: Configures the dialog for reporting content to the homeserver
-   admin.
-    1. `adminMessageMD`: An extra message to show on the reporting dialog to
-       mention homeserver-specific policies. Accepts Markdown.
-1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
-   server is not Element and normally not your homeserver either. The integration server settings
-   may be left blank to disable integrations.
-1. `integrations_rest_url`: URL to the REST interface for the integrations server.
-1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
-1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
-   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
-   "Send Logs" within the application. Bug reports can be disabled/hidden by leaving the
-   `bug_report_endpoint_url` out of your config file.
-1. `uisi_autorageshake_app`: If users enable the Labs flag
-   "Automatically send debug logs on decryption errors", rageshakes
-   submitted by that feature can be given a custom app name so that
-   the rageshake server can file them in a separate issue tracker.  If
-   this field is absent from the config, the app name for decryption
-   error rageshakes will be `"element-web"` just like for
-   manually-submitted rageshakes.
+For an example of a development/beta-tuned config, see https://develop.element.io/config.json

-   If `bug_report_endpoint_url` is set to Element's rageshake server,
-   then this field should be set to `"element-auto-uisi"` as in
-   `config.sample.json`. If `bug_report_endpoint_url` is left out,
-   this field has no effect and can be left out as well.  If you are
-   using your own rageshake server, set this field in accordance with
-   your rageshake server configuration.
-1. `roomDirectory`: config for the public room directory. This section is optional.
-1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
-   down list. Optional.
-1. `default_theme`: name of theme to use by default (e.g. 'light')
-1. `update_base_url` (electron app only): HTTPS URL to a web server to download
-   updates from. This should be the path to the directory containing `macos`
-   and `win32` (for update packages, not installer packages).
-1. DEPRECATED: `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
-   option out of your config file. If you want to enable analytics, set `piwik` to be an object
-   containing the following properties:
-    1. `url`: The URL of the Piwik instance to use for collecting analytics
-    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
-    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
-    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
-1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
-1. `embeddedPages`: Configures the pages displayed in portions of Element that
-   embed static files, such as:
-    1. `welcomeUrl`: Initial content shown on the outside of the app when not
-       logged in. Defaults to `welcome.html` supplied with Element.
-    1. `homeUrl`: Content shown on the inside of the app when a specific room is
-       not selected. By default, no home page is configured. If one is set, a
-       button to access it will be shown in the top left menu.
-    1. `loginForWelcome`: Overrides `welcomeUrl` to make the welcome page be the
-       same page as the login page when `true`. This effectively disables the
-       welcome page.
-1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
-   country selectors, like the phone number input on the registration page.
-   Defaults to `GB` if the given code is unknown or not provided.
-1. `settingDefaults`:  Defaults for settings that support the `config` level,
-   as an object mapping setting name to value (note that the "theme" setting
-   is special cased to the `default_theme` in the config file).
-1. `disable_custom_urls`: disallow the user to change the
-   default homeserver when signing up or logging in.
-1. `permalinkPrefix`: Used to change the URL that Element generates permalinks with.
-   By default, this is "https://matrix.to" to generate matrix.to (spec) permalinks.
-   Set this to your Element instance URL if you run an unfederated server (eg:
-   "https://element.example.org").
-1. `jitsi`: Used to change the default conference options. Learn more about the
-   Jitsi options at [jitsi.md](./jitsi.md).
-    1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
-       to `meet.element.io`. This is used whenever a user clicks on the voice/video
-       call buttons - integration managers may use a different domain.
-  This setting is ignored if your homeserver provides
-  `/.well-known/matrix/client` in its well-known location, and the JSON file
-  at that location has a key `m.vector.riot.jitsi`. In this case, the
-  configuration found in the well-known location is used instead.
-1. `jitsiWidget`: Options to change the built-in Jitsi widget behaviour. `jitsi` controls
-   how the widget gets created, but not how it behaves.
-    1. `skipBuiltInWelcomeScreen`: If you'd like to skip the default "Join Conference"
-       behaviour, set this to `true`. This will cause the widget to assume that there's
-       a Jitsi welcome screen set up and point the user towards that. Note that this can
-       cause the camera/microphone to flicker as "in use" while Jitsi tests the devices.
-1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver
-    and its value defines whether to enable/disable the presence status display
-    from that homeserver. If no options are configured, presence is shown for all
-    homeservers.
-1. `disable_guests`: Disables guest access tokens and auto-guest registrations.
-    Defaults to false (guests are allowed).
-1. `disable_login_language_selector`: Disables the login language selector. Defaults
-    to false (language selector is shown).
-1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form
-    Defaults to false (3rd party identity options are shown).
-1. `default_federate`: Default option for room federation when creating a room
-    Defaults to true (room federation enabled).
-1. `desktopBuilds`: Used to alter promotional links to the desktop app. By default
-   the builds are considered available and accessible from https://element.io. This
-   config option is typically used in the context of encouraging encrypted message
-   search capabilities (Seshat). All the options listed below are required if this
-   option is specified.
-   1. `available`: When false, the desktop app will not be promoted to the user.
-   1. `logo`: An HTTP URL to the avatar for the desktop build. Should be 24x24, ideally
-      an SVG.
-   1. `url`: An HTTP URL for where to send the user to download the desktop build.
-1. `mobileBuilds`: Used to alter promotional links to the mobile app. By default the
-   builds are considered available and accessible from https://element.io. This config
-   option is typically used in a context of encouraging the user to try the mobile app
-   instead of a mobile/incompatible browser.
-   1. `ios`: The URL to the iOS build. If `null`, it will be assumed to be not available.
-       If not set, the default element.io builds will be used.
-   1. `android`: The URL to the Android build. If `null`, it will be assumed to be not available.
-       If not set, the default element.io builds will be used.
-   1. `fdroid`: The URL to the FDroid build. If `null`, it will be assumed to be not available.
-      If not set, the default element.io builds will be used.
-1. `mobileGuideToast`: Whether to show a toast a startup which nudges users on
-   iOS and Android towards the native mobile apps. The toast redirects to the
-   mobile guide if they accept. Defaults to false.
-1. `audioStreamUrl`: If supplied, show an option on Jitsi widgets to stream
-   audio using Jitsi's live streaming feature. This option is experimental and
-   may be removed at any time without notice.
-1. `voip`: Behaviour related to calls
-   1. `obeyAssertedIdentity`: If set, MSC3086 asserted identity messages sent
-      on VoIP calls will cause the call to appear in the room corresponding to the
-      asserted identity. This *must* only be set in trusted environments.
-1. `posthog`: [Posthog](https://posthog.com/) integration config. If not set, Posthog analytics are disabled.
-   1. `projectApiKey`: The Posthog project API key
-   2. `apiHost`: The Posthog API host
-1. `sentry`: [Sentry](https://sentry.io/) configuration for rageshake data being sent to sentry.
-   1. `dsn`: the Sentry [DSN](https://docs.sentry.io/product/sentry-basics/dsn-explainer/)
-   2. `environment`: (optional) The [Environment](https://docs.sentry.io/product/sentry-basics/environments/) to pass to sentry
-1. `map_style_url`: Map tile server style URL for location sharing. e.g.
-   'https://api.maptiler.com/maps/streets/style.json?key=YOUR_KEY_GOES_HERE'
-  This setting is ignored if your homeserver provides
-  `/.well-known/matrix/client` in its well-known location, and the JSON file
-  at that location has a key `m.tile_server` (or the unstable version
-  `org.matrix.msc3488.tile_server`). In this case, the configuration found in
-  the well-known location is used instead.
-1. `analyticsOwner`: The entity that analytics data is being sent to. Used in copy
-   when explaining to the user where data is being sent. If not set, defaults to `brand`.
-1. `defaultDeviceDisplayName`: The default device display name to use for new logins
-   and registrations. If not set then a calculated version will be used.
-1. `custom_translations_url`: An optional URL to allow overriding of translatable strings.
-   The JSON file must be in a format of `{"affected string": {"languageCode": "new string"}}`.
-   See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
+After changing the config, the app will need to be reloaded. For web browsers this is a simple page refresh, however
+for the desktop app the application will need to be exited fully (including via the task tray) and re-started.

-Note that `index.html` also has an og:image meta tag that is set to an image
-hosted on riot.im. This is the image used if links to your copy of Element
-appear in some websites like Facebook, and indeed Element itself. This has to be
-static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
-not possible for this to be an option in config.json. If you'd like to change
-it, you can build Element, but run
-`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
-Alternatively, you can edit the `og:image` meta tag in `index.html` directly
-each time you download a new version of Element.
+## Homeserver configuration

-Identity servers
-================
+In order for Element to even start you will need to tell it what homeserver to connect to *by default*. Users will be
+able to use a different homeserver if they like, though this can be disabled with `"disable_custom_urls": false` in your
+config.
+
+One of the following options **must** be supplied:
+
+1. `default_server_config`: The preferred method of setting the homeserver connection information. Simply copy/paste
+   your [`/.well-known/matrix/client`](https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient)
+   into this field. For example:
+   ```json
+   {
+      "default_server_config": {
+         "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+         },
+         "m.identity_server": {
+            "base_url": "https://vector.im"
+         }
+      }
+   }
+   ```
+2. `default_server_name`: A different method of connecting to the homeserver by looking up the connection information
+   using `.well-known`. When using this option, simply use your server's domain name (the part at the end of user IDs):
+   `"default_server_name": "matrix.org"`
+3. <del>`default_hs_url` and (optionally) `default_is_url`</del>: A very deprecated method of defining the connection
+   information. These are the same values seen as `base_url` in the `default_server_config` example, with `default_is_url`
+   being optional.
+
+If a combination of these three methods is used then Element will fail to load. This is because it is unclear which
+should be considered "first".
+
+## Labs flags
+
+Labs flags are optional, typically beta or in-development, features that can be turned on or off. The full range of
+labs flags and their development status are documented [here](./labs.md). If interested, the feature flag process is
+documented [here](./feature-flags.md).
+
+To force a labs flag on or off, use the following:
+
+```json
+{
+   "features": {
+      "feature_you_want_to_turn_on": true,
+      "feature_you_want_to_keep_off": false
+   }
+}
+```
+
+If you'd like the user to be able to self-select which labs flags they can turn on, add `"show_labs_settings": true` to
+your config. This will turn on the tab in user settings.
+
+**Note**: Feature support varies release-by-release. Check the [labs flag documentation](./labs.md) frequently if enabling
+the functionality.
+
+## Default settings
+
+Some settings additionally support being specified at the config level to affect the user experience of your Element Web
+instance. As of writing those settings are not fully documented, however a few are:
+
+1. `default_federate`: When `true` (default), rooms will be marked as "federatable" during creation. Typically this setting
+   shouldn't be used as the federation capabilities of a room **cannot** be changed after the room is created.
+2. `default_country_code`: An optional ISO 3166 alpha2 country code (eg: `GB`, the default) to use when showing phone number
+   inputs.
+3. `room_directory`: Optionally defines how the room directory component behaves. Currently only a single property, `servers`
+   is supported to add additional servers to the dropdown. For example:
+   ```json
+   {
+      "room_directory": {
+         "servers": ["matrix.org", "example.org"]
+      }
+   }
+   ```
+4. `setting_defaults`: Optional configuration for settings which are not described by this document and support the `config`
+   level. This list is incomplete. For example:
+   ```json
+   {
+      "setting_defaults": {
+         "MessageComposerInput.showStickersButton": false,
+         "MessageComposerInput.showPollsButton": false
+      }
+   }
+   ```
+   These values will take priority over the hardcoded defaults for the settings.
+
+## Customisation & branding
+
+<!-- Author's note: https://english.stackexchange.com/questions/570116/alternative-ways-of-saying-white-labeled -->
+
+Element supports some customisation of the user experience through various branding and theme options. While it doesn't support
+complete re-branding/private labeling, a more personalised experience can be achieved for your users.
+
+1. `default_theme`: Typically either `light` (the default) or `dark`, this is the optional name of the colour theme to use.
+   If using custom themes, this can be a theme name from that as well.
+2. `default_device_display_name`: Optional public name for devices created by login and registration, instead of the default
+   templated string. Note that this option does not support templating, currently.
+3. `brand`: Optional name for the app. Defaults to `Element`. This is used throughout the application in various strings/locations.
+4. `permalink_prefix`: An optional URL pointing to an Element Web deployment. For example, `https://app.element.io`. This will
+   change all permalinks (via the "Share" menus) to point at the Element Web deployment rather than `matrix.to`.
+5. `desktop_builds`: Optional. Where the desktop builds for the application are, if available. This is explained in more detail
+   down below.
+6. `mobile_builds`: Optional. Like `desktop_builds`, except for the mobile apps. Also described in more detail down below.
+7. `mobile_guide_toast`: When `true` (default), users accessing the Element Web instance from a mobile device will be prompted to
+   download the app instead.
+8. `update_base_url`: For the desktop app only, the URL where to acquire update packages. If specified, must be a path to a directory
+   containing `macos` and `win32` directories, with the update packages within. Defaults to `https://packages.element.io/desktop/update/`
+   in production.
+9. `map_style_url`: Map tile server style URL for location sharing. e.g. `https://api.maptiler.com/maps/streets/style.json?key=YOUR_KEY_GOES_HERE`
+   This setting is ignored if your homeserver provides `/.well-known/matrix/client` in its well-known location, and the JSON file
+   at that location has a key `m.tile_server` (or the unstable version `org.matrix.msc3488.tile_server`). In this case, the
+   configuration found in the well-known location is used instead.
+10. `welcome_user_id`: An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
+11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
+    `{"affected string": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
+12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
+13. `embedded_pages`: Further optional URLs for various assets used within the app. Described in more detail down below.
+14. `disable_3pid_login`: When `false` (default), **enables** the options to log in with email address or phone number. Set to
+    `true` to hide these options.
+15. `disable_login_language_selector`: When `false` (default), **enables** the language selector on the login pages. Set to `true`
+    to hide this dropdown.
+16. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
+    users. Set to `true` to disable this functionality.
+
+### `desktop_builds` and `mobile_builds`
+
+These two options describe the various availability for the application. When the app needs to promote an alternative download,
+such as trying to get the user to use an Android app or the desktop app for encrypted search, the config options will be looked
+at to see if the link should be to somewhere else.
+
+Starting with `desktop_builds`, the following subproperties are available:
+
+1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
+2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
+3. `url`: Required. The download URL for the app. This is used as a hyperlink.
+
+When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io
+
+For `mobile_builds`, the following subproperties are available:
+
+1. `ios`: The URL for where to download the iOS app, such as an App Store link. When explicitly `null`, the app will assume the
+   iOS app cannot be downloaded. When not provided, the default Element app will be assumed available.
+2. `android`: The same as `ios`, except for Android instead.
+3. `fdroid`: The same as `android`, except for FDroid instead.
+
+Together, these two options might look like the following in your config:
+
+```json
+{
+   "desktop_builds": {
+      "available": true,
+      "logo": "https://example.org/assets/logo-small.svg",
+      "url": "https://example.org/not_element/download"
+   },
+   "mobile_builds": {
+      "ios": null,
+      "android": "https://example.org/not_element/android",
+      "fdroid": "https://example.org/not_element/fdroid"
+   }
+}
+```
+
+### `branding` and `embedded_pages`
+
+These two options point at various URLs for changing different internal pages (like the welcome page) and logos within the
+application.
+
+Starting with `branding`, the following subproperties are available:
+
+1. `welcome_background_url`: When a string, the URL for the full-page image background of the login, registration, and welcome
+   pages. This property can additionally be an array to have the app choose an image at random from the selections.
+2. `auth_header_logo_url`: A URL to the logo used on the login, registration, etc pages.
+3. `auth_footer_links`: A list of links to add to the footer during login, registration, etc. Each entry must have a `text` and
+   `url` property.
+
+`embedded_pages` can be configured as such:
+
+1. `welcome_url`: A URL to an HTML page to show as a welcome page (landing on `#/welcome`). When not specified, the default
+   `welcome.html` that ships with Element will be used instead.
+2. `home_url`: A URL to an HTML page to show within the app as the "home" page. When the app doesn't have a room/screen to
+   show the user, it will use the home page instead. The home page is additionally accessible from the user menu. By default,
+   no home page is set and therefore a hardcoded landing screen is used.
+3. `login_for_welcome`: When `true` (default `false`), the app will use the login form as a welcome page instead of the welcome
+   page itself. This disables use of `welcome_url` and all welcome page functionality.
+
+Together, the options might look like this in your config:
+
+```json
+{
+   "branding": {
+      "welcome_background_url": "https://example.org/assets/background.jpg",
+      "auth_header_logo_url": "https://example.org/assets/logo.svg",
+      "auth_footer_links": [
+         {"text": "FAQ", "url": "https://example.org/faq"},
+         {"text": "Donate", "url": "https://example.org/donate"},
+      ]
+   },
+   "embedded_pages": {
+      "welcome_url": "https://example.org/assets/welcome.html",
+      "home_url": "https://example.org/assets/home.html"
+   }
+}
+```
+
+Note that `index.html` also has an og:image meta tag that is set to an image hosted on element.io. This is the image used if
+links to your copy of Element appear in some websites like Facebook, and indeed Element itself. This has to be static in the HTML
+and an absolute URL (and HTTP rather than HTTPS), so it's not possible for this to be an option in config.json. If you'd like to
+change it, you can build Element, but run `RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`. Alternatively, you can edit
+the `og:image` meta tag in `index.html` directly each time you download a new version of Element.
+
+## SSO setup
+
+When Element is deployed alongside a homeserver with SSO-only login, some options to ease the user experience might want to be set:
+
+1. `logout_redirect_url`: Optional URL to redirect the user to after they have logged out. Some SSO systems support a page that the
+   user can be sent to in order to log them out of that system too, making logout symmetric between Element and the SSO system.
+2. `sso_redirect_options`: Options to define how to handle unauthenticated users. If the object contains `"immediate": true`, then
+   all unauthenticated users will be automatically redirected to the SSO system to start their login. If instead you'd only like to
+   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. As an example:
+   ```json
+   {
+      "sso_redirect_options": {
+         "immediate": false,
+         "on_welcome_page": true
+      }
+   }
+   ```
+   It is most common to use the `immediate` flag instead of `on_welcome_page`.
+
+## VoIP / Jitsi calls
+
+Currently, Element uses Jitsi to offer conference calls in rooms. A set of defaults are applied, pointing at our Jitsi instance,
+to ensure conference calling works, however you can point Element at your own Jitsi if you prefer.
+
+More information about the Jitsi setup can be found [here](./jitsi.md).
+
+The VoIP and Jitsi options are:
+
+1. `jitsi`: Optional configuration for how to start Jitsi conferences. Currently can only contain a single `preferred_domain`
+   value which points at the domain of the Jitsi instance. Defaults to `meet.element.io`. This is *not* used if the Jitsi widget
+   was created by an integration manager, or if the homeserver provides Jitsi information in `/.well-known/matrix/client`. For
+   example:
+   ```json
+   {
+      "jitsi": {
+         "preferred_domain": "meet.jit.si"
+      }
+   }
+   ```
+2. `jitsi_widget`: Optional configuration for the built-in Jitsi widget. Currently can only contain a single `skip_built_in_welcome_screen`
+   value, denoting whether the "Join Conference" button should be shown. When `true` (default `false`), Jitsi calls will skip to
+   the call instead of having a screen with a single button on it. This is most useful if the Jitsi instance being used already
+   has a landing page for users to test audio and video before joining the call, otherwise users will automatically join the call.
+   For example:
+   ```json
+   {
+      "jitsi_widget": {
+         "skip_built_in_welcome_screen": true
+      }
+   }
+   ```
+3. `voip`: Optional configuration for various VoIP features. Currently can only contain a single `obey_asserted_identity` value to
+   send MSC3086-style asserted identity messages during VoIP calls in the room corresponding to the asserted identity. This *must*
+   only be set in trusted environments. The option defaults to `false`. For example:
+   ```json
+   {
+      "voip": {
+         "obey_asserted_identity": false
+      }
+   }
+   ```
+4. `widget_build_url`: Optional URL to have Element make a request to when a user presses the voice/video call buttons in the app,
+   if a call would normally be started by the action. The URL will be called with a `roomId` query parameter to identify the room
+   being called in. The URL must respond with a JSON object similar to the following:
+   ```json
+   {
+      "widget_id": "$arbitrary_string",
+      "widget": {
+         "creatorUserId": "@user:example.org",
+          "id": "$the_same_widget_id",
+          "type": "m.custom",
+          "waitForIframeLoad": true,
+          "name": "My Widget Name Here",
+          "avatar_url": "mxc://example.org/abc123",
+          "url": "https://example.org/widget.html",
+          "data": {
+             "title": "Subtitle goes here"
+          }
+      },
+      "layout": {
+         "container": "top",
+         "index": 0,
+         "width": 65,
+         "height": 50
+      }
+   }
+   ```
+   The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
+   as defined by the `io.element.widgets.layout` state event.
+5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
+   at any time without notice.
+
+## Bug reporting
+
+If you run your own rageshake server to collect bug reports, the following options may be of interest:
+
+1. `bug_report_endpoint_url`: URL for where to submit rageshake logs to. Rageshakes include feedback submissions and bug reports. When
+   not present in the config, the app will disable all rageshake functionality. Set to `https://element.io/bugreports/submit` to submit
+   rageshakes to us, or use your own rageshake server.
+2. `uisi_autorageshake_app`: If a user has enabled the "automatically send debug logs on decryption errors" flag, this option will be sent
+   alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-web`, as with any other
+   rageshake submitted by the app.
+
+   If you are using the element.io rageshake server, please set this to `element-auto-uisi` so we can better filter them.
+
+If you would like to use [Sentry](https://sentry.io/) for rageshake data, add a `sentry` object to your config with the following values:
+
+1. `dsn`: The Sentry [DSN](https://docs.sentry.io/product/sentry-basics/dsn-explainer/).
+2. `environment`: Optional [environment](https://docs.sentry.io/product/sentry-basics/environments/) to pass to Sentry.
+
+For example:
+
+```json
+{
+   "sentry": {
+      "dsn": "dsn-goes-here",
+      "environment": "production"
+   }
+}
+```
+
+## Integration managers
+
+Integration managers are embedded applications within Element to help the user configure bots, bridges, and widgets. An integration manager
+is a separate piece of software not typically available with your homeserver. To disable integrations, leave the options defined here out of
+your config.
+
+1. `integrations_ui_url`: The UI URL for the integration manager.
+2. `integrations_rest_url`: The REST interface URL for the integration manager.
+3. `integrations_widgets_urls`: A list of URLs the integration manager uses to host widgets.
+
+If you would like to use Scalar, the integration manager maintained by Element, the following options would apply:
+
+```json
+{
+   "integrations_ui_url": "https://scalar.vector.im/",
+   "integrations_rest_url": "https://scalar.vector.im/api",
+   "integrations_widgets_urls": [
+      "https://scalar.vector.im/_matrix/integrations/v1",
+      "https://scalar.vector.im/api",
+      "https://scalar-staging.vector.im/_matrix/integrations/v1",
+      "https://scalar-staging.vector.im/api",
+      "https://scalar-staging.riot.im/scalar/api"
+   ]
+}
+```
+
+## Administrative options
+
+If you would like to include a custom message when someone is reporting an event, set the following Markdown-capable field:
+
+```json
+{
+   "report_event": {
+      "admin_message_md": "Please be sure to review our [terms of service](https://example.org/terms) before reporting a message."
+   }
+}
+```
+
+To add additional "terms and conditions" links throughout the app, use the following template:
+
+```json
+{
+   "terms_and_conditions_links": [
+      { "text": "Code of conduct", "url": "https://example.org/code-of-conduct" }
+   ]
+}
+```
+
+## Analytics
+
+Analytics are currently possible with two systems: `posthog` (preferred) and <del>`piwik`</del> (matomo; deprecated). When
+these configuration options are not present, analytics are deemed impossible and the user won't be asked to opt-in to the
+system.
+
+To configure [Posthog](https://posthog.com/), add the following under `posthog` in your config:
+
+1. `api_host`: The hostname of the posthog server.
+2. `project_api_key`: The API key from posthog.
+
+To configure Piwik (***DEPRECATED***), add the following under `piwik` in your config:
+
+1. `url`: The URL of the piwik server.
+2. `site_id`: The site ID to use.
+3. `policy_url`: URL to the analytics collection policy.
+4. `whitelisted_hs_urls`: A list of homeserver client-server URLs to *not* redact from analytics.
+
+Additionally, you may set `"piwik": false` to disable piwik configuration too. An `analytics_owner` can also be specified in your
+config to replace the company name used in dialogs talking about analytics - this defaults to `brand`, and is useful when the
+provider of analytics is different from the provider of the Element instance.
+
+## Server hosting links
+
+If you would like to encourage matrix.org users to sign up for a service like [Element Matrix Services](https://element.io/matrix-services/server-hosting),
+the following configuration options can be set. Note that if the options are missing from the configuration then the hosting prompts
+will not be shown to the user.
+
+1. `hosting_signup_link`: Optional URL to link the user to when talking about "Upgrading your account". Will contain a query parameter
+   of `utm_campaign` to denote which link the user clicked on within the app. Only ever applies to matrix.org users specifically.
+2. `host_signup`: Optional configuration for an account importer to your hosting platform. The API surface of this is not documented
+   at the moment, but can be configured with the following subproperties:
+   1. `brand`: The brand name to use.
+   2. `url`: The iframe URL for the importer.
+   3. `domains`: The homeserver domains to show the importer to.
+   4. `cookie_policy_url`: The URL to the cookie policy for the importer.
+   5. `privacy_policy_url`: The URL to the privacy policy for the importer.
+   6. `terms_of_service_url`: The URL to the terms of service for the importer.
+
+If you're looking to mirror a setup from our production/development environments, the following config should be used:
+
+```json
+{
+   "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+   "host_signup": {
+      "brand": "Element Home",
+      "domains": [ "matrix.org" ],
+      "url": "https://ems.element.io/element-home/in-app-loader",
+      "cookie_policy_url": "https://element.io/cookie-policy",
+      "privacy_policy_url": "https://element.io/privacy",
+      "terms_of_service_url": "https://element.io/terms-of-service"
+   }
+}
+```
+
+## Miscellaneous
+
+Element supports other options which don't quite fit into other sections of this document.
+
+To configure whether presence UI is shown for a given homeserver, set `enable_presence_by_hs_url`. It is recommended to
+set this value to the following at a minimum:
+
+```json
+{
+   "enable_presence_by_hs_url": {
+      "https://matrix.org": false,
+      "https://matrix-client.matrix.org": false
+   }
+}
+```
+
+## Identity servers

 The identity server is used for inviting other users to a room via third party
 identifiers like emails and phone numbers. It is not used to store your password
@@ -232,16 +488,14 @@ Currently, the only two public identity servers are https://vector.im and
 https://matrix.org, however in the future identity servers will be
 decentralised.

-Desktop app configuration
-=========================
+## Desktop app configuration

 See https://github.com/vector-im/element-desktop#user-specified-configjson

-UI Features
-===========
+## UI Features

 Parts of the UI can be disabled using UI features. These are settings which appear
-under `settingDefaults` and can only be `true` (default) or `false`. When `false`,
+under `setting_defaults` and can only be `true` (default) or `false`. When `false`,
 parts of the UI relating to that feature will be disabled regardless of the user's
 preferences.

@@ -277,4 +531,14 @@ Currently, the following UI feature flags are supported:
  user.
 * `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
  This should only be used if the room history visibility options are managed by the server.
-* `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the timeline for recent messages. When false day dates will be used.
+* `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the
+  timeline for recent messages. When false day dates will be used.
+
+## Undocumented / developer options
+
+The following are undocumented or intended for developer use only.
+
+1. `fallback_hs_url`
+2. `sync_timeline_limit`
+3. `dangerously_allow_unsafe_and_insecure_passwords`
+4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
--- a/docs/customisations.md
+++ b/docs/customisations.md
@@ -34,9 +34,9 @@ default, Element Web does *not* ship with this file to prevent conflicts.

 ### Custom components

-Instead of implementing skinning from the react-sdk, maintainers can use the above system to override components
-if they wish. Maintenance and API surface compatibility are left as a responsibility for the project - the layering
-in Element Web (including the react-sdk) do not make guarantees that properties/state machines won't change.
+Maintainers can use the above system to override components if they wish. Maintenance and API surface compatibility are
+left as a responsibility for the project - the layering in Element Web (including the react-sdk) do not make guarantees
+that properties/state machines won't change.

 ### Component visibility customisation

--- a/docs/feature-flags.md
+++ b/docs/feature-flags.md
@@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises.
 When starting work on a feature, we should create a matching feature flag:

 1. Add a new
-   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
+   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx)
   of the form:
 ```js
    "feature_cats": {
@@ -81,7 +81,7 @@ configs.

 **Note:** The above will only enable the feature for https://app.element.io and official Element
 Desktop builds. It will not be enabled for self-hosted installed, custom desktop builds, etc. To
-cover these cases, change the setting's `default` in `Settings.ts` to `true`.
+cover these cases, change the setting's `default` in `Settings.tsx` to `true`.

 ## Feature deployed successfully

--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -61,11 +61,11 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
            ],
            "bug_report_endpoint_url": "https://element.io/bugreports/submit",
            "defaultCountryCode": "GB",
-            "showLabsSettings": false,
+            "show_labs_settings": false,
            "features": { },
            "default_federate": true,
            "default_theme": "light",
-            "roomDirectory": {
+            "room_directory": {
                "servers": [
                        "matrix.org"
                ]
@@ -80,11 +80,11 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
                "https://matrix.org": false,
                "https://matrix-client.matrix.org": false
            },
-            "settingDefaults": {
+            "setting_defaults": {
                "breadcrumbs": true
            },
            "jitsi": {
-                "preferredDomain": "meet.element.io"
+                "preferred_domain": "meet.element.io"
            }
        }

--- a/docs/labs.md
+++ b/docs/labs.md
@@ -39,13 +39,6 @@ Also adds the `/jumptodate 2022-01-31` slash command.
 An experimental approach for supporting custom status messages across DMs. To set a status, click on
 your avatar next to the message composer.

-## Custom tags (`feature_custom_tags`)
-
-An experimental approach for dealing with custom tags. Custom tags will appear in the bottom portion
-of the community filter panel.
-
-Setting custom tags is not supported by Element.
-
 ## Render simple counters in room header (`feature_state_counters`)

 Allows rendering of labelled counters above the message list.
@@ -118,13 +111,6 @@ For some sample themes, check out [aaronraimist/element-themes](https://github.c
 To enable message previews for reactions in all rooms, enable `feature_roomlist_preview_reactions_all`.
 To enable message previews for reactions in DMs, enable `feature_roomlist_preview_reactions_dms`, ignored when it is enabled for all rooms.

-## Communities v2 prototyping (`feature_communities_v2_prototypes`) [In Development]
-
-**This is a highly experimental implementation for parts of the communities v2 experience.** It does not
-represent what communities v2 will look/feel like and can/will change without notice. Due to the early
-stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues
-or feedback for this functionality at this time.
-
 ## Dehydrated devices (`feature_dehydration`)

 Allows users to receive encrypted messages by creating a device that is stored
@@ -196,3 +182,13 @@ Threading allows users to branch out a new conversation from the main timeline o
 Threads can be access by clicking their summary below the root event on the room timeline. Users can find a comprehensive list of threads by click the icon on the room header button.

 This feature might work in degraded mode if the homeserver a user is connected to does not advertise support for the unstable feature `org.matrix.msc3440`  when calling the `/versions` API endpoint.
+
+## Right-click Message Context Menu (`feature_message_right_click_context_menu`)
+
+Enables showing a right-click context menu when right-clicking messages in the
+timeline. This menu shows options that can usually be found in the message
+action bar or in the message options.
+
+## Voice & video rooms (`feature_video_rooms`) [In Development]
+
+Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of.
--- a/docs/skinning
+++ b/docs/skinning
@@ -1,68 +0,0 @@
-== Skinning refactor ==
-
-matrix-react-sdk
-  - base images
-  - base CSS
-  - all the components needed to build a workable app (including the top layer)
-
-element-web: the Element skin
-  - Element-specific classes (e.g. login header/footer)
-  - Element-specific themes
-    - light
-    - dark
-
-i.e. the only things which should go into element-web are bits which apply vector-specific skinning
-specifically "Stuff that any other brand would not want to use. (e.g. Element logos, links, T&Cs)"
- - Questions:
-   - Electron app?  (should probably be a separate repo in its own right?  but might as well go here for now)
-   - index.html & index.js?  (should be in matrix-react-sdk, given the SDK is useless without them?)
-
-ideally matrix-react-sdk itself should ship with a default skin which actually works built in.
-
-status skin (can go in the same app for now)
-  - has status theme
-    - which inherits from Element light theme
-    - how do we share graphics between skins?
-      - shove them into react-sdk, or...
-      - guess we do ../../vector/img 
-      - this means keeping the skin name in the images (unless /img is a shortcut to the right skin's images)
-
-out of scope:
-  - making the components more independent, so they can be used in isolation.
-  - that said, the bits which should probably be used by being embeded into a different app:
-    - login/reg
-    - RoomView + RoomSettings
-    - MessageComposer
-    - RoomList
-    - MemberList
-    - MemberInfo
-    - Voip UI
-    - UserSettings
-  - sharing different js-sdks between the different isolated modules
-
-other changes:
-  - how do we handle i18n?
-    - each skin should really be its own i18n project.  As long as all the commonality stuff is in matrix-react-sdk this shouldn't be too bad.
-  - ability to associate components with a given skin
-    - skins/vector/src <-- components
-    - skins/vector/css
-    - skins/vector/img
-    - skins/vector/fonts
-  - gather together themes (per skin) into a single place too
-    - skins/vector/themes/foo/css
-    - skins/vector/themes/foo/img
-    - skins/vector/themes/foo/fonts
-  - ideally element-web would contain almost nothing but skins/vector directory. 
-  - ability to entirely replace CSS rather than override it for a given theme
-    - e.g. if we replace `Login.js` with `StatusLogin.js`, then we should similarly be able to replace `_Login.scss` with `_StatusLogin.scss`.
-
-random thoughts;
-   - should we be able to change the entire skin at runtime (more like wordpress) - to the extent of replacing entire components?
-     - might pose security issues if a theme can be swapped out to replace MatrixChat or other fundamental functionality at runtime
-   - if so, perhaps skins & themes should converge...
-
-----------------
-
-Immediate plan for Status:
- * Implement it as a theme for the Element skin
- * Ideally move skins to a sensible level (possibly even including src?)
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -6,7 +6,7 @@ Element app via CSS & custom imagery.

 They are *NOT* co be confused with 'skins', which describe apps which sit on top
 of matrix-react-sdk - e.g. in theory Element itself is a react-sdk skin.
-As of Jan 2017, skins are not fully supported; Element is the only available skin.
+As of March 2022, skins are not fully supported; Element is the only available skin.

 To define a theme for Element:

@@ -36,7 +36,7 @@ default theme, you would use `default_theme: "custom-Electric Blue"`.
 eg. in config.json:

 ```
-"settingDefaults": {
+"setting_defaults": {
        "custom_themes": [
            {
                "name": "Electric Blue",
--- a/docs/translating.md
+++ b/docs/translating.md
@@ -62,4 +62,4 @@ You can use inside the translation field "Review needed" checkbox. It will be sh

 ### Further reading

-The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
+The official Weblate doc provides some more in-depth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -52,7 +52,7 @@
    },
    "posthog": {
        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.hss.element.io"
+        "apiHost": "https://posthog.element.io"
    },
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -56,7 +56,7 @@
    },
    "posthog": {
        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.hss.element.io"
+        "apiHost": "https://posthog.element.io"
    },
    "features": {
        "feature_spotlight": true
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "element-web",
-  "version": "1.10.7",
+  "version": "1.10.12",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -30,28 +30,25 @@
    "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": "reskindex -h src/header",
-    "reskindex:watch": "reskindex -h src/header -w",
-    "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
    "clean": "rimraf lib webapp",
    "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
    "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
    "build:jitsi": "node scripts/build-jitsi.js",
    "build:res": "node scripts/copy-res.js",
-    "build:genfiles": "yarn reskindex && yarn build:res && yarn build:jitsi",
+    "build:genfiles": "yarn build:res && yarn build:jitsi",
    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
    "build:bundle": "webpack --progress --bail --mode production",
    "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
    "dist": "scripts/package.sh",
-    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
-    "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js --https\"",
+    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
+    "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"",
    "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
    "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
    "lint:js": "eslint --max-warnings 0 src",
    "lint:js-fix": "eslint --fix src",
    "lint:types": "tsc --noEmit --jsx react",
-    "lint:style": "stylelint 'res/css/**/*.scss'",
+    "lint:style": "stylelint \"res/css/**/*.scss\"",
    "test": "jest"
  },
  "dependencies": {
@@ -60,8 +57,8 @@
    "gfm.css": "^1.1.2",
    "jsrsasign": "^10.2.0",
    "katex": "^0.12.0",
-    "matrix-js-sdk": "16.0.0",
-    "matrix-react-sdk": "3.42.0",
+    "matrix-js-sdk": "17.2.0",
+    "matrix-react-sdk": "3.44.0",
    "matrix-widget-api": "^0.1.0-beta.18",
    "prop-types": "^15.7.2",
    "react": "17.0.2",
@@ -74,7 +71,6 @@
    "@babel/eslint-parser": "^7.12.10",
    "@babel/eslint-plugin": "^7.12.10",
    "@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-nullish-coalescing-operator": "^7.12.1",
    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
@@ -87,7 +83,6 @@
    "@babel/preset-typescript": "^7.12.7",
    "@babel/register": "^7.12.10",
    "@babel/runtime": "^7.12.5",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
    "@sentry/webpack-plugin": "^1.18.1",
    "@svgr/webpack": "^5.5.0",
@@ -130,7 +125,7 @@
    "matrix-react-test-utils": "^0.2.3",
    "matrix-web-i18n": "^1.2.0",
    "mini-css-extract-plugin": "^0.12.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
    "mkdirp": "^1.0.4",
    "modernizr": "^3.12.0",
    "node-fetch": "^2.6.7",
@@ -146,7 +141,6 @@
    "postcss-simple-vars": "^5.0.2",
    "postcss-strip-inline-comments": "^0.1.5",
    "raw-loader": "^4.0.2",
-    "react-refresh": "^0.10.0",
    "rimraf": "^3.0.2",
    "shell-escape": "^0.2.0",
    "simple-proxy-agent": "^1.1.0",
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -173,7 +173,8 @@ we don't have an account and should hide them. No account == no guest account ei
        <img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
    </a>
    <h1 class="mx_Header_title">_t("Welcome to Element")</h1>
-    <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h4>
+    <!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
+    <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo")</h4>
    <div class="mx_ButtonGroup">
        <div class="mx_ButtonRow">
            <a href="#/login" class="mx_ButtonParent mx_ButtonSignIn mx_Button_iconSignIn">
--- a/res/welcome/images/matrix.svg
+++ b/res/welcome/images/matrix.svg
@@ -1,153 +0,0 @@
-<?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>
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -32,7 +32,6 @@ cd react-sdk
 yarn link
 yarn link matrix-js-sdk
 yarn --network-timeout=100000 install
-yarn reskindex
 cd ../

 echo "Setting up element-web with react-sdk and js-sdk packages"
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -92,16 +92,8 @@ pushd matrix-react-sdk
 yarn link
 yarn link matrix-js-sdk
 yarn install --pure-lockfile
-yarn reskindex
 popd

 yarn link matrix-react-sdk

 ##############################
-
-# Link the reskindex binary in place: if we used `yarn link`,
-# Yarn would do this for us, but we don't because we'd have
-# to define the Yarn binary prefix somewhere so it could put the
-# intermediate symlinks there. Instead, we do it ourselves.
-mkdir -p node_modules/.bin
-ln -sfv ../matrix-react-sdk/scripts/reskindex.js node_modules/.bin/reskindex
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -27,7 +27,8 @@ interface IProps {
 }

 const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
-    const { brand, mobileBuilds } = SdkConfig.get();
+    const brand = SdkConfig.get("brand");
+    const mobileBuilds = SdkConfig.get("mobile_builds");

    let ios = null;
    const iosCustomUrl = mobileBuilds?.ios;
--- a/src/components/structures/VectorEmbeddedPage.tsx
+++ b/src/components/structures/VectorEmbeddedPage.tsx
@@ -1,34 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-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 EmbeddedPage from 'matrix-react-sdk/src/components/structures/EmbeddedPage';
-import sanitizeHtml from 'sanitize-html';
-import { _t } from 'matrix-react-sdk/src/languageHandler';
-
-export default class VectorEmbeddedPage extends EmbeddedPage {
-    static replaces = 'EmbeddedPage';
-
-    // we're overriding the base component here, for Element-specific tweaks
-    translate(s: string) {
-        s = sanitizeHtml(_t(s));
-        // ugly fix for https://github.com/vector-im/element-web/issues/4243
-        // eslint-disable-next-line max-len
-        s = s.replace(/\[matrix\]/, '<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="welcome/images/matrix.svg"/></a>');
-        return s;
-    }
-}
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -20,17 +20,13 @@ import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 import { _t } from 'matrix-react-sdk/src/languageHandler';

 const VectorAuthFooter = () => {
-    const brandingConfig = SdkConfig.get().branding;
-    let links = [
+    const brandingConfig = SdkConfig.getObject("branding");
+    const links = brandingConfig?.get("auth_footer_links") ?? [
        { "text": "Blog", "url": "https://element.io/blog" },
        { "text": "Twitter", "url": "https://twitter.com/element_hq" },
        { "text": "GitHub", "url": "https://github.com/vector-im/element-web" },
    ];

-    if (brandingConfig && brandingConfig.authFooterLinks) {
-        links = brandingConfig.authFooterLinks;
-    }
-
    const authFooterLinks = [];
    for (const linkEntry of links) {
        authFooterLinks.push(
@@ -48,6 +44,4 @@ const VectorAuthFooter = () => {
    );
 };

-VectorAuthFooter.replaces = 'AuthFooter';
-
 export default VectorAuthFooter;
--- a/src/components/views/auth/VectorAuthHeaderLogo.tsx
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -19,14 +19,9 @@ import React from 'react';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';

 export default class VectorAuthHeaderLogo extends React.PureComponent {
-    static replaces = 'AuthHeaderLogo';
-
-    render() {
-        const brandingConfig = SdkConfig.get().branding;
-        let logoUrl = "themes/element/img/logos/element-logo.svg";
-        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
-            logoUrl = brandingConfig.authHeaderLogoUrl;
-        }
+    public render() {
+        const brandingConfig = SdkConfig.getObject("branding");
+        const logoUrl = brandingConfig?.get("auth_header_logo_url") ?? "themes/element/img/logos/element-logo.svg";

        return (
            <div className="mx_AuthHeaderLogo">
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -15,35 +15,34 @@ limitations under the License.
 */

 import React, { CSSProperties } from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';

-export default class VectorAuthPage extends React.PureComponent {
-    static replaces = 'AuthPage';
+import VectorAuthFooter from "./VectorAuthFooter";

-    static welcomeBackgroundUrl;
+export default class VectorAuthPage extends React.PureComponent {
+    private static welcomeBackgroundUrl;

    // cache the url as a static to prevent it changing without refreshing
-    static getWelcomeBackgroundUrl() {
+    private static getWelcomeBackgroundUrl() {
        if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;

-        const brandingConfig = SdkConfig.get().branding;
+        const brandingConfig = SdkConfig.getObject("branding");
        VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg";
-        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
-            if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) {
-                const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length);
-                VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl[index];
+
+        const configuredUrl = brandingConfig?.get("welcome_background_url");
+        if (configuredUrl) {
+            if (Array.isArray(configuredUrl)) {
+                const index = Math.floor(Math.random() * configuredUrl.length);
+                VectorAuthPage.welcomeBackgroundUrl = configuredUrl[index];
            } else {
-                VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl;
+                VectorAuthPage.welcomeBackgroundUrl = configuredUrl;
            }
        }

        return VectorAuthPage.welcomeBackgroundUrl;
    }

-    render() {
-        const AuthFooter = sdk.getComponent('auth.AuthFooter');
-
+    public render() {
        const pageStyle = {
            background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
        };
@@ -78,7 +77,7 @@ export default class VectorAuthPage extends React.PureComponent {
                        { this.props.children }
                    </div>
                </div>
-                <AuthFooter />
+                <VectorAuthFooter />
            </div>
        );
    }
--- a/src/header
+++ b/src/header
@@ -1,15 +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.
-*/
--- a/src/i18n/strings/bn.json
+++ b/src/i18n/strings/bn.json
@@ -0,0 +1,4 @@
+{
+    "Dismiss": "সরাও",
+    "Open": "খোলা"
+}
--- a/src/i18n/strings/bn_BD.json
+++ b/src/i18n/strings/bn_BD.json
@@ -1 +1,3 @@
-{}
+{
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ভুল পছন্দসমূহ: এগয়লোর যেকোনো একটি কেবল নির্দিষ্ট করা যাবে default_server_config, default_server_name বা default_hs_url।"
+}
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@@ -31,5 +31,6 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizirani, šifrirani razgovor &amp; suradnja pokrenuta [matrix]",
    "Sign In": "Prijavite se",
    "Create Account": "Otvori račun",
-    "Explore rooms": "Istražite sobe"
+    "Explore rooms": "Istražite sobe",
+    "Use %(brand)s on mobile": "Koristi %(brand)s na mobitelu"
 }
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
    "Switch to space by number": "Přepnout na prostor podle čísla",
    "Next recently visited room or community": "Další nedávno navštívená místnost nebo komunita",
-    "Previous recently visited room or community": "Nedávno navštívená místnost nebo komunita"
+    "Previous recently visited room or community": "Nedávno navštívená místnost nebo komunita",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo"
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
    "Switch to space by number": "Zum n-ten Space wechseln",
    "Next recently visited room or community": "Nächster kürzlich besuchter Raum",
-    "Previous recently visited room or community": "Vorheriger kürzlich besuchter Raum"
+    "Previous recently visited room or community": "Vorheriger kürzlich besuchter Raum",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo"
 }
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -26,7 +26,7 @@
    "Go to element.io": "Go to element.io",
    "Failed to start": "Failed to start",
    "Welcome to Element": "Welcome to Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo",
    "Sign In": "Sign In",
    "Create Account": "Create Account",
    "Explore rooms": "Explore rooms"
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2,10 +2,10 @@
    "Dismiss": "Rezigni",
    "powered by Matrix": "povigita per Matrix",
    "Unknown device": "Nekonata aparato",
-    "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por ekranvidadi.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por ekran-kundivide alvoki.",
    "Welcome to Element": "Bonvenon al Element",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Malcentra, ĉifrita babilado &amp; kunlaboro povigita per [matrix]",
-    "Sign In": "Saluti",
+    "Sign In": "Ensaluti",
    "Create Account": "Krei konton",
    "Explore rooms": "Esplori ĉambrojn",
    "Unexpected error preparing the app. See console for details.": "Neatendita eraro okazis dum la preparado de la aplikaĵo. Rigardu la konzolon por detaloj.",
@@ -13,16 +13,16 @@
    "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.",
    "The message from the parser is: %(message)s": "La mesaĝo el la analizilo estas: %(message)s",
    "Invalid JSON": "Nevalida JSON",
-    "Go to your browser to complete Sign In": "Iru al via foliumilo por fini la saluton",
+    "Go to your browser to complete Sign In": "Iru al via retumilo por finpretigi la ensaluton",
    "Open user settings": "Malfermi agordojn de uzanto",
    "Unable to load config file: please refresh the page to try again.": "Ne povas enlegi agordan dosieron: bonvolu reprovi per aktualigo de la paĝo.",
    "Previous/next recently visited room or community": "Antaŭa/sekva freŝe vizitita ĉambro aŭ komunumo",
    "Missing indexeddb worker script!": "Mankas fonskripto «indexeddb»!",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s labortabla (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Unsupported browser": "Nesubtenata foliumilo",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali foliumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Vi povas daŭre uzadi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkcios, kaj la aspekto de la aplikaĵo eble ne estos ĝusta.",
+    "Unsupported browser": "Nesubtenata retumilo",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali retumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Vi povas daŭre uzi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkciu, kaj la aspekto de la aplikaĵo eble ne estu ĝusta.",
    "I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
    "Go to element.io": "Iri al element.io",
    "Failed to start": "Malsukcesis starti",
@@ -30,9 +30,10 @@
    "Open": "Malfermi",
    "Your Element is misconfigured": "Via Elemento estas misagordita",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Via agordaro de Elemento enhavas nevalidajn datumojn de JSON. Bonvolu korekti la problemon kaj aktualigi la paĝon.",
-    "Your browser can't run %(brand)s": "Via foliumilo ne povas ruli %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uzas specialajn funkciojn de foliumilo, kiujn via nuna foliumilo ne subtenas.",
+    "Your browser can't run %(brand)s": "Via retumilo ne povas ruli %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uzas specialajn funkciojn de retumilo, kiujn via nuna retumilo ne subtenas.",
    "Powered by Matrix": "Povigata de Matrix",
-    "Use %(brand)s on mobile": "Uzi %(brand)s telefone",
-    "Switch to space by number": "Baskuli al aro laŭ numero"
+    "Use %(brand)s on mobile": "Uzi %(brand)s poŝtelefone",
+    "Switch to space by number": "Baskuli al aro laŭ numero",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Malcentralizita kaj ĉifrita babilejo; kunlaboro danke al $matrixLogo"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -34,5 +34,6 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
    "Powered by Matrix": "Funciona con Matrix",
    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil",
-    "Switch to space by number": "Cambiar a espacio por número"
+    "Switch to space by number": "Cambiar a espacio por número",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo"
 }
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes",
    "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel",
    "Next recently visited room or community": "Järgmine hiljuti külastatud jututuba või kogukond",
-    "Previous recently visited room or community": "Eelmine hiljuti külastatud jututuba või kogukond"
+    "Previous recently visited room or community": "Eelmine hiljuti külastatud jututuba või kogukond",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone",
    "Switch to space by number": "Afficher un espace par son numéro",
    "Next recently visited room or community": "Prochain salon ou communauté récemment visité",
-    "Previous recently visited room or community": "Salon ou communauté précédemment visité"
+    "Previous recently visited room or community": "Salon ou communauté précédemment visité",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo"
 }
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Utiliza %(brand)s no móbil",
    "Switch to space by number": "Cambiar a espazo polo número",
    "Next recently visited room or community": "Seguinte sala ou comunidade visitada recentemente",
-    "Previous recently visited room or community": "Sala ou Comunidade visitada recentemente"
+    "Previous recently visited room or community": "Sala ou Comunidade visitada recentemente",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversas &amp; colaboración descentralizadas e cifradas grazas a $matrixLogo"
 }
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -11,7 +11,7 @@
    "Open user settings": "פתח הגדרות משתמש",
    "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
    "Explore rooms": "גלה חדרים",
-    "Create Account": "יצירת חשבון",
+    "Create Account": "משתמש חדש",
    "Sign In": "התחברות",
    "Previous/next recently visited room or community": "הבא\\קודם חדרים וקהילות שביקרתם לאחרונה",
    "Open": "פתח",
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -7,5 +7,28 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[मैट्रिक्स] द्वारा संचालित विकेंद्रीकृत, एन्क्रिप्टेड चैट और सहयोगिता",
    "Sign In": "साइन करना",
    "Create Account": "खाता बनाएं",
-    "Explore rooms": "रूम का अन्वेषण करें"
+    "Explore rooms": "रूम का अन्वेषण करें",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।",
+    "Failed to start": "प्रारंभ करने में विफल",
+    "Go to element.io": "element.io पर जाएं",
+    "I understand the risks and wish to continue": "मैं जोखिमों को समझता हूं और जारी रखना चाहता हूं",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "आप अपने वर्तमान ब्राउज़र का उपयोग जारी रख सकते हैं, लेकिन हो सकता है कि कुछ या सभी सुविधाएं काम न करें और एप्लिकेशन का रंगरूप गलत हो सकता है।",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "सर्वोत्तम अनुभव के लिए कृपया <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, या <safariLink>Safari</safariLink> इंस्टॉल करें।",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s उन्नत ब्राउज़र सुविधाओं का उपयोग करते हैं जो आपके वर्तमान ब्राउज़र द्वारा समर्थित नहीं हैं।",
+    "Your browser can't run %(brand)s": "आपका ब्राउज़र %(brand)s को नहीं चला सकता",
+    "Use %(brand)s on mobile": "मोबाइल पर %(brand)s का प्रयोग करें",
+    "Unsupported browser": "असमर्थित ब्राउज़र",
+    "Powered by Matrix": "मैट्रिक्स द्वारा संचालित",
+    "Go to your browser to complete Sign In": "साइन इन पूरा करने के लिए अपने ब्राउज़र पर जाएं",
+    "Open": "खुला",
+    "Download Completed": "डाउनलोड सम्पन्न हुआ",
+    "Unexpected error preparing the app. See console for details.": "ऐप्लिकेशन तैयार करने में अनपेक्षित गड़बड़ी हुई. विवरण के लिए कंसोल देखें।",
+    "Unable to load config file: please refresh the page to try again.": "कॉन्फ़िग फ़ाइल लोड करने में असमर्थ: कृपया पुन: प्रयास करने के लिए पृष्ठ को रीफ़्रेश करें।",
+    "Invalid JSON": "अमान्य JSON",
+    "The message from the parser is: %(message)s": "पार्सर का संदेश है: %(message)s",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "आपके एलीमेंट कॉन्फ़िगरेशन में अमान्य JSON है. कृपया समस्या को ठीक करें और पृष्ठ को पुनः लोड करें।",
+    "Your Element is misconfigured": "आपका तत्व गलत कॉन्फ़िगर किया गया है",
+    "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Mobilon használd ezt: %(brand)s",
    "Switch to space by number": "Tér váltás számmal",
    "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"
+    "Previous recently visited room or community": "Előző nemrég meglátogatott szoba vagy közösség",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Elosztott, titkosított csevegés &amp; együttműködés ezzel: $matrixLogo"
 }
--- a/src/i18n/strings/hy.json
+++ b/src/i18n/strings/hy.json
@@ -0,0 +1,16 @@
+{
+    "Explore rooms": "Փնտրել սենյակներ",
+    "Failed to start": "Չի ստացվում սկսել",
+    "Use %(brand)s on mobile": "Օգտագործում է %(brand)s հեռախոսի վրա",
+    "You need to be using HTTPS to place a screen-sharing call.": "Դուք պետք է օգտագործեք HTTPS միացում որպիսի կարողանաք կատարել էկրանը ցույց տալով զանգ",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s%(osName)s",
+    "Unknown device": "Անծանոթ սարք",
+    "Welcome to Element": "Բարի գալուստ Element",
+    "Your browser can't run %(brand)s": "Ձեր բրաուզերը չի թողարկում %(brand)s",
+    "Unsupported browser": "Չհամապատասխանող բրաուզեր",
+    "Dismiss": "Հեռացնել",
+    "Open": "Բացել",
+    "Unable to load config file: please refresh the page to try again.": "Ֆայլի ներմուծման սխալ․ խնդրում ենք թարմացնել էջը և նորից փորձել։",
+    "Invalid JSON": "Չաշխատող JSON",
+    "Your Element is misconfigured": "Ձեր Element֊ը սխալ է կարգավորված"
+}
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -36,5 +36,6 @@
    "Your Element is misconfigured": "Anda mengatur Element dengan salah",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurasi tidak valid: hanya bisa menentukan satu dari default_server_config, default_server_name, atau default_hs_url.",
    "Next recently visited room or community": "Ruangan atau komunitas berikutnya yang baru saja dilihat",
-    "Previous recently visited room or community": "Ruangan atau komunitas sebelumnya yang baru saja dilihat"
+    "Previous recently visited room or community": "Ruangan atau komunitas sebelumnya yang baru saja dilihat",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Obrolan &amp; kolaborasi terdesentralisasi dan terenkripsi, diberdayakan oleh $matrixLogo"
 }
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -7,22 +7,22 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall og samvinnutól keyrt með [matrix]",
    "Open": "Opna",
    "Unsupported browser": "Óstuddur vafri",
-    "Your browser can't run %(brand)s": "Vafri þinn geta ekki keyrt upp %(brand)s",
+    "Your browser can't run %(brand)s": "Vafrinn þinn getur ekki keyrt %(brand)s",
    "Sign In": "Skrá inn",
    "Create Account": "Búa til notandaaðgang",
    "Explore rooms": "Kanna spjallrásir",
    "Missing indexeddb worker script!": "Að vanta indexeddb vinnumaður tölvuhandrit!",
    "The message from the parser is: %(message)s": "Skilaboðið frá þáttaranum er %(message)s",
    "Invalid JSON": "Ógilt JSON",
-    "Download Completed": "Niðurhali lokið.",
+    "Download Completed": "Niðurhali lokið",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "vinsamlegast setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> fyrir besta reynsluna.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Þú ættir að setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> til að fá sem besta útkomu.",
    "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
-    "Go to element.io": "Farðu á element.io",
+    "Go to element.io": "Fara á element.io",
    "Unexpected error preparing the app. See console for details.": "Óvænt villa við undirbúning forritsins. Sjá nánar á stjórnskjá.",
    "Failed to start": "Mistókst að ræsa",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Þú getur haldið áfram að nota núverandi vafra, en sumar eða allir eiginleikar virka ekki og útlit og tilfinning forritsins geta verið röng.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af núverandi vafra þínum.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Þú getur haldið áfram að nota núverandi vafra, en sumir eða allir eiginleikar virka mögulega ekki rétt, auk þess sem útlit og hegðun forritsins geta verið röng.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af vafranum þínum.",
    "Powered by Matrix": "Keyrt með Matrix",
    "Go to your browser to complete Sign In": "Farðu í vafrann þinn til að ljúka innskráningu",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop fyrir vinnutölvur (%(platformName)s)",
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Nota %(brand)s í síma",
    "Next recently visited room or community": "Næsta nýlega heimsótt rými eða samfélag",
    "Previous recently visited room or community": "Fyrra nýlega heimsótt rými eða samfélag",
-    "Switch to space by number": "Skipta yfir í rými með númeri"
+    "Switch to space by number": "Skipta yfir í rými með númeri",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo"
 }
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Usa %(brand)s su mobile",
    "Switch to space by number": "Passa allo spazio per numero",
    "Next recently visited room or community": "Prossima stanza o comunità visitata di recente",
-    "Previous recently visited room or community": "Precedente stanza o comunità visitata di recente"
+    "Previous recently visited room or community": "Precedente stanza o comunità visitata di recente",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -10,14 +10,14 @@
    "Sign In": "サインイン",
    "Create Account": "アカウントを作成",
    "Explore rooms": "ルームを探索",
-    "The message from the parser is: %(message)s": "パーザーのメッセージ：%(message)s",
+    "The message from the parser is: %(message)s": "パーサーのメッセージ：%(message)s",
    "Invalid JSON": "不正なJSON",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "不正な設定：default_server_config、default_server_name、またはdefault_hs_urlのいずれか一つのみを指定できます。",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "最高のユーザー体験を得るためには、<chromeLink>Chrome</chromeLink>か<firefoxLink>Firefox</firefoxLink>、もしくは<safariLink>Safari</safariLink>をインストールしてください。",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "現在のブラウザーを使い続けることもできますが、いくつか（もしくは全ての）機能が動作しなかったり、外観が崩れたりする可能性があります。",
    "I understand the risks and wish to continue": "リスクを理解して続行",
    "Missing indexeddb worker script!": "IndexedDBのワーカースクリプトがありません！",
-    "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました：ページを再読み込みしてもう一度お試しください。",
+    "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました：ページを再読み込みして、もう一度やり直してください。",
    "Download Completed": "ダウンロードが完了しました",
    "Open": "開く",
    "Open user settings": "ユーザー設定を開く",
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -1,3 +1,33 @@
 {
-    "Open": "ເປີດ"
+    "Open": "ເປີດ",
+    "Explore rooms": "ສຳຫຼວດບັນດາຫ້ອງ",
+    "Create Account": "ສ້າງບັນຊີ",
+    "Sign In": "ເຂົ້າສູ່ລະບົບ",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "ການສົນທະນາແບບເຂົ້າລະຫັດ ແລະກະຈ່າຍການຄຸ້ມຄອງ &amp; ການຮ່ວມມື້ ແລະສະໜັບສະໜູນໂດຍ $matrixLogo",
+    "Welcome to Element": "ຍິນດີຕ້ອນຮັບ",
+    "Failed to start": "ບໍ່ສາມາດເປີດໄດ້",
+    "Go to element.io": "ໄປຫາ element.io",
+    "I understand the risks and wish to continue": "ຂ້າພະເຈົ້າເຂົ້າໃຈຄວາມສ່ຽງ ແລະຢາກສືບຕໍ່",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "ທ່ານສາມາດສືບຕໍ່ນຳໃຊ້ບຣາວເຊີປັດຈຸບັນຂອງເຈົ້າໄດ້, ແຕ່ບາງຄຸນສົມບັດ ຫຼື ທັງໝົດອາດຈະບໍ່ເຮັດວຽກ ແລະ ລັກສະນະ ແລະ ຄວາມຮູ້ສຶກຂອງແອັບພລິເຄຊັນອາດບໍ່ຖືກຕ້ອງ.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "ກະລຸນາຕິດຕັ້ງ <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> ສຳລັບປະສົບການທີ່ດີທີ່ສຸດ.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s ໃຊ້ຄຸນສົມບັດຂອງບຣາວເຊີຂັ້ນສູງທີ່ບຼາວເຊີປັດຈຸບັນຂອງທ່ານຍັງບໍ່ຮອງຮັບ.",
+    "Your browser can't run %(brand)s": "ບຣາວເຊີຂອງທ່ານບໍ່ສາມາດແລ່ນ %(brand)s ໄດ້",
+    "Unsupported browser": "ບໍ່ຮັບຮອງເວັບບຣາວເຊີນີ້",
+    "Use %(brand)s on mobile": "ໃຊ້ມືຖື %(brand)s",
+    "Powered by Matrix": "ສະໜັບສະໜູນໂດຍ Matrix",
+    "You need to be using HTTPS to place a screen-sharing call.": "ທ່ານຈໍາເປັນຕ້ອງໃຊ້ HTTPS ເພື່ອໃຊ້ການແບ່ງປັນຫນ້າຈໍ.",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Unknown device": "ທີ່ບໍ່ຮູ້ຈັກອຸປະກອນນີ້",
+    "Go to your browser to complete Sign In": "ໄປທີ່ໜ້າເວັບຂອງທ່ານເພື່ອເຂົ້າສູ່ລະບົບ",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s ຕັ້ງໂຕະ (%(platformName)s)",
+    "Dismiss": "ຍົກເລີກ",
+    "Download Completed": "ດາວໂຫຼດສຳເລັດແລ້ວ",
+    "Unexpected error preparing the app. See console for details.": "ເກີດຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດໃນການກະກຽມແອັບຯ. ເບິ່ງ console ສໍາລັບລາຍລະອຽດ.",
+    "Unable to load config file: please refresh the page to try again.": "ບໍ່ສາມາດໂຫຼດໄຟລ໌ config ໄດ້: ກະລຸນາໂຫຼດໜ້ານີ້ຄືນໃໝ່ເພື່ອລອງອີກຄັ້ງ.",
+    "Invalid JSON": "JSON ບໍ່ຖືກຕ້ອງ",
+    "The message from the parser is: %(message)s": "ຂໍ້ຄວາມຈາກຕົວປ່ຽນແມ່ນ: %(message)s",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານມີຄ່າ JSON ທີ່ບໍ່ຖືກຕ້ອງ. ກະລຸນາແກ້ໄຂບັນຫາ ແລະໂຫຼດໜ້ານີ້ຄືນໃໝ່.",
+    "Your Element is misconfigured": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານບໍ່ຖືກຕ້ອງ",
+    "Invalid configuration: no default server specified.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ສາມາດລະບຸໄດ້ພຽງແຕ່ອັນດຽວຂອງ default_server_config, default_server_name, or default_hs_url."
 }
--- a/src/i18n/strings/ne.json
+++ b/src/i18n/strings/ne.json
@@ -1 +1,33 @@
-{}
+{
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "सर्वोत्तम अनुभव के लिए कृपया <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, या <safariLink>Safari</safariLink> इंस्टॉल करें।",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s उन्नत ब्राउज़र सुविधाओं का उपयोग करते हैं जो आपके वर्तमान ब्राउज़र द्वारा समर्थित नहीं हैं।",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)",
+    "Sign In": "साइन करना",
+    "Explore rooms": "रूम का अन्वेषण करें",
+    "Create Account": "खाता बनाएं",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "विकेन्द्रीकृत, एन्क्रिप्टेड च्याट र $matrixLogo द्वारा संचालित सहयोग",
+    "Welcome to Element": "Element में आपका स्वागत है",
+    "Failed to start": "प्रारंभ करने में विफल",
+    "Go to element.io": "element.io पर जाएं",
+    "I understand the risks and wish to continue": "मैं जोखिमों को समझता हूं और जारी रखना चाहता हूं",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "आप अपने वर्तमान ब्राउज़र का उपयोग जारी रख सकते हैं, लेकिन हो सकता है कि कुछ या सभी सुविधाएं काम न करें और एप्लिकेशन का रंगरूप गलत हो सकता है।",
+    "Your browser can't run %(brand)s": "आपका ब्राउज़र %(brand)s को नहीं चला सकता",
+    "Unsupported browser": "असमर्थित ब्राउज़र",
+    "Use %(brand)s on mobile": "मोबाइल पर %(brand)s का प्रयोग करें",
+    "Powered by Matrix": "मैट्रिक्स द्वारा संचालित",
+    "You need to be using HTTPS to place a screen-sharing call.": "स्क्रीन साझा की कॉल करने के लिए आपको HTTPS का उपयोग करने की आवश्यकता है।",
+    "Unknown device": "अज्ञात यन्त्र",
+    "Go to your browser to complete Sign In": "साइन इन पूरा करने के लिए अपने ब्राउज़र पर जाएं",
+    "Dismiss": "खारिज",
+    "Open": "खुला",
+    "Download Completed": "डाउनलोड सम्पन्न हुआ",
+    "Unexpected error preparing the app. See console for details.": "ऐप्लिकेशन तैयार करने में अनपेक्षित गड़बड़ी हुई. विवरण के लिए कंसोल देखें।",
+    "Unable to load config file: please refresh the page to try again.": "कॉन्फ़िग फ़ाइल लोड करने में असमर्थ: कृपया पुन: प्रयास करने के लिए पृष्ठ को रीफ़्रेश करें।",
+    "Invalid JSON": "अमान्य JSON",
+    "The message from the parser is: %(message)s": "पार्सर का संदेश है: %(message)s",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "आपके एलीमेंट कॉन्फ़िगरेशन में अमान्य JSON है. कृपया समस्या को ठीक करें और पृष्ठ को पुनः लोड करें।",
+    "Your Element is misconfigured": "आपका तत्व गलत कॉन्फ़िगर किया गया है",
+    "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।"
+}
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -7,7 +7,7 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentrale en versleutelde chat &amp; samenwerken dankzij [matrix]",
    "Sign In": "Inloggen",
    "Create Account": "Registreren",
-    "Explore rooms": "Kamers verkennen",
+    "Explore rooms": "Kamers ontdekken",
    "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
    "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
    "Switch to space by number": "Wissel naar Space met nummer",
    "Next recently visited room or community": "Volgende recent bezochte kamer of community",
-    "Previous recently visited room or community": "Vorige recent bezochte kamer of community"
+    "Previous recently visited room or community": "Vorige recent bezochte kamer of community",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Usar %(brand)s em celular",
    "Switch to space by number": "Trocar para espaço por número",
    "Next recently visited room or community": "Próxima sala ou comunidade recentemente visitada",
-    "Previous recently visited room or community": "Anterior sala ou comunidade recentemente visitada"
+    "Previous recently visited room or community": "Anterior sala ou comunidade recentemente visitada",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado & colaboração, powered by $matrixLogo"
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -12,7 +12,7 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: можно указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
    "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.",
    "The message from the parser is: %(message)s": "Сообщение из парсера: %(message)s",
-    "Invalid JSON": "Нерабочий JSON",
+    "Invalid JSON": "Неверный JSON",
    "Go to your browser to complete Sign In": "Перейдите в браузер для завершения входа",
    "Open user settings": "Открыть настройки пользователя",
    "Missing indexeddb worker script!": "Отсутствует скрипт воркера для indexeddb!",
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Воспользуйтесь %(brand)s на мобильном телефоне",
    "Switch to space by number": "Переключение на пространство по номеру",
    "Next recently visited room or community": "Следующая недавно посещенная комната или сообщество",
-    "Previous recently visited room or community": "Предыдущая недавно посещенная комната или сообщество"
+    "Previous recently visited room or community": "Предыдущая недавно посещенная комната или сообщество",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализованное, зашифрованное общение и сотрудничество на основе $matrixLogo"
 }
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Používať %(brand)s pri mobilných zariadeniach",
    "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"
+    "Previous recently visited room or community": "Predchádzajúca nedávno navštívená miestnosť alebo komunita",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Përdor %(brand)s në celular",
    "Switch to space by number": "Kalo te hapësira me numrin",
    "Next recently visited room or community": "Dhomë ose bashkësi e vizituar më parë pasuese",
-    "Previous recently visited room or community": "Dhomë ose bashkësi e vizituar më parë e mëparshme"
+    "Previous recently visited room or community": "Dhomë ose bashkësi e vizituar më parë e mëparshme",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në $matrixLogo"
 }
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Använd %(brand)s på mobilen",
    "Switch to space by number": "Byt till utrymme med nummer",
    "Previous recently visited room or community": "Tidigare nyligen besökta rum eller gemenskap",
-    "Next recently visited room or community": "Nästa nyligen besökta rum eller gemenskap"
+    "Next recently visited room or community": "Nästa nyligen besökta rum eller gemenskap",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt &amp; samarbete som drivs av $matrixLogo"
 }
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -35,5 +35,6 @@
    "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!",
    "Use %(brand)s on mobile": "Mobilde %(brand)s kullan",
    "Switch to space by number": "Sayı ile belirtilen alana geç",
-    "Previous recently visited room or community": "En son ziyaret edilen oda veya topluluk"
+    "Previous recently visited room or community": "En son ziyaret edilen oda veya topluluk",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo tarafından merkeziyetsiz, şifrelenmiş sohbet &amp; iş birliği"
 }
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному",
    "Switch to space by number": "Перейдіть до простору за номером",
    "Next recently visited room or community": "Наступна нещодавно відвідана кімната або спільнота",
-    "Previous recently visited room or community": "Попередня нещодавно відвідана кімната або спільнота"
+    "Previous recently visited room or community": "Попередня нещодавно відвідана кімната або спільнота",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo"
 }
--- a/src/i18n/strings/uz.json
+++ b/src/i18n/strings/uz.json
@@ -1 +1,6 @@
-{}
+{
+    "Create Account": "Ro'yxatdan o'tish",
+    "Sign In": "Kirish",
+    "Dismiss": "Bekor qilish",
+    "Open": "Ochiq"
+}
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -36,5 +36,6 @@
    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s",
    "Switch to space by number": "依數字切換至空間",
    "Next recently visited room or community": "下一個近期造訪過的聊天室或社群",
-    "Previous recently visited room or community": "前一個近期造訪過的聊天室或社群"
+    "Previous recently visited room or community": "前一個近期造訪過的聊天室或社群",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天與協作，威力本源 $matrixLogo"
 }
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -18,81 +18,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+// To ensure we load the browser-request version
+import "matrix-js-sdk"; // eslint-disable-line no-restricted-imports
+
 import React from 'react';
-import * as sdk from 'matrix-react-sdk/src/index';
 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
 import { _td, newTranslatableError } from 'matrix-react-sdk/src/languageHandler';
 import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
 import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
 import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
 import SdkConfig, { parseSsoRedirectOptions } from "matrix-react-sdk/src/SdkConfig";
+import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 import { logger } from "matrix-js-sdk/src/logger";
 import { createClient } from "matrix-js-sdk/src/matrix";
+import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
+import MatrixChat from "matrix-react-sdk/src/components/structures/MatrixChat";

-import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
-import { parseQs, parseQsFromFragment } from './url_utils';
+import { parseQs } from './url_utils';
 import VectorBasePlatform from "./platform/VectorBasePlatform";
+import { getScreenFromLocation, init as initRouting, onNewScreen } from "./routing";

 // add React and ReactPerf to the global namespace, to make them easier to access via the console
 // this incidentally means we can forget our React imports in JSX files without penalty.
 window.React = React;

-let lastLocationHashSet: string = null;
-
 logger.log(`Application is running in ${process.env.NODE_ENV} mode`);

 window.matrixLogger = logger;

-// Parse the given window.location and return parameters that can be used when calling
-// MatrixChat.showScreen(screen, params)
-function getScreenFromLocation(location: Location) {
-    const fragparts = parseQsFromFragment(location);
-    return {
-        screen: fragparts.location.substring(1),
-        params: fragparts.params,
-    };
-}
-
-// Here, we do some crude URL analysis to allow
-// deep-linking.
-function routeUrl(location: Location) {
-    if (!window.matrixChat) return;
-
-    logger.log("Routing URL ", location.href);
-    const s = getScreenFromLocation(location);
-    (window.matrixChat as MatrixChatType).showScreen(s.screen, s.params);
-}
-
-function onHashChange(ev: HashChangeEvent) {
-    if (decodeURIComponent(window.location.hash) === lastLocationHashSet) {
-        // we just set this: no need to route it!
-        return;
-    }
-    routeUrl(window.location);
-}
-
-// This will be called whenever the SDK changes screens,
-// so a web page can update the URL bar appropriately.
-function onNewScreen(screen: string, replaceLast = false) {
-    logger.log("newscreen " + screen);
-    const hash = '#/' + screen;
-    lastLocationHashSet = hash;
-
-    // if the new hash is a substring of the old one then we are stripping fields e.g `via` so replace history
-    if (screen.startsWith("room/") &&
-        window.location.hash.includes("/$") === hash.includes("/$") && // only if both did or didn't contain event link
-        window.location.hash.startsWith(hash)
-    ) {
-        replaceLast = true;
-    }
-
-    if (replaceLast) {
-        window.location.replace(hash);
-    } else {
-        window.location.assign(hash);
-    }
-}
-
 // We use this to work out what URL the SDK should
 // pass through when registering to allow the user to
 // click back to the client having registered.
@@ -141,8 +94,7 @@ function onTokenLoginCompleted() {
 }

 export async function loadApp(fragParams: {}) {
-    window.addEventListener('hashchange', onHashChange);
-
+    initRouting();
    const platform = PlatformPeg.get();

    const params = parseQs(window.location);
@@ -154,6 +106,7 @@ export async function loadApp(fragParams: {}) {

    // Don't bother loading the app until the config is verified
    const config = await verifyServerConfig();
+    const snakedConfig = new SnakedObject<IConfigOptions>(config);

    // Before we continue, let's see if we're supposed to do an SSO redirect
    const [userId] = await Lifecycle.getStoredSessionOwner();
@@ -169,8 +122,8 @@ export async function loadApp(fragParams: {}) {
    if (!hasPossibleToken && !isReturningFromSso && autoRedirect) {
        logger.log("Bypassing app load to redirect to SSO");
        const tempCli = createClient({
-            baseUrl: config['validated_server_config'].hsUrl,
-            idBaseUrl: config['validated_server_config'].isUrl,
+            baseUrl: config.validated_server_config.hsUrl,
+            idBaseUrl: config.validated_server_config.isUrl,
        });
        PlatformPeg.get().startSingleSignOn(tempCli, "sso", `/${getScreenFromLocation(window.location).screen}`);

@@ -180,9 +133,9 @@ export async function loadApp(fragParams: {}) {
        return;
    }

-    const defaultDeviceName = config['defaultDeviceDisplayName'] ?? platform.getDefaultDeviceDisplayName();
+    const defaultDeviceName = snakedConfig.get("default_device_display_name")
+        ?? platform.getDefaultDeviceDisplayName();

-    const MatrixChat = sdk.getComponent('structures.MatrixChat');
    return <MatrixChat
        onNewScreen={onNewScreen}
        makeRegistrationUrl={makeRegistrationUrl}
@@ -196,7 +149,7 @@ export async function loadApp(fragParams: {}) {
    />;
 }

-async function verifyServerConfig() {
+async function verifyServerConfig(): Promise<IConfigOptions> {
    let validatedConfig;
    try {
        logger.log("Verifying homeserver configuration");
--- a/src/vector/getconfig.ts
+++ b/src/vector/getconfig.ts
@@ -16,9 +16,11 @@ limitations under the License.

 import request from 'browser-request';

+import type { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
+
 // Load the config file. First try to load up a domain-specific config of the
 // form "config.$domain.json" and if that fails, fall back to config.json.
-export async function getVectorConfig(relativeLocation='') {
+export async function getVectorConfig(relativeLocation=''): Promise<IConfigOptions> {
    if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/';

    const specificConfigPromise = getConfig(`${relativeLocation}config.${document.domain}.json`);
@@ -30,9 +32,9 @@ export async function getVectorConfig(relativeLocation='') {
        if (Object.keys(configJson).length === 0) {
            throw new Error(); // throw to enter the catch
        }
-        return configJson;
+        return configJson as IConfigOptions;
    } catch (e) {
-        return await generalConfigPromise;
+        return await generalConfigPromise as IConfigOptions;
    }
 }

--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -110,7 +110,6 @@ async function start() {
        preparePlatform,
        loadOlm,
        loadConfig,
-        loadSkin,
        loadLanguage,
        loadTheme,
        loadApp,
@@ -160,10 +159,9 @@ async function start() {
        const loadLanguagePromise = loadLanguage();
        // as quickly as we possibly can, set a default theme...
        const loadThemePromise = loadTheme();
-        const loadSkinPromise = loadSkin();

        // await things settling so that any errors we have to render have features like i18n running
-        await settled(loadSkinPromise, loadThemePromise, loadLanguagePromise);
+        await settled(loadThemePromise, loadLanguagePromise);

        let acceptBrowser = supportedBrowser;
        if (!acceptBrowser && window.localStorage) {
@@ -211,7 +209,6 @@ async function start() {
        // assert things started successfully
        // ##################################
        await loadOlmPromise;
-        await loadSkinPromise;
        await loadThemePromise;
        await loadLanguagePromise;

--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -63,7 +63,12 @@ export async function loadConfig() {
    // granular settings are loaded correctly and to avoid duplicating the override logic for the theme.
    //
    // Note: this isn't called twice for some wrappers, like the Jitsi wrapper.
-    SdkConfig.put(await PlatformPeg.get().getConfig() || {});
+    const platformConfig = await PlatformPeg.get().getConfig();
+    if (platformConfig) {
+        SdkConfig.put(platformConfig);
+    } else {
+        SdkConfig.unset(); // clears the config (sets to empty object)
+    }
 }

 export function loadOlm(): Promise<void> {
@@ -122,27 +127,6 @@ export async function loadLanguage() {
    }
 }

-export async function loadSkin() {
-    // Ensure the skin is the very first thing to load for the react-sdk. We don't even want to reference
-    // the SDK until we have to in imports.
-    logger.log("Loading skin...");
-    // load these async so that its code is not executed immediately and we can catch any exceptions
-    const [sdk, skin] = await Promise.all([
-        import(
-            /* webpackChunkName: "matrix-react-sdk" */
-            /* webpackPreload: true */
-            "matrix-react-sdk"),
-        import(
-            /* webpackChunkName: "element-web-component-index" */
-            /* webpackPreload: true */
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore - this module is generated so may fail lint
-            "../component-index"),
-    ]);
-    sdk.loadSkin(skin);
-    logger.log("Skin loaded!");
-}
-
 export async function loadTheme() {
    setTheme();
 }
--- a/src/vector/jitsi/index.scss
+++ b/src/vector/jitsi/index.scss
@@ -56,6 +56,10 @@ body, html {
    position: absolute;
    height: 100%;
    width: 100%;
+
+    // Hidden by default to avoid flashing the prejoin screen at the user when
+    // we're supposed to skip it anyways
+    visibility: hidden;
 }

 .joinConferenceFloating {
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -23,6 +23,8 @@ import {
 } from "matrix-widget-api";
 import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/ElementWidgetActions";
 import { logger } from "matrix-js-sdk/src/logger";
+import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
+import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";

 import { getVectorConfig } from "../getconfig";

@@ -49,11 +51,14 @@ let roomId: string;
 let openIdToken: IOpenIDCredentials;
 let roomName: string;
 let startAudioOnly: boolean;
+let isVideoChannel: boolean;

 let widgetApi: WidgetApi;
 let meetApi: any; // JitsiMeetExternalAPI
 let skipOurWelcomeScreen = false;

+const ack = (ev: CustomEvent<IWidgetApiRequest>) => widgetApi.transport.reply(ev.detail, {});
+
 (async function() {
    try {
        // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with
@@ -116,20 +121,20 @@ let skipOurWelcomeScreen = false;
        roomId = qsParam('roomId', true);
        roomName = qsParam('roomName', true);
        startAudioOnly = qsParam('isAudioOnly', true) === "true";
+        isVideoChannel = qsParam('isVideoChannel', true) === "true";

        // We've reached the point where we have to wait for the config, so do that then parse it.
-        const instanceConfig = await configPromise;
-        skipOurWelcomeScreen = instanceConfig?.['jitsiWidget']?.['skipBuiltInWelcomeScreen'] || false;
+        const instanceConfig = new SnakedObject<IConfigOptions>((await configPromise) ?? <IConfigOptions>{});
+        const jitsiConfig = instanceConfig.get("jitsi_widget") ?? {};
+        skipOurWelcomeScreen = (new SnakedObject<IConfigOptions["jitsi_widget"]>(jitsiConfig))
+            .get("skip_built_in_welcome_screen") ?? false;

-        // If we're meant to skip our screen, skip to the part where we show Jitsi instead of us.
+        // Either reveal the prejoin screen, or skip straight to Jitsi depending on the config.
        // We don't set up the call yet though as this might lead to failure without the widget API.
-        if (skipOurWelcomeScreen) {
-            toggleConferenceVisibility(true);
-        }
+        toggleConferenceVisibility(skipOurWelcomeScreen);

        if (widgetApi) {
            await readyPromise;
-            await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen

            // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
            if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
@@ -138,12 +143,49 @@ let skipOurWelcomeScreen = false;
                logger.log("Got OpenID Connect token");
            }

-            // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/element-web/issues/12795)
-
+            widgetApi.on(`action:${ElementWidgetActions.JoinCall}`,
+                (ev: CustomEvent<IWidgetApiRequest>) => {
+                    const { audioDevice, videoDevice } = ev.detail.data;
+                    joinConference(audioDevice as string, videoDevice as string);
+                    ack(ev);
+                },
+            );
            widgetApi.on(`action:${ElementWidgetActions.HangupCall}`,
                (ev: CustomEvent<IWidgetApiRequest>) => {
-                    if (meetApi) meetApi.executeCommand('hangup');
-                    widgetApi.transport.reply(ev.detail, {}); // ack
+                    meetApi?.executeCommand('hangup');
+                    ack(ev);
+                },
+            );
+            widgetApi.on(`action:${ElementWidgetActions.MuteAudio}`,
+                async (ev: CustomEvent<IWidgetApiRequest>) => {
+                    ack(ev);
+                    if (meetApi && !await meetApi.isAudioMuted()) {
+                        meetApi.executeCommand('toggleAudio');
+                    }
+                },
+            );
+            widgetApi.on(`action:${ElementWidgetActions.UnmuteAudio}`,
+                async (ev: CustomEvent<IWidgetApiRequest>) => {
+                    ack(ev);
+                    if (meetApi && await meetApi.isAudioMuted()) {
+                        meetApi.executeCommand('toggleAudio');
+                    }
+                },
+            );
+            widgetApi.on(`action:${ElementWidgetActions.MuteVideo}`,
+                async (ev: CustomEvent<IWidgetApiRequest>) => {
+                    ack(ev);
+                    if (meetApi && !await meetApi.isVideoMuted()) {
+                        meetApi.executeCommand('toggleVideo');
+                    }
+                },
+            );
+            widgetApi.on(`action:${ElementWidgetActions.UnmuteVideo}`,
+                async (ev: CustomEvent<IWidgetApiRequest>) => {
+                    ack(ev);
+                    if (meetApi && await meetApi.isVideoMuted()) {
+                        meetApi.executeCommand('toggleVideo');
+                    }
                },
            );
            widgetApi.on(`action:${ElementWidgetActions.StartLiveStream}`,
@@ -156,7 +198,7 @@ let skipOurWelcomeScreen = false;
                            //rtmpStreamKey: ev.detail.data.rtmpStreamKey,
                            youtubeStreamKey: ev.detail.data.rtmpStreamKey,
                        });
-                        widgetApi.transport.reply(ev.detail, {}); // ack
+                        ack(ev);
                    } else {
                        widgetApi.transport.reply(ev.detail, { error: { message: "Conference not joined" } });
                    }
@@ -170,6 +212,13 @@ let skipOurWelcomeScreen = false;
        }

        enableJoinButton(); // always enable the button
+
+        // Inform the client that we're ready to receive events
+        try {
+            await widgetApi?.transport.send(ElementWidgetActions.WidgetReady, {});
+        } catch (e) {
+            logger.error(e);
+        }
    } catch (e) {
        logger.error("Error setting up Jitsi widget", e);
        document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
@@ -240,7 +289,20 @@ function createJWTToken() {
    );
 }

-function joinConference() { // event handler bound in HTML
+async function notifyHangup() {
+    if (widgetApi) {
+        // We send the hangup event before setAlwaysOnScreen, because the latter
+        // can cause the receiving side to instantly stop listening.
+        try {
+            await widgetApi.transport.send(ElementWidgetActions.HangupCall, {});
+        } finally {
+            await widgetApi.setAlwaysOnScreen(false);
+        }
+    }
+}
+
+// event handler bound in HTML
+function joinConference(audioDevice?: string, videoDevice?: string) {
    let jwt;
    if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
        if (!openIdToken?.access_token) { // eslint-disable-line camelcase
@@ -259,11 +321,20 @@ function joinConference() { // event handler bound in HTML
        "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " +
        "our fragment values and not recognizing the options.",
    );
+
    const options = {
        width: "100%",
        height: "100%",
        parentNode: document.querySelector("#jitsiContainer"),
        roomName: conferenceId,
+        devices: {
+            audioInput: audioDevice,
+            videoInput: videoDevice,
+        },
+        userInfo: {
+            displayName,
+            email: userId,
+        },
        interfaceConfigOverwrite: {
            SHOW_JITSI_WATERMARK: false,
            SHOW_WATERMARK_FOR_GUESTS: false,
@@ -271,41 +342,91 @@ function joinConference() { // event handler bound in HTML
            VIDEO_LAYOUT_FIT: "height",
        },
        configOverwrite: {
+            subject: roomName,
            startAudioOnly,
-        },
+            startWithAudioMuted: !audioDevice,
+            startWithVideoMuted: !videoDevice,
+        } as any,
        jwt: jwt,
    };

+    // Video channel widgets need some more tailored config options
+    if (isVideoChannel) {
+        // Ensure that we skip Jitsi Meet's native prejoin screen, for
+        // deployments that have it enabled
+        options.configOverwrite.prejoinConfig = { enabled: false };
+        // Use a simplified set of toolbar buttons
+        options.configOverwrite.toolbarButtons = [
+            "microphone", "camera", "desktop", "tileview", "hangup",
+        ];
+        // Hide all top bar elements
+        options.configOverwrite.conferenceInfo = { autoHide: [] };
+    }
+
    meetApi = new JitsiMeetExternalAPI(jitsiDomain, options);
-    if (displayName) meetApi.executeCommand("displayName", displayName);
-    if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl);
-    if (userId) meetApi.executeCommand("email", userId);
-    if (roomName) meetApi.executeCommand("subject", roomName);

    // fires once when user joins the conference
    // (regardless of video on or off)
    meetApi.on("videoConferenceJoined", () => {
+        if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl);
+
        if (widgetApi) {
            // ignored promise because we don't care if it works
            // noinspection JSIgnoredPromiseFromCall
            widgetApi.setAlwaysOnScreen(true);
+            widgetApi.transport.send(ElementWidgetActions.JoinCall, {});
        }
+
+        // Video rooms should start in tile mode
+        if (isVideoChannel) meetApi.executeCommand("setTileView", true);
+    });
+
+    meetApi.on("videoConferenceLeft", () => {
+        notifyHangup();
+        meetApi = null;
    });

    meetApi.on("readyToClose", () => {
        switchVisibleContainers();
-
-        if (widgetApi) {
-            // ignored promise because we don't care if it works
-            // noinspection JSIgnoredPromiseFromCall
-            widgetApi.setAlwaysOnScreen(false);
-        }
-
        document.getElementById("jitsiContainer").innerHTML = "";
-        meetApi = null;

        if (skipOurWelcomeScreen) {
            skipToJitsiSplashScreen();
        }
    });
+
+    meetApi.on("errorOccurred", ({ error }) => {
+        if (error.isFatal) {
+            // We got disconnected. Since Jitsi Meet might send us back to the
+            // prejoin screen, we're forced to act as if we hung up entirely.
+            notifyHangup();
+        }
+    });
+
+    meetApi.on("audioMuteStatusChanged", ({ muted }) => {
+        const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio;
+        widgetApi.transport.send(action, {});
+    });
+
+    meetApi.on("videoMuteStatusChanged", ({ muted }) => {
+        if (muted) {
+            // Jitsi Meet always sends a "video muted" event directly before
+            // hanging up, which we need to ignore by padding the timeout here,
+            // otherwise the React SDK will mistakenly think the user turned off
+            // their video by hand
+            setTimeout(() => {
+                if (meetApi) widgetApi.transport.send(ElementWidgetActions.MuteVideo, {});
+            }, 200);
+        } else {
+            widgetApi.transport.send(ElementWidgetActions.UnmuteVideo, {});
+        }
+    });
+
+    ["videoConferenceJoined", "participantJoined", "participantLeft"].forEach(event => {
+        meetApi.on(event, () => {
+            widgetApi?.transport.send(ElementWidgetActions.CallParticipants, {
+                participants: meetApi.getParticipantsInfo(),
+            });
+        });
+    });
 }
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -28,6 +28,7 @@ import BaseEventIndexManager, {
 import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
 import { _t } from 'matrix-react-sdk/src/languageHandler';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
+import { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 import * as rageshake from 'matrix-react-sdk/src/rageshake/rageshake';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
@@ -280,7 +281,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
        this.ipcCall("startSSOFlow", this.ssoID);
    }

-    async getConfig(): Promise<{}> {
+    async getConfig(): Promise<IConfigOptions> {
        return this.ipcCall('getConfig');
    }

--- a/src/vector/platform/VectorBasePlatform.ts
+++ b/src/vector/platform/VectorBasePlatform.ts
@@ -20,6 +20,7 @@ limitations under the License.
 import BasePlatform from 'matrix-react-sdk/src/BasePlatform';
 import { _t } from 'matrix-react-sdk/src/languageHandler';

+import type { IConfigOptions } from "matrix-react-sdk/src/IConfigOptions";
 import { getVectorConfig } from "../getconfig";
 import Favicon from "../../favicon";

@@ -29,7 +30,7 @@ import Favicon from "../../favicon";
 export default abstract class VectorBasePlatform extends BasePlatform {
    protected _favicon: Favicon;

-    async getConfig(): Promise<{}> {
+    async getConfig(): Promise<IConfigOptions> {
        return getVectorConfig();
    }

--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -128,26 +128,22 @@ export default class WebPlatform extends VectorBasePlatform {
        //
        // Ideally, loading an old copy would be impossible with the
        // cache-control: nocache HTTP header set, but Firefox doesn't always obey it :/
+        console.log("startUpdater, current version is " + this.getNormalizedAppVersion(process.env.VERSION));
        this.pollForUpdate((version: string, newVersion: string) => {
            const query = parseQs(location);
-            if (query.updated === "1") {
+            if (query.updated) {
+                console.log("Update reloaded but still on an old version, stopping");
                // We just reloaded already and are still on the old version!
                // Show the toast rather than reload in a loop.
                showUpdateToast(version, newVersion);
                return;
            }

-            // Set updated=1 as a query param so we can detect that we've already done this once
-            // and reload the page.
-            let suffix = "updated=1";
-            if (window.location.search.length === 0) {
-                suffix = "?" + suffix;
-            } else {
-                suffix = "&" + suffix;
-            }
-
-            // This line has the effect of loading the page at the new location
-            window.location.href = window.location.href + suffix;
+            // Set updated as a cachebusting query param and reload the page.
+            const url = new URL(window.location.href);
+            url.searchParams.set("updated", newVersion);
+            console.log("Update reloading to " + url.toString());
+            window.location.href = url.toString();
        });
        setInterval(() => this.pollForUpdate(showUpdateToast, hideUpdateToast), POKE_RATE_MS);
    }
@@ -165,10 +161,14 @@ export default class WebPlatform extends VectorBasePlatform {

            if (currentVersion !== mostRecentVersion) {
                if (this.shouldShowUpdate(mostRecentVersion)) {
+                    console.log("Update available to " + mostRecentVersion + ", will notify user");
                    showUpdate(currentVersion, mostRecentVersion);
+                } else {
+                    console.log("Update available to " + mostRecentVersion + " but won't be shown");
                }
                return { status: UpdateCheckStatus.Ready };
            } else {
+                console.log("No update available, already on " + mostRecentVersion);
                showNoUpdate?.();
            }

--- a/src/vector/routing.ts
+++ b/src/vector/routing.ts
@@ -0,0 +1,76 @@
+/*
+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.
+*/
+
+// Parse the given window.location and return parameters that can be used when calling
+// MatrixChat.showScreen(screen, params)
+import { logger } from "matrix-js-sdk/src/logger";
+import MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
+
+import { parseQsFromFragment } from "./url_utils";
+
+let lastLocationHashSet: string = null;
+
+export function getScreenFromLocation(location: Location) {
+    const fragparts = parseQsFromFragment(location);
+    return {
+        screen: fragparts.location.substring(1),
+        params: fragparts.params,
+    };
+}
+
+// Here, we do some crude URL analysis to allow
+// deep-linking.
+function routeUrl(location: Location) {
+    if (!window.matrixChat) return;
+
+    logger.log("Routing URL ", location.href);
+    const s = getScreenFromLocation(location);
+    (window.matrixChat as MatrixChatType).showScreen(s.screen, s.params);
+}
+
+function onHashChange(ev: HashChangeEvent) {
+    if (decodeURIComponent(window.location.hash) === lastLocationHashSet) {
+        // we just set this: no need to route it!
+        return;
+    }
+    routeUrl(window.location);
+}
+
+// This will be called whenever the SDK changes screens,
+// so a web page can update the URL bar appropriately.
+export function onNewScreen(screen: string, replaceLast = false) {
+    logger.log("newscreen " + screen);
+    const hash = '#/' + screen;
+    lastLocationHashSet = hash;
+
+    // if the new hash is a substring of the old one then we are stripping fields e.g `via` so replace history
+    if (screen.startsWith("room/") &&
+        window.location.hash.includes("/$") === hash.includes("/$") && // only if both did or didn't contain event link
+        window.location.hash.startsWith(hash)
+    ) {
+        replaceLast = true;
+    }
+
+    if (replaceLast) {
+        window.location.replace(hash);
+    } else {
+        window.location.assign(hash);
+    }
+}
+
+export function init() {
+    window.addEventListener('hashchange', onHashChange);
+}
--- a/test/app-tests/joining-test.tsx
+++ b/test/app-tests/joining-test.tsx
@@ -18,9 +18,7 @@ limitations under the License.

 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
 import WebPlatform from '../../src/vector/platform/WebPlatform';
-import * as sdk from "matrix-react-sdk/src/index";
 import * as jssdk from "matrix-js-sdk/src/matrix";
-import "../skin-sdk";
 import "../jest-mocks";
 import React from "react";
 import ReactDOM from "react-dom";
@@ -28,15 +26,12 @@ import ReactTestUtils from "react-dom/test-utils";
 import {makeType} from "matrix-react-sdk/src/utils/TypeUtils";
 import {ValidatedServerConfig} from "matrix-react-sdk/src/utils/AutoDiscoveryUtils";
 import {sleep} from "../test-utils";
-import * as test_utils from "../test-utils";
 import MockHttpBackend from "matrix-mock-request";
 import "fake-indexeddb/auto";
 import { RoomView as RoomViewClass } from 'matrix-react-sdk/src/components/structures/RoomView';
-
-
-const MatrixChat = sdk.getComponent('structures.MatrixChat');
-const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
-const RoomPreviewBar = sdk.getComponent('rooms.RoomPreviewBar');
+import MatrixChat from "matrix-react-sdk/src/components/structures/MatrixChat";
+import RoomDirectory from "matrix-react-sdk/src/components/structures/RoomDirectory";
+import RoomPreviewBar from "matrix-react-sdk/src/components/views/rooms/RoomPreviewBar";

 const HS_URL='http://localhost';
 const IS_URL='http://localhost';
@@ -77,7 +72,6 @@ describe('joining a room', function() {
            const ROOM_ALIAS = '#alias:localhost';
            const ROOM_ID = '!id:localhost';

-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
            httpBackend.when('GET', '/pushrules').respond(200, {});
            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });

--- a/test/app-tests/loading-test.tsx
+++ b/test/app-tests/loading-test.tsx
@@ -19,16 +19,14 @@ limitations under the License.

 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
 import WebPlatform from '../../src/vector/platform/WebPlatform';
-import '../skin-sdk';
 import "../jest-mocks";
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
 import * as jssdk from 'matrix-js-sdk/src/matrix';
-import * as sdk from 'matrix-react-sdk/src/index';
 import {MatrixClientPeg} from 'matrix-react-sdk/src/MatrixClientPeg';
-import {Views} from 'matrix-react-sdk/src/components/structures/MatrixChat';
+import MatrixChat, {Views} from 'matrix-react-sdk/src/components/structures/MatrixChat';
 import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
 import * as test_utils from '../test-utils';
 import MockHttpBackend from 'matrix-mock-request';
@@ -41,6 +39,8 @@ import {cleanLocalstorage} from "../test-utils";
 import {IndexedDBCryptoStore} from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
 import { RoomView as RoomViewClass } from 'matrix-react-sdk/src/components/structures/RoomView';
 import LoginComponent from 'matrix-react-sdk/src/components/structures/auth/Login';
+import WelcomeComponent from "matrix-react-sdk/src/components/views/auth/Welcome";
+import EmbeddedPage from "matrix-react-sdk/src/components/structures/EmbeddedPage";

 const DEFAULT_HS_URL='http://my_server';
 const DEFAULT_IS_URL='http://my_is';
@@ -124,7 +124,6 @@ describe('loading:', function() {
            };
        }

-        const MatrixChat = sdk.getComponent('structures.MatrixChat');
        const fragParts = parseQsFromFragment(windowLocation);

        const config = Object.assign({
@@ -168,15 +167,15 @@ describe('loading:', function() {
    // returns a promise resolving to the received request
    async function expectAndAwaitSync(opts?) {
        let syncRequest = null;
+        httpBackend.when('GET', '/_matrix/client/versions')
+            .respond(200, {
+                "versions": ["r0.3.0"],
+                "unstable_features": {
+                    "m.lazy_load_members": true
+                }
+            });
        const isGuest = opts && opts.isGuest;
        if (!isGuest) {
-            httpBackend.when('GET', '/_matrix/client/versions')
-                .respond(200, {
-                    "versions": ["r0.3.0"],
-                    "unstable_features": {
-                        "m.lazy_load_members": true
-                    }
-                });
            // the call to create the LL filter
            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'llfid' });
        }
@@ -269,7 +268,7 @@ describe('loading:', function() {
            return awaitLoginComponent(matrixChat).then(() => {
                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.auth.Login'));
+                    matrixChat, LoginComponent);

                // the only outstanding request should be a GET /login
                // (in particular there should be no /register request for
@@ -290,7 +289,7 @@ describe('loading:', function() {
            }).then(() => {
                // once the sync completes, we should have a room view
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.EmbeddedPage'));
+                    matrixChat, EmbeddedPage);
                expect(windowLocation.hash).toEqual("#/home");
            });
        });
@@ -313,7 +312,6 @@ describe('loading:', function() {
        });

        it('shows the last known room by default', function() {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });
            httpBackend.when('GET', '/pushrules').respond(200, {});

            loadApp();
@@ -333,7 +331,6 @@ describe('loading:', function() {
        it('shows a home page by default if we have no joined rooms', function() {
            localStorage.removeItem("mx_last_room_id");

-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
            httpBackend.when('GET', '/pushrules').respond(200, {});

            loadApp();
@@ -345,13 +342,12 @@ describe('loading:', function() {
                // once the sync completes, we should have a home page
                httpBackend.verifyNoOutstandingExpectation();
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.EmbeddedPage'));
+                    matrixChat, EmbeddedPage);
                expect(windowLocation.hash).toEqual("#/home");
            });
        });

        it('shows a room view if we followed a room link', function() {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
            httpBackend.when('GET', '/pushrules').respond(200, {});

            loadApp({
@@ -387,7 +383,7 @@ describe('loading:', function() {

                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.auth.Login'),
+                    matrixChat, LoginComponent,
                );

                // the only outstanding request should be a GET /login
@@ -416,7 +412,7 @@ describe('loading:', function() {
                    // we should see a home page, even though we previously had
                    // a stored mx_last_room_id
                    ReactTestUtils.findRenderedComponentWithType(
-                        matrixChat, sdk.getComponent('structures.EmbeddedPage'));
+                        matrixChat, EmbeddedPage);
                    expect(windowLocation.hash).toEqual("#/home");
                });
            });
@@ -425,7 +421,6 @@ describe('loading:', function() {

    describe('Guest auto-registration:', function() {
        it('shows a welcome page by default', function() {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });

            loadApp();

@@ -451,13 +446,12 @@ describe('loading:', function() {
                // once the sync completes, we should have a welcome page
                httpBackend.verifyNoOutstandingExpectation();
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('auth.Welcome'));
+                    matrixChat, WelcomeComponent);
                expect(windowLocation.hash).toEqual("#/welcome");
            });
        });

        it('uses the default homeserver to register with', function() {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });

            loadApp();

@@ -485,7 +479,7 @@ describe('loading:', function() {
                // once the sync completes, we should have a welcome page
                httpBackend.verifyNoOutstandingExpectation();
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('auth.Welcome'));
+                    matrixChat, WelcomeComponent);
                expect(windowLocation.hash).toEqual("#/welcome");
                expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
                expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
@@ -493,7 +487,6 @@ describe('loading:', function() {
        });

        it('shows a room view if we followed a room link', function() {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });

            loadApp({
                uriFragment: "#/room/!room:id",
@@ -526,7 +519,6 @@ describe('loading:', function() {

        describe('Login as user', function() {
            beforeEach(function() {
-                httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });

                // first we have to load the homepage
                loadApp();
@@ -546,7 +538,7 @@ describe('loading:', function() {
                }).then(() => {
                    // once the sync completes, we should have a home page
                    ReactTestUtils.findRenderedComponentWithType(
-                        matrixChat, sdk.getComponent('structures.EmbeddedPage'));
+                        matrixChat, EmbeddedPage);

                    // we simulate a click on the 'login' button by firing off
                    // the relevant dispatch.
@@ -568,7 +560,7 @@ describe('loading:', function() {

                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.auth.Login'),
+                    matrixChat, LoginComponent,
                );
            });

@@ -576,7 +568,7 @@ describe('loading:', function() {
            // ILAG renders this obsolete. I think.
            it('should allow us to return to the app', function() {
                const login = ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.auth.Login')
+                    matrixChat, LoginComponent
                );

                const linkText = 'Return to app';
@@ -593,7 +585,7 @@ describe('loading:', function() {
                return sleep(1).then(() => {
                    // we should be straight back into the home page
                    ReactTestUtils.findRenderedComponentWithType(
-                        matrixChat, sdk.getComponent('structures.EmbeddedPage'));
+                        matrixChat, EmbeddedPage);
                });
            });
            */
@@ -674,7 +666,6 @@ describe('loading:', function() {
            // Wait for another trip around the event loop for the UI to update
            return sleep(1);
        }).then(() => {
-            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
            httpBackend.when('GET', '/pushrules').respond(200, {});
            return expectAndAwaitSync().catch((e) => {
                throw new Error("Never got /sync after login: did the client start?");
@@ -741,19 +732,19 @@ function awaitRoomView(matrixChat, retryLimit?, retryCount?) {

 function awaitLoginComponent(matrixChat, attempts?) {
    return MatrixReactTestUtils.waitForRenderedComponentWithType(
-        matrixChat, sdk.getComponent('structures.auth.Login'), attempts,
+        matrixChat, LoginComponent, attempts,
    );
 }

 function awaitWelcomeComponent(matrixChat, attempts?) {
    return MatrixReactTestUtils.waitForRenderedComponentWithType(
-        matrixChat, sdk.getComponent('auth.Welcome'), attempts,
+        matrixChat, WelcomeComponent, attempts,
    );
 }

 function moveFromWelcomeToLogin(matrixChat) {
    ReactTestUtils.findRenderedComponentWithType(
-        matrixChat, sdk.getComponent('auth.Welcome'));
+        matrixChat, WelcomeComponent);
    dis.dispatch({ action: 'start_login' });
    return awaitLoginComponent(matrixChat);
 }
--- a/test/skin-sdk.js
+++ b/test/skin-sdk.js
@@ -1,9 +0,0 @@
-/*
- * skin-sdk.js
- *
- * Skins the react-sdk with the vector components
- */
-
-import * as sdk from "matrix-react-sdk";
-import * as skin from "../src/component-index";
-sdk.loadSkin(skin);
--- 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,
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
-const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const SentryCliPlugin = require("@sentry/webpack-plugin");

 dotenv.config();
@@ -50,21 +49,31 @@ try {
 } catch (e) {
    // ignore - not important
 }
-const moduleReplacementPlugins = Object.entries(fileOverrides).map(([oldPath, newPath]) => {
-    return new webpack.NormalModuleReplacementPlugin(
-        // because the input is effectively defined by the person running the build, we don't
-        // need to do anything special to protect against regex overrunning, etc.
-        new RegExp(oldPath.replace(/\//g, '[\\/\\\\]').replace(/\./g, '\\.')),
-        path.resolve(__dirname, newPath),
-    );
-});
+
+function parseOverridesToReplacements(overrides) {
+    return Object.entries(overrides).map(([oldPath, newPath]) => {
+        return new webpack.NormalModuleReplacementPlugin(
+            // because the input is effectively defined by the person running the build, we don't
+            // need to do anything special to protect against regex overrunning, etc.
+            new RegExp(oldPath.replace(/\//g, '[\\/\\\\]').replace(/\./g, '\\.')),
+            path.resolve(__dirname, newPath),
+        );
+    });
+}
+
+const moduleReplacementPlugins = [
+    ...parseOverridesToReplacements(require('./components.json')),
+
+    // Allow customisations to override the default components too
+    ...parseOverridesToReplacements(fileOverrides),
+];

 module.exports = (env, argv) => {
    // Establish settings based on the environment and args.
    //
    // argv.mode is always set to "production" by yarn build
    //      (called to build prod, nightly and develop.element.io)
-    // arg.mode is set to "delopment" by yarn start
+    // arg.mode is set to "development" by yarn start
    //      (called by developers, runs the continuous reload script)
    // process.env.CI_PACKAGE is set when yarn build is called from scripts/ci_package.sh
    //      (called to build nightly and develop.element.io)
@@ -242,9 +251,6 @@ module.exports = (env, argv) => {
                    loader: 'babel-loader',
                    options: {
                        cacheDirectory: true,
-                        plugins: [
-                            useHMR && require.resolve('react-refresh/babel'),
-                        ].filter(Boolean),
                    },
                },
                {
@@ -624,7 +630,6 @@ module.exports = (env, argv) => {
            new HtmlWebpackInjectPreload({
                files: [{ match: /.*Inter.*\.woff2$/ }],
            }),
-            useHMR && new ReactRefreshWebpackPlugin(fullPageErrors ? undefined : { overlay: { entry: false } }),

            // upload to sentry if sentry env is present
            process.env.SENTRY_DSN &&
--- a/yarn.lock
+++ b/yarn.lock