diff --git a/vim/.vimrc b/vim/.vimrc
index 9edd9d2..cf4861c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -40,6 +40,7 @@ let mapleader = ","
 set backupdir=~/.vim/backup//
 set directory=~/.vim/swap//
 set undodir=~/.vim/undo//
+set splitright
 
 " flag lines wider than 80 char
 highlight ColorColumn ctermbg=magenta
@@ -55,6 +56,7 @@ if has("autocmd")
   autocmd FileType go setlocal ts=4 sts=4 sw=4 noexpandtab
   autocmd FileType rst setlocal tw=80 ts=3 sts=3 sw=3 expandtab
   autocmd FileType gitcommit setlocal tw=80 ts=2 sts=2 sw=2 expandtab
+  autocmd FileType md setlocal tw=80 ts=2 sts=2 sw=2 expandtab
 endif
 
 " Airline options
@@ -75,6 +77,10 @@ let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 1
 let g:syntastic_aggregate_errors = 1
+" let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
+" let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
+let g:syntastic_javascript_checkers = ['eslint']
+let g:syntastic_java_javac_config_file_enabled = 1
 
 " Vim-go options
 let g:go_fmt_command = "goimports"
@@ -99,12 +105,15 @@ if has("autocmd")
     autocmd FileType go nmap <leader>f  <Plug>(go-fmt)
 endif
 
-" Syntastic options
-" let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
-" let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
-let g:syntastic_javascript_checkers = ['eslint']
+" vimwiki options
+let g:vimwiki_list = [{'path': '~/Notebook', 
+                      \ 'auto_toc': 1, 
+                      \ 'index': 'main',
+                      \ 'ext': '.md',
+                      \ 'syntax': 'markdown'}]
 
-" other plugins
+" Grammalecte options
+let g:grammalecte_cli_py='/usr/share/grammalecte-fr/cli.py'
 
 call plug#begin('~/.vim/plugged')
 
@@ -125,8 +134,18 @@ call plug#begin('~/.vim/plugged')
     Plug 'scrooloose/syntastic'
     Plug 'mtscout6/syntastic-local-eslint.vim'
 
+    Plug 'aklt/plantuml-syntax'
+    Plug 'scrooloose/vim-slumlord'
+
+    Plug 'vimwiki/vimwiki'
+
+    Plug 'dpelle/vim-Grammalecte'
+
 call plug#end()
 
 
 " Other key mappings
 map <C-n> :NERDTreeToggle<CR>
+map <leader>n :cnext<CR>
+map <leader>p :cprevious<CR>
+nnoremap <leader>h :cclose<CR>