diff --git a/theme.omp.json b/theme.omp.json
index 1cc2a75..8a165b7 100644
--- a/theme.omp.json
+++ b/theme.omp.json
@@ -12,9 +12,7 @@
         },
         {
           "foreground": "#06884b",
-          "foreground_templates": [
-            "{{ if gt .Code 0 }}#e61010{{ end }}"
-          ],
+          "foreground_templates": ["{{ if gt .Code 0 }}#e61010{{ end }}"],
           "properties": {
             "always_enabled": true
           },
@@ -96,11 +94,26 @@
           "type": "path"
         },
         {
-          "foreground": "#193549",
-          "powerline_symbol": "\ue0b0",
+          "type": "git",
           "style": "powerline",
-          "template": " {{ .Status }} ",
-          "type": "poshgit"
+          "powerline_symbol": "",
+          "foreground": "#193549",
+          "background": "#ffeb3b",
+          "background_templates": [
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}#FFEB3B{{ end }}",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#FFCC80{{ end }}",
+            "{{ if gt .Ahead 0 }}#B388FF{{ end }}",
+            "{{ if gt .Behind 0 }}#B388FB{{ 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_stash_count": true,
+            "fetch_upstream_icon": true,
+            "untracked_modes": {
+              "/Users/user/Projects/oh-my-posh/": "no"
+            }
+          }
         }
       ],
       "type": "prompt"