diff --git a/.config/theme/quick-term.omp.json b/.config/theme/quick-term.omp.json
index b7cc891..e80590b 100644
--- a/.config/theme/quick-term.omp.json
+++ b/.config/theme/quick-term.omp.json
@@ -1,5 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+<<<<<<< HEAD
   "palette": {
     "text": "#ffffff",
     "darktext": "#6e738d",
@@ -11,14 +12,21 @@
     "grey": "#e4e4e4",
     "ahead": "#54433a"
   },
+=======
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
   "blocks": [
     {
       "alignment": "left",
       "newline": true,
       "segments": [
         {
+<<<<<<< HEAD
           "background": "p:mauve",
           "foreground": "p:text",
+=======
+          "background": "#d75f00",
+          "foreground": "#f2f3f8",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "alpine": "\uf300",
             "arch": "\uf303",
@@ -42,16 +50,26 @@
           "type": "os"
         },
         {
+<<<<<<< HEAD
           "background": "p:grey",
           "foreground": "p:darktext",
+=======
+          "background": "#e4e4e4",
+          "foreground": "#4e4e4e",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "style": "powerline",
           "powerline_symbol": "\ue0b0",
           "template": " {{ .UserName }} ",
           "type": "session"
         },
         {
+<<<<<<< HEAD
           "background": "p:blue",
           "foreground": "p:text",
+=======
+          "background": "#0087af",
+          "foreground": "#f2f3f8",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "style": "agnoster_short",
             "max_depth": 3,
@@ -64,10 +82,20 @@
           "type": "path"
         },
         {
+<<<<<<< HEAD
           "background": "p:green",
           "foreground": "p:text",
           "background_templates": [
             "{{ if or (.Working.Changed) (.Staging.Changed) }}p:maroon{{ end }}"
+=======
+          "background": "#378504",
+          "foreground": "#f2f3f8",
+          "background_templates": [
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}#a97400{{ end }}",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#54433a{{ end }}",
+            "{{ if gt .Ahead 0 }}#744d89{{ end }}",
+            "{{ if gt .Behind 0 }}#744d89{{ end }}"
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           ],
           "properties": {
             "branch_max_length": 25,
@@ -90,8 +118,13 @@
       "alignment": "right",
       "segments": [
         {
+<<<<<<< HEAD
           "background": "p:grey",
           "foreground": "p:darktext",
+=======
+          "background": "#e4e4e4",
+          "foreground": "#585858",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "style": "austin",
             "always_enabled": true
@@ -103,8 +136,13 @@
           "type": "executiontime"
         },
         {
+<<<<<<< HEAD
           "background": "p:mauve",
           "foreground": "p:text",
+=======
+          "background": "#d75f00",
+          "foreground": "#f2f3f8",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "time_format": "15:04:05"
           },
@@ -122,7 +160,11 @@
       "newline": true,
       "segments": [
         {
+<<<<<<< HEAD
           "foreground": "p:mauve",
+=======
+          "foreground": "#d75f00",
+>>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "style": "plain",
           "template": "\u2570\u2500 {{ if .Root }}#{{else}}${{end}}",
           "type": "text"