diff --git a/Makefile b/Makefile
index fbb47a2..e2f261b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ CSC_NAME ?=
 -include release.mk
 
 setup:
-	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
+	./setup.sh
 
 element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
 
diff --git a/bump_release_version.sh b/bump_release_version.sh
index fc69cf7..3fc5346 100755
--- a/bump_release_version.sh
+++ b/bump_release_version.sh
@@ -17,4 +17,12 @@ forall_repos check_clean_git
 
 bump_release_version
 
+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New release v$versions_string"
+
 popd > /dev/null
diff --git a/bump_test_version.sh b/bump_test_version.sh
index 35c3efc..979ed48 100755
--- a/bump_test_version.sh
+++ b/bump_test_version.sh
@@ -17,4 +17,12 @@ forall_repos check_clean_git
 
 bump_test_version
 
+# Get version string
+get_current_versions
+get_versions_string
+
+# Add everything
+git add -A
+git commit --allow-empty -m "New test release v$versions_string"
+
 popd > /dev/null
diff --git a/configs/sc/config.json b/configs/sc/config.json
index 3a229d0..2916dee 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -27,11 +27,5 @@
             "text": "Privacy Policy"
         }
     ],
-    "sc_update_announcement_room": {
-        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
-        "via_servers": [
-            "supercable.onl",
-            "spiritcroc.de"
-        ]
-    }
+    "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 a074ede..592337d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234
+Subproject commit 592337db774fe9fd186243d3eaac1780229b459d
diff --git a/element-web b/element-web
index 94895de..f64fa1e 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc
+Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030
diff --git a/i18n-overlays/element-desktop/fa.json b/i18n-overlays/element-desktop/fa.json
index 0967ef4..1cb3a76 100644
--- a/i18n-overlays/element-desktop/fa.json
+++ b/i18n-overlays/element-desktop/fa.json
@@ -1 +1,3 @@
-{}
+{
+    "Show": "نشان دادن"
+}
diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json
index 4ec4a1e..3fbe2a8 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -39,5 +39,6 @@
     "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"
 }
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/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD
index df4c516..ffa8052 100644
--- a/local-pkgbuild-template/PKGBUILD
+++ b/local-pkgbuild-template/PKGBUILD
@@ -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/matrix-js-sdk b/matrix-js-sdk
index 09fc7b8..07619ca 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85
+Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 2fd5a96..b616808 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f
+Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 8c97abf..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
 }
@@ -238,9 +239,6 @@ automatic_packagejson_reversion() {
 automatic_packagejson_adjustment() {
     local versions
     get_current_versions
-    
-    # every build after a merge is a new test build
-    versions[2]=$((versions[2] + 1))
 
     forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
     forelement_repos write_version "package.json"
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