diff --git a/Makefile b/Makefile
index e099073..95fd274 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,8 @@ web: setup
 	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
+	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
diff --git a/README.md b/README.md
index 5526d5a..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)  
diff --git a/element-desktop b/element-desktop
index 31b2394..1d3a14d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 31b23944dc6f2ae9dee02ad9c91c1d2ada75472d
+Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b
diff --git a/element-web b/element-web
index 4ab85f7..11fedf6 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 4ab85f7cfb4570477a63d0c217d723ff73539fc5
+Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 4a5ee08..ee15b18 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 4a5ee08063d1e48aa707a2898675168cc3c176db
+Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 8fd244e..f167688 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 8fd244ea3c20c3dc665e21eb1f6e6ede57c80ff7
+Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef