diff --git a/amro.toml b/amro.toml
index cd97785..6e1e7b4 100644
--- a/amro.toml
+++ b/amro.toml
@@ -1,27 +1,26 @@
-"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
+#"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
 version = 2
+final_space = true
 
 [[blocks]]
 newline = true
 alignment = "left"
 type = "prompt"
+
 [[blocks.segments]]
 foreground = "#45F1C2"
-foreground_templates = [
-  "{{if .Root }}red{{end}}",
-]
 style = "plain"
-template = " {{ .UserName }} "
+template = " {{ .UserName }}"
 type = "session"
 [[blocks.segments]]
 foreground = "red"
 style = "plain"
-template = "@"
+template = "󰁥 "
 type = "text"
 [[blocks.segments]]
 foreground = "#45F1C2"
 style = "plain"
-template = "  {{ .HostName }} "
+template = " {{ .HostName }} "
 type = "session"
 
 [[blocks]]
@@ -31,32 +30,38 @@ type = "prompt"
 [[blocks.segments]]
 foreground = "#0CA0D8"
 style = "plain"
-template = "  {{ .Path }} "
+template = " {{ .Path }} "
 type = "path"
 [blocks.segments.properties]
 folder_separator_icon = "/"
 style = "full"
-
 [[blocks.segments]]
 type = "git"
 style = "plain"
 foreground = "#193549"
 background = "transparent"
-template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}"
-[blocks.segments.properties]
+foreground_templates = [
+  "{{ if or (.Working.Changed) (.Staging.Changed) }}#a7364d{{else}}#1ea54c{{end}}"
+]
+template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}"
+[properties]
 fetch_status = true
 fetch_upstream_icon = true
-fetch_stash_count = true
-[blocks.segments.properties.branch_icon]
+source = "cli"
+[properties.mapped_branches]
 "feat/*" = "🚀 "
 "bug/*" = "🐛 "
-"main" = "💎 "
-"dev" = "⚙️ "
-[blocks.segments.properties.template_logic]
-default = "#1ea54c"
-has_staged = "#a7364d"
-has_unstaged = "#a7364d"
-
+"main/*" = "💎 "
+"dev/*" = "⚙️ "
+# foreground = "#915ada"
+# powerline_symbol = ""
+# style = "plain"
+# # template = "{{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }} "
+# template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+# type = "git"
+[blocks.segments.properties]
+fetch_stash_count = true
+fetch_upstream_icon = true
 [[blocks]]
 alignment = "left"
 newline = true
@@ -64,7 +69,7 @@ type = "prompt"
 [[blocks.segments]]
 foreground = "#cd5e42"
 style = "plain"
-template = " "
+template = " "
 type = "root"
 [[blocks.segments]]
 foreground = "#CD4277"
@@ -72,12 +77,17 @@ style = "plain"
 template = "# "
 type = "text"
 
+[[blocks]]
+alignment = "left"
+type = "plain"
 [transient_prompt]
-background = "transparent"
-foreground = "#CD4277"
-template = "{{ if gt .Code 0 }}❯{{ else }}❯{{ end }} "
-
-[secondary_prompt]
-background = "transparent"
-foreground = "#CD4277"
-template = "{{ if gt .Code 0 }}❯{{ else }}❯{{ end }} "
+background = 'transparent'
+foreground = 'magenta'
+template = ""
+# template = '>'
+type = "prompt"
+foreground_templates = [
+  "{{if gt .Code 0}}red{{end}}",
+  "{{if eq .Code 0}}green{{end}}",
+]
+# # foreground = "p:terminal-blue"