diff --git a/gitconfig b/gitconfig
index 61dec29..d1362a1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -6,6 +6,7 @@
   autocrlf = false
   safecrlf = false
   editor = vim
+  pager = delta
 [color]
   ui = true
 [credential]
@@ -19,7 +20,7 @@
 [pull]
   rebase = true
 [merge]
-  tool = vimdiff
+  conflictStyle = zdiff3
 [alias]
   lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
   lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
@@ -29,3 +30,9 @@
   required = true
   clean = git-lfs clean -- %f
   smudge = git-lfs smudge -- %f
+[interactive]
+  diffFilter = delta --color-only
+[delta]
+  line-numbers = true
+  navigate = true
+