diff --git a/flake.nix b/flake.nix
index 03a9d53f..693a1ef8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,7 +97,6 @@
       # Laptops
       intuos.imports = [ ./hosts/intuos ];
       jupiter.imports = [ ./hosts/jupiter ];
-      flight.imports = [ ./hosts/flight ];
 
       # Servers
       midas.imports = [ ./hosts/midas ];
diff --git a/hosts/flight/boot/default.nix b/hosts/flight/boot/default.nix
deleted file mode 100644
index 2d553d61..00000000
--- a/hosts/flight/boot/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  boot = {
-    kernelPackages = pkgs.linuxPackages;
-    loader.limine = {
-      enable = true;
-      biosDevice = lib.mkForce "/dev/disk/by-id/ata-XSTAR_SSD_64GB_XSFA2011000462";
-    };
-    plymouth.enable = true;
-  };
-}
diff --git a/hosts/flight/default.nix b/hosts/flight/default.nix
deleted file mode 100644
index fe3b545a..00000000
--- a/hosts/flight/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./boot
-    ./filesystems
-    ./hardware
-    ./root
-    ./user
-  ];
-
-  system = {
-    nixos.tags = [ "pc" ];
-    stateVersion = "25.05";
-  };
-
-  deployment.targetHost = "409:b2b1:966c:b13:6d67:2d6b:45e2:f048";
-}
diff --git a/hosts/flight/filesystems/default.nix b/hosts/flight/filesystems/default.nix
deleted file mode 100644
index 8a568d0f..00000000
--- a/hosts/flight/filesystems/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
-  fileSystems = {
-    "/persist/storage" = {
-      device = "/dev/disk/by-uuid/3d6f81f2-7fa5-40a2-85bb-56f4cab63773";
-      fsType = "btrfs";
-      options = [
-        "nofail"
-        "nosuid"
-        "subvol=storage"
-      ];
-    };
-  };
-}
diff --git a/hosts/flight/hardware/default.nix b/hosts/flight/hardware/default.nix
deleted file mode 100644
index fa1b984c..00000000
--- a/hosts/flight/hardware/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, modulesPath, ... }:
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ehci_pci"
-        "ahci"
-        "xhci_pci"
-        "usb_storage"
-        "sd_mod"
-        "sr_mod"
-      ];
-      kernelModules = [ "dm-snapshot" ];
-    };
-    kernelModules = [ "kvm-intel" ];
-  };
-
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-  hardware = {
-    cpu.intel.updateMicrocode = true;
-    nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
-      prime = {
-        sync.enable = true;
-        intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
-      };
-    };
-  };
-
-  nixpkgs.hostPlatform = "x86_64-linux";
-}
diff --git a/hosts/flight/root/default.nix b/hosts/flight/root/default.nix
deleted file mode 100644
index 7bccd4b8..00000000
--- a/hosts/flight/root/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, name, ... }:
-{
-  boot.initrd.luks.devices."${name}-disk".device = "/dev/disk/by-uuid/0fc43c11-c382-4e37-812b-8866b1b20e68";
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/FA96-EF11";
-      fsType = "vfat";
-      options = [ "umask=0077" ];
-    };
-
-    "/" = {
-      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
-      fsType = "btrfs";
-      options = [
-        "compress=zstd"
-        "ssd"
-        "subvol=root"
-      ];
-    };
-    "/prev" = {
-      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
-      fsType = "btrfs";
-      options = [
-        "compress=zstd"
-        "noexec"
-        "ssd"
-        "subvol=prev"
-      ];
-    };
-    "/nix" = {
-      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
-      fsType = "btrfs";
-      options = [
-        "compress=zstd"
-        "ssd"
-        "subvol=nix"
-      ];
-    };
-
-    "/persist" = {
-      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
-      fsType = "btrfs";
-      neededForBoot = true;
-      options = [
-        "compress=zstd"
-        "ssd"
-        "subvol=persist"
-      ];
-    };
-  };
-
-  swapDevices = [ { device = "/dev/disk/by-uuid/93ac8c5c-c947-4b45-a12a-146e87398517"; } ];
-}
diff --git a/hosts/flight/user/default.nix b/hosts/flight/user/default.nix
deleted file mode 100644
index e408de6a..00000000
--- a/hosts/flight/user/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  home-manager.users."${config.vars.mainUser}" = {
-    home.guifull.enable = true;
-    wayland.windowManager.sway.extraSessionCommands = lib.mkForce "";
-  };
-}
diff --git a/hosts/hidden/default.nix b/hosts/hidden/default.nix
index c0da8fb6..d64e2118 100644
--- a/hosts/hidden/default.nix
+++ b/hosts/hidden/default.nix
@@ -5,11 +5,13 @@
     ./disko
     ./hardware
     ./services
-    ./user
   ];
 
   system = {
-    nixos.tags = [ "pc" ];
+    nixos.tags = [
+      "pc"
+      "school"
+    ];
     stateVersion = "24.11";
   };
 
diff --git a/hosts/hidden/user/default.nix b/hosts/hidden/user/default.nix
deleted file mode 100644
index 60e0e93a..00000000
--- a/hosts/hidden/user/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    desktop.enable = true;
-    school.enable = true;
-  };
-}
diff --git a/hosts/intuos/default.nix b/hosts/intuos/default.nix
index 4e3a9f3b..7725d47d 100644
--- a/hosts/intuos/default.nix
+++ b/hosts/intuos/default.nix
@@ -4,11 +4,13 @@
     ./boot
     ./disko
     ./hardware
-    ./user
   ];
 
   system = {
-    nixos.tags = [ "pc" ];
+    nixos.tags = [
+      "pc"
+      "production"
+    ];
     stateVersion = "24.11";
   };
 
diff --git a/hosts/intuos/user/default.nix b/hosts/intuos/user/default.nix
deleted file mode 100644
index 256a66ed..00000000
--- a/hosts/intuos/user/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    desktop.enable = true;
-    production.enable = true;
-  };
-}
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 7271d00e..1a9c5076 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -7,11 +7,15 @@
     ./hardware
     ./jovian
     ./services
-    ./user
   ];
 
   system = {
-    nixos.tags = [ "pc" ];
+    nixos.tags = [
+      "pc"
+      "gaming"
+      "production"
+      "school"
+    ];
     stateVersion = "24.11";
   };
 
diff --git a/hosts/jupiter/user/default.nix b/hosts/jupiter/user/default.nix
deleted file mode 100644
index 43b57345..00000000
--- a/hosts/jupiter/user/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home = {
-    guifull.enable = true;
-    school.enable = true;
-    enableNixpkgsReleaseCheck = false;
-  };
-}
diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix
index cddcad85..6a45e683 100644
--- a/hosts/midas/services/default.nix
+++ b/hosts/midas/services/default.nix
@@ -20,11 +20,9 @@
     minecraft-servers = {
       enable = true;
       servers = {
-        velocity.enable = true;
         johnside.enable = true;
-        marsh.enable = true;
-        cornworld.enable = true;
         skyblock.enable = true;
+        velocity.enable = true;
       };
     };
   };
diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix
index bb1ea3e0..11daf4cb 100644
--- a/hosts/tower/default.nix
+++ b/hosts/tower/default.nix
@@ -5,11 +5,14 @@
     ./disko
     ./filesystems
     ./hardware
-    ./user
   ];
 
   system = {
-    nixos.tags = [ "pc" ];
+    nixos.tags = [
+      "pc"
+      "gaming"
+      "production"
+    ];
     stateVersion = "24.05";
   };
 
diff --git a/hosts/tower/user/default.nix b/hosts/tower/user/default.nix
deleted file mode 100644
index bdfb086b..00000000
--- a/hosts/tower/user/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ config, ... }:
-{
-  home-manager.users."${config.vars.mainUser}".home.guifull.enable = true;
-}
diff --git a/modules/home/profiles/default.nix b/modules/home/profiles/default.nix
index 4c658ec6..7b85ee23 100644
--- a/modules/home/profiles/default.nix
+++ b/modules/home/profiles/default.nix
@@ -1,7 +1,5 @@
 { lib, ... }:
 {
-  imports = [ ./guifull ];
-
   options.home = with lib; {
     desktop.enable = mkEnableOption "Desktop programs and services";
     gaming.enable = mkEnableOption "Gaming apps and programs";
diff --git a/modules/home/profiles/guifull/default.nix b/modules/home/profiles/guifull/default.nix
deleted file mode 100644
index a322678d..00000000
--- a/modules/home/profiles/guifull/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-{
-  options.home = with lib; {
-    guifull.enable = mkEnableOption "Enable most other GUI profiles";
-  };
-
-  config.home = lib.mkIf config.home.guifull.enable {
-    desktop.enable = true;
-    gaming.enable = true;
-    production.enable = true;
-  };
-}
diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix
index 5fbad56b..43a041ea 100644
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@@ -14,8 +14,8 @@
     ./nix-index
     ./ranger
     ./ssh
+    ./tmux
     ./yt-dlp
-    ./zellij
     ./zoxide
     ./zsh
   ];
diff --git a/modules/home/programs/terminal/tmux/default.nix b/modules/home/programs/terminal/tmux/default.nix
new file mode 100644
index 00000000..338fa76e
--- /dev/null
+++ b/modules/home/programs/terminal/tmux/default.nix
@@ -0,0 +1,24 @@
+{ ... }:
+{
+  programs.tmux = {
+    enable = true;
+    keyMode = "vi";
+    mouse = true;
+    terminal = "st-256color";
+    historyLimit = 4096;
+    baseIndex = 1;
+    extraConfig = ''
+      set -g status on
+      set -g status-left ""
+      set -g status-position bottom
+      set -g status-right "#[bg=brightblack]#[fg=dark_purple] #T "
+      set -g status-style "bg=black"
+
+      set -g set-titles on
+      set -g set-titles-string "#T"
+
+      setw -g window-status-format "#[bg=brightmagenta]#[fg=black] #I #[bg=brightblack]#[fg=white] #W "
+      setw -g window-status-current-format "#[bg=brightmagenta]#[fg=black] #I #[bg=white]#[fg=black] #W "
+    '';
+  };
+}
diff --git a/modules/home/programs/terminal/zellij/default.nix b/modules/home/programs/terminal/zellij/default.nix
deleted file mode 100644
index 2b0546b6..00000000
--- a/modules/home/programs/terminal/zellij/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, ... }:
-{
-  programs.zellij.enable = true;
-
-  home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = 
-  with lib; with config.home; with config.xdg; [
-    "state/${removePrefix "${homeDirectory}/" cacheHome}/zellij"
-    "state/${removePrefix "${homeDirectory}/" configHome}/zellij"
-  ];
-}
diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index e842508a..4dd256a8 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -14,6 +14,15 @@
           }
         '';
       };
+
+      mpdscribble = {
+        enable = true;
+        endpoints."last.fm" = {
+          username = "viceebun";
+          passwordFile = "${config.xdg.dataHome}/mpd/lastfm_password";
+        };
+      };
+
       mpd-mpris.enable = true;
       mpd-discord-rpc.enable = true;
     };
diff --git a/modules/system/devices/networking/hosts/default.nix b/modules/system/devices/networking/hosts/default.nix
index c2f38678..8d27ab61 100644
--- a/modules/system/devices/networking/hosts/default.nix
+++ b/modules/system/devices/networking/hosts/default.nix
@@ -6,7 +6,6 @@
     "${hidden.config.deployment.targetHost}" = [ "hidden" ];
     "${intuos.config.deployment.targetHost}" = [ "intuos" ];
     "${jupiter.config.deployment.targetHost}" = [ "jupiter" ];
-    "${flight.config.deployment.targetHost}" = [ "flight" ];
 
     # Servers
     "${midas.config.deployment.targetHost}" = [ "midas" ];
diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index 0ba12e4d..66805622 100644
Binary files a/modules/system/secrets/default.nix and b/modules/system/secrets/default.nix differ
diff --git a/modules/system/services/server/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix
index 744cde04..96fe9b52 100644
--- a/modules/system/services/server/mailserver/default.nix
+++ b/modules/system/services/server/mailserver/default.nix
@@ -25,9 +25,9 @@
         "jimbo@nixfox.ca" = {
           hashedPassword = config.secrets.mailHash.bun;
           aliases = [
-            "james@nixfox.ca"
-
             "bun@nixfox.ca"
+            "aubun@nixfox.ca"
+
             "bun@bloxelcom.net"
 
             "contact@nixfox.ca"
diff --git a/modules/system/services/server/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix
index 6b7bdb5e..41b47284 100644
--- a/modules/system/services/server/minecraft/common/default.nix
+++ b/modules/system/services/server/minecraft/common/default.nix
@@ -18,17 +18,20 @@
 
     # Common whitelist
     whitelist = {
-      K5G = "8656dc10-6050-4a17-b29e-88c4babbc54c";
-      JimmJam = "2f7affee-e10b-450f-a5e2-44c79a14a109";
-      Viceebun = "f583f591-ad9b-4a30-8d91-514881b31394";
+      # Me!
+      viceebun = "f583f591-ad9b-4a30-8d91-514881b31394";
+      monarchbun = "2f7affee-e10b-450f-a5e2-44c79a14a109";
+      aubund = "8656dc10-6050-4a17-b29e-88c4babbc54c";
+
+      # Everyone else
+      Ankha3000 = "dd65a277-f618-411e-812c-900c9c7e82d9";
       DewDemolisher = "9205524f-3886-483d-b471-82bb9905671a";
       Freecorn1854 = "8299cd8d-3cd4-4779-8180-0d9db6dc12a9";
       Freemid1854 = "cf430607-3c2e-4c8b-8183-28299e801fa5";
-      Tinyattack09 = "aaa8e9e2-4e51-4925-b9df-8a9504aec5d5";
-      Ankha3000 = "dd65a277-f618-411e-812c-900c9c7e82d9";
-      catoiico = "01f10cdf-c146-437e-99b1-2278b5dbe420";
-      Sp0ok7 = "016c3daa-3dd5-4631-ae79-3a6f48d7cbe6";
       PooxterMooxter = "c973f4b5-ab50-45e3-b3eb-36286a6f66aa";
+      Sp0ok7 = "016c3daa-3dd5-4631-ae79-3a6f48d7cbe6";
+      Tinyattack09 = "aaa8e9e2-4e51-4925-b9df-8a9504aec5d5";
+      catoiico = "01f10cdf-c146-437e-99b1-2278b5dbe420";
     };
 
     # Common plugins
@@ -45,10 +48,6 @@
         url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/Il6UOBoH/voicechat-bukkit-2.5.27.jar";
         sha256 = "1k95sy0hf74y80fzk7960ww8wk210phyaiqkn4q7wlagdq48mxqm";
       };
-      "plugins/ViaVersion.jar" = builtins.fetchurl {
-        url = "https://cdn.modrinth.com/data/P1OZGk5p/versions/cdC9vQSF/ViaVersion-5.3.2.jar";
-        sha256 = "0q1jrd3n6pyki8pyvckhm0d2jgh3lhzkq99cngskj3mlfb9pr57l";
-      };
     };
 
     # Config files
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index dee9152e..88ccf70d 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -40,8 +40,15 @@
     uid = 1000;
   };
 
+  # Import hm config, enable profiles based on system tags
   home-manager.users."${config.vars.mainUser}" = {
     imports = [ ../../../home ];
-    home.stateVersion = lib.mkForce config.system.stateVersion;
+    home = {
+      desktop.enable = builtins.elem "pc" config.system.nixos.tags;
+      gaming.enable = builtins.elem "gaming" config.system.nixos.tags;
+      production.enable = builtins.elem "production" config.system.nixos.tags;
+      school.enable = builtins.elem "school" config.system.nixos.tags;
+      stateVersion = lib.mkForce config.system.stateVersion;
+    };
   };
 }