diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix
index a0f97fb..0bcdafc 100644
--- a/hosts/yodaGaming/configuration.nix
+++ b/hosts/yodaGaming/configuration.nix
@@ -20,6 +20,11 @@
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
 
+      #../../modules/headless.nix
+      #
+      #../../modules/kde.nix
+      #../../modules/programs-kde.nix
+      #
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
       ../../modules/gnome-extensions.nix
@@ -27,9 +32,6 @@
       ../../modules/gnome-wallpaper.nix
       ../../modules/programs-gnome.nix
 
-      #../../modules/gnome-terminal.nix
-      ../../modules/blackbox.nix
-
       ../../modules/programs-base.nix
       #../../modules/programs.nix
       ../../modules/flatpak.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 5fb0ba4..1e08598 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -22,8 +22,11 @@
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
 
+      #../../modules/headless.nix
+      #
       #../../modules/kde.nix
       #../../modules/programs-kde.nix
+      #
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
       ../../modules/gnome-extensions.nix
@@ -33,9 +36,6 @@
       ../../modules/gnome-wallpaper.nix
       ../../modules/programs-gnome.nix
 
-      #../../modules/gnome-terminal.nix
-      ../../modules/blackbox.nix
-
       ../../modules/programs-base.nix
       ../../modules/programs.nix
       ../../modules/flatpak.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 919594b..032ef31 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -29,18 +29,18 @@
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
 
+      #../../modules/headless.nix
+      #
       ../../modules/kde.nix
       ../../modules/programs-kde.nix
-#      ../../modules/gnome-base.nix
-#      ../../modules/gnome-config.nix
-#      ../../modules/gnome-extensions.nix
-#      ../../modules/gnome-fractional-scaling.nix
-#      #../../modules/fwupd-gnome.nix # TODO: Constantly keeps installing the same fw update again
-#      ../../modules/gnome-wallpaper.nix
-#      ../../modules/programs-gnome.nix
-
-      #../../modules/gnome-terminal.nix
-      #../../modules/blackbox.nix
+      #
+      #../../modules/gnome-base.nix
+      #../../modules/gnome-config.nix
+      #../../modules/gnome-extensions.nix
+      #../../modules/gnome-fractional-scaling.nix
+      #../../modules/fwupd-gnome.nix # TODO: Constantly keeps installing the same fw update again
+      #../../modules/gnome-wallpaper.nix
+      #../../modules/programs-gnome.nix
 
       ../../modules/programs-base.nix
       #../../modules/programs.nix
@@ -92,12 +92,5 @@
   # Most users should never change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release.
   system.stateVersion = "23.05";
 
-#  users.users.foo = {
-#    initialPassword = "asdf";
-#    isNormalUser  = true;
-#    description  = "Just for testing";
-#    extraGroups  = [ "wheel" "networkmanager" ];
-#  };
-
   # TODO: refactor new file "favorite-apps.nix" -> only if on gnome, use dconf.settings
 }
diff --git a/modules/programs-gnome.nix b/modules/programs-gnome.nix
index 6226591..3939a39 100644
--- a/modules/programs-gnome.nix
+++ b/modules/programs-gnome.nix
@@ -4,6 +4,8 @@
     ./file-roller.nix # Archive manager: Compress and decompress
     ./thunderbird.nix # email
     ./ghostwriter.nix # Markdown editor
+    #./gnome-terminal.nix # Terminal emulator.
+    ./blackbox.nix # Terminal emulator.
   ];
 
   users.users.yoda = {