diff --git a/gitconfig/attributes b/gitconfig/attributes
new file mode 100644
index 0000000..fcecdbc
--- /dev/null
+++ b/gitconfig/attributes
@@ -0,0 +1,6 @@
+# hunk headers show the enclosing heading/section
+*.md diff=markdown
+gitconfig diff=ini
+*.gitconfig diff=ini
+*.ini diff=ini
+*.toml diff=ini
diff --git a/gitconfig/gitconfig b/gitconfig/gitconfig
index 6c0bf85..69569ba 100644
--- a/gitconfig/gitconfig
+++ b/gitconfig/gitconfig
@@ -1,32 +1,33 @@
 # This is Git's per-user configuration file.
 [user]
 # Please adapt and uncomment the following lines:
-name = Fabian Ising
-email = github@murgi.de
+	name = Fabian Ising
+	email = github@murgi.de
 
 [includeIf "hasconfig:remote.*.url:https://github.com/**"]
-    path = ~/dotfiles/gitconfig/github.gitconfig
+	path = ~/dotfiles/gitconfig/github.gitconfig
 [includeIf "hasconfig:remote.*.url:git@github.com/**"]
-    path = ~/dotfiles/gitconfig/github.gitconfig
+	path = ~/dotfiles/gitconfig/github.gitconfig
 [includeIf "hasconfig:remote.*.url:https://git.fh-muenster.de/**"]
-    path = ~/dotfiles/gitconfig/fhms.gitconfig
+	path = ~/dotfiles/gitconfig/fhms.gitconfig
 [includeIf "hasconfig:remote.*.url:git@git.fh-muenster.de:*/**"]
-    path = ~/dotfiles/gitconfig/fhms.gitconfig
+	path = ~/dotfiles/gitconfig/fhms.gitconfig
 [includeIf "hasconfig:remote.*.url:ssh://git@git.fh-muenster.de:*/**"]
-    path = ~/dotfiles/gitconfig/fhms.gitconfig
+	path = ~/dotfiles/gitconfig/fhms.gitconfig
 [includeIf "hasconfig:remote.*.url:https://vcs.murgi.de/**"]
-    path = ~/dotfiles/gitconfig/murgi.gitconfig
+	path = ~/dotfiles/gitconfig/murgi.gitconfig
 [includeIf "hasconfig:remote.*.url:ssh://git@vcs.murgi.de:*/**"]
-    path = ~/dotfiles/gitconfig/murgi.gitconfig
+	path = ~/dotfiles/gitconfig/murgi.gitconfig
 [includeIf "hasconfig:remote.*.url:git@vcs.murgi.de:*/**"]
-    path = ~/dotfiles/gitconfig/murgi.gitconfig
+	path = ~/dotfiles/gitconfig/murgi.gitconfig
 [includeIf "hasconfig:remote.*.url:git@git-int.sit.fraunhofer.de:*/**"]
-    path = ~/dotfiles/gitconfig/sit.gitconfig
+	path = ~/dotfiles/gitconfig/sit.gitconfig
 [includeIf "hasconfig:remote.*.url:https://git-int.sit.fraunhofer.de/**"]
-    path = ~/dotfiles/gitconfig/sit.gitconfig
+	path = ~/dotfiles/gitconfig/sit.gitconfig
 [core]
 	excludesfile = ~/dotfiles/.gitignore_global
-    pager = delta
+	attributesfile = ~/dotfiles/gitconfig/attributes
+	pager = delta
 [submodule]
 	recurse = true
 [filter "lfs"]
@@ -39,6 +40,23 @@ email = github@murgi.de
 [pull]
 	rebase = true
 [interactive]
-    diffFilter = delta --color-only
+	diffFilter = delta --color-only
+[diff]
+	colorMoved = default
 [delta]
-    navigate = true
+	navigate = true
+	; plain look: +/- markers, line backgrounds (auto light/dark), no syntax colors
+	keep-plus-minus-markers = true
+	syntax-theme = none
+	file-style = bold
+	file-decoration-style = none
+	hunk-header-style = file syntax
+	hunk-header-decoration-style = none
+	tabs = 4
+	line-numbers = true
+	line-numbers-left-format = 
+	line-numbers-right-format = "{np:>4} "
+[diff "ini"]
+	xfuncname = "^\\[.*\\]"
+[alias]
+	wsdiff = -c pager.diff='less -R' -c color.diff.old='red reverse' -c color.diff.new='green reverse' diff --word-diff=color --word-diff-regex='[^[:space:]]+|[[:space:]]+'