diff --git a/post_merge.sh b/post_merge.sh
index 58659b994a..32905f18b1 100755
--- a/post_merge.sh
+++ b/post_merge.sh
@@ -22,6 +22,15 @@ restore_sc() {
     fi
 }
 
+# Color corrections | TODO more?
+sed -i 's|@color/riotx_accent|?colorAccent|g' vector/src/main/res/layout/*
+uncommitted=`git status --porcelain`
+if [ -z "$uncommitted" ]; then
+    echo "Seems like colors are still fine :)"
+else
+    git add -A
+    git commit -m 'Automatic color correction'
+fi
 
 # Keep in sync with pre_merge.sh!
 restore_sc README.md