diff --git a/bash/bash.d/ps1 b/bash/bash.d/ps1
index ae046a9..f2fb1ca 100644
--- a/bash/bash.d/ps1
+++ b/bash/bash.d/ps1
@@ -77,7 +77,7 @@ function __prompt_command() {
 			'maclean')	PS1+="${IGre}\H${RCol}";;
 			'beatmaker')	PS1+="${Gre}\H${RCol}";;
 			'blacksmith'|'beatmachine') PS1+="${Blu}\H${RCol}";;
-			'fatserf')	PS1+="${Pur}\H${RCol}";;
+			'locksmith'|'fatserf')	PS1+="${Pur}\H${RCol}";;
 			'lilo'*)	PS1+="${BWhi}\H${RCol}";;
 			'hg'*)	PS1+="${BRed}\H${RCol}";;
 			'gouda'|'bunnik'|'houten'|'zandberg'|'bussum'|'baarn') PS1+="${Gre}${On_Whi}HEF:${Blu}${On_Whi}\H${RCol}";;
diff --git a/bin/overview b/bin/overview
new file mode 100755
index 0000000..779055d
--- /dev/null
+++ b/bin/overview
@@ -0,0 +1,8 @@
+#! /bin/bash
+systemctl status sshd
+systemctl status mpd
+systemctl status nginx
+systemctl status mariadb
+systemctl status postfix
+systemctl status dovecot
+#systemctl status 
diff --git a/git/gitconfig b/git/gitconfig
index 08b7996..de2aeda 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -14,3 +14,7 @@
 	ui = auto
 [merge]
 	conflictstyle = diff3
+[branch]
+	autosetuprebase = always
+[diff]
+	tool = vimdiff
diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings
index cc21b4c..86d37a5 100644
--- a/ncmpcpp/bindings
+++ b/ncmpcpp/bindings
@@ -178,8 +178,8 @@ def_key "down"
 #def_key "end"
 #  move_end
 #
-def_key "space"
-  press_space
+#def_key "space"
+#  press_space
 #
 def_key "enter"
   press_enter
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 5ffc548..c548d50 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -28,10 +28,6 @@ set-option -g set-titles on
 set-window-option -g automatic-rename on
 setw -g monitor-activity on
 
-# unicode
-setw -g utf8 on
-set -g status-utf8 on
-
 # use PREFIX | to split window horizontally and PREFIX - to split vertically
 bind | split-window -h
 bind - split-window -v
diff --git a/vim/vimrc b/vim/vimrc
index a1a4105..a01b89b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -21,6 +21,7 @@ filetype indent on
 
 " Set tabbing stuff
 set tabstop=4
+set softtabstop=4
 set shiftwidth=4
 set noexpandtab