diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e2a1227..eae583c 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,23 +1,22 @@
 [core]
 	excludesfile = /Users/marcusbengtsson/.gitignore_global
-[difftool "sourcetree"]
-	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
-	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@hiq.se
 [diff]
-	tool = kdiff3
-	guitool = kdiff3
+  tool = meld
 [difftool]
-	prompt = false
+  prompt = false
+[difftool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
 [merge]
-	tool = kdiff3
-[difftool "kdiff3"]
-	path = /usr/local/bin/kdiff3
+  tool = meld
+[mergetool]
+  prompt = false
+[mergetool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
 [alias] 
     tree = log --oneline --decorate --all --graph 
     pulls = !git pull && git submodule init && git submodule

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e2a1227..eae583c 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,23 +1,22 @@
 [core]
 	excludesfile = /Users/marcusbengtsson/.gitignore_global
-[difftool "sourcetree"]
-	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
-	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@hiq.se
 [diff]
-	tool = kdiff3
-	guitool = kdiff3
+  tool = meld
 [difftool]
-	prompt = false
+  prompt = false
+[difftool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
 [merge]
-	tool = kdiff3
-[difftool "kdiff3"]
-	path = /usr/local/bin/kdiff3
+  tool = meld
+[mergetool]
+  prompt = false
+[mergetool "meld"]
+  trustExitCode = true
+  cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
 [alias] 
     tree = log --oneline --decorate --all --graph 
     pulls = !git pull && git submodule init && git submodule
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 2105e5b..f582667 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -79,6 +79,9 @@
 # Rebind the delete key.
 bindkey '\e[3~' delete-char
 
+# Enable reverse search
+bindkey '^R' history-incremental-pattern-search-backward
+
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"