diff --git a/radio.scm b/radio.scm
index b35920a..5ea9776 100644
--- a/radio.scm
+++ b/radio.scm
@@ -1,5 +1,5 @@
 #|Modules|#
-(use-modules 
+(use-modules
  #|GNU  |# (gnu)
            (gnu home)
            (gnu home services)
@@ -32,7 +32,7 @@
  #|I|# image-viewers
  #|L|# linux
  #|M|# messaging minetest
- #|P|# package-management password-utils pdf pulseaudio python-xyz
+ #|P|# password-utils pdf pulseaudio python-xyz
  #|S|# scheme shells ssh suckless
  #|T|# telegram tex text-editors tor toys
  #|V|# version-control video
@@ -48,77 +48,75 @@
 
 (home-environment
  (packages
-  (list #|admin             |# neofetch
-        #|bittorrent        |# aria2 qbittorrent
-        #|c                 |# c-intro-and-ref
-        #|calendar          |# remind
-        #|disk              |# lf              ;Remove if I get used to dirvish
-        #|emacs             |# emacs
-        #|emacs-xyz         |#
-        #| • completion     |# emacs-cape emacs-corfu emacs-corfu-doc
-                               emacs-consult-lsp emacs-vertico
-        #| • centering      |# emacs-olivetti
-        #| • file manager   |# emacs-dirvish
-        #| • fuzzy-finder   |# emacs-orderless
-        #| • guile          |# emacs-geiser emacs-geiser-guile
-                               emacs-macrostep-geiser emacs-geiser-eros
-        #| • guix           |# emacs-guix emacs-direnv
-        #| • haunt          |# emacs-ox-haunt
-        #| • icons          |# emacs-all-the-icons
-        #| • irc            |# emacs-circe
-        #| • kakoune        |# emacs-kakoune emacs-phi-search-mc emacs-ryo-modal
-        #| • latex          |# emacs-auctex emacs-latex-preview-pane
-        #| • linter         |# emacs-flycheck emacs-flycheck-guile
-        #| • maps           |# emacs-osm
-        #| • music player   |# emacs-emms
-        #| • org            |# emacs-org-bullets emacs-org-fragtog
-                               emacs-org-present emacs-org-roam emacs-org-modern
-        #| • pulsar         |# emacs-pulsar
-        #| • rss            |# emacs-elfeed emacs-elfeed-org 
-        #| • s-expressions  |# emacs-lispy emacs-rainbow-delimiters
-        #| • ease config    |# emacs-setup
-        #| • typing         |# emacs-typing
-        #| • terminal       |# emacs-eat
-        #|file              |# file
-        #|fonts             |# font-arabic-misc font-liberation font-meslo-lg-dz
-                               font-misc-misc font-un font-wqy-zenhei
-        #|freedesktop       |# xdg-utils
-        #|games             |# minetest supertuxkart xonotic
-        #|gnome             |# adwaita-icon-theme
-        #|gnu-doc           |# gnu-standards
-        #|gnupg             |# gnupg pinentry
-        #|gnuzilla          |# icecat
-        #|guile-xyz         |# guile-reader guile-pfds guile-srfi-159 haunt
-        #|image-viewers     |# nsxiv
-        #|linux             |# alsa-utils
-        #|messaging         |# toxic
-        #|package-management|# gwl
-        #|password-utils    |# keepassxc
-        #|pulseaudio        |# pulseaudio
-        #|pdf               |# zathura zathura-pdf-mupdf zathura-pdf-poppler
-                               zathura-djvu
-        #|pulseaudio        |# pulseaudio pamixer pavucontrol
-        #|python-xyz        |# python-ueberzug
-        #|scheme            |# sicp slib
-        #|shells            |# fish fish-foreign-env
-        #|ssh               |# openssh
-        #|suckless          |# xst
-        #|telegram          |# telegram-desktop
-        #|tex               |# texlive-amsfonts texlive-scheme-basic
-                               texlive-beamer texlive-bibtex texlive-ec
-                               texlive-latex-fonts texlive-graphics
-                               texlive-float texlive-geometry texlive-minted
-                               texlive-pdfx texlive-texinfo texlive-tools
-                               texlive-unicode-math
-        #|tor               |# tor
-        #|toys              |# oneko
-        #|vesion-control    |# git
-        #|video             |# ffmpeg mpv yt-dlp
-        #|web-browsers      |# nyxt
-        #|wm                |# awesome-next
-        #|xdisorg           |# maim redshift xbanish xclip xdotool xinit xsel
-        #|xorg              |# setxkbmap xinput xf86-input-libinput xkill
-                               xmodmap xorg-server xrdb xset))
+  (list #|admin           |# neofetch
+        #|bittorrent      |# aria2 qbittorrent
+        #|c               |# c-intro-and-ref
+        #|calendar        |# remind
+        #|disk            |# lf              ;Remove if I get used to dirvish
+        #|emacs           |# emacs
+        #|emacs-xyz       |#
+        #| • completion   |# emacs-cape emacs-corfu emacs-corfu-doc
+                             emacs-consult-lsp emacs-vertico
+        #| • centering    |# emacs-olivetti
+        #| • file manager |# emacs-dirvish
+        #| • fuzzy-finder |# emacs-orderless
+        #| • guile        |# emacs-geiser emacs-geiser-guile
+                             emacs-macrostep-geiser emacs-geiser-eros
+        #| • guix         |# emacs-guix emacs-direnv
+        #| • haunt        |# emacs-ox-haunt
+        #| • icons        |# emacs-all-the-icons
+        #| • irc          |# emacs-circe
+        #| • kakoune      |# emacs-kakoune emacs-phi-search-mc emacs-ryo-modal
+        #| • latex        |# emacs-auctex emacs-latex-preview-pane
+        #| • linter       |# emacs-flycheck emacs-flycheck-guile
+        #| • maps         |# emacs-osm
+        #| • music player |# emacs-emms
+        #| • org          |# emacs-org-bullets emacs-org-fragtog
+                             emacs-org-present emacs-org-roam emacs-org-modern
+        #| • pulsar       |# emacs-pulsar
+        #| • rss          |# emacs-elfeed emacs-elfeed-org
+        #| • s-exps       |# emacs-lispy emacs-rainbow-delimiters
+        #| • ease config  |# emacs-setup
+        #| • typing       |# emacs-typing
+        #| • terminal     |# emacs-eat
+        #|file            |# file
+        #|fonts           |# font-arabic-misc font-liberation font-meslo-lg-dz
+                             font-misc-misc font-un font-wqy-zenhei
+        #|freedesktop     |# xdg-utils
+        #|games           |# minetest supertuxkart xonotic
+        #|gnome           |# adwaita-icon-theme
+        #|gnu-doc         |# gnu-standards
+        #|gnupg           |# gnupg pinentry
+        #|gnuzilla        |# icecat
+        #|guile-xyz       |# guile-reader guile-pfds guile-srfi-159 haunt
+        #|image-viewers   |# nsxiv
+        #|linux           |# alsa-utils
+        #|messaging       |# toxic
+        #|password-utils  |# keepassxc
+        #|pulseaudio      |# pulseaudio
+        #|pdf             |# zathura zathura-pdf-mupdf zathura-pdf-poppler
+                             zathura-djvu
+        #|pulseaudio      |# pulseaudio pamixer pavucontrol
+        #|python-xyz      |# python-ueberzug
+        #|scheme          |# sicp slib
+        #|shells          |# fish fish-foreign-env
+        #|ssh             |# openssh
+        #|suckless        |# xst
+        #|telegram        |# telegram-desktop
+        #|tex             |# texlive-amsfonts texlive-scheme-basic
+                             texlive-beamer texlive-bibtex texlive-ec
+                             texlive-latex-fonts texlive-graphics texlive-float
+                             texlive-geometry texlive-minted texlive-pdfx
+                             texlive-texinfo texlive-tools texlive-unicode-math
+        #|tor             |# tor
+        #|toys            |# oneko
+        #|vesion-control  |# git
+        #|video           |# ffmpeg mpv yt-dlp
+        #|web-browsers    |# nyxt
+        #|wm              |# awesome-next
+        #|xdisorg         |# maim redshift xbanish xclip xdotool xinit xsel
+        #|xorg            |# setxkbmap xinput xf86-input-libinput xkill
+                             xmodmap xorg-server xrdb xset))
 
  (services
   (list #|XDG services|#