diff --git a/profiles/base/.aliases b/profiles/base/.aliases
index 1cf8ed5..c506aaa 100644
--- a/profiles/base/.aliases
+++ b/profiles/base/.aliases
@@ -16,4 +16,5 @@ alias csreport="ssh lcluster11 csreport"
 alias scancel="ssh lcluster11 scancel"
 
 # faster sshfs
-alias sshfs="sshfs -o Ciphers=arcfour,Compression=no,auto_cache"
+#alias sshfs="sshfs -o Ciphers=arcfour,Compression=no,auto_cache"
+alias sshfs="sshfs -o Compression=no,auto_cache"
diff --git a/profiles/base/.gitconfig b/profiles/base/.gitconfig
index 0dec70e..db0f02b 100644
--- a/profiles/base/.gitconfig
+++ b/profiles/base/.gitconfig
@@ -5,3 +5,5 @@
 	email = bauer@cbs.tu-darmstadt.de
 [pack]
 	threads = 8
+[merge]
+	tool = kdiff3
diff --git a/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings b/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings
index e8da70d..e9013f3 100644
--- a/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
+++ b/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
@@ -22,6 +22,7 @@
 		"rsub",
 		"Rust Enhanced",
 		"SideBarEnhancements",
-		"TabNine"
+		"TabNine",
+		"WordCount"
 	]
 }
diff --git a/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings b/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
index 1131a17..1b32133 100644
--- a/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
+++ b/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
@@ -4,7 +4,7 @@
 	"detect_indentation": false,
 	"dictionary": "Packages/Language - English/en_US.dic",
 	"font_face": "Hack for Powerline Regular",
-	"font_size": 12,
+	"font_size": 14,
 	"hot_exit": false,
 	"ignored_packages":
 	[