diff --git a/community/mate/desktop-overlay/etc/environment b/community/mate/desktop-overlay/etc/environment
index 578e471..ed8da2d 100644
--- a/community/mate/desktop-overlay/etc/environment
+++ b/community/mate/desktop-overlay/etc/environment
@@ -3,5 +3,5 @@
 #
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
-
-QT_QPA_PLATFORMTHEME="qt5ct"
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export EDITOR=/usr/bin/nano
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 27fb578..c3313a0 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -76,6 +76,7 @@ manjaro-hotfixes
 manjaro-pulse
 manjaro-hello
 mesa-demos
+mesa-wayland-dri
 mobile-broadband-provider-info
 modemmanager
 mousetweaks
diff --git a/manjaro/gnome/desktop-overlay/etc/environment b/manjaro/gnome/desktop-overlay/etc/environment
new file mode 100644
index 0000000..ed8da2d
--- /dev/null
+++ b/manjaro/gnome/desktop-overlay/etc/environment
@@ -0,0 +1,7 @@
+#
+# This file is parsed by pam_env module
+#
+# Syntax: simple "KEY=VAL" pairs on separate lines
+#
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export EDITOR=/usr/bin/nano