diff --git a/.config/gitconfig b/.config/gitconfig
index a511da7..2046852 100644
--- a/.config/gitconfig
+++ b/.config/gitconfig
@@ -1,27 +1,35 @@
-[user]
-	name = Tobias Schmidl
+[alias]
+	trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v
 [branch]
 	autosetuprebase = always
 [branch "master"]
 	rebase = true
 [core]
 	autocrlf = input
-	whitespace = tabwidth=4
-	pager = less -F -X
 	excludesfile = ~/.config/gitignore
+	pager = less -F -X
+	whitespace = tabwidth=4
 [credential]
 	helper = store
 [diff]
+	algorithm = histogram
 	renamelimit = 65536
 	renames = copies
 [difftool]
 	prompt = false
+[fetch]
+	fsckobjects = true
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	process = git-lfs filter-process
+	required = true
+	smudge = git-lfs smudge -- %f
 [gitflow "prefix"]
-	feature = dev/
+	feature = feature/system/
 	versiontag = v
 [http]
 	sslverify = true
-	sslversion = tlsv1.2
+	sslversion = tlsv1.3
 [merge]
 	conflictstyle = diff3
 	renormalize = true
@@ -29,35 +37,28 @@
 [pack]
 	threads = 0
 [pager]
+	diff = diffr | less -FRX
 	log = diffr | less -FRX
 	show = diffr | less -FRX
-	diff = diffr | less -FRX
 [pull]
 	rebase = true
-[transfer]
-	fsckobjects = true
-[fetch]
-	fsckobjects = true
-[receive]
-	fsckobjects = true
 [rebase]
 	autosquash = true
+[receive]
+	fsckobjects = true
+[sendemail]
+	transferEncoding = 8bit
+[svn]
+	addAuthorFrom = true
+	findcopiesharder = true
+	rmdir = true
+	useLogAuthor = true
 [tig]
 	blob-view = line-number:yes,interval=5 text
 	diff-highlight = true
 	line-graphics = utf-8
 	tab-size = 4
-[filter "lfs"]
-	required = true
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-[svn]
-	findcopiesharder = true
-	rmdir = true
-	useLogAuthor = true
-	addAuthorFrom = true
-[alias]
-	trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v
-[sendemail]
-	transferEncoding = 8bit
+[transfer]
+	fsckobjects = true
+[user]
+	name = Tobias Schmidl