diff --git a/flake.nix b/flake.nix
index 28b7210d..0cb85218 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,7 @@
       # User Machines
       nixos-desktop       = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "plasma6"; };
       framework13         = libx.mkHost { hostname = "framework13";     unfree = true; desktop = "gnome";   };
-      framework16         = libx.mkHost { hostname = "framework16";     unfree = true; desktop = "plasma6"; };
+      framework16         = libx.mkHost { hostname = "framework16";     unfree = true; desktop = "gnome";   };
       steamdeck           = libx.mkDeck { hostname = "steamdeck";                      desktop = "plasma6"; };
       
       # Raspberry Pi's
@@ -87,7 +87,7 @@
       # User Machines 
       "albert@nixos-desktop"       = libx.mkHome { hostname = "nixos-desktop";   desktop = "plasma6"; };
       "albert@framework13"         = libx.mkHome { hostname = "framework13";     desktop = "gnome";   };
-      "albert@framework16"         = libx.mkHome { hostname = "framework16";     desktop = "plasma6"; };
+      "albert@framework16"         = libx.mkHome { hostname = "framework16";     desktop = "gnome";   };
       "albert@steamdeck"           = libx.mkHome { hostname = "steamdeck";       desktop = "plasma6"; };
 
       # Raspberry Pi's 
diff --git a/home-manager/common/software/gui/ghostty.nix b/home-manager/common/software/gui/ghostty.nix
index 34810af4..e2df340e 100644
--- a/home-manager/common/software/gui/ghostty.nix
+++ b/home-manager/common/software/gui/ghostty.nix
@@ -1,28 +1,26 @@
 { theme, ... }: {
 
-  # FIX: Re-enable this when 25.05 is out or when this is compabile with 24.11 
-  # imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ];
+  imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ];
 
   # Otherwise it sets the term to "xterm-ghostty" and it fails to connect to ssh
   programs.bash.sessionVariables = { TERM = "xterm-256color"; };
   programs.fish.shellInit        = ''set TERM "xterm-256color" '';
 
-  # FIX: Re-enable this when 25.05 is out or when this is compabile with 24.11 
-#  programs.ghostty = {
-#    enable = true; 
-#    enableBashIntegration = true;
-#    enableFishIntegration = true;
-#    enableZshIntegration = true; 
-#    installBatSyntax = true;
-#    installVimSyntax = true;
-#    settings = {
-#      font-size = 10;
-#      cursor-style = "bar";
-#      keybind = [
-#        "shift+right=next_tab"
-#        "shift+left=previous_tab"
-#        "shift+up=toggle_tab_overview"
-#      ];
-#    };
-#  };
+  programs.ghostty = {
+    enable = true; 
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+    enableZshIntegration = true; 
+    installBatSyntax = true;
+    installVimSyntax = true;
+    settings = {
+      font-size = 10;
+      cursor-style = "bar";
+      keybind = [
+        "shift+right=next_tab"
+        "shift+left=previous_tab"
+        "shift+up=toggle_tab_overview"
+      ];
+    };
+  };
 }
diff --git a/stylix/themes/default/home-manager/ghostty.nix b/stylix/themes/default/home-manager/ghostty.nix
index 4a1fcc39..f3c03dc4 100644
--- a/stylix/themes/default/home-manager/ghostty.nix
+++ b/stylix/themes/default/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "Ayu Mirage";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/green/home-manager/ghostty.nix b/stylix/themes/green/home-manager/ghostty.nix
index 4a1fcc39..f3c03dc4 100644
--- a/stylix/themes/green/home-manager/ghostty.nix
+++ b/stylix/themes/green/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "Ayu Mirage";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/gruvbox/home-manager/ghostty.nix b/stylix/themes/gruvbox/home-manager/ghostty.nix
index 0242d734..92563a55 100644
--- a/stylix/themes/gruvbox/home-manager/ghostty.nix
+++ b/stylix/themes/gruvbox/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "GruvboxDark";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/sakura-day/home-manager/ghostty.nix b/stylix/themes/sakura-day/home-manager/ghostty.nix
index 0a2c1eaa..1407de73 100644
--- a/stylix/themes/sakura-day/home-manager/ghostty.nix
+++ b/stylix/themes/sakura-day/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "catpuccin-latte";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/sakura-night/home-manager/ghostty.nix b/stylix/themes/sakura-night/home-manager/ghostty.nix
index c9e0467f..ffe3e44a 100644
--- a/stylix/themes/sakura-night/home-manager/ghostty.nix
+++ b/stylix/themes/sakura-night/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "sakura";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/stylix-day/home-manager/ghostty.nix b/stylix/themes/stylix-day/home-manager/ghostty.nix
index 4a1fcc39..f3c03dc4 100644
--- a/stylix/themes/stylix-day/home-manager/ghostty.nix
+++ b/stylix/themes/stylix-day/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "Ayu Mirage";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/stylix/home-manager/ghostty.nix b/stylix/themes/stylix/home-manager/ghostty.nix
index 4a1fcc39..f3c03dc4 100644
--- a/stylix/themes/stylix/home-manager/ghostty.nix
+++ b/stylix/themes/stylix/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "Ayu Mirage";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/tokyo-day/home-manager/ghostty.nix b/stylix/themes/tokyo-day/home-manager/ghostty.nix
index 4a1fcc39..f3c03dc4 100644
--- a/stylix/themes/tokyo-day/home-manager/ghostty.nix
+++ b/stylix/themes/tokyo-day/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "Ayu Mirage";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }
diff --git a/stylix/themes/tokyo-night/home-manager/ghostty.nix b/stylix/themes/tokyo-night/home-manager/ghostty.nix
index 429db0f2..5244d4a0 100644
--- a/stylix/themes/tokyo-night/home-manager/ghostty.nix
+++ b/stylix/themes/tokyo-night/home-manager/ghostty.nix
@@ -1,4 +1,5 @@
 { lib, ... }: {
   programs.ghostty.settings.theme = lib.mkForce "tokyonight_night";
-  stylix.targets.ghostty.enable = false;
+  # FIX:  This isn't quite available in 24.11
+  # stylix.targets.ghostty.enable = false;
 }