diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index 08758e7..895ae59 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -26,7 +26,12 @@ in
 
       ../../modules/base.nix
       ../../modules/headless.nix
+
       #../../modules/gnome-base.nix
+      #../../modules/gnome-config.nix
+      #../../modules/gnome-extensions.nix
+      #../../modules/gnome-fractional-scaling.nix
+
       #../../modules/programs.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
@@ -34,10 +39,6 @@ in
       #../../modules/print-and-scan.nix
       ../../modules/fde-ssh-unlock.nix
       #../../modules/nextcloud-integration.nix
-
-      #../../modules/gnome-config.nix
-      #../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
       #../../modules/git.nix
       ../../modules/zsh.nix
       #../../modules/nitrokey-gpg-smartcard.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index f716771..5ac9b36 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -25,7 +25,12 @@ in
 
       ../../modules/base.nix
       #../../modules/headless.nix
+
       ../../modules/gnome-base.nix
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      #../../modules/gnome-fractional-scaling.nix
+
       ../../modules/programs.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
@@ -33,10 +38,6 @@ in
       ../../modules/print-and-scan.nix
       #../../modules/fde-ssh-unlock.nix
       ../../modules/nextcloud-integration.nix
-
-      ../../modules/gnome-config.nix
-      ../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-gpg-smartcard.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 1fec780..ea2cd81 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -25,7 +25,12 @@ in
 
       ../../modules/base.nix
       #../../modules/headless.nix
+
       ../../modules/gnome-base.nix
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      ../../modules/gnome-fractional-scaling.nix
+
       ../../modules/programs.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
@@ -33,10 +38,6 @@ in
       ../../modules/print-and-scan.nix
       #../../modules/fde-ssh-unlock.nix
       ../../modules/nextcloud-integration.nix
-
-      ../../modules/gnome-config.nix
-      ../../modules/gnome-extensions.nix
-      ../../modules/gnome-fractional-scaling.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-gpg-smartcard.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index af24300..abb62ab 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -26,7 +26,12 @@ in
 
       ../../modules/base.nix
       ../../modules/headless.nix
+
       #../../modules/gnome-base.nix
+      #../../modules/gnome-config.nix
+      #../../modules/gnome-extensions.nix
+      #../../modules/gnome-fractional-scaling.nix
+
       #../../modules/programs.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
@@ -34,10 +39,6 @@ in
       #../../modules/print-and-scan.nix
       ../../modules/fde-ssh-unlock.nix
       #../../modules/nextcloud-integration.nix
-
-      #../../modules/gnome-config.nix
-      #../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
       #../../modules/git.nix
       ../../modules/zsh.nix
       #../../modules/nitrokey-gpg-smartcard.nix
diff --git a/modules/gnome-base.nix b/modules/gnome-base.nix
index 826f126..ac8b1b2 100644
--- a/modules/gnome-base.nix
+++ b/modules/gnome-base.nix
@@ -1,6 +1,20 @@
 { config, pkgs, ... }:
 
 {
+  # Don't install all programs of the GNOME desktop.
+  # https://nixos.wiki/wiki/GNOME#Excluding_some_GNOME_applications_from_the_default_install
+  environment.gnome.excludePackages = (with pkgs; [
+    gnome-photos
+    gnome-tour
+    gnome-console # Can't be configured with Home-Manager as of 2023-10.
+    gnome.cheese # Webcam viewer
+    gnome.gnome-music # Music player
+    gnome.epiphany # Web browser
+    gnome.geary # Email
+    gnome.gnome-characters
+    #gnome.gnome-contacts
+  ]);
+
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
diff --git a/modules/programs.nix b/modules/programs.nix
index 1c37d0b..73d9014 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,23 +1,12 @@
 { config, pkgs, ... }:
 
 {
-  # Don't install all programs of the GNOME desktop.
-  # https://nixos.wiki/wiki/GNOME#Excluding_some_GNOME_applications_from_the_default_install
-  environment.gnome.excludePackages = (with pkgs; [
-    gnome-photos
-    gnome-tour
-    gnome-console # Can't be configured with Home-Manager as of 2023-10.
-  ]) ++ (with pkgs.gnome; [
-    cheese # Webcam viewer
-    gnome-music # Music player
-    epiphany # Web browser
-    geary # Email
-    gnome-characters
-    #gnome-contacts
-  ]);
-
   users.users.yoda = {
     packages = with pkgs; [
+      #
+      # DEVELOPMENT
+      #
+
       # CLI apps
       gnumake # make
       wget
@@ -25,21 +14,25 @@
       killall
       colmena
 
-      # CCC Weather Workshop
-      #
-      # TODO: rdwd from Git, the packaged version is too old
-      #
-      # TODO: move to nix shell of weather Git repository
-      #       (think of it as a docker container for the weather project: I don't need this elsewhere)
-      # https://github.com/nix-community/nix-direnv
-      #
-      unzip
-      (rWrapper.override{ packages = with rPackages; [ lubridate rdwd zoo ]; })
-
-      # Graphical Apps
+      # Graphical apps
       gnome.gnome-terminal # Console. For now, we use this instead of gnome-console.
       gnome.gnome-tweaks
       gnome.dconf-editor
+      meld # Diff and merge tool
+      handbrake # Rip DVD and Blu-ray; rotate and export videos
+      mediainfo-gui # View video metadata.
+      ( # Integrated Development Environment (IDE)
+        if (config.nixpkgs.config.allowUnfree)
+        then jetbrains.idea-ultimate
+        else jetbrains.idea-community
+      )
+
+      #
+      # OFFICE
+      #
+
+      # Graphical apps
+
       tor-browser-bundle-bin # Tor web browser
       keepassxc # Password manager
       freetube # YouTube client
@@ -48,19 +41,12 @@
       rnote # Handwritten notes
       xournalpp # Handwritte notes
       pdfarranger # PDF files: Split, merge, rotate, rearrange, export selected pages
+      # Office suite.
       # For spellcheck, see here: https://nixos.wiki/wiki/LibreOffice#Spellcheck
-      libreoffice-fresh # Office suite
+      libreoffice-fresh
       anki-bin # Flashcards
       signal-desktop # Signal client
-      ( # Integrated Development Environment (IDE)
-        if (config.nixpkgs.config.allowUnfree)
-        then jetbrains.idea-ultimate
-        else jetbrains.idea-community
-      )
       transmission-gtk # BitTorrent client
-      meld # Diff and merge tool
-      handbrake # Rip DVD and Blu-ray; rotate and export videos
-      mediainfo-gui # View video metadata.
 
       # Matrix clients
       element-desktop