diff --git a/.gitmodules b/.gitmodules
index dcd6adb..da54f13 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "matrix-js-sdk"]
 	path = matrix-js-sdk
-	url = https://github.com/SpiritCroc/matrix-js-sdk.git
+	url = https://github.com/SchildiChat/matrix-js-sdk.git
 [submodule "matrix-react-sdk"]
 	path = matrix-react-sdk
-	url = https://github.com/SpiritCroc/matrix-react-sdk.git
+	url = https://github.com/SchildiChat/matrix-react-sdk.git
 [submodule "element-web"]
 	path = element-web
-	url = https://github.com/SpiritCroc/element-web.git
+	url = https://github.com/SchildiChat/element-web.git
 [submodule "element-desktop"]
 	path = element-desktop
-	url = https://github.com/SpiritCroc/element-desktop.git
+	url = https://github.com/SchildiChat/element-desktop.git
diff --git a/README.md b/README.md
index aaab6d6..9a21964 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,37 @@
 # SchildiChat-Desktop
 
-Wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
+SchildiChat-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-Desktop compared to Element are:
+
+- A unifed chat list for both direct and group chats
+- Message bubbles
+- Bigger items in the room list
+
+While SchildiChat-Desktop should be already usable as is, it's still better seen as a
+proof-of-concept rather than a finished product, as there are still a few UX bugs
+remaining, and no ways to configure Schildi's features.
+Furthermore, I don't know how much more work I'm going to put into this, but
+if anybody wants to help improving it, contributions are welcome!
+
+Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
+Hosted web variant: https://schildiweb.spiritcroc.de/
+
+Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
+
+<img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
 
-# Debian compilation dependencies
+# Building SchildiChat-Desktop
+
+This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
+
+
+## Debian compilation dependencies
+
+Since Debian is usually slow to update packages on its stable releases, some dependencies
+might not be recent enough to building Schildi.
+Here are the dependencies which I had to install for compilation on Debian 10:
 
 ```
 # apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
@@ -21,18 +49,18 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc
 $ source .bashrc
 ```
 
-# Initial setup
+## Initial setup
 
 ```
-git clone --recurse-submodules https://github.com/SpiritCroc/schildichat-desktop.git
+git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
 cd schildichat-desktop
 ./setup.sh
 ```
 
-# Build
+## Build
 
 `make`
 
-# Install
+## Install
 
 Installable packages should appear in element-desktop/dist/.
diff --git a/element-desktop b/element-desktop
index 6ffd1e8..3172fb9 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 6ffd1e87ce00dbe38db1622c3b2106ca573e5f7b
+Subproject commit 3172fb927ddd4a63456028159f40d202512620de
diff --git a/element-web b/element-web
index 103009b..fc486a5 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 103009be67ec02c853406018f42d0514f646ad91
+Subproject commit fc486a5044adcc6b39180ffaabd75360f242e635
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 2e83ee6..2ef998e 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 2e83ee602dec73f44ce44159eeef796ec5e24271
+Subproject commit 2ef998e8eca5aea54ab5f70e913d8b628290a8c1
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 7e8979a..6538fca 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 7e8979ac526a12dd0d266d5e29ece3687494ffd7
+Subproject commit 6538fca287d25a6f9d986904e315f10b3e0baa5e
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 64bf4b2..ca2bfa1 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -10,10 +10,10 @@ add_upstream() {
     local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')"
     if echo "$sc_remote" | grep -q matrix; then
         # matrix.org repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|matrix-org|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
     elif echo "$sc_remote" | grep -q element; then
         # vector-im repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|vector-im|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|vector-im|')"
     else
         echo "Don't know upstream repo for $sc_remote"
         return 1
diff --git a/screenshots/1.png b/screenshots/1.png
new file mode 100644
index 0000000..d0f2ed0
Binary files /dev/null and b/screenshots/1.png differ