diff --git a/roles/home-gui/files/xsession-netbsd b/roles/home-gui/files/xsession-netbsd
index a11d79a..0ba8acf 100644
--- a/roles/home-gui/files/xsession-netbsd
+++ b/roles/home-gui/files/xsession-netbsd
@@ -4,4 +4,4 @@ export XDG_DATA_DIRS=/usr/local/share:/usr/share:/usr/pkg/share
 xrdb -merge ~/.Xresources
 xset b off
 setxkbmap gb
-exec ssh-agent fvwm
+exec ssh-agent mate-session
diff --git a/roles/home-gui/tasks/main.yml b/roles/home-gui/tasks/main.yml
index a80e34b..73b31a0 100644
--- a/roles/home-gui/tasks/main.yml
+++ b/roles/home-gui/tasks/main.yml
@@ -5,4 +5,3 @@
 - include: emacs.yml
 - include: firefox.yml
 - include: mate.yml
-  when: ansible_system == 'Linux'
diff --git a/roles/netbsd/tasks/packages-gui.yml b/roles/netbsd/tasks/packages-gui.yml
index e4f7617..9d15128 100644
--- a/roles/netbsd/tasks/packages-gui.yml
+++ b/roles/netbsd/tasks/packages-gui.yml
@@ -1,7 +1,4 @@
 ---
-- name: Install libstroke manually
-  become: true
-  command: pkg_add libstroke
 - name: Install GUI packages
   become: true
   pkgin:
@@ -11,10 +8,10 @@
     packages:
       - adwaita-icon-theme
       - atril
+      - dbus
       - firefox
-      - fvwm
       - liberation-ttf
-      - mate-terminal
+      - mate
       - rxvt-unicode
       - vim-gtk3
       - xlockmore-lite