diff --git a/users/servostar/config/starship.toml b/users/servostar/config/starship.toml
index 8bb5fe8..d947e67 100644
--- a/users/servostar/config/starship.toml
+++ b/users/servostar/config/starship.toml
@@ -1,33 +1,104 @@
-# Based on: https://starship.rs/presets/pastel-powerline.html
-
 format = """
-[█](#a3aed2)\
-[  ](bg:#a3aed2 fg:#090c0c)\
+[╭── \
 $username\
-[](bg:#769ff0 fg:#a3aed2)\
+$hostname\
+$localip\
+$shlvl\
+$singularity\
+$kubernetes\
 $directory\
-[](fg:#769ff0 bg:#394260)\
+$vcsh\
+$fossil_branch\
 $git_branch\
+$git_commit\
+$git_state\
+$git_metrics\
 $git_status\
-[](fg:#394260 bg:#212736)\
-$nodejs\
-$rust\
+$hg_branch\
+$pijul_channel\
+$docker_context\
+$package\
+$c\
+$cmake\
+$cobol\
+$daml\
+$dart\
+$deno\
+$dotnet\
+$elixir\
+$elm\
+$erlang\
+$fennel\
 $golang\
+$guix_shell\
+$haskell\
+$haxe\
+$helm\
+$java\
+$julia\
+$kotlin\
+$gradle\
+$lua\
+$nim\
+$nodejs\
+$ocaml\
+$opa\
+$perl\
 $php\
-[](fg:#212736 bg:#1d2230)\
+$pulumi\
+$purescript\
+$python\
+$raku\
+$rlang\
+$red\
+$ruby\
+$rust\
+$scala\
+$solidity\
+$swift\
+$terraform\
+$vlang\
+$vagrant\
+$zig\
+$buf\
+$nix_shell\
+$conda\
+$meson\
+$spack\
+$memory_usage\
+$aws\
+$gcloud\
+$openstack\
+$azure\
+$env_var\
+$crystal\
+$custom\
+$sudo\
+$cmd_duration\
+](bold teal)
+[╰─](bold teal) \
+$jobs\
+$battery\
 $time\
-[ ](fg:#1d2230)"""
+$status\
+$os\
+$container\
+$character"""
+
+[git_branch]
+symbol = ' '
+format = 'on [$symbol$branch(:$remote_branch)]($style) '
 
 [username]
 show_always = true
-style_user = "bg:#a3aed2 fg:#090c0c"
-style_root = "bg:#a3aed2 fg:#090c0c"
-format = '[$user ]($style)'
+style_user = "bold blue"
+style_root = "bold red"
+format = '[$user]($style) in '
 disabled = false
 
 [directory]
-style = "fg:#e3e5e5 bg:#769ff0"
-format = "[ $path ]($style)"
+style = "white"
+format = "[$path]($style)[$read_only]($read_only_style) "
 truncation_length = 3
 truncation_symbol = "…/"
 
@@ -39,38 +110,3 @@ truncation_symbol = "…/"
 "Video" = " "
 "Desktop" = " "
 
-[git_branch]
-symbol = ""
-style = "bg:#394260"
-format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'
-
-[git_status]
-style = "bg:#394260"
-format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'
-
-[nodejs]
-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)'
-
-[golang]
-symbol = ""
-style = "bg:#212736"
-format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
-
-[php]
-symbol = ""
-style = "bg:#212736"
-format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
-
-[time]
-disabled = false
-time_format = "%R" # Hour:Minute Format
-style = "bg:#1d2230"
-format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'
-