diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e41882a..43f45f2 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,17 +1,17 @@
 [core]
 	excludesfile = /Users/marcusbengtsson/.gitignore_global
 [difftool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE
-	path = 
+	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
+	path =
 [mergetool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE $BASE $MERGED
+	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 = bcompare
+	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
-	tool = bcompare
+	tool = kdiff3

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e41882a..43f45f2 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,17 +1,17 @@
 [core]
 	excludesfile = /Users/marcusbengtsson/.gitignore_global
 [difftool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE
-	path = 
+	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
+	path =
 [mergetool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE $BASE $MERGED
+	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 = bcompare
+	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
-	tool = bcompare
+	tool = kdiff3
diff --git a/install/brew.sh b/install/brew.sh
index d13ac6d..dd43673 100644
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -1,23 +1,27 @@
 #!/bin/sh
 
-brew install android-sdk  
-brew install bash-completion 
-brew install gradle      
-brew install libevent    
-brew install macvim --override-system-vim     
-brew install maven       
-brew install node        
-brew install sbt     
-brew install wget
-brew install cscope
-brew install htop-osx
-brew install lynx
-brew install mariadb
-brew install nmap
-brew install openssl
-brew install scala
-brew install youtube-dl
-brew install unrar
-brew install p7zip
+brew install android-sdk
+brew install bash-completion
 brew install git
+brew install gradle
+brew install htop-osx
+brew install kdiff3
+brew install libevent
+brew install libxml2
+brew install lynx
+brew install macvim --override-system-vim
+brew install mariadb
+brew install maven
+brew install nmap
+brew install node
+brew install p7zip
+brew install sbt
+brew install scala
+brew install tree
+brew install unrar
+brew install wget
+brew install youtube-dl
 brew install zsh
+
+brew linkapps macvim
+brew linkapps kdiff3

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e41882a..43f45f2 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,17 +1,17 @@
 [core]
 	excludesfile = /Users/marcusbengtsson/.gitignore_global
 [difftool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE
-	path = 
+	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
+	path =
 [mergetool "sourcetree"]
-	cmd = /usr/local/bin/bcomp $LOCAL $REMOTE $BASE $MERGED
+	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 = bcompare
+	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
-	tool = bcompare
+	tool = kdiff3
diff --git a/install/brew.sh b/install/brew.sh
index d13ac6d..dd43673 100644
--- a/install/brew.sh
+++ b/install/brew.sh
@@ -1,23 +1,27 @@
 #!/bin/sh
 
-brew install android-sdk  
-brew install bash-completion 
-brew install gradle      
-brew install libevent    
-brew install macvim --override-system-vim     
-brew install maven       
-brew install node        
-brew install sbt     
-brew install wget
-brew install cscope
-brew install htop-osx
-brew install lynx
-brew install mariadb
-brew install nmap
-brew install openssl
-brew install scala
-brew install youtube-dl
-brew install unrar
-brew install p7zip
+brew install android-sdk
+brew install bash-completion
 brew install git
+brew install gradle
+brew install htop-osx
+brew install kdiff3
+brew install libevent
+brew install libxml2
+brew install lynx
+brew install macvim --override-system-vim
+brew install mariadb
+brew install maven
+brew install nmap
+brew install node
+brew install p7zip
+brew install sbt
+brew install scala
+brew install tree
+brew install unrar
+brew install wget
+brew install youtube-dl
 brew install zsh
+
+brew linkapps macvim
+brew linkapps kdiff3
diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
index dcfe33e..a2aca5f 100644
--- a/vim/vim.symlink/plugins.vim
+++ b/vim/vim.symlink/plugins.vim
@@ -62,6 +62,9 @@
 " VIM-ROOTER https://github.com/airblade/vim-rooter
 Plugin 'airblade/vim-rooter'
 
+" VIM-XPATH https://github.com/actionshrimp/vim-xpath
+Plugin 'actionshrimp/vim-xpath'
+
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required