diff --git a/hosts/jupiter/filesystems/default.nix b/hosts/jupiter/filesystems/default.nix
index 7f734c26..7c1feb2d 100644
--- a/hosts/jupiter/filesystems/default.nix
+++ b/hosts/jupiter/filesystems/default.nix
@@ -1,13 +1,11 @@
 { config, ... }:
 {
-  fileSystems = {
-    "/mnt/Games" = {
-      device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803";
-      fsType = "btrfs";
-      options = [
-        "nofail"
-        "nosuid"
-      ];
-    };
+  fileSystems."/mnt/Games" = {
+    device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803";
+    fsType = "btrfs";
+    options = [
+      "nofail"
+      "nosuid"
+    ];
   };
 }
diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix
index c6c170d8..30fca6b4 100644
--- a/hosts/jupiter/jovian/default.nix
+++ b/hosts/jupiter/jovian/default.nix
@@ -3,14 +3,6 @@
   imports = [ ./desktop ];
 
   config = lib.mkIf config.jovian.steam.enable {
-    # Kernel and hardware
-    boot = {
-      kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;
-      supportedFilesystems.nfs = lib.mkForce false;
-    };
-
-    hardware.xone.enable = true;
-
     # Steam and Jovian services
     jovian = {
       steam = {
@@ -27,9 +19,16 @@
       };
     };
 
+    # Disable NFS mounts
+    boot.supportedFilesystems.nfs = lib.mkForce false;
+
+    # Steam input on Wayland desktops
     programs.steam.extest.enable = true;
 
-    # Networkmanager for UI compatibility
+    # Xbox controller support
+    hardware.xone.enable = true;
+
+    # NetworkManager for UI compatibility
     networking.networkmanager.enable = true;
 
     # Disable conflicting services
diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix
index 4aec46c2..c6b46c7d 100644
--- a/hosts/jupiter/services/default.nix
+++ b/hosts/jupiter/services/default.nix
@@ -7,15 +7,7 @@
 
     virtualisation = {
       libvirtd.enable = true;
-      vmware.host.enable = true;
-    };
-
-    services.nginx = {
-      enable = true;
-      virtualHosts."localhost" = {
-        default = true;
-        root = "/var/www/landing-page";
-      };
+      #vmware.host.enable = true;
     };
   };
 }
diff --git a/hosts/jupiter/services/nginx/default.nix b/hosts/jupiter/services/nginx/default.nix
deleted file mode 100644
index 99142a59..00000000
--- a/hosts/jupiter/services/nginx/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [ ./nixfox ];
-
-  services.nginx.enable = true;
-}
diff --git a/hosts/jupiter/services/nginx/nixfox/default.nix b/hosts/jupiter/services/nginx/nixfox/default.nix
deleted file mode 100644
index 3b9860c6..00000000
--- a/hosts/jupiter/services/nginx/nixfox/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, ... }:
-{
-  services.nginx = {
-    enable = true;
-    virtualHosts."localhost" = {
-      default = true;
-      root = "/var/www/landing-page";
-    };
-  };
-}
diff --git a/modules/system/secrets/networks/default.nix b/modules/system/secrets/networks/default.nix
index 23f458ad..7f54d4d1 100644
Binary files a/modules/system/secrets/networks/default.nix and b/modules/system/secrets/networks/default.nix differ
diff --git a/modules/system/services/general/vmware/default.nix b/modules/system/services/general/vmware/default.nix
index e7541157..9cb6c44f 100644
--- a/modules/system/services/general/vmware/default.nix
+++ b/modules/system/services/general/vmware/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   config = lib.mkIf config.virtualisation.vmware.host.enable {
     virtualisation.vmware.host.extraConfig = ''