diff --git a/files/dotfiles/vim/config/base.vim b/files/dotfiles/vim/config/base.vim
index cc2f492..739c066 100644
--- a/files/dotfiles/vim/config/base.vim
+++ b/files/dotfiles/vim/config/base.vim
@@ -5,10 +5,7 @@ set number
 set laststatus=2
 
 " Necessary to show Unicode glyphs
-set encoding=utf8 
-
-" tab length
-set tabstop=4
+set encoding=utf8
 
 " smart tab
 set smartindent
@@ -63,9 +60,9 @@ set relativenumber
 nmap <leader>L :set list!<CR>
 
 " Behaviour of tab
-set tabstop =4
-set shiftwidth =4
-set softtabstop =4
+set tabstop=4
+set shiftwidth=4
+set softtabstop=4
 set expandtab
 
 " Folding
@@ -110,14 +107,12 @@ vmap < <gv
 vmap > >gv
 
 " Spelling
-set spelllang=fr
-" Set and unset spelling correction
-map <silent> <F7> "<Esc>:silent setlocal spell! spelllang=en<CR>"
-map <silent> <F6> "<Esc>:silent setlocal spell! spelllang=fr<CR>"
+" set spelllang=fr
+autocmd BufRead,BufNewFile *.{md,tex,rst} setlocal spell spelllang=fr
+autocmd FileType tex,latex,markdown,md,rst setlocal spell spelllang=fr
 
-autocmd BufRead,BufNewFile *.{md,tex,rst} setlocal spell
+" Remove trailing whitespace at the end of lines
+autocmd BufWritePre * %s/\s\+$//e
 
+" Different color for far columns
 execute "set colorcolumn=" . join(range(81,335), ',')
-" Show what is written!
-set conceallevel=0
-
diff --git a/files/dotfiles/vim/config/plugins.vim b/files/dotfiles/vim/config/plugins.vim
index 0064c43..1cf2860 100644
--- a/files/dotfiles/vim/config/plugins.vim
+++ b/files/dotfiles/vim/config/plugins.vim
@@ -2,7 +2,15 @@
 set noshowmode
 let g:lightline = {
       \ 'colorscheme': 'selenized_dark',
+      \ 'active': {
+      \   'left': [ [ 'mode', 'paste' ],
+      \             [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
+      \ },
+      \ 'component_function': {
+      \   'gitbranch': 'FugitiveHead'
+      \ },
       \ }
+
 " Supertab
 let g:SuperTabDefaultCompletionType = "context"
 
@@ -68,6 +76,7 @@ let g:vimtex_compiler_latexmk = {
             \   '-shell-escape',
             \ ],
             \}
+let g:vimtex_view_method = 'zathura'
 
 " Les fichiers sty et cls sont vus comme des fichiers tex
 autocmd BufRead,BufNewFile *.{sty,cls} setlocal syntax=tex
diff --git a/files/dotfiles/vimrc b/files/dotfiles/vimrc
index f066791..e57baf3 100644
--- a/files/dotfiles/vimrc
+++ b/files/dotfiles/vimrc
@@ -1,4 +1,8 @@
 set nocompatible              " be iMproved, required
+noremap <Space> <Nop>
+map <Space> <Leader>
+let mapleader = "\<Space>"
+let localleader = "\<Space>"
 
 " set the runtime path to include plug.com and initialize
 call plug#begin('~/.vim/plugged')
@@ -117,3 +121,4 @@ call plug#end()            " required
 "runtime! config/*.vim 
 runtime! config/base.vim 
 runtime! config/plugins.vim 
+set conceallevel=0
diff --git a/tasks/arch_graphicals.yml b/tasks/arch_graphicals.yml
index 8b4aad3..e20c22f 100644
--- a/tasks/arch_graphicals.yml
+++ b/tasks/arch_graphicals.yml
@@ -23,6 +23,7 @@
       - zathura-djvu
       - zathura-cb
       - zathura-pdf-mupdf
+      - xdotool
       - guvcview
     state: present