diff --git a/bump_release_version.sh b/bump_release_version.sh
index 3fc5346..a322d61 100755
--- a/bump_release_version.sh
+++ b/bump_release_version.sh
@@ -24,5 +24,6 @@ get_versions_string
 # Add everything
 git add -A
 git commit --allow-empty -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 979ed48..847af31 100755
--- a/bump_test_version.sh
+++ b/bump_test_version.sh
@@ -24,5 +24,6 @@ get_versions_string
 # Add everything
 git add -A
 git commit --allow-empty -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 dfc32f4..2916dee 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -26,5 +26,6 @@
             "url": "https://schildi.chat/desktop/privacy",
             "text": "Privacy Policy"
         }
-    ]
+    ],
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
diff --git a/deploy/update-aur-bin.sh b/deploy/update-aur-bin.sh
index 81b999d..f5d2213 100755
--- a/deploy/update-aur-bin.sh
+++ b/deploy/update-aur-bin.sh
@@ -21,6 +21,7 @@ git fetch
 git reset --hard origin/master
 
 sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
+sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD
 sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
 
 makepkg --printsrcinfo > .SRCINFO
diff --git a/element-desktop b/element-desktop
index 15cd24d..c9dd12d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8
+Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b
diff --git a/element-web b/element-web
index 661bfae..abdb370 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91
+Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755
diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index f9fa215..34ebcbb 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -40,5 +40,7 @@
     "Hide advanced theme settings": "Skrýt pokročilá nastavení motivu",
     "Mark rooms as unread": "Povolit označování chatů jako nepřečtených",
     "Mark as unread": "Označit jako nepřečtené",
-    "Mark as read": "Označit jako př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"
 }
diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json
index e65cb3d..02c1ee5 100644
--- a/i18n-overlays/matrix-react-sdk/de_DE.json
+++ b/i18n-overlays/matrix-react-sdk/de_DE.json
@@ -141,5 +141,7 @@
     "Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen",
     "Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren",
     "Mark as read": "Als gelesen markieren",
-    "Mark as unread": "Als ungelesen markieren"
+    "Mark as unread": "Als ungelesen markieren",
+    "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
+    "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 4ec4a1e..8d07295 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -39,5 +39,8 @@
     "Font size and typeface": "Font size and typeface",
     "Mark rooms as unread": "Allow marking chats as unread",
     "Mark as unread": "Mark as unread",
-    "Mark as read": "Mark as read"
+    "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."
 }
diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json
index 1e42805..210a093 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -39,5 +39,7 @@
     "Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris",
     "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca",
     "Mark as unread": "Tandai sebagai belum dibaca",
-    "Mark as read": "Tandai sebagai dibaca"
+    "Mark as read": "Tandai sebagai dibaca",
+    "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
+    "Collapse additional buttons": "Sembunyikan tombol tambahan"
 }
diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json
index c27b526..5bac536 100644
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/i18n-overlays/matrix-react-sdk/pt_BR.json
@@ -37,5 +37,8 @@
     "Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha",
     "Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha",
     "Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas",
-    "Room list style": "Estilo da lista de salas"
+    "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"
 }
diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json
index 8990c52..b1616fb 100644
--- a/i18n-overlays/matrix-react-sdk/sv.json
+++ b/i18n-overlays/matrix-react-sdk/sv.json
@@ -39,5 +39,7 @@
     "Room list style": "Rumslista stil",
     "Mark as unread": "markera som oläst",
     "Mark as read": "markera som läst",
-    "Mark rooms as unread": "Tillåt att chattar markeras som olästa"
+    "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"
 }
diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD
index df4c516..ff49e1f 100644
--- a/local-pkgbuild-template/PKGBUILD
+++ b/local-pkgbuild-template/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional
 arch=('x86_64')
 url="https://schildi.chat"
 license=('Apache')
-depends=('sqlcipher')
+depends=()
 provides=('---appName---')
 conflicts=('---appName---')
 source=("---debName---"
@@ -22,4 +22,5 @@ package() {
   msg2 "Extracting the data.tar.xz..."
   bsdtar -xf data.tar.xz -C "$pkgdir/"
   install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
+  sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop
 }
diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh
index 8e25e12..99168a8 100644
--- a/local-pkgbuild-template/schildichat-desktop.sh
+++ b/local-pkgbuild-template/schildichat-desktop.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@"
+exec "/opt/---productName---/---appName---" "$@"
diff --git a/matrix-js-sdk b/matrix-js-sdk
index a71dd32..9faf862 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d
+Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 7edaf5b..0d1b0bc 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9
+Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 4b7aed3..3808eab 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -162,7 +162,8 @@ get_current_versions() {
 get_versions_string() {
     versions_string="${versions[0]}-sc.${versions[1]}"
 
-    if [[ ${versions[2]} -gt 0 ]]; then
+    # both zero means the initial version after a merge
+    if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
         versions_string+=".test.${versions[2]}"
     fi
 }
diff --git a/merge_upstream.sh b/merge_upstream.sh
index c3fef9c..cfbea1f 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -46,7 +46,7 @@ automatic_packagejson_adjustment
 
 # Automatic theme update
 pushd "matrix-react-sdk" > /dev/null
-./theme.sh
+./theme.sh y
 popd > /dev/null
 
 popd > /dev/null