diff --git a/starship.toml b/starship.toml
index e9f3c3b..8ab5977 100644
--- a/starship.toml
+++ b/starship.toml
@@ -8,6 +8,8 @@ $directory\
 $direnv\
 [](fg:color_directory_bg bg:color_git_bg)\
 $git_branch\
+$git_commit\
+$git_state\
 $git_status\
 [](fg:color_git_bg bg:color_code_bg)\
 $c\
@@ -33,39 +35,51 @@ palette = 'lesbian_pastel'
 
 [palettes.lesbian_pastel]
 color_user_fg = '#FFFFFF'
-color_user_bg = '#B63520'
-color_directory_fg = '#FFFFFF'
-color_directory_bg = '#E69070'
+color_user_bg = '#F94B1D'
+color_directory_fg = '#555555'
+color_directory_bg = '#FFAF78'
 color_git_fg = '#666666'
-color_git_bg = '#F5F5F5'
+color_git_bg = '#FFFFFF'
 color_code_fg = '#FFFFFF'
-color_code_bg = '#C07293'
+color_code_bg = '#E28ABE'
 color_time_fg = '#FFFFFF'
-color_time_bg = '#861848'
+color_time_bg = '#C1177E'
 
-[palettes.bisexual]
+[palettes.bisexual_pastel]
 color_user_fg = '#FFFFFF'
-color_user_bg = '#D60270'
+color_user_bg = '#D82E88'
 color_directory_fg = '#FFFFFF'
-color_directory_bg = '#D60270'
+color_directory_bg = '#D82E88'
 color_git_fg = '#FFFFFF'
-color_git_bg = '#9B4F96'
+color_git_bg = '#B679B1'
 color_code_fg = '#FFFFFF'
-color_code_bg = '#0038A8'
+color_code_bg = '#004BE0'
 color_time_fg = '#FFFFFF'
-color_time_bg = '#0038A8'
+color_time_bg = '#004BE0'
 
-[palettes.pansexual]
+[palettes.poly_pastel]
 color_user_fg = '#666666'
 color_user_bg = '#FFFFFF'
 color_directory_fg = '#666666'
-color_directory_bg = '#FCBF00'
+color_directory_bg = '#FFCF37'
 color_git_fg = '#FFFFFF'
-color_git_bg = '#009FE3'
+color_git_bg = '#06B4FF'
 color_code_fg = '#FFFFFF'
-color_code_bg = '#E50051'
+color_code_bg = '#E62F70'
 color_time_fg = '#FFFFFF'
-color_time_bg = '#340C46'
+color_time_bg = '#4B1E5F'
+
+[palettes.pansexual_pastel]
+color_user_fg = '#FFFFFF'
+color_user_bg = '#FF4BA3'
+color_directory_fg = '#FFFFFF'
+color_directory_bg = '#FF4BA3'
+color_git_fg = '#666666'
+color_git_bg = '#FFE138'
+color_code_fg = '#FFFFFF'
+color_code_bg = '#4AC0FF'
+color_time_fg = '#FFFFFF'
+color_time_bg = '#4AC0FF'
 
 # Disable the blank line at the start of the prompt
 # add_newline = false
@@ -81,7 +95,7 @@ disabled = false
 
 [hostname]
 ssh_only = false
-ssh_symbol = ' '
+ssh_symbol = ' '
 style = 'fg:color_user_fg bg:color_user_bg'
 format = '[@$hostname$ssh_symbol ]($style)'
 
@@ -115,30 +129,49 @@ truncation_symbol = "…/"
 # "Important 󰈙 " = " 󰈙 "
 
 [git_branch]
-symbol = ""
+symbol = ""
+only_attached = true
 style = "fg:color_git_fg bg:color_git_bg"
-format = '[ $symbol $branch ]($style)'
+format = '[ $symbol $branch]($style)'
+
+[git_commit]
+style = "fg:color_git_fg bg:color_git_bg"
+tag_disabled = false
+tag_symbol = ''
+format = '[ \($hash:$tag\)]($style)'
+
+[git_state]
+rebase = 'rebasing'
+merge = 'merging'
+revert = 'reverting'
+cherry_pick = 'cherry picking'
+bisect = 'bisecting'
+am = 'am'
+am_or_rebase = 'am/rebase'
+style = 'fg:color_git_fg bg:color_git_bg'
+format = '[ \($state( $progress_current/$progress_total)\)]($style)'
 
 [git_status]
 style = "fg:color_git_fg bg:color_git_bg"
-ahead = '⇡${count}'
-diverged = '⇕⇡${ahead_count}⇣${behind_count}'
-behind = '⇣${count}'
+ahead = '⇡${count} '
+diverged = '⇕⇡${ahead_count}⇣${behind_count} '
+behind = '⇣${count} '
 untracked = '?${count} '
 modified = '!${count} '
-stashed = '$${count} '
+stashed = '\$${count} '
 staged = '+${count} '
 renamed = '»${count} '
 deleted = '-${count} '
-format = '[$all_status$ahead_behind ]($style)'
+conflicted = '=${count} '
+format = '[ $all_status$ahead_behind]($style)'
 
 [golang]
-symbol = ""
+symbol = ""
 style = "fg:color_code_fg bg:color_code_bg"
 format = '[ $symbol ($version) ]($style)'
 
 [python]
-symbol = ""
+symbol = ""
 style = "fg:color_code_fg bg:color_code_bg"
 format = '[ $symbol ($virtualenv)($version) ]($style)'
 pyenv_version_name = true