diff --git a/config/starship.toml b/config/starship.toml
index dc30c84..a16914b 100644
--- a/config/starship.toml
+++ b/config/starship.toml
@@ -23,7 +23,7 @@ $line_break\
 $character"""
 
 # Timeout for commands executed by starship (in milliseconds).
-# command_timeout = 1000
+command_timeout = 1500
 
 [character]
 success_symbol = "[→](bold green)"
@@ -43,16 +43,18 @@ style = "blue"
 
 [docker_context]
 symbol = " "
+format = '[$symbol$context]($style) '
 
 [fill]
 symbol = '·'
 style = 'bold black'
 
 [gcloud]
-format = ' [($symbol)$account(@$domain)(\($region\))]($style) '
+format = '[($symbol)$account(@$domain)(\($region\))]($style) '
 
 [git_branch]
 symbol = " "
+format = '[$symbol$branch(:$remote_branch)]($style) '
 truncation_length = 20
 truncation_symbol = '…'
 ignore_branches = ['master', 'main']
@@ -72,12 +74,16 @@ disabled = false
 
 [golang]
 symbol = " "
+format = '[$symbol($version )]($style) '
 
 [hostname]
 ssh_symbol = " "
 ssh_only = false
 format = '[$ssh_symbol](bold blue)[$hostname](bold red) '
 
+[lua]
+format = '[$symbol($version )]($style)'
+
 [nodejs]
 symbol = " "
 format = '[$symbol($version )]($style)'
@@ -141,5 +147,4 @@ version_format = '${major}.${minor}'
 [python]
 symbol = " "
 format = "[$virtualenv]($style) "
-style = "bright-black"