diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml
index de5d56e..a0e53c3 100644
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@@ -50,9 +50,10 @@
       update_cache: yes
       # One day
       cache_valid_time: 86400
-  - name: Install terminal packages
+  - name: Install packages
     apt:
       name:
+        # Terminal packages
         - adb
         - build-essential
         - earlyoom
@@ -80,31 +81,13 @@
         - wine
         - wine-binfmt
         - xz-utils # For Ansible deb support
-  - name: Install development packages
-    apt:
-      install_recommends: no
-      name:
-        - php # Dev stuff
-        - php-xml
-  - name: Install fonts
-    apt:
-      name:
+        # Fonts
         - fonts-inconsolata
         - fonts-noto
         - fonts-roboto
-  - name: Install games
-    apt:
-      name:
-        - minetest
-  - name: Install out-of-repo packages
-    apt:
-      deb: "{{ item }}"
-    loop:
-      - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb"
-      - "https://d11yldzmag5yn.cloudfront.net/prod/5.0.399860.0429/zoom_amd64.deb"
-  - name: Install desktop applications through APT
-    apt:
-      name:
+        # DE
+        - kubuntu-desktop
+        # Desktop applications
         - cantata
         - chromium-browser
         - clonezilla
@@ -120,7 +103,6 @@
         - kcolorchooser
         - kdenlive
         - keepassxc
-        - kubuntu-desktop
         - lutris
         - mesa-vulkan-drivers
         - mpc
@@ -148,16 +130,25 @@
         - zim
         - "libgl1-mesa-dri:i386"
         - "mesa-vulkan-drivers:i386"
+        # Games
+        - minetest
   - name: Install Focal-exclusive desktop applications
     apt:
       name:
         - piper
-    when: ansible_distribution_release == "focal"
-  - name: Remove desktop applications through APT
+  - name: Install packages without recommends
     apt:
-      state: absent
+      install_recommends: no
       name:
-        - ktorrent
+        - php # Dev stuff
+        - php-xml
+  - name: Install out-of-repo packages
+    apt:
+      deb: "{{ item }}"
+    loop:
+      - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb"
+      - "https://d11yldzmag5yn.cloudfront.net/prod/5.0.399860.0429/zoom_amd64.deb"
+    when: ansible_distribution_release == "focal"
   - name: Install desktop applications through pip3
     pip:
       executable: "/usr/bin/pip3"
@@ -176,6 +167,11 @@
       name: "{{ item }}"
     loop:
       - slack
+  - name: Remove desktop applications through APT
+    apt:
+      state: absent
+      name:
+        - ktorrent
   - name: Stop services
     systemd:
       name: "{{ item }}"