diff --git a/home/shell/starship.nix b/home/shell/starship.nix
index a51f777..f1bb016 100644
--- a/home/shell/starship.nix
+++ b/home/shell/starship.nix
@@ -9,35 +9,30 @@
       add_newline = false;
 
       format = lib.concatStrings [
-        "[░▒▓](#a3aed2)"
         "$os"
-        "[](bg:#769ff0 fg:#a3aed2)"
+        "$username"
+        "$hostname"
         "$directory"
-        "[](fg:#769ff0 bg:#394260)"
         "$git_branch"
         "$git_status"
-        "[](fg:#394260 bg:#212736)"
         "$nix_shell"
         "$nodejs"
         "$python"
         "$go"
         "$rust"
         "$docker_context"
-        "[](fg:#212736 bg:#1d2230)"
         "$cmd_duration"
-        "[ ](fg:#1d2230)"
-        "\n$character"
+        "$line_break"
+        "$character"
       ];
 
       character = {
-        success_symbol = "[❯](bold #769ff0)";
+        success_symbol = "[❯](bold green)";
         error_symbol = "[❯](bold red)";
       };
 
       os = {
         disabled = false;
-        style = "bg:#a3aed2 fg:#090c0c";
-        format = "[ $symbol]($style)";
         symbols = {
           NixOS = " ";
           Linux = " ";
@@ -47,8 +42,6 @@
       };
 
       directory = {
-        style = "fg:#e3e5e5 bg:#769ff0";
-        format = "[ $path ]($style)";
         truncation_length = 3;
         truncation_symbol = "…/";
         substitutions = {
@@ -58,59 +51,35 @@
         };
       };
 
-      git_branch = {
-        symbol = "";
-        style = "bg:#394260";
-        format = "[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)";
-      };
+      git_branch.symbol = " ";
 
       git_status = {
-        style = "bg:#394260";
-        format = "[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)";
+        format = "([\\[$all_status$ahead_behind\\]]($style) )";
       };
 
       nix_shell = {
         symbol = " ";
-        style = "bg:#212736";
-        format = "[[ $symbol$state( \\($name\\)) ](fg:#769ff0 bg:#212736)]($style)";
-      };
-
-      nodejs = {
-        symbol = "";
-        style = "bg:#212736";
-        format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
-        detect_extensions = [ ];
-      };
-
-      python = {
-        symbol = "";
-        style = "bg:#212736";
-        format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
-      };
-
-      go = {
-        symbol = "";
-        style = "bg:#212736";
-        format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
-      };
-
-      rust = {
-        symbol = "";
-        style = "bg:#212736";
-        format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
+        format = "[$symbol$state( \\($name\\))]($style) ";
       };
 
       docker_context = {
         symbol = " ";
-        style = "bg:#212736";
-        format = "[[ $symbol $context ](fg:#769ff0 bg:#212736)]($style)";
+        format = "[$symbol$context]($style) ";
       };
 
       cmd_duration = {
         min_time = 2000;
-        style = "bg:#1d2230";
-        format = "[[  $duration ](fg:#a0a9cb bg:#1d2230)]($style)";
+        format = "[$duration]($style) ";
       };
+
+      nodejs = {
+        format = "[$symbol($version)]($style) ";
+        detect_extensions = [ ];
+      };
+
+      python.format = "[$symbol($version)]($style) ";
+      go.format = "[$symbol($version)]($style) ";
+      rust.format = "[$symbol($version)]($style) ";
     };
   };
 }
diff --git a/home/theme.nix b/home/theme.nix
index b420479..39263c6 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -4,7 +4,5 @@
   catppuccin = {
     enable = true;
     flavor = "mocha";
-    nvim.enable = false;
-    starship.enable = false;
   };
 }