diff --git a/home/home.scm b/home/home.scm
index e1b9cbd..d2e12ac 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -90,19 +90,24 @@
                                                     "fd"
 
                                                     ; utilities
-                                                    "flatpak"
                                                     "qbittorrent"
                                                     "syncthing"
                                                     "wine-staging"
                                                     "winetricks"))
 
-            (list neovim-new
+            (list ; system
+                  freya-ca-certs
+
+                  ; programs
+                  neovim-new
                   easyeffects
-                  firefox-wayland-new
+
+                  ; gtk
                   lavanda-gtk-theme
                   mint-themes
+
+                  ; shell
                   zsh-autosuggestions
-                  freya-ca-certs
                   vim-plug)))
 
   ;; Below is the list of Home services.  To search for available
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 109c3ca..c0e8f9f 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -37,21 +37,6 @@
            #:use-module (freya packages networking)
            #:use-module (freya packages virtualization))
 
-(define %my-base-packages
-  (remove (lambda (package)
-        (member (package-name package)
-            (list "sudo" "nano")))
-      %base-packages))
-
-(define %backlight-udev-rule
-  (udev-rule
-    "90-backlight.rules"
-    (string-append "ACTION==\"add\", SUBSYSTEM==\"backlight\", "
-                   "RUN+=\"/run/current-system/profile/bin/chgrp video /sys/class/backlight/%k/brightness\""
-                   "\n"
-                   "ACTION==\"add\", SUBSYSTEM==\"backlight\", "
-                    "RUN+=\"/run/current-system/profile/bin/chmod g+w /sys/class/backlight/%k/brightness\"")))
-
 (define-public base-operating-system
     (operating-system
          (kernel linux)
@@ -171,23 +156,33 @@
                                                            "font-google-noto-sans-cjk"
                                                            "font-jetbrains-mono"
                                                            "font-dejavu"))
-                           (list xdg-desktop-portal-hyprland
+                           (list ; desktop
+                                 xdg-desktop-portal-hyprland
                                  swaylock-effects-new
                                  waybar-new
-                                 virt-manager-new
-                                 freya-ca-certs
-                                 hyprland-plugin-hy3
-                                 hyprland-plugins
+                                 mint-themes
+
+                                 ; hyprwm
                                  hyprland
                                  hyprlock
                                  hyprpaper
                                  hypridle
+                                 hyprland-plugin-hy3
+                                 hyprland-plugins
+
+                                 ; qt
+                                 qt5-styleplugins
+                                 qt6gtk2
+
+                                 ; bluetooth
                                  bluez-new
                                  blueman-new
-                                 mesa
-                                 qt5-styleplugins
-                                 qt6gtk2)
-                           %my-base-packages))
+
+                                 ; system
+                                 virt-manager-new
+                                 freya-ca-certs
+                                 mesa)
+                           %base-packages))
 
          ;; Below is the list of system services. TO search for available
          ;; services. run 'guix system search KEYWORD' in a terminal.