diff --git a/themes.gitconfig b/themes.gitconfig
index 447297add..178924436 100644
--- a/themes.gitconfig
+++ b/themes.gitconfig
@@ -302,7 +302,7 @@
     dark = true
     line-numbers = true
     side-by-side = true
-    keep-plus-minus-markers = true
+    keep-plus-minus-markers = false
     syntax-theme = Nord
     file-style = "#434C5E" bold
     file-decoration-style = "#434C5E" ul
@@ -312,18 +312,26 @@
     file-removed-label = [-]
     file-renamed-label = [->]
     hunk-header-style = omit
-    line-numbers-left-format = " {nm:>1} │"
+    line-numbers-left-format = " {nm:>3} │"
     line-numbers-left-style = red
-    line-numbers-right-format = " {np:>1} │"
+    line-numbers-right-format = " {np:>3} │"
     line-numbers-right-style = green
     line-numbers-minus-style = red italic black
     line-numbers-plus-style = green italic black
     line-numbers-zero-style = "#434C5E" italic
     minus-style = bold red
-    minus-emph-style = bold red
+    minus-emph-style = bold "#202020" "#FF5555"
+    minus-non-emph-style = bold
     plus-style = bold green
-    plus-emph-style = bold green
+    plus-emph-style = bold "#202020" "#50FA7B"
+    plus-non-emph-style = bold
     zero-style = syntax
     blame-code-style = syntax
-    blame-format = "{author:<18} ({commit:>7}) {timestamp:^16} "
+    blame-format = "{author:<18} ({commit:>9}) {timestamp:^16}"
     blame-palette = "#2E3440" "#3B4252" "#434C5E" "#4C566A"
+    merge-conflict-begin-symbol = ~
+    merge-conflict-end-symbol = ~
+    merge-conflict-ours-diff-header-style = "#F1FA8C" bold
+    merge-conflict-ours-diff-header-decoration-style = "#434C5E" box
+    merge-conflict-theirs-diff-header-style = "#F1FA8C" bold
+    merge-conflict-theirs-diff-header-decoration-style = "#434C5E" box