diff --git a/flake.nix b/flake.nix
index e439ef53..cef41961 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # Nix colorizer / themer 
-    stylix.url = "github:danth/stylix/release-23.11";
+    green.url = "github:danth/stylix/release-23.11";
     # lanzaboote - Secureboot Configuration
     lanzaboote.url = "github:nix-community/lanzaboote";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
@@ -61,7 +61,7 @@
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
       nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "tokyo-night"; };
-      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "stylix"; };
+      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "green"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
@@ -71,7 +71,7 @@
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server"; };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "tokyo-night"; };
-      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "stylix"; };
+      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/software/cli/starship.nix b/home-manager/common/software/cli/starship.nix
index 442faebf..7530e091 100644
--- a/home-manager/common/software/cli/starship.nix
+++ b/home-manager/common/software/cli/starship.nix
@@ -1,10 +1,17 @@
 { config, lib, ... }:
 let 
-  usernameColor  = "#${config.lib.stylix.colors.base07}";
-  directoryColor = "#${config.lib.stylix.colors.base06}";
-  statusolor     = "#${config.lib.stylix.colors.base05}";
-  errorColor     = "#${config.lib.stylix.colors.base04}";
-  fgColor        = "#${config.lib.stylix.colors.base02}";
+  usernameBG  = "#${config.lib.stylix.colors.base08}";
+  directoryBG = "#${config.lib.stylix.colors.base09}";
+  statusBG    = "#${config.lib.stylix.colors.base0A}";
+  errorBG     = "#${config.lib.stylix.colors.base0B}";
+  timeBG      = "#${config.lib.stylix.colors.base06}";
+
+  usernameFG  = "#${config.lib.stylix.colors.base06}";
+  directoryFG = "#${config.lib.stylix.colors.base07}";
+  statusFG    = "#${config.lib.stylix.colors.base01}";
+  errorFG     = "#${config.lib.stylix.colors.base00}";
+  timeFG      = "#${config.lib.stylix.colors.base0C}";
+
   blackColor     = "#${config.lib.stylix.colors.base00}";
   whiteColor     = "#${config.lib.stylix.colors.base06}";
 in 
@@ -14,39 +21,39 @@ in
     enableBashIntegration = true;
     settings = {
       format = lib.concatStrings [
-        "[](${usernameColor})"
+        "[](${usernameBG})"
         "$username"
         "$hostname"
-        "[](bg:${directoryColor} fg:${usernameColor})"
+        "[](bg:${directoryBG} fg:${usernameBG})"
         "$directory"
-        "[](fg:${directoryColor} bg:${statusolor})"
+        "[](fg:${directoryBG} bg:${statusBG})"
         "$git_branch"
         "$git_status"
         "$rust"
         "$docker_context"
         "$nix_shell"
-        "[](fg:${statusolor} bg:${errorColor})"
+        "[](fg:${statusBG} bg:${errorBG})"
         "$status"
-        "[ ](fg:${errorColor})"
+        "[ ](fg:${errorBG})"
       ];
 
       username = {
         show_always = true;
-        style_user = "fg:${whiteColor} bg:${usernameColor}";
-        style_root = "fg:${whiteColor} bg:${usernameColor}";
+        style_user = "fg:${usernameFG} bg:${usernameBG}";
+        style_root = "fg:${usernameFG} bg:${usernameBG}";
         format = "[$user]($style)";
         disabled = false;
       };
 
       hostname = {
         ssh_only = true;
-        style = "fg:${whiteColor} bg:${usernameColor}";
+        style = "fg:${usernameFG} bg:${usernameBG}";
         format = "[@$hostname]($style)";
         disabled = false;
       };
 
       os = {
-        style = "bg:${usernameColor}";
+        style = "bg:${usernameBG}";
         disabled = true;
       };
 
@@ -55,11 +62,11 @@ in
         heuristic = true;
         symbol = " ";
         format = "[$symbol]($style)";
-        style = "fg:${fgColor} bg:${statusolor}";
+        style = "fg:${statusFG} bg:${statusBG}";
       };
  
       directory = {
-        style = "fg:${fgColor} bg:${directoryColor}";
+        style = "fg:${directoryFG} bg:${directoryBG}";
         format = "[ $path ]($style)";
         truncation_length = 3;
         truncation_symbol = "…/";
@@ -73,17 +80,17 @@ in
 
       git_branch = {
         symbol = "";
-        style = "fg:${fgColor} bg:${statusolor}";
+        style = "fg:${statusFG} bg:${statusBG}";
         format = "[ $symbol $branch ]($style)";
       };
 
       git_status = {
-        style = "fg:${fgColor} bg:${statusolor}";
+        style = "fg:${statusFG} bg:${statusBG}";
         format = "[$all_status$ahead_behind ]($style)";
       };
 
       status = {
-        style = "fg:${fgColor} bg:${errorColor}";
+        style = "fg:${errorFG} bg:${errorBG}";
         format = "[ $status]($style)";
         disabled = false;
       };
@@ -91,7 +98,7 @@ in
       time = {
         disabled = false;
         time_format = "%R"; # Hour:Minute Format
-        style = "fg:${fgColor} bg:${blackColor}";
+        style = "fg:${timeFG} bg:${timeBG}";
         format = "[ $time]($style)";
       };
     };