diff --git a/Makefile b/Makefile
index e2f261b..5a897e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
 .PHONY: clean
@@ -60,12 +60,8 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns
 regenerate-i18n: setup
 	./regenerate_i18n.sh
 
-reskindex: setup
-	$(YARN) --cwd matrix-react-sdk reskindex
-	$(YARN) --cwd element-web reskindex
-
 web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
-web: setup reskindex
+web: setup
 	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
 	echo "$(VERSION)" > element-web/webapp/version
diff --git a/element-desktop b/element-desktop
index f118f8f..aea9cef 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit f118f8fbd3d5caf98ced8fe709649ecb65b5e2e0
+Subproject commit aea9cefa5d59930a831e94104521b70619d6623b
diff --git a/element-web b/element-web
index 164d8e9..416913d 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 164d8e9643b22ddd1925177a7df475b599e062c3
+Subproject commit 416913d12060244672c86cc175b6fbbcbfaf759b
diff --git a/matrix-js-sdk b/matrix-js-sdk
index e82be9f..c696abf 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5
+Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 2b81c48..cdc59f3 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 2b81c48ed650d011c84d4f6fa6e5b325cb4c690f
+Subproject commit cdc59f3df4d67c36a79c0872499713c256ba068d