diff --git a/home-manager/common/desktops/hyprland/components/rofi.nix b/home-manager/common/desktops/hyprland/components/rofi.nix
index b1cfdd96..3a19d241 100644
--- a/home-manager/common/desktops/hyprland/components/rofi.nix
+++ b/home-manager/common/desktops/hyprland/components/rofi.nix
@@ -1,7 +1,7 @@
-{ ...}: {
+{ lib, ...}: {
     programs.rofi = {
       enable = true;
       # theme = "material";
-      font = "DejaVu Sans 12";
+      font = lib.mkForce "DejaVu Sans 12";
     };
 }
diff --git a/home-manager/common/software/cli/starship.nix b/home-manager/common/software/cli/starship.nix
index 313f849d..ffcbb85f 100644
--- a/home-manager/common/software/cli/starship.nix
+++ b/home-manager/common/software/cli/starship.nix
@@ -1,11 +1,10 @@
 { config, lib, ... }:
 let 
-  orangeColor = "#${config.lib.stylix.colors.base0C}";
-  yellowColor = "#${config.lib.stylix.colors.base0A}";
-  blueColor   = "#${config.lib.stylix.colors.base08}";
-  whiteColor  = "#${config.lib.stylix.colors.base07}";
-  blackColor  = "#${config.lib.stylix.colors.base00}";
-  redColor    = "#${config.lib.stylix.colors.base0E}";
+  gitColor      = "#${config.lib.stylix.colors.base08}";
+  hostnameColor = "#${config.lib.stylix.colors.base0A}";
+  dirColor      = "#${config.lib.stylix.colors.base0C}";
+  timeColor     = "#${config.lib.stylix.colors.base00}";
+  redColor      = "#${config.lib.stylix.colors.base09}";
 in 
 {
   programs.starship = {
@@ -13,56 +12,52 @@ in
     enableBashIntegration = true;
     settings = {
       format = lib.concatStrings [
-        "[](${whiteColor})"
-        "$time"
-        "[](${whiteColor}) "
-        
-        "[](${orangeColor})"
+        "$os"
+        "» "
         "$username"
         "$hostname"
-        "[](bg:${yellowColor} fg:${orangeColor})"
+        " »"
         "$directory"
-        "[](fg:${yellowColor} bg:${blueColor})"
+        " »"
         "$git_branch"
         "$git_status"
         "$rust"
         "$docker_context"
         "$nix_shell"
-        "[](fg:${blueColor} bg:${redColor})"
         "$status"
-        "[ ](fg:${redColor})"
+        
       ];
 
       username = {
         show_always = true;
-        style_user = "fg:${blackColor} bg:${orangeColor}";
-        style_root = "fg:${blackColor} bg:${orangeColor}";
+        style_user = "fg:${hostnameColor}";
+        style_root = "fg:${hostnameColor}";
         format = "[$user]($style)";
         disabled = false;
       };
 
       hostname = {
         ssh_only = true;
-        style = "fg:${blackColor} bg:${orangeColor}";
+        style = "fg:${hostnameColor}";
         format = "[@$hostname]($style)";
         disabled = false;
       };
 
       os = {
-        style = "bg:${orangeColor}";
-        disabled = true;
+        style = "fg:${hostnameColor}";
+        disabled = false;
       };
 
       nix_shell = {
-        disabled = false;
+        disabled = true;
         heuristic = true;
         symbol = " ";
         format = "[$symbol$state(\($name\))]($style)";
-        style = "fg:${whiteColor} bg:${blueColor}";
+        style = "fg:${gitColor}";
       };
  
       directory = {
-        style = "fg:${blackColor} bg:${yellowColor}";
+        style = "fg:${dirColor}";
         format = "[ $path ]($style)";
         truncation_length = 3;
         truncation_symbol = "…/";
@@ -76,25 +71,25 @@ in
 
       git_branch = {
         symbol = "";
-        style = "fg:${whiteColor} bg:${blueColor}";
+        style = "fg:${gitColor}";
         format = "[ $symbol $branch ]($style)";
       };
 
       git_status = {
-        style = "fg:${whiteColor} bg:${blueColor}";
-        format = "[$all_status$ahead_behind ]($style)";
+        style = "fg:${gitColor}";
+        format = "[$all_status$ahead_behind]($style)";
       };
 
       status = {
-        style = "fg:${whiteColor} bg:${redColor}";
-        format = "[$status ]($style)";
+        style = "fg:${redColor}";
+        format = "[$status ]($style) » ";
         disabled = false;
       };
       
       time = {
         disabled = false;
         time_format = "%R"; # Hour:Minute Format
-        style = "fg:${blackColor} bg:${whiteColor}";
+        style = "fg:${timeColor}";
         format = "[ $time]($style)";
       };
     };