diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix
index 6d343aa4..5ac9ff43 100644
--- a/home-manager/common/desktops/gnome/default.nix
+++ b/home-manager/common/desktops/gnome/default.nix
@@ -2,12 +2,10 @@
 { ... }: {
   imports = [
     ./dconf-dock.nix
-    # TODO Re-eanble this when in hm 24.11
-    # ../../software/gui/ghostty.nix
+    ../../software/gui/ghostty.nix
   ];
   programs.bash.sessionVariables = { 
     DISABLE_TMUX = "true";
-    GTK_THEME  = "Breeze"; # To set the firefox theme
   };
   programs.fish.shellInit = ''
     set DISABLE_TMUX "true"
diff --git a/home-manager/common/software/cli/starship.nix b/home-manager/common/software/cli/starship.nix
index 51a074d1..3be7d70e 100644
--- a/home-manager/common/software/cli/starship.nix
+++ b/home-manager/common/software/cli/starship.nix
@@ -12,8 +12,8 @@ let
   errorFG     = "#${config.lib.stylix.colors.base00}";
   timeFG      = "#${config.lib.stylix.colors.base0C}";
 
-  # blackColor     = "#${config.lib.stylix.colors.base00}";
-  # whiteColor     = "#${config.lib.stylix.colors.base06}";
+  blackColor     = "#${config.lib.stylix.colors.base00}";
+  whiteColor     = "#${config.lib.stylix.colors.base06}";
 in 
   {
   programs.starship = {
@@ -22,21 +22,23 @@ in
     enableFishIntegration = true;
     settings = {
       format = lib.concatStrings [
-#         "[](${usernameBG})"
-#         "$username"
-#         "$hostname"
-#         "[](bg:${directoryBG} fg:${usernameBG})"
-        "[](${directoryBG})"
+        # Othe symbols:    //   //     
+        "[](${blackColor})"
+        "$time"
+        "[](bg:${usernameBG} fg:${blackColor})"
+        "$hostname"
+        "[](fg:${usernameBG} bg:${directoryBG})"
+        # "[](${directoryBG})"
         "$directory"
-        "[](fg:${directoryBG} bg:${statusBG})"
+        "[](fg:${directoryBG} bg:${statusBG})"
         "$git_branch"
         "$git_status"
         "$rust"
         "$docker_context"
         "$nix_shell"
-        "[](fg:${statusBG} bg:${errorBG})"
+        "[](fg:${statusBG} bg:${errorBG})"
         "$status"
-        "[ ](fg:${errorBG})"
+        "[ ](fg:${errorBG})"
       ];
 
       username = {
@@ -61,7 +63,7 @@ in
 
       nix_shell = {
         disabled = false;
-        heuristic = true;
+        heuristic = false;
         symbol = " ";
         format = "[$symbol]($style)";
         style = "fg:${statusFG} bg:${statusBG}";
@@ -106,8 +108,8 @@ in
       time = {
         disabled = false;
         time_format = "%R"; # Hour:Minute Format
-        style = "fg:${timeFG} bg:${timeBG}";
-        format = "[ $time]($style)";
+        style = "fg:${whiteColor} bg:${blackColor}";
+        format = "[  $time ]($style)";
       };
     };
   };
diff --git a/home-manager/common/software/gui/ghostty.nix b/home-manager/common/software/gui/ghostty.nix
index ed66a304..ca705e79 100644
--- a/home-manager/common/software/gui/ghostty.nix
+++ b/home-manager/common/software/gui/ghostty.nix
@@ -1,9 +1,15 @@
 { theme, ... }: {
 
-  imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ];
+  # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11 
+  # 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 '';
 
   programs.ghostty = {
-    enable = true; 
+    # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11 
+    enable = false; 
     enableBashIntegration = true;
     enableFishIntegration = true;
     enableZshIntegration = true;