diff --git a/.vimrc b/.vimrc
index b850c7c..84a7a45 100644
--- a/.vimrc
+++ b/.vimrc
@@ -16,6 +16,8 @@ Plugin 'preservim/tagbar'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'dpelle/vim-Grammalecte'
 Plugin 'loremipsum'
+Plugin 'mkitt/tabline.vim'
+Plugin 'derekwyatt/vim-fswitch'
 
 call vundle#end()
 filetype plugin indent on
@@ -58,7 +60,7 @@ let NERDTreeMinimalMenu = 1     " Use the minimal menu (m)
 let NERDTreeWinPos = "left"     " Panel opens on the left side
 let NERDTreeWinSize = 31        " Set panel width to 31 columns
 
-nmap <F2> :NERDTreeToggle<CR>
+nmap <silent> <F2> :NERDTreeToggle<CR>
 
 """"""""""""""""""""""""""""""""""""""
 " Tagbar
@@ -71,7 +73,7 @@ let g:tagbar_autoshowtag = 1
 " Make panel vertical and place on the right
 let g:tagbar_position = 'botright vertical'
 " Mapping to open and close the panel
-nmap <F8> :TagbarToggle<CR>
+nmap <silent> <F8> :TagbarToggle<CR>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Text, tab and indent related
@@ -88,7 +90,7 @@ set tabstop=4
 
 set number
 
-set listchars=eol:$,space:·,tab:>-,trail:~,extends:>,precedes:<
+set listchars=eol:$,space:·,tab:▏\ ,trail:_,nbsp:~,extends:>,precedes:<
 set list
 
 set colorcolumn=80
@@ -119,3 +121,13 @@ set signcolumn=auto
 """"""""""""""""""""""""""""""""""""""
 
 let g:grammalecte_cli_py='~/Grammalecte-fr/grammalecte-cli.py'
+
+""""""""""""""""""""""""""""""""""""""
+" FSwitch
+""""""""""""""""""""""""""""""""""""""
+"au! BufEnter *.c let b:fswitchdst = 'hpp,h'
+"au! BufEnter *.h let b:fswitchdst = 'cpp,c'
+
+"nmap <C-Z> :vsplit <bar> :wincmd l <bar> :FSHere<CR>
+nmap <silent> <leader>z :FSSplitLeft<CR>
+