diff --git a/software.yaml b/software.yaml
index c080cf8..e43fd6c 100644
--- a/software.yaml
+++ b/software.yaml
@@ -7,26 +7,32 @@
     - name: Install applications
       dnf:
         name:
-          - audacity
+          # General
+          - git
           - code
-          - freecad
           - gcc-c++
+          - guile
           - valgrind
-          - gimp
           - htop
-          - inkscape
-          - kdenlive
-          - shotcut
-          - kicad
-          - krita
-          - mypaint
-          - prusa-slicer
           - python3-idle
           - texstudio
           - screen
           - tmux
           - vim
+          - emacs
+          # Multimedia
+          - audacity
+          - gimp
+          - inkscape
+          - kdenlive
+          - shotcut
+          - krita
+          - mypaint
           - celluloid
+          # CAD
+          - freecad
+          - kicad
+          - prusa-slicer
           # Multimedia codecs
           - ffmpeg-libs
           # Domain join requirements
@@ -35,6 +41,10 @@
           - oddjob-mkhomedir
           - adcli
           - samba-common-tools
+          # Fun
+          - sl
+          - cowsay
+          - figlet
           # Games
           #- openarena
         state: present