refactor: adjust themes to new git segment properties

themes/M365Princess.omp.json

@@ -35,11 +35,11 @@
           "foreground": "#ffffff",
           "background": "#FCA17D",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "status_colors_enabled": false,
             "branch_icon": "",
-            "display_status": false,
+            "fetch_status": false,
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}",
             "prefix": " \u279C (",
             "postfix": ") "
           }

themes/agnoster.omp.json

@@ -37,7 +37,10 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "python",

themes/agnosterplus.omp.json

@@ -46,7 +46,10 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         }
       ]
     }

themes/aliens.omp.json

@@ -28,18 +28,18 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "python",
           "style": "diamond",
           "foreground": "#ffffff",
           "background": "#FF6471",
-          "leading_diamond": "",
+          "leading_diamond": "<transparent,background>\uE0B0</>",
-          "trailing_diamond": "\uE0B4",
+          "trailing_diamond": "\uE0B4"
-          "properties": {
-            "prefix": "<transparent>\uE0B0 </>"
-          }
         }
       ]
     }

themes/amro.omp.json

@@ -31,9 +31,10 @@
           "powerline_symbol": "\uE0B0",
           "foreground": "#14A5AE",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "prefix": ""
+            "prefix": "",
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         }
       ]

themes/avit.omp.json

@@ -17,7 +17,11 @@
         {
           "type": "git",
           "style": "plain",
-          "foreground": "#C2C206"
+          "foreground": "#C2C206",
+          "properties": {
+            "prefix": "",
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "root",

themes/blue-owl.omp.json

@@ -16,6 +16,7 @@
           "foreground": "#FFEB3B",
           "background": "#a313a8",
           "properties": {
+            "prefix": "",
             "root_icon": "⚡"
           }
         },
@@ -23,7 +24,10 @@
           "type": "os",
           "style": "plain",
           "foreground": "#ffffff",
-          "background": "transparent"
+          "background": "transparent",
+          "properties": {
+            "prefix": ""
+          }
         },
         {
           "type": "path",
@@ -45,14 +49,16 @@
           "powerline_symbol": "\uE0B0",
           "foreground": "#000000",
           "background": "#00C853",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#FFEB3B{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#FFCC80{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#B388FF{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#B388FF{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "staging_color": "#FF6F00",
+            "fetch_status": true,
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }}<#FF6F00> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "local_changes_color": "#FFEB3B",
-            "ahead_and_behind_color": "#FFCC80",
-            "behind_color": "#B388FF",
-            "ahead_color": "#B388FF"
           }
         },
         {

themes/blueish.omp.json

@@ -57,8 +57,9 @@
           "foreground": "#193549",
           "background": "#a2c4e0",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "display_upstream_icon": true
+            "display_upstream_icon": true,
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/bubbles.omp.json

@@ -42,8 +42,8 @@
           "properties": {
             "prefix": "",
             "postfix": "",
-            "display_status_detail": false,
+            "branch_icon": "",
-            "branch_icon": ""
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/bubblesline.omp.json

@@ -28,7 +28,7 @@
           "properties": {
             "prefix": "",
             "postfix": "",
-            "display_status_detail": false,
+            "template": "{{ .Repo.HEAD }}",
             "branch_icon": ""
           }
         },
@@ -136,7 +136,6 @@
     {
       "type": "prompt",
       "alignment": "left",
-      "newline": true,
       "segments": [
         {
           "type": "session",

themes/cert.omp.json

@@ -41,7 +41,7 @@
           "foreground": "#fff",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
+            "template": "{{ .Repo.HEAD }}",
             "prefix": " git(",
             "postfix": ") "
           }

themes/craver.omp.json

@@ -60,9 +60,10 @@
           "foreground": "#3A86FF",
           "background": "#242424",
           "properties": {
-            "display_status": true,
+            "fetch_status": true,
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}",
             "prefix": ""
           }
         },

themes/darkblood.omp.json

@@ -22,7 +22,8 @@
           "foreground": "#ffffff",
           "properties": {
             "prefix": "<#CB4B16>[</>",
-            "postfix": "<#CB4B16>]</>"
+            "postfix": "<#CB4B16>]</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/emodipt.omp.json

@@ -34,7 +34,7 @@
           "style": "plain",
           "foreground": "#F3C267",
           "properties": {
-            "display_status": true,
+            "template": "{{ .Repo.HEAD }}",
             "branch_identical_icon": "\uF14A",
             "branch_gone_icon": "\u274E"
           }
@@ -58,6 +58,5 @@
         }
       ]
     }
-  ],
+  ]
-  "final_space": true
 }

themes/fish.omp.json

@@ -43,7 +43,8 @@
           "background": "#007ACC",
           "properties": {
             "prefix": "<#ffffff>\uE0B1</> ",
-            "postfix": " "
+            "postfix": " ",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/gmay.omp.json

@@ -48,8 +48,9 @@
           "foreground": "#193549",
           "background": "#fffb38",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "display_upstream_icon": true
+            "display_upstream_icon": true,
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/half-life.omp.json

@@ -49,15 +49,8 @@
             "rebase_icon": "",
             "cherry_pick_icon": "",
             "revert_icon": "",
-            "working_color": "#D75F00",
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }}<#87FF00> ● {{ .Repo.Staging.String }}</>{{ end }}{{ if .Repo.Working.Changed }}<#D75F00> ● {{ .Repo.Working.String }}</>{{ end }}",
-            "staging_color": "#87FF00",
+            "fetch_status": true
-            "local_working_icon": " ●",
-            "local_staged_icon": " ●",
-            "status_separator_icon": "",
-            "display_status": true,
-            "display_status_detail": false,
-            "display_branch_status": false,
-            "display_stash_count": false
           }
         },
         {

themes/honukai.omp.json

@@ -31,7 +31,8 @@
           "style": "plain",
           "foreground": "#B8B80A",
           "properties": {
-            "prefix": "<#ffffff>on git:</>"
+            "prefix": "<#ffffff>on git:</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         }
       ]

themes/hotstick.minimal.omp.json

@@ -24,7 +24,7 @@
           "foreground": "black",
           "background": "lightBlue",
           "leading_diamond": "",
-          "trailing_diamond": "",
+          "trailing_diamond": "\uE0B0",
           "properties": {
             "style": "mixed"
           }
@@ -32,11 +32,15 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "black",
           "background": "green",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}yellow{{ end }}"
+          ],
           "properties": {
-            "display_status_detail": true,
+            "fetch_status": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}",
             "branch_icon": " ",
             "branch_identical_icon": "≡",
             "branch_ahead_icon": "↑",
@@ -50,11 +54,7 @@
             "rebase_icon": "Ɫ ",
             "cherry_pick_icon": "✓ ",
             "merge_icon": "◴ ",
-            "no_commits_icon": "[no commits]",
+            "no_commits_icon": "[no commits]"
-            "status_separator_icon": " │",
-            "status_colors_enabled": true,
-            "color_background": true,
-            "local_changes_color": "yellow"
           }
         }
       ]

themes/hunk.omp.json

@@ -55,19 +55,19 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#caffbf",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#FCA17D{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#89d1dc{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#f17c37{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": false,
             "display_upstream_icon": true,
-            "status_colors_enabled": true,
+            "fetch_status": true,
-            "display_status": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}"
-            "local_changes_color": "#FCA17D",
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#f17c37",
-            "ahead_color": "#89d1dc",
-            "stash_count_icon": "\uF692 "
           }
         }
       ]

themes/huvix.omp.json

@@ -48,7 +48,7 @@
               "foreground": "#56B6C2",
               "properties": {
                 "branch_icon": "",
-                "display_status": false,
+                "template": "{{ .Repo.HEAD }}",
                 "prefix": "<#E8CC97>git(</>",
                 "postfix": "<#E8CC97>) </>"
               }

themes/iterm2.omp.json

@@ -48,19 +48,19 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
           "background": "#d2ff5e",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ff9248{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#89d1dc{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#f17c37{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_status": true,
-            "display_upstream_icon": true,
+            "fetch_stash_count": true,
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "display_status": true,
-            "local_changes_color": "#ff9248",
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#f17c37",
-            "ahead_color": "#89d1dc",
-            "stash_count_icon": "\uF692 "
           }
         },
         {

themes/jandedobbeleer.omp.json

@@ -10,7 +10,7 @@
           "foreground": "#ffffff",
           "background": "#c386f1",
           "leading_diamond": "",
-          "trailing_diamond": "",
+          "trailing_diamond": "\uE0B0",
           "properties": {
             "postfix": " ",
             "display_host": false
@@ -19,7 +19,7 @@
         {
           "type": "path",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#ff479c",
           "properties": {
@@ -32,24 +32,28 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
           "background": "#fffb38",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ff8c00{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#ff4500{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#B388FF{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#B388FF{{ end }}"
+          ],
+          "leading_diamond": "",
+          "trailing_diamond": "",
           "properties": {
-            "display_stash_count": true,
+            "fetch_status": true,
-            "display_upstream_icon": true,
+            "fetch_stash_count": true,
-            "status_colors_enabled": true,
+            "branch_max_length": 25,
-            "local_changes_color": "#ff9248",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#f17c37",
-            "ahead_color": "#89d1dc",
-            "stash_count_icon": "\uF692 "
           }
         },
         {
           "type": "node",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#6CA35E",
           "properties": {
@@ -60,7 +64,7 @@
         {
           "type": "go",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#111111",
           "background": "#8ED1F7",
           "properties": {
@@ -71,7 +75,7 @@
         {
           "type": "julia",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#111111",
           "background": "#4063D8",
           "properties": {
@@ -82,7 +86,7 @@
         {
           "type": "python",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#111111",
           "background": "#FFDE57",
           "properties": {
@@ -95,7 +99,7 @@
         {
           "type": "ruby",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#AE1401",
           "properties": {
@@ -107,7 +111,7 @@
         {
           "type": "azfunc",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#FEAC19",
           "properties": {
@@ -119,7 +123,7 @@
         {
           "type": "aws",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background_templates": [
             "{{if contains \"default\" .Profile}}#FFA400{{end}}",
@@ -133,7 +137,7 @@
         {
           "type": "root",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#111111",
           "background": "#ffff66",
           "properties": {
@@ -149,7 +153,7 @@
           "trailing_diamond": "",
           "properties": {
             "always_enabled": true,
-            "prefix": "<transparent></> \ufa1e",
+            "prefix": "<transparent>\uE0B0</> \ufa1e",
             "postfix": "\u2800"
           }
         },
@@ -165,7 +169,7 @@
             "always_enabled": true,
             "error_color": "#f1184c",
             "color_background": true,
-            "prefix": "<#83769c></> "
+            "prefix": "<#83769c>\uE0B0</> "
           }
         }
       ]

themes/jblab_2021.omp.json

@@ -48,18 +48,19 @@
         {
           "background": "#280C2E",
           "foreground": "#FFFFFF",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#7621DE{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#7621DE{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#7621DE{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#7621DE{{ end }}"
+          ],
           "powerline_symbol": "\uE0B0",
           "properties": {
-            "ahead_and_behind_color": "#7621DE",
+            "fetch_stash_count": true,
-            "ahead_color": "#7621DE",
+            "fetch_status": true,
-            "behind_color": "#7621DE",
-            "display_stash_count": true,
-            "display_status": true,
             "display_upstream_icon": true,
-            "local_changes_color": "#7621DE",
             "prefix": " ",
-            "staging_color": "#7621DE",
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "status_colors_enabled": true
           },
           "style": "powerline",
           "type": "git"

themes/jonnychipz.omp.json

@@ -119,18 +119,17 @@
           "style": "diamond",
           "foreground": "#000000",
           "background": "#ffffff",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ffea00{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#2EC4B6{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#8A4FFF{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "display_status": true,
+            "fetch_status": true,
-            "status_colors_enabled": true,
+            "prefix": "<#000000>\ue0b1 </>",
-            "color_background": false,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }}<#2FDA4E> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }}<#E84855> \uF044 {{ .Repo.Working.String }}</>{{ end }}"
-            "local_changes_color": "#ffea00",
-            "working_color": "#E84855",
-            "staging_color": "#2FDA4E",
-            "ahead_color": "#2EC4B6",
-            "behind_color": "#8A4FFF",
-            "prefix": "<#ffffff>\ue0b1 </>"
           }
         },
         {

themes/jtracey93.omp.json

@@ -29,7 +29,8 @@
           "background": "#25AFF3",
           "foreground": "#ffffff",
           "properties": {
-            "display_status": true,
+            "fetch_status": true,
+            "template": "{{ .Repo.HEAD }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}",
             "postfix": ") ",
             "prefix": " branch ("
           },
@@ -55,7 +56,7 @@
             "time_format": "15:04:05"
           },
           "style": "diamond",
-          "trailing_diamond": "",
+          "trailing_diamond": "\uE0B0",
           "type": "time"
         }
       ],

themes/jv_sitecorian.omp.json

@@ -69,16 +69,17 @@
           "powerline_symbol": "\uE0B0",
           "foreground": "#ffffff",
           "background": "#6f42c1",
+          "backround_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#176f2c{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#0366d6{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#f9c513{{ end }}"
+          ],
           "properties": {
-              "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-              "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-              "display_status": true,
-              "local_changes_color": "#176f2c",
-              "ahead_and_behind_color": "#f26d50",
-              "behind_color": "#f9c513",
-              "ahead_color": "#0366d6",
-              "stash_count_icon": "\uF692 "
           }
         },
         {
@@ -136,7 +137,6 @@
           "background": "#2B2B2B",
           "properties": {
             "postfix": "<#ffffff> \uF252 </>",
-                "postfix": "<#ffffff> \ufbab </>",
             "always_enabled": true
           }
         }

themes/lambda.omp.json

@@ -27,7 +27,8 @@
           "style": "plain",
           "foreground": "#B80101",
           "properties": {
-            "prefix": " <#F5F5F5>git:</>"
+            "prefix": " <#F5F5F5>git:</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         }
       ]

themes/marcduiker.omp.json

@@ -9,9 +9,9 @@
         {
           "background": "#feae34",
           "foreground": "#262b44",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "leading_diamond": "",
-          "trailing_diamond": "",
+          "trailing_diamond": "\uE0B0",
           "properties": {
             "prefix": "  ",
             "style": "folder"
@@ -22,16 +22,18 @@
         {
           "background": "#fee761",
           "foreground": "#262b44",
-          "powerline_symbol": "",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#f77622{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#e43b44{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#2ce8f5{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#f77622{{ end }}"
+          ],
+          "powerline_symbol": "\uE0B0",
           "properties": {
-            "display_stash_count": true,
+            "fetch_status": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "local_changes_color": "#f77622",
-            "ahead_and_behind_color": "#e43b44",
-            "behind_color": "#f77622",
-            "ahead_color": "#2ce8f5",
-            "stash_count_icon": "\uF692 "
           },
           "style": "powerline",
           "type": "git"
@@ -39,14 +41,14 @@
         {
           "background": "#fee761",
           "foreground": "#262b44",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "style": "powerline",
           "type": "root"
         },
         {
           "background": "#0095e9",
           "foreground": "#ffffff",
-          "leading_diamond": "<transparent, #0095e9></>",
+          "leading_diamond": "<transparent, #0095e9>\uE0B0</>",
           "properties": {
             "always_enabled": true,
             "color_background": true,

themes/material.omp.json

@@ -29,7 +29,8 @@
           "foreground": "#D0666F",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
+            "fetch_status": false,
+            "template": "{{ .Repo.HEAD }}",
             "prefix": "<#5FAAE8>git:(</>",
             "postfix": "<#5FAAE8>)</>"
           }

themes/microverse-power.omp.json

@@ -65,9 +65,10 @@
           "foreground": "#3A86FF",
           "background": "#242424",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "prefix": ""
+            "prefix": "",
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/mojada.omp.json

@@ -1,9 +1,11 @@
 {
-    "blocks": [{
+  "blocks": [
+    {
       "type": "prompt",
       "alignment": "left",
       "newline": true,
-            "segments": [{
+      "segments": [
+        {
           "type": "os",
           "style": "diamond",
           "leading_diamond": "\uE0B6",
@@ -68,15 +70,17 @@
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
           "background": "#fffb38",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ff9248{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#f17c37{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#89d1dc{{ end }}"
+          ],
           "properties": {
-                        "display_stash_count": true,
+            "fetch_status": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-                        "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-                        "local_changes_color": "#ff9248",
-                        "ahead_and_behind_color": "#f26d50",
-                        "behind_color": "#f17c37",
-                        "ahead_color": "#89d1dc",
-                        "stash_count_icon": "\uF692 "
           }
         },
         {
@@ -93,7 +97,8 @@
     },
     {
       "type": "rprompt",
-            "segments": [{
+      "segments": [
+        {
           "type": "exit",
           "style": "plain",
           "foreground": "#ffffff",

themes/mt.omp.json

@@ -35,11 +35,11 @@
           "foreground": "#ffffff",
           "background": "#4E44FF",
           "properties": {
-                        "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": false,
             "display_upstream_icon": true,
-                        "status_colors_enabled": false,
             "branch_icon": "",
-                        "display_status": false,
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}",
             "prefix": " \u279C (",
             "postfix": ") "
           }

themes/negligible.omp.json

@@ -28,7 +28,8 @@
           "foreground": "#F1502F",
           "properties": {
             "prefix": ":: ",
-                        "display_status": true
+            "fetch_status": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}"
           }
         }
       ]

themes/night-owl.omp.json

@@ -51,16 +51,17 @@
           "powerline_symbol": "\uE0B0",
           "foreground": "#011627",
           "background": "#22da6e",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ffeb95{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#c5e478{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#C792EA{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#C792EA{{ end }}"
+          ],
           "properties": {
             "branch_icon": "\ue725 ",
-            "display_status": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-            "staging_color": "#ef5350",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<#ef5350> \uF046 {{ .Repo.Staging.String }}</>{{ end }}"
-            "status_colors_enabled": true,
-            "local_changes_color": "#ffeb95",
-            "ahead_and_behind_color": "#c5e478",
-            "behind_color": "#C792EA",
-            "ahead_color": "#C792EA"
           }
         },
         {

themes/nu4a.omp.json

@@ -40,7 +40,10 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "python",

themes/paradox.omp.json

@@ -36,7 +36,10 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "python",

themes/pararussel.omp.json

@@ -29,9 +29,9 @@
           "foreground": "#D0666F",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
             "prefix": "<#5FAAE8>git:(</>",
-            "postfix": "<#5FAAE8>)</>"
+            "postfix": "<#5FAAE8>)</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/patriksvensson.omp.json

@@ -35,21 +35,20 @@
           "type": "git",
           "style": "plain",
           "foreground": "green",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}yellow{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}red{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}red{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}green{{ end }}"
+          ],
           "properties": {
-                      "display_status": true,
+            "fetch_status": true,
+            "fetch_stash_count": true,
+            "display_upstream_icon": true,
             "prefix": " on ",
             "postfix": "",
-                      "ahead_color": "red",
+            "github_icon": " ",
-                      "behind_color": "green",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }}<red> \uF044 {{ .Repo.Working.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<yellow> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-                      "working_color": "red",
-                      "staging_color": "yellow",
-                      "local_changes_color": "yellow",
-                      "ahead_and_behind_color": "red",
-                      "color_background": false,
-                      "display_stash_count": true,
-                      "display_upstream_icon": true,
-                      "status_colors_enabled": true,
-                      "github_icon": " "
           }
         },
         {

themes/pixelrobots.omp.json

@@ -119,18 +119,17 @@
           "style": "diamond",
           "foreground": "#ffea00",
           "background": "#2f2f2f",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ffea00{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#2EC4B6{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#8A4FFF{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-            "display_status": true,
+            "prefix": "<#ffea00>\ue0b1 </>",
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }}<#E84855> \uF044 {{ .Repo.Working.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<#2FDA4E> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "color_background": false,
-            "local_changes_color": "#ffea00",
-            "working_color": "#E84855",
-            "staging_color": "#2FDA4E",
-            "ahead_color": "#2EC4B6",
-            "behind_color": "#8A4FFF",
-            "prefix": "<#ffea00>\ue0b1 </>"
           }
         },
         {

themes/plague.omp.json

@@ -41,8 +41,9 @@
           "foreground": "#193549",
           "background": "#fffb38",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "display_upstream_icon": true
+            "display_upstream_icon": true,
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/powerlevel10k_classic.omp.json

@@ -36,7 +36,8 @@
           "foreground": "#D4E157",
           "background": "#546E7A",
           "properties": {
-            "prefix": "<#26C6DA>\uE0B1 </>"
+            "prefix": "<#26C6DA>\uE0B1 </>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/powerlevel10k_lean.omp.json

@@ -35,7 +35,8 @@
           "style": "plain",
           "foreground": "#FFE700",
           "properties": {
-            "prefix": ""
+            "prefix": "",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/powerlevel10k_modern.omp.json

@@ -41,8 +41,8 @@
           "background": "#D4E157",
           "powerline_symbol": "\uE0B4",
           "properties": {
-            "style": "full",
+            "prefix": " ",
-            "prefix": " "
+            "template": "{{ .Repo.HEAD }}"
           }
         }
       ]

themes/powerlevel10k_rainbow.omp.json

@@ -15,7 +15,7 @@
         {
           "type": "path",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#e4e4e4",
           "background": "#3465a4",
           "properties": {
@@ -27,19 +27,21 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#000000",
           "background": "#4e9a06",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#c4a000{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#89d1dc{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#4e9a06{{ end }}"
+          ],
           "properties": {
             "branch_icon": "\uF126 ",
-            "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "local_changes_color": "#c4a000",
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#4e9a06",
-            "ahead_color": "#89d1dc",
-            "stash_count_icon": "\uF692 "
           }
         }
       ]
@@ -180,7 +182,7 @@
           "type": "time",
           "style": "diamond",
           "invert_powerline": true,
-          "trailing_diamond": "─╮",
+          "trailing_diamond": "\uE0B0─╮",
           "background": "#d3d7cf",
           "foreground": "#000000",
           "properties": {

themes/powerline.omp.json

@@ -30,7 +30,10 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
-          "background": "#95ffa4"
+          "background": "#95ffa4",
+          "properties": {
+            "template": "{{ .Repo.HEAD }}"
+          }
         },
         {
           "type": "python",

themes/pure.omp.json

@@ -41,15 +41,15 @@
           "foreground": "#6C6C6C",
           "properties": {
             "prefix": "",
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "display_status": true,
+            "fetch_status": true,
-            "display_status_detail": true,
             "display_upstream_icon": true,
             "branch_icon": "",
             "github_icon": "",
             "branch_ahead_icon": "<#88C0D0>\u21e1 </>",
             "branch_behind_icon": "<#88C0D0>\u21e3 </>",
-            "local_working_icon": "<#FFAFD7>\u002a</>"
+            "local_working_icon": "<#FFAFD7>\u002a</>",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         }
       ]

themes/remk.omp.json

@@ -33,9 +33,9 @@
           "background": "lightCyan",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
             "prefix": " git(",
-            "postfix": ") "
+            "postfix": ") ",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/robbyrussel.omp.json

@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
   "blocks": [
@@ -30,9 +29,9 @@
           "foreground": "#D0666F",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
             "prefix": "<#5FAAE8>git:(</>",
-            "postfix": "<#5FAAE8>)</>"
+            "postfix": "<#5FAAE8>)</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/rudolfs-dark.omp.json

@@ -21,7 +21,6 @@
             "wsl_separator": "",
             "prefix": " ",
             "postfix": " "
-
           }
         },
         {
@@ -54,19 +53,13 @@
           "foreground": "#ffffff",
           "background": "#256C9D",
           "properties": {
+            "fetch_status": true,
+            "fetch_stash_count": false,
             "branch_max_length": 30,
-            "display_stash_count": false,
             "display_upstream_icon": true,
-            "display_status": true,
-            "status_colors_enabled": false,
-            "color_background": true,
-            "local_changes_color": "#ffffff",
-            "working_color": "#ffffff",
-            "staging_color": "#ffffff",
-            "ahead_color": "#ffffff",
-            "behind_color": "#ffffff",
             "prefix": "[ ",
-            "postfix": " ]"
+            "postfix": " ]",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/rudolfs-light.omp.json

@@ -21,7 +21,6 @@
             "wsl_separator": "",
             "prefix": " ",
             "postfix": " "
-
           }
         },
         {
@@ -40,20 +39,17 @@
           "style": "plain",
           "background": "#E0E0E0",
           "foreground": "#424242",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#053F22{{ end }}",
+            "{{ if or (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#0A703E{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": false,
+            "fetch_status": true,
             "branch_max_length": 30,
             "display_upstream_icon": true,
-            "display_status": true,
-            "status_colors_enabled": true,
-            "color_background": false,
-            "local_changes_color": "#053F22",
-            "working_color": "#BD6200",
-            "staging_color": "#053F22",
-            "ahead_color": "#0A703E",
-            "behind_color": "#0A703E",
             "prefix": " [",
-            "postfix": "] "
+            "postfix": "] ",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }}<#BD6200> \uF044 {{ .Repo.Working.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<#053F22> \uF046 {{ .Repo.Staging.String }}</>{{ end }}"
           }
         },
         {

themes/slim.omp.json

@@ -78,18 +78,17 @@
           "style": "diamond",
           "foreground": "#ffeb3b",
           "background": "#2f2f2f",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ffeb3b{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#2EC4B6{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#8A4FFF{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-            "display_status": true,
+            "prefix": "<#7a7a7a>\ue0b1 </>",
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }}<#E84855> \uF044 {{ .Repo.Working.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<#2FDA4E> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "color_background": false,
-            "local_changes_color": "#ffeb3b",
-            "working_color": "#E84855",
-            "staging_color": "#2FDA4E",
-            "ahead_color": "#2EC4B6",
-            "behind_color": "#8A4FFF",
-            "prefix": "<#7a7a7a>\ue0b1 </>"
           }
         },
         {

themes/slimfat.omp.json

@@ -76,18 +76,17 @@
           "style": "diamond",
           "foreground": "#ffeb3b",
           "background": "#2f2f2f",
+          "foreground_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ffeb3b{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#2EC4B6{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#8A4FFF{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
+            "fetch_status": true,
             "display_upstream_icon": true,
-            "display_status": true,
+            "prefix": "<#7a7a7a>\ue0b1 </>",
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }}<#E84855> \uF044 {{ .Repo.Working.String }}</>{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }}<#2FDA4E> \uF046 {{ .Repo.Staging.String }}</>{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "color_background": false,
-            "local_changes_color": "#ffeb3b",
-            "working_color": "#E84855",
-            "staging_color": "#2FDA4E",
-            "ahead_color": "#2EC4B6",
-            "behind_color": "#8A4FFF",
-            "prefix": "<#7a7a7a>\ue0b1 </>"
           }
         },
         {

themes/sorin.omp.json

@@ -34,7 +34,8 @@
           "style": "plain",
           "foreground": "#C1C106",
           "properties": {
-            "prefix": "<#ffffff>git:</>"
+            "prefix": "<#ffffff>git:</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/space.omp.json

@@ -48,9 +48,9 @@
           "invert_powerline": false,
           "properties": {
             "branch_icon": "",
-            "display_stash_count": true,
+            "fetch_stash_count": true,
-            "display_status": false,
+            "prefix": "<#ffffff>on</> ",
-            "prefix": "<#ffffff>on</> "
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
         {

themes/spaceship.omp.json

@@ -39,9 +39,9 @@
           "foreground": "#ff94df",
           "properties": {
             "branch_icon": " <#ff94df><b> </b></>",
-						"display_stash_count": true,
+            "fetch_stash_count": true,
-						"display_status": false,
+            "prefix": "<#ffffff>on</> ",
-						"prefix": "<#ffffff>on</> "
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           }
         },
 

themes/star.omp.json

@@ -30,7 +30,8 @@
           "foreground": "#C678DD",
           "properties": {
             "prefix": "<#ffffff>on</> ",
-            "display_status": true
+            "fetch_status": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}"
           }
         },
         {

themes/stelbent.minimal.omp.json

@@ -68,29 +68,29 @@
           "powerline_symbol": "\ue0b0",
           "foreground": "#100e23",
           "background": "#95ffa4",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ff9248{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#89d1dc{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#c5b6ad{{ end }}"
+          ],
           "properties": {
+            "fetch_status": true,
+            "fetch_stash_count": true,
             "branch_ahead_icon": "\u2191",
             "branch_behind_icon": "\u2193",
             "branch_gone": "\u2262",
             "branch_icon": "\ue0a0 ",
             "branch_identical_icon": "\u2261",
             "cherry_pick_icon": "\u2713 ",
-            "color_background": true,
             "commit_icon": "\u25b7 ",
-            "display_status_detail": true,
             "local_staged_icon": "",
             "local_working_icon": "",
             "merge_icon": "\u25f4 ",
             "no_commits_icon": "[no commits]",
             "rebase_icon": "\u2c62 ",
-            "stash_count_icon": "",
-            "status_colors_enabled": true,
-            "status_separator_icon": " \u2502",
             "tag_icon": "\u25b6 ",
-            "local_changes_color": "#ff9248",
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} \u2502{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} {{ .Repo.StashCount }}{{ end }}"
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#f17c37",
-            "ahead_color": "#89d1dc"
           }
         },
         {

themes/tonybaloney.omp.json

@@ -9,9 +9,8 @@
         {
           "background": "#18354c",
           "foreground": "#ffc107",
-          "powerline_symbol": "",
           "leading_diamond": "",
-          "trailing_diamond": "",
+          "trailing_diamond": "\uE0B0",
           "properties": {
             "prefix": "  ",
             "style": "folder"
@@ -22,11 +21,11 @@
         {
           "background": "#18354c",
           "foreground": "#ffc107",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "properties": {
-            "display_stash_count": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "status_colors_enabled": false
+            "template": "{{ .Repo.HEAD }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
           },
           "style": "powerline",
           "type": "git"
@@ -45,7 +44,7 @@
         {
           "background": "#ffc107",
           "foreground": "#18354c",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "style": "powerline",
           "type": "root"
         }

themes/unicorn.omp.json

@@ -37,19 +37,20 @@
         {
           "type": "git",
           "style": "powerline",
-          "powerline_symbol": "",
+          "powerline_symbol": "\uE0B0",
           "foreground": "#193549",
           "background": "#d2ff5e",
+          "background_templates": [
+            "{{ if or (.Repo.Working.Changed) (.Repo.Staging.Changed) }}#ff9248{{ end }}",
+            "{{ if and (.Repo.Ahead gt 0) (.Repo.Behind gt 0) }}#f26d50{{ end }}",
+            "{{ if .Repo.Ahead gt 0 }}#89d1dc{{ end }}",
+            "{{ if .Repo.Behind gt 0 }}#f17c37{{ end }}"
+          ],
           "properties": {
-            "display_stash_count": true,
+            "fetch_status": true,
+            "fetch_stash_count": true,
             "display_upstream_icon": true,
-            "status_colors_enabled": true,
+            "template": "{{ .Repo.HEAD }}{{ .Repo.BranchStatus }}{{ if .Repo.Working.Changed }} \uF044 {{ .Repo.Working.String }}{{ end }}{{ if and (.Repo.Working.Changed) (.Repo.Staging.Changed) }} |{{ end }}{{ if .Repo.Staging.Changed }} \uF046 {{ .Repo.Staging.String }}{{ end }}{{ if gt .Repo.StashCount 0 }} \uF692 {{ .Repo.StashCount }}{{ end }}"
-            "display_status": true,
-            "local_changes_color": "#ff9248",
-            "ahead_and_behind_color": "#f26d50",
-            "behind_color": "#f17c37",
-            "ahead_color": "#89d1dc",
-            "stash_count_icon": "\uF692 "
           }
         },
         {

themes/wopian.omp.json

@@ -30,7 +30,8 @@
           "foreground": "lightYellow",
           "properties": {
             "prefix": ":: <lightBlue>git(</>",
-                        "postfix": "<lightBlue>)</>"
+            "postfix": "<lightBlue>)</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         }
       ]

themes/xtoys.omp.json

@@ -37,9 +37,8 @@
           "properties": {
             "prefix": "HEAD:",
             "branch_icon": "",
-            "display_status": false,
             "display_upstream_icon": false,
-            "display_stash_count": false
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/ys.omp.json

@@ -62,7 +62,8 @@
           "type": "git",
           "style": "plain",
           "properties": {
-              "prefix": "<darkGray>on</> <white>git:</>"
+            "prefix": "<darkGray>on</> <white>git:</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {

themes/zash.omp.json

@@ -40,9 +40,9 @@
           "foreground": "#D4AAFC",
           "properties": {
             "branch_icon": "",
-            "display_status": false,
             "prefix": " <#DDB15F>git(</>",
-            "postfix": "<#DDB15F>)</>"
+            "postfix": "<#DDB15F>)</>",
+            "template": "{{ .Repo.HEAD }}"
           }
         },
         {