diff --git a/git/.config/git/config b/git/.config/git/config
index 1050064..460722d 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -1,20 +1,37 @@
 [user]
-	email = dev@buffet.sh
-	name = buffet
+    email = dev@buffet.sh
+    name = buffet
 
 [init]
-	defaultBranch = master
+    defaultBranch = master
+
+[core]
+    pager = delta
 
 [alias]
-	a = add
-	b = branch
-	c = commit --verbose
-	m = commit --amend --verbose
+    a = add
+    b = branch
+    c = commit --verbose
+    m = commit --amend --verbose
 
-	d = diff
-	ds = diff --stat
-	dc = diff --cached
+    d = diff
+    ds = diff --stat
+    dc = diff --cached
 
-	s = status -s
-	co = checkout
-	cob = checkout -b
+    s = status -s
+    co = checkout
+    cob = checkout -b
+
+[interactive]
+    diffFilter = delta --color-only
+
+[merge]
+    conflictstyle = diff3
+
+[diff]
+    colorMoved = default
+
+[delta]
+    navigate = true
+    hyperlinks = true
+    syntax-theme = Solarized (light)