diff --git a/.containerignore b/.containerignore
deleted file mode 100644
index ae02570..0000000
--- a/.containerignore
+++ /dev/null
@@ -1 +0,0 @@
-release/
\ No newline at end of file
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 674a67d..0000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Close stale issues'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v6
-        with:
-          stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
-          days-before-issue-stale: 150
-          days-before-issue-close: 14
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure'
diff --git a/Containerfile.debian b/Containerfile.debian
deleted file mode 100644
index 041c64e..0000000
--- a/Containerfile.debian
+++ /dev/null
@@ -1,30 +0,0 @@
-ARG NODE_VERSION
-FROM node:${NODE_VERSION}
-
-RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
-    curl \
-    g++ \
-    gcc \
-    git \
-    jq \
-    libarchive-tools \
-    libsecret-1-dev \
-    libsqlcipher-dev \
-    libssl-dev \
-    make \
-    openssl \
-    pkg-config \
-    python \
-    tcl \
-    vim
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup
\ No newline at end of file
diff --git a/Containerfile.fedora b/Containerfile.fedora
deleted file mode 100644
index a61578c..0000000
--- a/Containerfile.fedora
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM fedora:latest
-
-RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
-
-# node setup
-ARG NODE_VERSION
-RUN mkdir -p /usr/local/n
-RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
-RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
-RUN bash n ${NODE_VERSION}
-RUN npm install -g n
-RUN npm install -g yarn
-RUN npm install -g node-gyp
-RUN gem install --no-user-install --no-document fpm
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup
diff --git a/Makefile b/Makefile
index 205cea9..e2f261b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,13 @@
-.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: container-build-debian container-build-fedora
-.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
-.PHONY: clean undo_setup fixup
-.PHONY: fix_yarn_cache
+.PHONY: clean
 
 CFGDIR ?= configs/sc
 
 all: web
 
 YARN ?= yarnpkg
-CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 16
 
 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
@@ -37,9 +32,6 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
 OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
 OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
 
-CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
-CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
-
 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
 
@@ -68,15 +60,19 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns
 regenerate-i18n: setup
 	./regenerate_i18n.sh
 
+reskindex: setup
+	$(YARN) --cwd matrix-react-sdk reskindex
+	$(YARN) --cwd element-web reskindex
+
 web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
-web: setup
+web: setup reskindex
 	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
 	echo "$(VERSION)" > element-web/webapp/version
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
-	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
+	$(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
@@ -161,31 +157,10 @@ macos-mas-release: macos-mas
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
 
-container-build-debian:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-build-fedora:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-web-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
-
-container-debian-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
-
-container-rpm-release: container-build-fedora
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
-
-container-appimage-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
-
 bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
 	./build-bom.sh
 bom: bom.lock
 
-fix_yarn_cache:
-	$(YARN) cache list || $(YARN) cache clean
-
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
@@ -195,11 +170,3 @@ clean:
 	rm -rf element-web/dist
 	rm -rf local-pkgbuild
 	rm -f bom.lock
-
-undo_setup:
-	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
-
-fixup: undo_setup fix_yarn_cache
-	make setup
-	make clean
-	make setup
diff --git a/README.md b/README.md
index 9b1ea85..20b0099 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,9 @@
 SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
 
 The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
-- Customizable room list style (compact single line, intermediate and roomy with two line preview)
-- Option to show direct and group chats in a combined list
-- Improved theming options
+- A unified chat list for both direct and group chats
 - Message bubbles
+- Bigger items in the room list
 - … and more!
 
 Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
@@ -16,18 +15,6 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we
 
 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
-<details>
-<summary>Public key used to sign the Debian packages</summary>
-
-```
-pub   rsa4096 2020-12-08 [SC]
-      560BB70DA86A6633A39CEC6023358905FE294D01
-uid           Super apt repo key <apt@supercable.onl>
-sub   rsa4096 2020-12-08 [E]
-```
-
-</details>
-
 
 ## Building SchildiChat Web/Desktop
 
@@ -52,9 +39,9 @@ some dependencies might not be recent enough to build SchildiChat.
 The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye):
 
 ```
-# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
+# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools
 
-# curl -sL https://deb.nodesource.com/setup_16.x | bash -
+# curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update
 # apt install nodejs
 
diff --git a/bump_release_version.sh b/bump_release_version.sh
index 92b5cac..a322d61 100755
--- a/bump_release_version.sh
+++ b/bump_release_version.sh
@@ -24,6 +24,6 @@ get_versions_string
 # Add everything
 git add -A
 git commit --allow-empty -m "New release v$versions_string"
-git tag -s "v$versions_string" -m "New release v$versions_string"
+git tag -a "v$versions_string" -m "New release v$versions_string"
 
 popd > /dev/null
diff --git a/bump_test_version.sh b/bump_test_version.sh
index bffb851..847af31 100755
--- a/bump_test_version.sh
+++ b/bump_test_version.sh
@@ -24,6 +24,6 @@ get_versions_string
 # Add everything
 git add -A
 git commit --allow-empty -m "New test release v$versions_string"
-git tag -s "v$versions_string" -m "New test release v$versions_string"
+git tag -a "v$versions_string" -m "New test release v$versions_string"
 
 popd > /dev/null
diff --git a/configs/sc/config.json b/configs/sc/config.json
index 0402a78..2916dee 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -1,11 +1,6 @@
 {
     "update_base_url": null,
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://matrix-client.matrix.org",
-            "server_name": "matrix.org"
-        }
-    },
+    "default_server_name": "matrix.org",
     "brand": "SchildiChat",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -16,13 +11,10 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "show_labs_settings": true,
-    "room_directory": {
+    "showLabsSettings": true,
+    "roomDirectory": {
         "servers": [
-            "matrix.org",
-            "gitter.im",
-            "libera.chat",
-            "schildi.chat"
+            "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {
diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh
index 7451aec..31c4ce5 100755
--- a/deploy/update-flathub.sh
+++ b/deploy/update-flathub.sh
@@ -20,11 +20,8 @@ debdate=$(date +%Y-%m-%d -r $debpath)
 pushd "$repopath" > /dev/null
 
 git fetch
-git checkout master
 git reset --hard origin/master
 
-git checkout -B "release-v$version"
-
 yamlFile="chat.schildi.desktop.yaml"
 xmlFile="chat.schildi.desktop.metainfo.xml"
 
@@ -36,8 +33,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push -f --set-upstream origin "release-v$version"
+git push
 
 popd > /dev/null
 
-echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
+echo "Release v$version published on flathub!"
diff --git a/element-desktop b/element-desktop
index 000e503..c9dd12d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16
+Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b
diff --git a/element-web b/element-web
index 396585e..abdb370 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3
+Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755
diff --git a/flake.lock b/flake.lock
index d010aa2..271a3d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699380656,
-        "narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=",
+        "lastModified": 1633901457,
+        "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6",
+        "rev": "f358794824b4595d77fec93732485d329ed7b0e0",
         "type": "github"
       },
       "original": {
diff --git a/generate_changelog.sh b/generate_changelog.sh
deleted file mode 100755
index 1e65601..0000000
--- a/generate_changelog.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mydir="$(dirname "$(realpath "$0")")"
-
-pushd "$mydir" > /dev/null
-
-source ./merge_helpers.sh
-
-# Check branch
-check_branch $branch
-forall_repos check_branch $branch
-
-# Ensure clean git state
-forall_repos check_clean_git
-
-# Fetch upstream
-forall_repos git fetch origin > /dev/null 2>/dev/null
-forall_repos git fetch upstream > /dev/null 2>/dev/null
-
-(
-    # Add new line below git log: https://unix.stackexchange.com/a/345558
-
-    get_latest_upstream_tag
-    forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \
-        | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|"
-
-    get_current_mxsdk_tags
-
-    pushd "matrix-js-sdk" > /dev/null
-    git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | grep -v "Merge .*tag"
-    popd > /dev/null
-
-    pushd "matrix-react-sdk" > /dev/null
-    git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \
-        | printf '%s\n' "$(cat)" \
-        | grep -v "Merge .*tag"
-    popd > /dev/null
-) \
-    | grep -v "Automatic i18n reversion" \
-    | grep -v "Automatic package.json reversion" \
-    | grep -v "Merge .*branch" \
-    | grep -v "Automatic theme update" \
-    | grep -v "Automatic package.json adjustment" \
-    | grep -v "Automatic i18n adjustment" \
-    | grep -v "Update version to .*-sc\\..*" \
-    | grep -v "\\.sh" \
-    | grep -v "\\.md" \
-    | grep -v "Added translation using Weblate" \
-    | grep -v "Translated using Weblate" \
-    | grep -v "weblate/sc" \
-    | grep -v "\\[.*merge.*\\]" \
-    | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \
-    || echo "No significant changes since the last stable release"
-
-popd > /dev/null
diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh
deleted file mode 100755
index 4e17e2a..0000000
--- a/hard_reset_repos.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mydir="$(dirname "$(realpath "$0")")"
-
-cd "$mydir"
-
-source ./merge_helpers.sh
-
-# Note: this doesn't delete files starting with a dot,
-# and in particular not the '.git' directory, which we
-# want to keep
-forall_repos bash -c 'rm -rf *'
-forall_repos git reset HEAD --hard
diff --git a/i18n-helper/index.js b/i18n-helper/index.js
index 11e3fc4..f226e47 100644
--- a/i18n-helper/index.js
+++ b/i18n-helper/index.js
@@ -35,13 +35,7 @@ function writeStrings(p, strings) {
 		let strings = readStrings(p);
 
 		for (const key of Object.keys(strings)) {
-			strings[key] = strings[key]
-				.replace(/Element/g, "SchildiChat")
-				.replace(/element\.io/g, "schildi.chat")
-				
-				// It's still Element Call
-				.replace(/SchildiChat Call/g, "Element Call")
-				.replace(/SchildiChat-Call/g, "Element-Call");
+			strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
 		}
 
 		if (overlayPath) {
diff --git a/i18n-overlays/element-desktop/hu.json b/i18n-overlays/element-desktop/hu.json
index 8598663..0967ef4 100644
--- a/i18n-overlays/element-desktop/hu.json
+++ b/i18n-overlays/element-desktop/hu.json
@@ -1,3 +1 @@
-{
-    "Show": "Mutat"
-}
+{}
diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json
deleted file mode 100644
index 0967ef4..0000000
--- a/i18n-overlays/element-desktop/ja.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json
deleted file mode 100644
index f1a952b..0000000
--- a/i18n-overlays/element-desktop/tr.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Show": "Göster"
-}
diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json
deleted file mode 100644
index 0967ef4..0000000
--- a/i18n-overlays/element-web/ja.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json
deleted file mode 100644
index 0967ef4..0000000
--- a/i18n-overlays/element-web/tr.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index a0816fc..34ebcbb 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -21,8 +21,8 @@
     "MXID": "MXID",
     "In group chats": "Ve skupinových chatech",
     "In public rooms": "Ve veřejných místnostech",
-    "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.",
-    "Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu",
+    "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.",
+    "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení",
     "Show people in spaces": "Ukázat lidi v prostorech",
     "Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech",
     "Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",
@@ -42,14 +42,5 @@
     "Mark as unread": "Označit jako nepřečtené",
     "Mark as read": "Označit jako přečtené",
     "Enable YouTube embed player": "Povolí vložený přehrávač YouTube",
-    "Collapse additional buttons": "Sbalit další tlačítka",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti.",
-    "Corners": "Rohy",
-    "Round": "Oblé",
-    "Extra round": "Kulaté",
-    "Mixed": "Smíšené",
-    "Sound pack": "Balíček zvuků",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti",
-    "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element",
-    "React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\""
+    "Collapse additional buttons": "Sbalit další tlačítka"
 }
diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json
index d7d2ed2..02c1ee5 100644
--- a/i18n-overlays/matrix-react-sdk/de_DE.json
+++ b/i18n-overlays/matrix-react-sdk/de_DE.json
@@ -143,13 +143,5 @@
     "Mark as read": "Als gelesen markieren",
     "Mark as unread": "Als ungelesen markieren",
     "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
-    "Collapse additional buttons": "Zusätzliche Buttons einklappen",
-    "Round": "Rund",
-    "Mixed": "Gemischt",
-    "Corners": "Ecken",
-    "Extra round": "Extra rund",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst.",
-    "Classic: The same sharp sounds as Element": "Klassisch: Die gleichen scharfen Geräusche wie in Element",
-    "Sound pack": "Geräuschpaket",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Sanftere Klänge für weniger Angstgefühle"
+    "Collapse additional buttons": "Zusätzliche Buttons einklappen"
 }
diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json
index 2c59706..8d07295 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -42,13 +42,5 @@
     "Mark as read": "Mark as read",
     "Enable YouTube embed player": "Enable YouTube embed player",
     "Collapse additional buttons": "Collapse additional buttons",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.",
-    "Corners": "Corners",
-    "Round": "Round",
-    "Extra round": "Extra round",
-    "Mixed": "Mixed",
-    "Sound pack": "Sound pack",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
-    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
-    "React with \"%(reaction)s\"": "React with \"%(reaction)s\""
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms."
 }
diff --git a/i18n-overlays/matrix-react-sdk/hu.json b/i18n-overlays/matrix-react-sdk/hu.json
index cde030f..a048d36 100644
--- a/i18n-overlays/matrix-react-sdk/hu.json
+++ b/i18n-overlays/matrix-react-sdk/hu.json
@@ -3,27 +3,5 @@
     "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
     "Message bubbles": "Üzenet buborékok",
     "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
-    "Normal priority": "Normál prioritás",
-    "Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában",
-    "Update notifications": "Értesítések frissítése",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).",
-    "System": "Rendszer",
-    "Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon",
-    "All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.",
-    "Mark as read": "Olvasottnak jelöl",
-    "Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért",
-    "Sound pack": "Hangcsomag",
-    "Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél",
-    "Don't ask again": "Ne kérdezze újra",
-    "Light theme": "Világos téma",
-    "Dark theme": "Sötét téma",
-    "Mark as unread": "Olvasatlannak jelöl",
-    "Collapse additional buttons": "További gombok összecsukása",
-    "Theme": "Téma",
-    "Room list": "Szobák listája",
-    "Font size and typeface": "Betűméret és betűtípus",
-    "Message layout": "Üzenetek elrendezése",
-    "Modern": "Modern"
+    "Normal priority": "Normál prioritás"
 }
diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json
index 3324b6f..210a093 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -41,14 +41,5 @@
     "Mark as unread": "Tandai sebagai belum dibaca",
     "Mark as read": "Tandai sebagai dibaca",
     "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
-    "Collapse additional buttons": "Sembunyikan tombol tambahan",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan.",
-    "Corners": "Sudut",
-    "Round": "Bulat",
-    "Extra round": "Ekstra bulat",
-    "Mixed": "Campur",
-    "Sound pack": "Paket suara",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan",
-    "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element",
-    "React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\""
+    "Collapse additional buttons": "Sembunyikan tombol tambahan"
 }
diff --git a/i18n-overlays/matrix-react-sdk/it.json b/i18n-overlays/matrix-react-sdk/it.json
index 187e9c4..72a5b3a 100644
--- a/i18n-overlays/matrix-react-sdk/it.json
+++ b/i18n-overlays/matrix-react-sdk/it.json
@@ -9,26 +9,5 @@
     "Light theme": "Tema chiaro",
     "Dark theme": "Tema scuro",
     "Normal priority": "Priorità normale",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)",
-    "Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo",
-    "Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo",
-    "User name color mode": "Modalità colore nome utente",
-    "Room list style": "Stile lista stanze",
-    "Theme": "Tema",
-    "Show all rooms in Home": "Visualizza tutte le stanze nella Home",
-    "All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.",
-    "For people": "Per le persone",
-    "Room list": "Lista stanze",
-    "Show advanced theme settings": "Visualizza impostazioni avanzate tema",
-    "Mark rooms as unread": "Permetti di segnare le chat come non lette",
-    "Message bubbles": "Bolle messaggi",
-    "Message layout": "Impaginazione messaggi",
-    "Mark as unread": "Segna come non letto",
-    "Uniform": "Uniforme",
-    "Show people in spaces": "Visualizza persone negli spazi",
-    "MXID": "MXID",
-    "In public rooms": "Nelle stanze pubbliche",
-    "In group chats": "Nelle chat di gruppo",
-    "Font size and typeface": "Dimensione e tipo carattere",
-    "Hide advanced theme settings": "Nascondi impostazioni avanzate tema"
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
 }
diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json
deleted file mode 100644
index fedc533..0000000
--- a/i18n-overlays/matrix-react-sdk/ja.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Normal priority": "常優先度"
-}
diff --git a/i18n-overlays/matrix-react-sdk/lt.json b/i18n-overlays/matrix-react-sdk/lt.json
index 7013517..2b32484 100644
--- a/i18n-overlays/matrix-react-sdk/lt.json
+++ b/i18n-overlays/matrix-react-sdk/lt.json
@@ -17,37 +17,5 @@
     "In group chats": "Pokalbių grupėse",
     "In public rooms": "Viešuose kambariuose",
     "Show all rooms in Home": "Rodyti visus kambarius Pradžioje",
-    "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.",
-    "Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus",
-    "Show advanced theme settings": "Rodyti išplėstinius temos nustatymus",
-    "Theme": "Tema",
-    "Font size and typeface": "Šrifto dydis ir raštas",
-    "Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje",
-    "Sound pack": "Garso paketas",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui",
-    "Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element",
-    "Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą",
-    "Add custom theme": "Pridėti pasirinktinę temą",
-    "Mark as unread": "Žymėti kaip neskaitytą",
-    "Mark as read": "Žymėti kaip perskaitytą",
-    "User name color mode": "Naudotojo vardo spalvų režimas",
-    "Uniform": "Vienodi",
-    "Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse",
-    "Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje",
-    "If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.",
-    "Room list style": "Kambarių sąrašo stilius",
-    "Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje",
-    "Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra",
-    "Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra",
-    "PowerLevel": "Galios lygis",
-    "For people": "Žmonėms",
-    "Show people in spaces": "Rodyti žmones erdvėse",
-    "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.",
-    "Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.",
-    "Collapse additional buttons": "Sulankstyti papildomus mygtukus",
-    "Corners": "Kampai",
-    "Round": "Apvalus",
-    "Extra round": "Ypač apvalus",
-    "Mixed": "Mišrus"
+    "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje."
 }
diff --git a/i18n-overlays/matrix-react-sdk/nb_NO.json b/i18n-overlays/matrix-react-sdk/nb_NO.json
index e3eb1c6..cd11a91 100644
--- a/i18n-overlays/matrix-react-sdk/nb_NO.json
+++ b/i18n-overlays/matrix-react-sdk/nb_NO.json
@@ -8,29 +8,5 @@
     "Show message bubbles on one side only": "Vis meldingsbobler kun på én side",
     "Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side",
     "Don't ask again": "Ikke spør igjen",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS).",
-    "Hide advanced theme settings": "Skjul avanserte draktinnstillinger",
-    "Show advanced theme settings": "Vis avanserte draktinnstillinger",
-    "Theme": "Drakt",
-    "Room list": "Romliste",
-    "Font size and typeface": "Størrelse på og type skrift",
-    "Sound pack": "Lydpakke",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Mykere lyder for mindre angst",
-    "System": "System",
-    "Add custom theme": "Legg til egendefinert drakt",
-    "Theme in use": "Drakt i bruk",
-    "Light theme": "Lys drakt",
-    "Dark theme": "Mørk drakt",
-    "Mark as read": "Marker som lest",
-    "Mark rooms as unread": "Tillat markering av sludringer som uleste",
-    "Mark as unread": "Marker som ulest",
-    "In group chats": "I gruppesludringer",
-    "In public rooms": "I offentlige rom",
-    "For people": "For folk",
-    "Classic: The same sharp sounds as Element": "Klassisk: Samme skarpe lyder som Element",
-    "Collapse additional buttons": "Fold sammen ytterligere knapper",
-    "Corners": "Hjørner",
-    "Round": "Runde",
-    "Extra round": "Ekstra runde",
-    "Mixed": "Blandet"
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS)."
 }
diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json
index 1b4c8af..5bac536 100644
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/i18n-overlays/matrix-react-sdk/pt_BR.json
@@ -40,6 +40,5 @@
     "Room list style": "Estilo da lista de salas",
     "Mark rooms as unread": "Permitir markar conversas como não lidos",
     "Mark as unread": "Markar como não lido",
-    "Mark as read": "Markar como lido",
-    "Collapse additional buttons": "Recolher botões adicionais"
+    "Mark as read": "Markar como lido"
 }
diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json
index 9facd06..b1616fb 100644
--- a/i18n-overlays/matrix-react-sdk/sv.json
+++ b/i18n-overlays/matrix-react-sdk/sv.json
@@ -41,13 +41,5 @@
     "Mark as read": "markera som läst",
     "Mark rooms as unread": "Tillåt att chattar markeras som olästa",
     "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare",
-    "Collapse additional buttons": "Dölj ytterligare knappar",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum.",
-    "Round": "Runda",
-    "Extra round": "Extrarunda",
-    "Mixed": "Blandad",
-    "Corners": "Hörn",
-    "Sound pack": "Ljudpaket",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Mjukare ljud för minskad ångest",
-    "Classic: The same sharp sounds as Element": "Klassisk: Samma skarpa ljud som Element"
+    "Collapse additional buttons": "Dölj ytterligare knappar"
 }
diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json
deleted file mode 100644
index 0856dee..0000000
--- a/i18n-overlays/matrix-react-sdk/tr.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster",
-    "Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster",
-    "Message bubbles": "Mesaj baloncukları",
-    "Normal priority": "Normal öncelik",
-    "Message layout": "Mesaj düzeni",
-    "Modern": "Modern",
-    "Update notifications": "Güncelleme bildirimleri",
-    "Don't ask again": "Bir daha sorma",
-    "System": "Sistem",
-    "Add custom theme": "Özel tema ekle",
-    "Theme in use": "Tema kullanımda",
-    "Light theme": "Açık tema",
-    "Dark theme": "Koyu tema",
-    "Uniform": "Düzenli",
-    "For people": "İnsanlar için",
-    "In group chats": "Grup sohbetlerinde",
-    "In public rooms": "Halka açık odalarda",
-    "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.",
-    "If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.",
-    "Mark as unread": "Okunmadı olarak işaretle",
-    "User name color mode": "Kullanıcı adı renk modu",
-    "Show people in spaces": "İnsanları alanlarda göster",
-    "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.",
-    "Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster",
-    "Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön",
-    "Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar",
-    "Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar",
-    "Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar",
-    "Room list style": "Oda listesi tarzı",
-    "Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle",
-    "Show all rooms in Home": "Ana sayfadaki tüm odaları göster",
-    "All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.",
-    "Show advanced theme settings": "Gelişmiş tema ayarlarını göster",
-    "Theme": "Tema",
-    "Font size and typeface": "Yazı tipi boyutu ve yazı karakteri",
-    "Room list": "Oda sıralaması",
-    "Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver",
-    "Mark as read": "Okundu olarak işaretle",
-    "Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir",
-    "Collapse additional buttons": "Ek düğmeleri daralt",
-    "Corners": "Köşeler",
-    "Round": "Yuvarlak",
-    "Extra round": "Fazladan yuvarlak",
-    "Mixed": "Karışık",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın."
-}
diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json
index e3e332a..6702566 100644
--- a/i18n-overlays/matrix-react-sdk/zh_Hans.json
+++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json
@@ -39,16 +39,5 @@
     "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。",
     "Mark as read": "标记为已读",
     "Mark rooms as unread": "允许将聊天记录标记为未读",
-    "Mark as unread": "标记为未读",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。",
-    "Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
-    "Collapse additional buttons": "折叠额外的按钮",
-    "Round": "圆角",
-    "React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑",
-    "Mixed": "混合",
-    "Extra round": "超圆角",
-    "Sound pack": "音频包",
-    "Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音",
-    "Corners": "边缘"
+    "Mark as unread": "标记为未读"
 }
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 10fe11f..9faf862 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414
+Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 6a3ee32..0d1b0bc 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34
+Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb
diff --git a/merge_upstream.sh b/merge_upstream.sh
index e772262..cfbea1f 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -23,13 +23,7 @@ automatic_i18n_reversion
 automatic_packagejson_reversion
 
 # Merge upstream
-
-# Check if specific version to merge passed
-if [ -z "$1" ]; then
-    get_latest_upstream_tag
-else
-    latest_upstream_tag="$1"
-fi
+get_latest_upstream_tag
 forelement_repos git merge "$latest_upstream_tag"
 
 get_current_mxsdk_tags