diff --git a/gitconfig b/gitconfig
index 8294324..ec3387e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -112,13 +112,17 @@
 [credential "https://github.com"]
 	helper = !gh auth git-credential
 [diff]
+	colorWords = true
 	tool = vimdiff
 	ignoreSubmodules = dirty
 [merge]
 	tool = vimdiff
+	conflictstyle = zdiff3
 [interactive]
 	diffFilter = delta --color-only
 [delta]
+	navigate = true
+	dark = true
 	side-by-side = true
 	plus-style = 'syntax "#142e20"'
 	zero-style = 'syntax "#1d1f21" dim'
@@ -126,3 +130,6 @@
 	commit-decoration-style = bold yellow box ul
 	file-style = bold yellow ul
 	file-decoration-style = none
+	wrap-max-lines=unlimited
+	wrap-right-percent=1
+	wrap-left-symbol=" "