diff --git a/starship.toml b/starship.toml
index 35f3e5f..f2969f9 100644
--- a/starship.toml
+++ b/starship.toml
@@ -6,63 +6,98 @@
 
 palette = "catppuccin_mocha"
 format = """
-$username$hostname$kubernetes$nodejs$ruby$rust
+$username$hostname$kubernetes\
+$terraform$nodejs$ruby$rust$python[\uE0B0](base bg:mantle)\
+$git_branch$git_state$git_status[\uE0B4](mantle)
 $directory$character 
 """
-right_format = """$git_state$git_status$git_branch$time"""
+right_format = """$time"""
 
 [character]
 format = "$symbol"
-success_symbol = '[\$](bold green)'
+success_symbol = '[\$](bold white)'
 error_symbol = "[✗](bold red)"
 
 [directory]
-style = "sky"
+style = "blue"
+truncate_to_repo = false
+truncation_length = 6
+truncation_symbol = "…/"
 
 [git_branch]
-format = "[$symbol$branch(:$remote_branch)]($style)"
+symbol = ""
+style = "lavender bg:mantle"
+format = "[ $symbol $branch(:$remote_branch) ]($style)"
+
+[git_state]
+style = "pink bg:mantle"
+format = '[\([$state( $progress_current/$progress_total)]($style)\) ](bg:mantle)'
+
+[git_status]
+style = "flamingo bg:mantle"
+modified = "󰏫"
+staged = ""
+ahead = ""
+behind = ""
+diverged = ""
+format = '[([$all_status$ahead_behind]($style) )](bg:mantle)'
 
 [hostname]
 ssh_only = false
-style = "dimmed green"
-format = "[  $hostname]($style) "
+style = "base bg:yellow"
+format = """
+[   $hostname]($style)\
+[\uE0B4](yellow bg:surface0)\
+"""
 
 [kubernetes]
 disabled = false
 symbol = " "
-style = "cyan"
-format = '[$symbol$context(\($namespace\))]($style)'
+style = "sky bg:surface0"
+format = """
+[ $symbol$context(\\($namespace\\)) ]($style)\
+[\uE0B0](surface0 bg:base)"""
 
 [nodejs]
-symbol = " "
-style = "green"
-format = "[$symbol($version )]($style)"
+symbol = ""
+style = "teal bg:base"
+format = "[ $symbol ($version) ]($style)"
 
 [python]
-symbol = " "
-style = "yellow"
-format = '[${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)'
+symbol = ""
+style = "yellow bg:base"
+format = '[ ${symbol} ${pyenv_prefix}(${version})(\($virtualenv\)) ]($style)'
 
 [ruby]
-symbol = " "
-style = "red"
-format = '[$symbol($version )]($style)'
+symbol = ""
+style = "maroon bg:base"
+format = '[ $symbol ($version) ]($style)'
 
 [rust]
-symbol = " "
-style = "orange"
-format = '[$symbol($version )]($style)'
+symbol = ""
+style = "peach bg:base"
+format = '[ $symbol ($version) ]($style)'
+
+[terraform]
+symbol = ""
+style = "mauve bg:base"
+format = '[ $symbol $workspace ]($style)'
+detect_extensions = ["hcl", "tf", "tfplan", "tfstate"]
 
 [time]
 disabled = false
 use_12hr = true
-format = '  [$time]($style)'
-style = "gray dimmed"
+format = "[\uE0B6](base)[$time  ]($style)[\uE0B4](base)"
+style = "subtext0 bg:base"
 
 [username]
 show_always = true
-style_user = "green"
-format = "[ $user]($style) "
+style_user = "base bg:green"
+format = """
+[\uE0B6](green)\
+[ $user ]($style)\
+[\uE0B0](green bg:yellow)\
+"""
 
 #
 # Palettes