diff --git a/roles/Tachikoma/tasks/main.yml b/roles/Tachikoma/tasks/main.yml
index a448865..20dbf91 100644
--- a/roles/Tachikoma/tasks/main.yml
+++ b/roles/Tachikoma/tasks/main.yml
@@ -1,47 +1,51 @@
 ---
 
- - name: Install Tachikoma packages
-   become: yes
-   package:
-     name:
-       - wifi-menu
-       - weechat
-       - elinks
-       - conky
-       - xfce4
-       - xfce4-goodies
-       - xfce4-screenshooter
-       - xscreensaver
-       - libreoffice-still
-       - hunspell
-       - hunspell-en_us
-       - google-chrome
-       - keepassxc
-       - sshfs
-       - vlc
-       - cups
-       - brother-mfc-j430w
-       - brscan4
-       - xsane
-       - mtpfs
-       - libmtp
-       - alsamixer
+- name: Install Tachikoma packages
+  become: true
+  ansible.builtin.package:
+    name:
+      - wifi-menu # Needed XFCE4 add-ons
+      - conky
+      - xfce4
+      - xfce4-goodies
+      - xfce4-screenshooter
+      - xscreensaver
+      - alsamixer
+      - sshfs # Mount helpers
+      - mtpfs
+      - libmtp
+      - libreoffice-still # Office
+      - hunspell
+      - hunspell-en_us
+      - keepassxc
+      - weechat # Clients
+      - elinks
+      - google-chrome
+      - vlc # Multimedia
+      - sound-juicer
+      - obs-studio
+      - kdenlive
+      - gimp
+      - cups # Printing
+      - brother-mfc-j430w
+      - brscan4
+      - xsane
 
- - name: Remove deprecated packages
-   become: yes
-   package:
-     name:
-       - chromium
-       - keepassx
-       - kpcli
-       - irssi
-       - lynx
+- name: Remove deprecated packages
+  become: true
+  ansible.builtin.package:
+    name:
+      - chromium
+      - keepassx
+      - kpcli
+      - irssi
+      - lynx
 
- - name: Enable services
-   become: yes
-   service:
-     name: "{{ item }}"
-     state: running
-     enabled: yes
-   with:
-     - cups.service
+- name: Enable services
+  become: true
+  ansible.builtin.service:
+    name: "{{ item }}"
+    state: running
+    enabled: true
+  with:
+    - cups.service