diff --git a/vimrc b/vimrc
index 3900178..aaff3a1 100644
--- a/vimrc
+++ b/vimrc
@@ -7,10 +7,9 @@ let g:airline_powerline_fonts = 1
 filetype plugin indent on
 " show existing tab with 4 spaces width
 set tabstop=4
+set softtabstop=0 noexpandtab
 " when indenting with '>', use 4 spaces width
 set shiftwidth=4
-" On pressing tab, insert 4 spaces
-set expandtab
 " Enable highlighted search
 set hlsearch
 " Disable VIM matching parenthesis highlighting
diff --git a/zshrc b/zshrc
index 2d3b7e9..c186d0c 100644
--- a/zshrc
+++ b/zshrc
@@ -106,3 +106,10 @@ fi
 # no beep for console
 #setterm -blength 0
 #TODO if term console
+
+# force vim, usefull on FreeBSD that do not use update-alternatives stuff
+alias vi="vim"
+export EDITOR="vim"
+
+# force screen unicode to render powerfont correctly
+alias screen="screen -U"