diff --git a/community/bspwm-mate/desktop-overlay/etc/environment b/community/bspwm-mate/desktop-overlay/etc/environment
index 7021281..a9a7acc 100644
--- a/community/bspwm-mate/desktop-overlay/etc/environment
+++ b/community/bspwm-mate/desktop-overlay/etc/environment
@@ -4,4 +4,4 @@
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
 GTK_CSD=1
-QT_QPA_PLATFORMTHEME=kvantum
+QT_QPA_PLATFORMTHEME=qt5ct
diff --git a/community/mate/desktop-overlay/etc/environment b/community/mate/desktop-overlay/etc/environment
index 8c6cce4..9474e03 100644
--- a/community/mate/desktop-overlay/etc/environment
+++ b/community/mate/desktop-overlay/etc/environment
@@ -4,5 +4,5 @@
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
 
-QT_QPA_PLATFORMTHEME="kvantum"
+QT_QPA_PLATFORMTHEME="qt5ct"
 EDITOR=/usr/bin/nano
diff --git a/oem/bladebook-oem-gnome/desktop-overlay/etc/environment b/oem/bladebook-oem-gnome/desktop-overlay/etc/environment
index 8c6cce4..5260286 100644
--- a/oem/bladebook-oem-gnome/desktop-overlay/etc/environment
+++ b/oem/bladebook-oem-gnome/desktop-overlay/etc/environment
@@ -4,5 +4,16 @@
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
 
-QT_QPA_PLATFORMTHEME="kvantum"
+QT_AUTO_SCREEN_SCALE_FACTOR=1
+
+QT_QPA_PLATFORMTHEME="gnome"
+
+QT_STYLE_OVERRIDE="kvantum"
+
+# Force to use Xwayland backend
+# QT_QPA_PLATFORM=xcb
+
+#Not tested: this should disable window decorations
+# QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
 EDITOR=/usr/bin/nano
diff --git a/oem/starlabs-oem-gnome/desktop-overlay/etc/environment b/oem/starlabs-oem-gnome/desktop-overlay/etc/environment
index 8c6cce4..5260286 100644
--- a/oem/starlabs-oem-gnome/desktop-overlay/etc/environment
+++ b/oem/starlabs-oem-gnome/desktop-overlay/etc/environment
@@ -4,5 +4,16 @@
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
 
-QT_QPA_PLATFORMTHEME="kvantum"
+QT_AUTO_SCREEN_SCALE_FACTOR=1
+
+QT_QPA_PLATFORMTHEME="gnome"
+
+QT_STYLE_OVERRIDE="kvantum"
+
+# Force to use Xwayland backend
+# QT_QPA_PLATFORM=xcb
+
+#Not tested: this should disable window decorations
+# QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
 EDITOR=/usr/bin/nano