diff --git a/gitconfig b/gitconfig
index d23d3d5..c66c17a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -9,6 +9,16 @@
   excludesfile = ~/.gitignore
   legacyheaders = false
   whitespace = trailing-space,space-before-tab
+  pager = delta
+[interactive]
+  diffFilter = delta --color-only
+[add.interactive]
+  useBuildtin = false
+[delta]
+  navigate = true
+  light = false
+  line-numbers = true
+  syntax-theme = Dracula
 [alias]
   st = status
   ci = commit
@@ -62,11 +72,13 @@
 [diff]
   tool = Kaleidoscope
   algorithm = patience
+  colorMoved = default
 [difftool]
   prompt = false
 [difftool "Kaleidoscope"]
   cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [merge]
+  conflictstyle = diff3
   tool = Kaleidoscope
 [mergetool]
   prompt = false
diff --git a/nvim/after/plugin/sad.lua b/nvim/after/plugin/sad.lua
index f165912..3ef0c66 100644
--- a/nvim/after/plugin/sad.lua
+++ b/nvim/after/plugin/sad.lua
@@ -8,7 +8,7 @@ sad.setup({
 	diff = "delta", -- you can use `diff`, `diff-so-fancy`
 	ls_file = "fd", -- also git ls_file
 	exact = false, -- exact match
-	vsplit = true, -- split sad window the screen vertically, when set to number
-	height_ratio = 0.6, -- height ratio of sad window when split horizontally
-	width_ratio = 0.6, -- height ratio of sad window when split vertically
+	vsplit = false, -- split sad window the screen vertically, when set to number
+	height_ratio = 0.5, -- height ratio of sad window when split horizontally
+	width_ratio = 0.5, -- height ratio of sad window when split vertically
 })
diff --git a/setup/brew.sh b/setup/brew.sh
index 07dfbfc..ed2ede6 100755
--- a/setup/brew.sh
+++ b/setup/brew.sh
@@ -49,6 +49,7 @@ brew install gcc                        # GNU compiler collection
 brew install gh                         # GitHub command-line tool
 brew install giflib                     # GIF library using patented LZW algorithm
 brew install git                        # Distributed revision control system
+brew install git-delta                  # Syntax-highlighting pager for git and diff output
 brew install git-extras                 # Small git utilities
 brew install git-fixup                  # Alias for git commit --fixup <ref>
 brew install git-lfs                    # Git extension for versioning large files