diff --git a/Makefile b/Makefile
index 95fd274..5a897e6 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ web: setup
 
 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 ''
diff --git a/README.md b/README.md
index f4d437d..12a7bb2 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)  
@@ -52,7 +51,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 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_14.x | bash -
 # apt update
diff --git a/element-desktop b/element-desktop
index 46855f6..686a02c 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df
+Subproject commit 686a02cc404525713d1815b9662b19d83e637c85
diff --git a/element-web b/element-web
index f31e989..863bae4 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f
+Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3
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/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 861e944..f4e03bb 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -43,12 +43,5 @@
     "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"
+    "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."
 }
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 7732df7..8d07295 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -42,12 +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"
+    "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/id.json b/i18n-overlays/matrix-react-sdk/id.json
index c0d5cbb..a986a4d 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -42,12 +42,5 @@
     "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"
+    "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."
 }
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/sv.json b/i18n-overlays/matrix-react-sdk/sv.json
index 9facd06..7282f7f 100644
--- a/i18n-overlays/matrix-react-sdk/sv.json
+++ b/i18n-overlays/matrix-react-sdk/sv.json
@@ -42,12 +42,5 @@
     "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"
+    "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."
 }
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/matrix-js-sdk b/matrix-js-sdk
index 12f88b5..a7e6126 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded
+Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 1ce24a8..7038265 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283
+Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc