diff --git a/homes/common/oh-my-posh/gmay.json b/homes/common/oh-my-posh/gmay.json
index 7318d9f..68ddd82 100644
--- a/homes/common/oh-my-posh/gmay.json
+++ b/homes/common/oh-my-posh/gmay.json
@@ -12,11 +12,20 @@
           "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}} ",
           "type": "os"
         },
+        {
+          "background": "#AF3A03",
+          "foreground": "#EBDBB2",
+          "powerline_symbol": "\ue0b0",
+          "style": "powerline",
+          "template": " \uf0e7 ",
+          "type": "root"
+        },
         {
           "background": "#076678",
           "foreground": "#EBDBB2",
+          "powerline_symbol": "\ue0b0",
           "style": "powerline",
-          "template": " {{ .UserName }}@{{ .HostName }} ",
+          "template": " {{ if .SSHSession }}\ueba9 {{ end }}{{ .UserName }}@{{ .HostName }} ",
           "type": "session"
         },
         {
@@ -42,24 +51,38 @@
           "type": "time"
         },
         {
-          "background": "#8F3F71",
-          "foreground": "#EBDBB2",
-          "powerline_symbol": "\ue0b0",
-          "properties": {
-            "fetch_stash_count": true,
-            "fetch_upstream_icon": true
-          },
+          "type": "project",
           "style": "powerline",
-          "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{ if gt .StashCount 0 }} \ueb4b {{ .StashCount }}{{ end }} ",
-          "type": "git"
+          "powerline_symbol": "",
+          "foreground": "#193549",
+          "background": "#ffeb3b",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Version }} {{.Version}}{{ end }} {{ if .Name }}{{ .Name }}{{ end }}{{ end }} "
         },
         {
-          "background": "#9D0006",
-          "foreground": "#EBDBB2",
-          "powerline_symbol": "\ue0b0",
+          "type": "git",
           "style": "powerline",
-          "template": " \uf0e7 ",
-          "type": "root"
+          "powerline_symbol": "",
+          "background": "#427b58",
+          "foreground": "#EBDBB2",
+          "background_templates": [
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}#8f3f71{{ end }}",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#076678{{ end }}",
+            "{{ if gt .Ahead 0 }}#076678{{ end }}",
+            "{{ if gt .Behind 0 }}#076678{{ 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,
+            "untracked_modes": {
+              "/Users/user/Projects/oh-my-posh/": "no"
+            },
+            "source": "cli",
+            "mapped_branches": {
+              "feat/*": "🚀 ",
+              "bug/*": "🐛 "
+            }
+          }
         },
         {
           "background": "#427B58",