diff --git a/tasks/audio.yaml b/tasks/audio.yaml
index 05658e6..96df91e 100644
--- a/tasks/audio.yaml
+++ b/tasks/audio.yaml
@@ -1,8 +1,11 @@
 ---
-# tasks file for desktop-audio
-
-- name: audio packages
+- name: desktop audio packages
   apt:
     pkg:
       - audacity
       - sound-juicer
+      - pulseaudio
+      - pavucontrol
+      - pasystray
+      - pavumeter
+      - paprefs
diff --git a/tasks/bluetooth.yaml b/tasks/bluetooth.yaml
index c533fd6..9e6c217 100644
--- a/tasks/bluetooth.yaml
+++ b/tasks/bluetooth.yaml
@@ -1,18 +1,6 @@
 ---
-
-# https://wiki.debian.org/BluetoothUser#Preparation
-
-- name: bluetooth system packages
-  apt:
-    pkg: bluetooth
-
-# - name: enable bluetooth service
-#   service:
-#     name: bluetooth
-#     enabled: yes
-#     state: started
-
-- name: bluetooth gui packages
+- name: desktop bluetooth packages
   apt:
     pkg:
+      - bluetooth
       - blueman
diff --git a/tasks/editors.yaml b/tasks/editors.yaml
index 2b032dc..b09f9f1 100644
--- a/tasks/editors.yaml
+++ b/tasks/editors.yaml
@@ -1,6 +1,5 @@
 ---
-
-- name: install editors
+- name: desktop editor packages
   apt:
     pkg:
       - vim-gtk
diff --git a/tasks/filesystem.yaml b/tasks/filesystem.yaml
new file mode 100644
index 0000000..96078b5
--- /dev/null
+++ b/tasks/filesystem.yaml
@@ -0,0 +1,13 @@
+---
+- name: desktop filesystem packages
+  apt:
+    pkg:
+      - gvfs
+      - gvfs-backends
+      - gvfs-bin
+      - gvfs-fuse
+      - zip
+      - unzip
+      - baobab
+      - thunar
+      - catfish
diff --git a/tasks/graphic.yaml b/tasks/graphic.yaml
index dbc599a..64eee4f 100644
--- a/tasks/graphic.yaml
+++ b/tasks/graphic.yaml
@@ -1,6 +1,5 @@
 ---
-
-- name: graphic editors packages
+- name: desktop graphic packages
   apt:
     pkg:
       - gimp
@@ -9,3 +8,5 @@
       - gthumb
       - krita
       - krita-l10n
+      - eog
+      - xfce4-screenshooter
diff --git a/tasks/mail.yaml b/tasks/mail.yaml
index 702c659..591f38a 100644
--- a/tasks/mail.yaml
+++ b/tasks/mail.yaml
@@ -1,6 +1,5 @@
 ---
-
-- name: thunderbird
+- name: desktop mail client packages
   apt:
     pkg:
       - thunderbird
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 93a8d2c..8a2ee0d 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -1,8 +1,5 @@
 ---
 
-- import_role:
-    name: basic_desktop
-
 - import_role:
     name: firefox
 
@@ -13,6 +10,7 @@
     name: libreoffice
 
 - import_tasks: xfce.yaml
+- import_tasks: filesystem.yaml
 - import_tasks: audio.yaml
 - import_tasks: bluetooth.yaml
 - import_tasks: editors.yaml
diff --git a/tasks/mindmap.yaml b/tasks/mindmap.yaml
index 07c4874..ad74376 100644
--- a/tasks/mindmap.yaml
+++ b/tasks/mindmap.yaml
@@ -1,4 +1,4 @@
 ---
-- name: mindmapping software
+- name: desktop mindmapping software packages
   apt:
     pkg: vym
diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml
index ebc6c8b..5833f92 100644
--- a/tasks/multimedia.yaml
+++ b/tasks/multimedia.yaml
@@ -1,6 +1,5 @@
 ---
-
-- name: multimedia packages
+- name: desktop multimedia packages
   apt:
     pkg:
       - vlc
diff --git a/tasks/notifications.yaml b/tasks/notifications.yaml
index dc8f193..bf8f46d 100644
--- a/tasks/notifications.yaml
+++ b/tasks/notifications.yaml
@@ -4,7 +4,7 @@
   apt:
     pkg: notify-osd
 
-- name: dunst package absent
+- name: ensure dunst package is absent
   apt:
     pkg: dunst
     state: absent
diff --git a/tasks/office.yaml b/tasks/office.yaml
new file mode 100644
index 0000000..fbc0f6b
--- /dev/null
+++ b/tasks/office.yaml
@@ -0,0 +1,5 @@
+---
+- name: desktop office packages
+  apt:
+    pkg:
+      - evince
diff --git a/tasks/scanner.yaml b/tasks/scanner.yaml
index 153af1c..2d9c136 100644
--- a/tasks/scanner.yaml
+++ b/tasks/scanner.yaml
@@ -1,6 +1,6 @@
 ---
-
-- name: scan packages
+- name: desktop scanner packages
   apt:
     pkg:
       - simple-scan
+      - gscan2pdf
diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml
index 556919c..a773563 100644
--- a/tasks/xfce.yaml
+++ b/tasks/xfce.yaml
@@ -19,10 +19,3 @@
       - gnome-noble-icon-theme
       - gnome-wine-icon-theme
       - gnome-wise-icon-theme
-      - xfonts-terminus
-      - gvfs
-      - gvfs-backends
-      - gvfs-bin
-      - gvfs-fuse
-      - zip
-      - unzip