diff --git a/.bashrc b/.bashrc
index 2ab2854618be3e21e3d54855791318ad13e4e8a2..f786884ce2c2909b87871efecbe6a1c7f8ae7a06 100644
--- a/.bashrc
+++ b/.bashrc
@@ -55,6 +55,6 @@ alias sf='php app/console --ansi'
 #[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
 #    . /usr/share/bash-completion/bash_completion
 
-export TERM=xterm-256color
+export TERM=screen-256color
 export PATH="$PATH:$HOME/.composer/vendor/bin"
 export PATH="$PATH:$HOME/.gem/ruby/2.1.0/bin"
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
index b0bb781fc73ef40365e4c996a16f04368d64fc9d..0000000000000000000000000000000000000000
--- a/.vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d
diff --git a/.vimrc b/.vimrc
index 228aa3c86a75f53abf351477b60c52562fc796c1..9282bdb204847e335615143c8a2ae5aa8a4eb7fa 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,14 +13,22 @@ Plugin 'gmarik/Vundle.vim'
 Plugin 'sjbach/lusty.git'
 Plugin 'kien/ctrlp.vim.git'
 Plugin 'arnaud-lb/vim-php-namespace.git'
-Plugin 'danro/rename.vim.git'
+Plugin 'Lokaltog/vim-powerline.git'
+Plugin 'tpope/vim-fugitive.git'
+
 
 " Here should be other plugins
 " Bundle 'joonty/vim-phpqa.git'
 
+Bundle 'tobyS/pdv'
+Bundle 'danro/rename.vim'
+
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
-filetype plugin indent on    " required
+
+filetype on
+filetype plugin on
+filetype indent on    " required
 " To ignore plugin indent changes, instead use:
 "filetype plugin on
 "
@@ -46,10 +54,9 @@ set number
 set tabstop=4
 set expandtab
 set smartindent
-set autoindent
+"set autoindent
 set shiftwidth=4
 set directory=/tmp/
-filetype plugin indent on
 
 set nobackup                    " Don't make a backup before overwriting a file.
 set nowritebackup               " And again.
@@ -57,11 +64,12 @@ set nowritebackup               " And again.
 set wildmenu                    " Better completion
 set wildmode=list:longest       " BASH style completion
 set wildignore=.svn,CVS,.git,.hg,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.png,*.xpm,*.gif,*.pyc,*.pyo,*.log,**/cache/**,**/logs/**,**/zend/**,**/vendor/**/vendor/**,web/css,web/js,web/bundles,*/project/*,*/target/*,*.hi
+set incsearch                   " Highlight matches as you type.
+set hlsearch                    " Highlight matches.
 
-" Not sure theses 3 lines are usefull
-set clipboard+=unnamedplus
-set paste
-set go+=a
+" Is cool in order to paste from the terminal, but drop the indentation
+" could be use on a distant server
+"set paste
 
 set hidden
 set showcmd
@@ -100,3 +108,37 @@ noremap <silent> <C-t> :CtrlPTag<cr>
 inoremap <Leader>u <C-O>:call PhpInsertUse()<CR>
 noremap <Leader>u :call PhpInsertUse()<CR>
 
+
+" esay copy-paste clipboard
+vmap <Leader>y "+y<CR>
+nmap <leader>p "+p<CR>
+
+" easy navigation between words
+nmap <C-l> w
+nmap <C-h> b
+nmap <C-j> 4j
+nmap <C-k> 4k
+
+" Clear search highlight
+nmap <silent> <leader>/ :let @/=""<cr>
+
+" Powerline protip
+let g:Powerline_symbols = 'fancy'
+set ls=2                            " Always show status bar
+
+
+" This function allow to toggle settings for line in files (from absolute to
+" relative)
+function! NumberToggle()
+  if(&relativenumber == 1)
+    "set number
+    set norelativenumber
+  else
+    set relativenumber
+  endif
+endfunc
+" Mapping of the last function on CTRL+N
+nnoremap <C-n> :call NumberToggle()<cr>
+
+
+