diff --git a/starship.toml b/starship.toml
index fb6fcc7..b9a19b1 100644
--- a/starship.toml
+++ b/starship.toml
@@ -1,6 +1,6 @@
 format = """
-$env_var\
-[](fg:white)\
+$os\
+[](fg:white bg:black)\
 $username\
 $hostname\
 [](fg:black bg:#6D8DD1)\
@@ -10,11 +10,20 @@ $git_branch\
 $git_state\
 $git_status\
 $git_metrics\
-[](fg:#86BBD8 bg:#33658A)\
+[](fg:#47CB6B bg:#FCA17D)\
+$c\
+$dart\
+$golang\
+$java\
+$nodejs\
+$php\
+$python\
+$rust\
+[](fg:#FCA17D bg:#33658A)\
 $docker_context\
-[](fg:#33658A bg:black)\
+[](fg:#33658A)\
 $fill\
-[](fg:#33658A bg:black)\
+[](fg:#33658A)\
 $jobs\
 [](fg:yellow bg:#33658A)\
 $cmd_duration\
@@ -22,6 +31,7 @@ $cmd_duration\
 $memory_usage\
 [](fg:white bg:#47CB6B)\
 $time\
+$battery\
 [ ](fg:white)\
 $line_break\
 $character"""
@@ -37,12 +47,11 @@ success_symbol = "[❯](purple)"
 error_symbol = "[❯](red)"
 vicmd_symbol = "[❮](green)"
 
-# You can also replace your username with a neat symbol like  to save some space
 [username]
 show_always = false
 style_user = "fg:yellow bg:black"
 style_root = "fg:#CE4B4E bg:black"
-format = '[ $user]($style)'
+format = '[ $user ]($style)'
 
 [hostname]
 ssh_only = true
@@ -51,31 +60,66 @@ format = "[@](fg:yellow bg:black)[$hostname](fg:yellow bg:black) [$ssh_symbol ](
 trim_at = ".companyname.com"
 disabled = false
 
-[env_var.STARSHIP_DISTRO]
-format = '[ $env_value ](fg:black bg:white)'
-variable = "STARSHIP_DISTRO"
+[os]
+format = '[ $symbol](fg:black bg:white)'
 disabled = false
 
+[os.symbols]
+Alpine = " "
+Amazon = " "
+Android = " "
+Arch = " "
+CentOS = " "
+Debian = " "
+DragonFly = " "
+Emscripten = " "
+EndeavourOS = " "
+Fedora = " "
+FreeBSD = " "
+Garuda = "﯑ "
+Gentoo = " "
+HardenedBSD = "ﲊ "
+Illumos = " "
+Linux = " "
+Macos = " "
+Manjaro = " "
+Mariner = " "
+MidnightBSD = " "
+Mint = " "
+NetBSD = " "
+NixOS = " "
+OpenBSD = " "
+openSUSE = " "
+OracleLinux = " "
+Pop = " "
+Raspbian = " "
+Redhat = " "
+RedHatEnterprise = " "
+Redox = " "
+Solus = "ﴱ "
+SUSE = " "
+Ubuntu = " "
+Unknown = " "
+Windows = " "
+
 [directory]
 style = "bg:#6D8DD1"
 read_only = " "
-format = "[ $path ]($style)"
+format = "[ $path[$read_only](fg:yellow bg:#6D8DD1) ]($style)"
 truncation_length = 3
 truncation_symbol = "…/"
+truncate_to_repo = false
 
-# Here is how you can shorten some long paths by text replacement
-# similar to mapped_locations in Oh My Posh:
 [directory.substitutions]
+"Important Documents" = " "
 "Documents" = " "
 "Downloads" = " "
-"Music" = "� "
+"Music" = " "
 "Pictures" = " "
+"Development" = " "
+"Developer" = " "
+"Dev" = " "
 "~" = " ~"
-# Keep in mind that the order matters. For example:
-# "Important Documents" = "  "
-# will not be replaced, because "Documents" was already substituted before.
-# So either put "Important Documents" before "Documents" or use the substituted version:
-# "Important  " = "  "
 
 [docker_context]
 symbol = " "
@@ -96,10 +140,13 @@ behind = "⇣${count}"
 
 [git_state]
 style = "fg:black bg:#47CB6B"
-format = '\([$state( $progress_current/$progress_total)]($style)\) '
+format = '\([$state( $progress_current of $progress_total)]($style)\) '
 #style = "bright-black"
 
 [git_metrics]
+added_style = "fg:black bg:#47CB6B"
+deleted_style = "fg:white bold bg:#47CB6B"
+format = '[ +$added |]($added_style)[ -$deleted ](fg:red bold bg:#47CB6B)'
 disabled = false
 
 [cmd_duration]
@@ -124,3 +171,156 @@ disabled = false
 time_format = "%R" # Hour:Minute Format
 format = '[](fg:white)[ $time   ](fg:black bg:white)'
 
+[battery]
+full_symbol = ' '
+charging_symbol = ' '
+discharging_symbol = ' '
+unknown_symbol = ' '
+empty_symbol = ' '
+format = '[](fg:white)[ $symbol$percentage ]($style)'
+
+[[battery.display]]
+threshold = 10
+style = 'bold red bg:white'
+
+[[battery.display]]
+threshold = 30
+style = 'bold yellow bg:white'
+
+[[battery.display]]
+threshold = 50
+style = 'bold purpel bg:white'
+
+[[battery.display]]
+threshold = 100
+style = 'bold green bg:white'
+
+[aws]
+symbol = "  "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[buf]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[c]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[conda]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[dart]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[elixir]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[elm]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[golang]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[guix_shell]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[haskell]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[haxe]
+symbol = "⌘ "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[hg_branch]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[java]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[julia]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[lua]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[meson]
+symbol = "喝 "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[nim]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[nix_shell]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[nodejs]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[package]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[python]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[rlang]
+symbol = "ﳒ "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[ruby]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[rust]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[scala]
+symbol = " "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
+
+[spack]
+symbol = "🅢 "
+style = "bg:#FCA17D"
+format = '[ $symbol ($version) ]($style)'
\ No newline at end of file