diff --git a/git/gitconfig b/git/gitconfig
index 3dbad9f..62f1e4a 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -9,14 +9,17 @@
 [alias]
   co = checkout
   br = checkout -b
-  st = status -sb
   ci = commit
-  rd = rebase -i development
-  rh = rebase -i HEAD~5
   cp = cherry-pick
-  unstage = reset
+  st = stash
+  sp = stash pop
+  rim = rebase -i master
+  rih = rebase -i HEAD~5
+  rc = rebase --continue
+  ra = rebase --abort
   undo = reset --soft HEAD^
-  reword = git commit --amend -m
+  reword = commit --amend -m
+  last = for-each-ref --sort=-committerdate --count=10 refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:green)(%(committerdate:relative))%(color:reset) - %(color:blue)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname)'
 [color]
   diff = auto
   status = auto
@@ -25,6 +28,7 @@
 [core]
   excludesfile = ~/.gitignore
   editor = vim
+	pager = diff-so-fancy | less --tabs=4 -R
 [push]
   default = current
 [apply]
@@ -48,5 +52,21 @@
 [merge]
   tool = Kaleidoscope
 [filter "media"]
-	clean = git-media-clean %f
-	smudge = git-media-smudge %f
+	required = true
+	clean = git media clean %f
+	smudge = git media smudge %f
+[filter "hawser"]
+	clean = git hawser clean %f
+	smudge = git hawser smudge %f
+	required = true
+[filter "lfs"]
+	clean = git lfs clean %f
+	smudge = git lfs smudge %f
+	required = true
+[url "ssh://git@github.com/"]
+	insteadOf = https://github.com/
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22