diff --git a/helpers/make-mate-tweak b/helpers/make-mate-tweak
index 219fc640d55c6681d9dadf12d9680fc864e9f5c1..7359dca6f37bc9665783de3855473d2f431a0334 100644
--- a/helpers/make-mate-tweak
+++ b/helpers/make-mate-tweak
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2019  Mason Hock <mason@masonhock.com>
-#    Copyright (C) 2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2021  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 
 . ./config
 
@@ -27,10 +27,14 @@ sed -i 's/Manjaro/Trisquel/g' mate-tweak
 
 # Disable composition on llvm
 sed 's/Software Rasterizer/Accelerated: no/' -i mate-tweak
-sed '/no-composite/a # Do not run without 3D acceleration\nglxinfo | grep -q "Accelerated: no" && exit 0\n' -i marco-compton
+sed '2a # Do not run without 3D acceleration\nglxinfo | grep -q "Accelerated: no" && exit 0\n' -i marco-compton
 
 # Allow loading global compton config file
-sed '/config \/dev\/null/d' -i marco-compton
+sed '/for this wrapper./aif [ -f /etc/xdg/compton.conf]; then \n    compton --config /etc/xdg/compton.conf' -i marco-compton
+sed '/^if.*HOME.*compton.conf/s/if/elif/' -i marco-compton
+
+# Corrects rendering delay on Pluma, possibly others
+sed '/--backend/s/\\/--xrender-sync-fence --xrender-sync \\/' -i  marco-compton
 
 # Shadow config
 sed 's/-r 10 -o 0.225 -l -12 -t -12/-r 6 -o 0.6 -l -9 -t -9/' -i marco-compton