diff --git a/Makefile b/Makefile
index e2f261b..e099073 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n 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: clean
@@ -60,17 +60,14 @@ 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 reskindex
+web: setup
 	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
 	echo "$(VERSION)" > element-web/webapp/version
 
 desktop-common: web
+	export SQLCIPHER_STATIC=1
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
 	$(YARN) --cwd element-desktop run build:native
 
diff --git a/README.md b/README.md
index 12a7bb2..f4d437d 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,10 @@
 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:
-- A unified chat list for both direct and group chats
+- 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
 - 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)  
@@ -51,7 +52,7 @@ 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
+# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
 
 # curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update
diff --git a/element-desktop b/element-desktop
index 2fac82b..13b4cb7 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 2fac82bd009bf520bb0abdabaea1721a266f52ce
+Subproject commit 13b4cb7e3d51fd626d35a8cdb16f31894c19a20b
diff --git a/element-web b/element-web
index 8394c41..2eaaf0f 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8394c417728e728ff641a1691e5c4bc40d13f866
+Subproject commit 2eaaf0f577ba9fc9ec8c5b38b10f38cf82195df0
diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json
index 6702566..aef112a 100644
--- a/i18n-overlays/matrix-react-sdk/zh_Hans.json
+++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json
@@ -39,5 +39,8 @@
     "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": "标记为未读"
+    "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": "折叠额外的按钮"
 }
diff --git a/matrix-js-sdk b/matrix-js-sdk
index e82be9f..ee15b18 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5
+Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 1f9e6c8..8d9129f 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 1f9e6c81fbc183ced62f8567babafe4d42b1660d
+Subproject commit 8d9129f329ce137bd519f7116bfdf693d74a1609