diff --git a/merge_upstream.sh b/merge_upstream.sh
index 2d21c08..7956fd3 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -15,6 +15,13 @@ forall_repos check_branch $branch
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
-./setup.sh
+# Automatic theme update
+pushd "matrix-react-sdk" > /dev/null
+./theme.sh
+popd > /dev/null
+
+# Refresh environment
+make clean
+make setup
 
 popd > /dev/null