diff --git a/dotfiles/vim.org b/dotfiles/vim.org
index c4cfde0..dc54b63 100644
--- a/dotfiles/vim.org
+++ b/dotfiles/vim.org
@@ -577,31 +577,30 @@ au BufRead,BufNewFile *.md setlocal spell spelllang=fr,en
 
 ** LaTeX
 #+begin_src vimrc
-" TODO : améliorer ça
-au BufRead,BufNewFile *.tikz set filetype=tex
-let tex_no_error=1 " TODO: used to not highlight underscores
-au BufRead,BufNewFile *.tex set filetype=tex
-au BufRead,BufNewFile *.tex let b:AutoPairs={'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`', '$':'$'}
+  au BufRead,BufNewFile *.tikz set filetype=tex
+  let tex_no_error=1 " used to not highlight underscores
+  au BufRead,BufNewFile *.tex set filetype=tex
+  au BufRead,BufNewFile *.tex let b:AutoPairs={'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`', '$':'$'}
 
-au BufRead,BufNewFile *.tex set iskeyword+=-
+  au BufRead,BufNewFile *.tex set iskeyword+=-
 
-" " clear the current list of matches that cause error-highlighting
-" syn clear texOnlyMath
-" " still mark '^' as an error outside of math mode
-" syn match texOnlyMath /[\^]/
+  " " clear the current list of matches that cause error-highlighting
+  " syn clear texOnlyMath
+  " " still mark '^' as an error outside of math mode
+  " syn match texOnlyMath /[\^]/
 
-" autocmd FileType tex,tikz nnoremap <leader>lt <plug>(vimtex-toc-toggle)
-" autocmd FileType tex,tikz nnoremap <leader>ll <plug>(vimtex-labels-open)
-" autocmd FileType tex,tikz nnoremap <leader>lv <plug>(vimtex-view)
-" autocmd FileType tex,tikz nnoremap <leader>lf <plug>(vimtex-reverse-search)
+  " autocmd FileType tex,tikz nnoremap <leader>lt <plug>(vimtex-toc-toggle)
+  " autocmd FileType tex,tikz nnoremap <leader>ll <plug>(vimtex-labels-open)
+  " autocmd FileType tex,tikz nnoremap <leader>lv <plug>(vimtex-view)
+  " autocmd FileType tex,tikz nnoremap <leader>lf <plug>(vimtex-reverse-search)
 
-" " Make Tikz
-" nnoremap <leader>mt :Make pdf t=tikz f=%:t:r<cr>
-" nnoremap <leader>mto :make open t=tikz f=%:t:r<cr>
+  " " Make Tikz
+  " nnoremap <leader>mt :Make pdf t=tikz f=%:t:r<cr>
+  " nnoremap <leader>mto :make open t=tikz f=%:t:r<cr>
 
-" " Make LaTeX
-" nnoremap <leader>ml :Make pdf f=%:t:r<cr>
-" nnoremap <leader>mlo :make open f=%:t:r<cr>
+  " " Make LaTeX
+  " nnoremap <leader>ml :Make pdf f=%:t:r<cr>
+  " nnoremap <leader>mlo :make open f=%:t:r<cr>
 #+end_src
 
 ** Arduino
@@ -615,90 +614,79 @@ au BufRead,BufNewFile *.ino set filetype=arduino
 
 ** Python
 #+begin_src vimrc
-let g:slime_python_ipython = 1
+  let g:slime_python_ipython = 1
 
-au FileType python setlocal expandtab
-au FileType python setlocal tabstop=4
-au FileType python setlocal shiftwidth=4
+  au FileType python setlocal expandtab
+  au FileType python setlocal tabstop=4
+  au FileType python setlocal shiftwidth=4
 
-" Run Section
-au FileType python nmap <buffer> <localleader><localleader> <Plug>SlimeParagraphSend
+  " Run Section
+  au FileType python nmap <buffer> <localleader><localleader> <Plug>SlimeParagraphSend
 
-" Run Selected text
-au FileType python vmap <buffer> <localleader><localleader> <Plug>SlimeRegionSend
+  " Run Selected text
+  au FileType python vmap <buffer> <localleader><localleader> <Plug>SlimeRegionSend
 
-" CD to directory of current file
-" TODO - Should enter the command. This just output the command without runing
-" it...
-au FileType python nmap <buffer> <localleader>c :SlimeSend0('cd '.expand('%:p:h'))<CR>
+  " CD to directory of current file
+  au FileType python nmap <buffer> <localleader>c :SlimeSend0('cd '.expand('%:p:h'))<CR>
 
-" let python_highlight_all = 1
-" au FileType python syn keyword pythonDecorator True None False self
+  " let python_highlight_all = 1
+  " au FileType python syn keyword pythonDecorator True None False self
 
-" au BufNewFile,BufRead *.jinja set syntax=htmljinja
-" au BufNewFile,BufRead *.mako set ft=mako
+  " au BufNewFile,BufRead *.jinja set syntax=htmljinja
+  " au BufNewFile,BufRead *.mako set ft=mako
 
-" au FileType python map <buffer> F :set foldmethod=indent<cr>
+  " au FileType python map <buffer> F :set foldmethod=indent<cr>
 
-" au FileType python inoremap <buffer> $r return
-" au FileType python inoremap <buffer> $i import
-" au FileType python inoremap <buffer> $p print
-" au FileType python inoremap <buffer> $f #--- <esc>a
-" au FileType python map <buffer> <leader>1 /class
-" au FileType python map <buffer> <leader>2 /def
-" au FileType python map <buffer> <leader>C ?class
-" au FileType python map <buffer> <leader>D ?def
+  " au FileType python inoremap <buffer> $r return
+  " au FileType python inoremap <buffer> $i import
+  " au FileType python inoremap <buffer> $p print
+  " au FileType python inoremap <buffer> $f #--- <esc>a
+  " au FileType python map <buffer> <leader>1 /class
+  " au FileType python map <buffer> <leader>2 /def
+  " au FileType python map <buffer> <leader>C ?class
+  " au FileType python map <buffer> <leader>D ?def
 #+end_src
 
 ** Matlab
 #+begin_src vimrc
-" TODO Run Section (delimited by %%)
-au FileType matlab nmap <buffer> <localleader>mm <Plug>SlimeParagraphSend
-let g:which_key_map_local.m = { 'name' : '+matlab' }
+  " Run Section (delimited by %%)
+  au FileType matlab nmap <buffer> <localleader>mm <Plug>SlimeParagraphSend
+  let g:which_key_map_local.m = { 'name' : '+matlab' }
 
-" Run either Selected text
-au FileType matlab vmap <buffer> <localleader>mm <Plug>SlimeRegionSend
-let g:which_key_map_local.mm = 'run-code'
+  " Run either Selected text
+  au FileType matlab vmap <buffer> <localleader>mm <Plug>SlimeRegionSend
+  let g:which_key_map_local.mm = 'run-code'
 
-func! GetSelectedText()
+  func! GetSelectedText()
   normal gv"xy
   let result = getreg("x")
   normal gv
   return result
-endfunc
+  endfunc
 
-" Help on the current selection
-au FileType matlab vmap <buffer> <localleader>mh :<C-U>SlimeSend0('help '.expand(GetSelectedText()))<CR>
-let g:which_key_map_local.mh = 'help'
+  " Help on the current selection
+  au FileType matlab vmap <buffer> <localleader>mh :<C-U>SlimeSend0('help '.expand(GetSelectedText()))<CR>
+  let g:which_key_map_local.mh = 'help'
 
-" Documentation on the current selection
-au FileType matlab vmap <buffer> <localleader>mH :<C-U>SlimeSend0('doc '.expand(GetSelectedText()))<CR>
-let g:which_key_map_local.mh = 'help'
+  " Documentation on the current selection
+  au FileType matlab vmap <buffer> <localleader>mH :<C-U>SlimeSend0('doc '.expand(GetSelectedText()))<CR>
+  let g:which_key_map_local.mh = 'help'
 
-" Open the current file in the Matlab Editor (usefull for debuging)
-au FileType matlab nmap <buffer> <localleader>me :SlimeSend0('edit '.expand('%:p'))<CR>
-let g:which_key_map_local.me = 'edit-gui'
+  " Open the current file in the Matlab Editor (usefull for debuging)
+  au FileType matlab nmap <buffer> <localleader>me :SlimeSend0('edit '.expand('%:p'))<CR>
+  let g:which_key_map_local.me = 'edit-gui'
 
-" Run all the file
-au FileType matlab nmap <buffer> <localleader>mr :SlimeSend0('run '.expand('%:t'))<CR>
-let g:which_key_map_local.mr = 'run-file'
+  " Run all the file
+  au FileType matlab nmap <buffer> <localleader>mr :SlimeSend0('run '.expand('%:t'))<CR>
+  let g:which_key_map_local.mr = 'run-file'
 
-" Send "cd filepath" to matlab
-au FileType matlab nmap <buffer> <localleader>mc :SlimeSend0('cd '.expand('%:p:h'))<CR>
-let g:which_key_map_local.mr = 'cd-file'
+  " Send "cd filepath" to matlab
+  au FileType matlab nmap <buffer> <localleader>mc :SlimeSend0('cd '.expand('%:p:h'))<CR>
+  let g:which_key_map_local.mr = 'cd-file'
 
-" Open workspace
-au FileType matlab nmap <buffer> <localleader>mw :SlimeSend0('workspace')<CR>
-let g:which_key_map_local.mr = 'workspace'
-#+end_src
-
-** Sage
-#+begin_src vimrc
-" TODO Run Section
-au FileType sage.python nmap <buffer> <localleader><localleader> <Plug>SlimeParagraphSend
-
-" Run Selected text
-au FileType sage.python vmap <buffer> <localleader><localleader> <Plug>SlimeRegionSend
+  " Open workspace
+  au FileType matlab nmap <buffer> <localleader>mw :SlimeSend0('workspace')<CR>
+  let g:which_key_map_local.mr = 'workspace'
 #+end_src
 
 ** Save Which Key Configuration
@@ -963,355 +951,352 @@ let g:tex_conceal = ""
 * Bindings
 ** Vim Which Key
 #+begin_src vimrc
-nnoremap <silent> <leader> :WhichKey '<Space>'<cr>
+  nnoremap <silent> <leader> :WhichKey '<Space>'<cr>
 
-let g:which_key_map =  {}
+  let g:which_key_map =  {}
 #+end_src
 
 ** Direct ones
 #+begin_src vimrc
-" Switch with last buffer
-nnoremap <leader><Tab> :e #<cr>
-" let g:which_key_map.<Tab> = 'last-buffer'
+  " Switch with last buffer
+  nnoremap <leader><Tab> :e #<cr>
+  " let g:which_key_map.<Tab> = 'last-buffer'
 #+end_src
 
 ** Quit
 #+begin_src vimrc
-let g:which_key_map.q = { 'name' : '+quit' }
+  let g:which_key_map.q = { 'name' : '+quit' }
 
-" Quit
-nnoremap <leader>qq :qa<cr>
-let g:which_key_map.q.q = 'quit'
+  " Quit
+  nnoremap <leader>qq :qa<cr>
+  let g:which_key_map.q.q = 'quit'
 
-" Quit - Force
-nnoremap <leader>qQ :qa!<cr>
-let g:which_key_map.q.Q = 'quit-force'
+  " Quit - Force
+  nnoremap <leader>qQ :qa!<cr>
+  let g:which_key_map.q.Q = 'quit-force'
 
-" Quit - Save
-nnoremap <leader>qw :wq<cr>
-let g:which_key_map.q.w = 'quit-save'
+  " Quit - Save
+  nnoremap <leader>qw :wq<cr>
+  let g:which_key_map.q.w = 'quit-save'
 
-" Quit - Save all
-nnoremap <leader>qW :wqa<cr>
-let g:which_key_map.q.W = 'quit-save-all'
+  " Quit - Save all
+  nnoremap <leader>qW :wqa<cr>
+  let g:which_key_map.q.W = 'quit-save-all'
 #+end_src
 
 ** Files
 #+begin_src vimrc
-let g:which_key_map.f = { 'name' : '+files' }
+  let g:which_key_map.f = { 'name' : '+files' }
 
-" Fast saving
-nnoremap <leader>fs :w!<cr>
-let g:which_key_map.f.s = 'save-file'
+  " Fast saving
+  nnoremap <leader>fs :w!<cr>
+  let g:which_key_map.f.s = 'save-file'
 
-" Fast saving all
-nnoremap <leader>fS :wa!<cr>
-let g:which_key_map.f.S = 'save-all'
+  " Fast saving all
+  nnoremap <leader>fS :wa!<cr>
+  let g:which_key_map.f.S = 'save-all'
 
-" Find Files
-noremap <leader>ff :Files<CR>
-let g:which_key_map.f.f = 'find-file'
+  " Find Files
+  noremap <leader>ff :Files<CR>
+  let g:which_key_map.f.f = 'find-file'
 
-" Find File corresping to Word
-nnoremap <leader>fw
+  " Find File corresping to Word
+  nnoremap <leader>fw
   \ :call fzf#vim#files('.', fzf#vim#with_preview({'options': ['--query', expand('<cword>')]}))<cr>
-" TODO - Add visual keymap
-" vnoremap <leader>fw
-  " \ :call fzf#vim#files('.', fzf#vim#with_preview({'options': ['--query', <C-r>0]}))<cr>
-let g:which_key_map.f.w = 'find-file-word'
+
+  let g:which_key_map.f.w = 'find-file-word'
 #+end_src
 
 ** Buffers
 #+begin_src vimrc
-let g:which_key_map.b = { 'name' : '+buffers' }
+  let g:which_key_map.b = { 'name' : '+buffers' }
 
-" Buffer Create
-noremap <leader>bc :enew<cr>
-let g:which_key_map.b.c = 'buffer-create'
+  " Buffer Create
+  noremap <leader>bc :enew<cr>
+  let g:which_key_map.b.c = 'buffer-create'
 
-" Buffer Delete
-noremap <leader>bd :Bclose<cr>
-let g:which_key_map.b.d = 'buffer-delete'
+  " Buffer Delete
+  noremap <leader>bd :Bclose<cr>
+  let g:which_key_map.b.d = 'buffer-delete'
 
-" Buffer Delete all others
-noremap <leader>bD :bufdo bd<cr>
-let g:which_key_map.b.D = 'buffer-delete-others'
+  " Buffer Delete all others
+  noremap <leader>bD :bufdo bd<cr>
+  let g:which_key_map.b.D = 'buffer-delete-others'
 
-" Buffer Next
-noremap <leader>bn :bnext<cr>
-let g:which_key_map.b.n = 'buffer-next'
+  " Buffer Next
+  noremap <leader>bn :bnext<cr>
+  let g:which_key_map.b.n = 'buffer-next'
 
-" Buffer Previous
-noremap <leader>bp :bprevious<cr>
-let g:which_key_map.b.p = 'buffer-previous'
+  " Buffer Previous
+  noremap <leader>bp :bprevious<cr>
+  let g:which_key_map.b.p = 'buffer-previous'
 
-" Find Buffers
-noremap <leader>bf :Buffers<CR>
-let g:which_key_map.b.f = 'buffer-find'
+  " Find Buffers
+  noremap <leader>bf :Buffers<CR>
+  let g:which_key_map.b.f = 'buffer-find'
 
-" Buffer Home (startify)
-noremap <leader>bh :Startify<CR>
-let g:which_key_map.b.h = 'buffer-home'
+  " Buffer Home (startify)
+  noremap <leader>bh :Startify<CR>
+  let g:which_key_map.b.h = 'buffer-home'
 
-" CD to buffer path
-noremap <leader>bw :cd %:p:h<CR>:pwd<CR>
-let g:which_key_map.b.w = 'buffer-pwd'
+  " CD to buffer path
+  noremap <leader>bw :cd %:p:h<CR>:pwd<CR>
+  let g:which_key_map.b.w = 'buffer-pwd'
 #+end_src
 
 ** Tabs
 #+begin_src vimrc
-let g:which_key_map.t = { 'name' : '+tabs' }
+  let g:which_key_map.t = { 'name' : '+tabs' }
 
-" Let 'tt' toggle between this and the last accessed tab
-let g:lasttab = 1
-au TabLeave * let g:lasttab = tabpagenr()
+  " Let 'tt' toggle between this and the last accessed tab
+  let g:lasttab = 1
+  au TabLeave * let g:lasttab = tabpagenr()
 
-" Tab New
-nnoremap <leader>tc :tabnew<cr>
-let g:which_key_map.t.c = 'tab-create'
+  " Tab New
+  nnoremap <leader>tc :tabnew<cr>
+  let g:which_key_map.t.c = 'tab-create'
 
-" Tab Delete
-nnoremap <leader>td :tabclose<cr>
-let g:which_key_map.t.d = 'tab-delete'
+  " Tab Delete
+  nnoremap <leader>td :tabclose<cr>
+  let g:which_key_map.t.d = 'tab-delete'
 
-" Tab Maximize
-nnoremap <leader>tD :tabonly<cr>
-let g:which_key_map.t.D = 'tab-delete-others'
+  " Tab Maximize
+  nnoremap <leader>tD :tabonly<cr>
+  let g:which_key_map.t.D = 'tab-delete-others'
 
-" Tab Left
-nnoremap <leader>th gt<cr>
-let g:which_key_map.t.h = 'tab-left'
+  " Tab Left
+  nnoremap <leader>th gt<cr>
+  let g:which_key_map.t.h = 'tab-left'
 
-" Tab Right
-nnoremap <leader>tl gT<cr>
-let g:which_key_map.t.l = 'tab-right'
+  " Tab Right
+  nnoremap <leader>tl gT<cr>
+  let g:which_key_map.t.l = 'tab-right'
 
-" Tab Move Left
-nnoremap <leader>tH :tabmove -1<cr>
-let g:which_key_map.t.H = 'tab-move-left'
+  " Tab Move Left
+  nnoremap <leader>tH :tabmove -1<cr>
+  let g:which_key_map.t.H = 'tab-move-left'
 
-" Tab Move Right
-nnoremap <leader>tL :tabmove +1<cr>
-let g:which_key_map.t.L = 'tab-move-right'
+  " Tab Move Right
+  nnoremap <leader>tL :tabmove +1<cr>
+  let g:which_key_map.t.L = 'tab-move-right'
 
-" Tab Toggle
-nnoremap <Leader>tt :exe "tabn ".g:lasttab<CR>
-let g:which_key_map.t.t = 'tab-toggle'
+  " Tab Toggle
+  nnoremap <Leader>tt :exe "tabn ".g:lasttab<CR>
+  let g:which_key_map.t.t = 'tab-toggle'
 #+end_src
 
 ** Terminals
 #+begin_src vimrc
-let g:which_key_map.T = { 'name' : '+terminals' }
+  let g:which_key_map.T = { 'name' : '+terminals' }
 
-" Quickly create a new terminal in a new tab
-nnoremap <Leader>Tc :tab new<CR>:term<CR>
-let g:which_key_map.T.c = 'term-create'
+  " Quickly create a new terminal in a new tab
+  nnoremap <Leader>Tc :tab new<CR>:term<CR>
+  let g:which_key_map.T.c = 'term-create'
 
-" Quickly create a new terminal in a vertical split
-nnoremap <Leader>T/ :vsplit<CR>:term<CR>
-" let g:which_key_map.T./ = 'term-vert'
+  " Quickly create a new terminal in a vertical split
+  nnoremap <Leader>T/ :vsplit<CR>:term<CR>
+  " let g:which_key_map.T./ = 'term-vert'
 
-" Quickly create a new terminal in a horizontal split
-nnoremap <Leader>T- :split<CR>:term<CR>
-" let g:which_key_map.T.- = 'term-hor'
+  " Quickly create a new terminal in a horizontal split
+  nnoremap <Leader>T- :split<CR>:term<CR>
+  " let g:which_key_map.T.- = 'term-hor'
 #+end_src
 
 ** Splits / Windows
 #+begin_src vimrc
-let g:which_key_map.w = { 'name' : '+windows' }
+  let g:which_key_map.w = { 'name' : '+windows' }
 
-" Split Horizontal
-nnoremap <leader>w- :split<cr>
-" let g:which_key_map.w.- = 'win-hor'
+  " Split Horizontal
+  nnoremap <leader>w- :split<cr>
+  " let g:which_key_map.w.- = 'win-hor'
 
-" Split Vertical
-nnoremap <leader>w/ :vsplit<cr>
-" let g:which_key_map.w./ = 'win-vert'
+  " Split Vertical
+  nnoremap <leader>w/ :vsplit<cr>
+  " let g:which_key_map.w./ = 'win-vert'
 
-" Split Maximize
-nnoremap <leader>wD <C-w>o
-let g:which_key_map.w.D = 'win-delete-others'
+  " Split Maximize
+  nnoremap <leader>wD <C-w>o
+  let g:which_key_map.w.D = 'win-delete-others'
 
-" Split Delete
-nnoremap <leader>wd <C-w>q
-let g:which_key_map.w.d = 'win-delete'
+  " Split Delete
+  nnoremap <leader>wd <C-w>q
+  let g:which_key_map.w.d = 'win-delete'
 
-" Split Go Left
-nnoremap <leader>wh :wincmd h<CR>
-let g:which_key_map.w.h = 'win-left'
+  " Split Go Left
+  nnoremap <leader>wh :wincmd h<CR>
+  let g:which_key_map.w.h = 'win-left'
 
-" Split Go Down
-nnoremap <leader>wj :wincmd j<CR>
-let g:which_key_map.w.j = 'win-down'
+  " Split Go Down
+  nnoremap <leader>wj :wincmd j<CR>
+  let g:which_key_map.w.j = 'win-down'
 
-" Split Go Up
-nnoremap <leader>wk :wincmd k<CR>
-let g:which_key_map.w.k = 'win-up'
+  " Split Go Up
+  nnoremap <leader>wk :wincmd k<CR>
+  let g:which_key_map.w.k = 'win-up'
 
-" Split Go Right
-nnoremap <leader>wl :wincmd l<CR>
-let g:which_key_map.w.l = 'win-right'
+  " Split Go Right
+  nnoremap <leader>wl :wincmd l<CR>
+  let g:which_key_map.w.l = 'win-right'
 
-" Split to Tab
-nnoremap <leader>wt <C-w>T
-let g:which_key_map.w.t = 'win-make-tab'
+  " Split to Tab
+  nnoremap <leader>wt <C-w>T
+  let g:which_key_map.w.t = 'win-make-tab'
 
-" Find window
-nnoremap <leader>wf :Windows<CR>
-let g:which_key_map.w.f = 'win-find'
+  " Find window
+  nnoremap <leader>wf :Windows<CR>
+  let g:which_key_map.w.f = 'win-find'
 
-" Maximize window
-nnoremap <leader>wm :call MaximizeToggle()<CR>
-let g:which_key_map.w.m = 'win-maximize'
+  " Maximize window
+  nnoremap <leader>wm :call MaximizeToggle()<CR>
+  let g:which_key_map.w.m = 'win-maximize'
 
-function! MaximizeToggle()
+  function! MaximizeToggle()
   if exists("s:maximize_session")
-    exec "source " . s:maximize_session
-    call delete(s:maximize_session)
-    unlet s:maximize_session
-    let &hidden=s:maximize_hidden_save
-    unlet s:maximize_hidden_save
+  exec "source " . s:maximize_session
+  call delete(s:maximize_session)
+  unlet s:maximize_session
+  let &hidden=s:maximize_hidden_save
+  unlet s:maximize_hidden_save
   else
-    let s:maximize_hidden_save = &hidden
-    let s:maximize_session = tempname()
-    set hidden
-    exec "mksession! " . s:maximize_session
-    only
+  let s:maximize_hidden_save = &hidden
+  let s:maximize_session = tempname()
+  set hidden
+  exec "mksession! " . s:maximize_session
+  only
   endif
-endfunction
+  endfunction
 #+end_src
 
 ** Check Spell
 #+begin_src vimrc
-let g:which_key_map.S = { 'name' : '+spell-check' }
+  let g:which_key_map.S = { 'name' : '+spell-check' }
 
-" CheckSpell Toggle
-noremap <leader>St :setlocal spell!<cr>
-let g:which_key_map.S.t = 'spell-toggle'
+  " CheckSpell Toggle
+  noremap <leader>St :setlocal spell!<cr>
+  let g:which_key_map.S.t = 'spell-toggle'
 
-" CheckSpell Correct
-noremap <leader>Sc z=
-let g:which_key_map.S.c = 'spell-correct'
+  " CheckSpell Correct
+  noremap <leader>Sc z=
+  let g:which_key_map.S.c = 'spell-correct'
 
-" CheckSpell Do first
-noremap <leader>SC 1z=
-let g:which_key_map.S.C = 'spell-correct-first'
+  " CheckSpell Do first
+  noremap <leader>SC 1z=
+  let g:which_key_map.S.C = 'spell-correct-first'
 
-" CheckSpell Language
-noremap <leader>Sl :set spelllang=
-let g:which_key_map.S.l = 'spell-language'
+  " CheckSpell Language
+  noremap <leader>Sl :set spelllang=
+  let g:which_key_map.S.l = 'spell-language'
 
-" CheckSpell Next
-noremap <leader>Sn ]s
-let g:which_key_map.S.n = 'spell-next'
+  " CheckSpell Next
+  noremap <leader>Sn ]s
+  let g:which_key_map.S.n = 'spell-next'
 
-" CheckSpell Next and correct
-noremap <leader>SN ]s1z=
-let g:which_key_map.S.N = 'spell-next-correct'
+  " CheckSpell Next and correct
+  noremap <leader>SN ]s1z=
+  let g:which_key_map.S.N = 'spell-next-correct'
 
-" CheckSpell Previous
-noremap <leader>Sp [s
-let g:which_key_map.S.p = 'spell-prev'
+  " CheckSpell Previous
+  noremap <leader>Sp [s
+  let g:which_key_map.S.p = 'spell-prev'
 
-" CheckSpell Previous and correct
-noremap <leader>SP [s1z=
-let g:which_key_map.S.P = 'spell-prev-correct'
+  " CheckSpell Previous and correct
+  noremap <leader>SP [s1z=
+  let g:which_key_map.S.P = 'spell-prev-correct'
 
-" CheckSpell Add to dictionnary
-noremap <leader>Sa zg
-let g:which_key_map.S.a = 'spell-add-dict'
+  " CheckSpell Add to dictionnary
+  noremap <leader>Sa zg
+  let g:which_key_map.S.a = 'spell-add-dict'
 #+end_src
 
 ** Make
 #+begin_src vimrc
-let g:which_key_map.m = { 'name' : '+make' }
+  let g:which_key_map.m = { 'name' : '+make' }
 
-" Make Make
-nnoremap <leader>mm :Make -B<CR>
-let g:which_key_map.m.m = 'make'
+  " Make Make
+  nnoremap <leader>mm :Make -B<CR>
+  let g:which_key_map.m.m = 'make'
 
-" Make Clean
-nnoremap <leader>mc :Make clean<CR>
-let g:which_key_map.m.c = 'make-clean'
+  " Make Clean
+  nnoremap <leader>mc :Make clean<CR>
+  let g:which_key_map.m.c = 'make-clean'
 
-" Make Force
-nnoremap <leader>mf :Make! -B<CR>
-let g:which_key_map.m.f = 'make-force'
+  " Make Force
+  nnoremap <leader>mf :Make! -B<CR>
+  let g:which_key_map.m.f = 'make-force'
 
-" Make Run
-nnoremap <leader>mr :Make! run<cr>
-let g:which_key_map.m.r = 'make-run'
+  " Make Run
+  nnoremap <leader>mr :Make! run<cr>
+  let g:which_key_map.m.r = 'make-run'
 
-" Make Open
-nnoremap <leader>mo :make! open<cr>
-let g:which_key_map.m.o = 'make-open'
+  " Make Open
+  nnoremap <leader>mo :make! open<cr>
+  let g:which_key_map.m.o = 'make-open'
 #+end_src
 
 ** Search
 #+begin_src vimrc
-let g:which_key_map.s = { 'name' : '+search' }
+  let g:which_key_map.s = { 'name' : '+search' }
 
-" Search History
-noremap <leader>sh :History<CR>
-let g:which_key_map.s.h = 'search-history'
+  " Search History
+  noremap <leader>sh :History<CR>
+  let g:which_key_map.s.h = 'search-history'
 
-" Search Tags
-noremap <leader>sT :Tags<CR>
-let g:which_key_map.s.T = 'search-tags'
+  " Search Tags
+  noremap <leader>sT :Tags<CR>
+  let g:which_key_map.s.T = 'search-tags'
 
-" Search All
-noremap <leader>sa :Rg<CR>
-let g:which_key_map.s.g = 'search-all'
+  " Search All
+  noremap <leader>sa :Rg<CR>
+  let g:which_key_map.s.g = 'search-all'
 
-" Search Word
-noremap <leader>sw :exe ':Rg ' . expand('<cword>')<CR>
-let g:which_key_map.s.w = 'search-word'
+  " Search Word
+  noremap <leader>sw :exe ':Rg ' . expand('<cword>')<CR>
+  let g:which_key_map.s.w = 'search-word'
 
-" Search todo keyboard
-" TODO - should not have to press enter
-nnoremap <leader>st :Grepper -tool rg -query TODO<CR>
-let g:which_key_map.s.t = 'search-todos'
+  " Search todo keyboard
+  nnoremap <leader>st :Grepper -tool rg -query TODO<CR>
+  let g:which_key_map.s.t = 'search-todos'
 #+end_src
 
 ** GIT
 #+begin_src vimrc
-let g:which_key_map.g = { 'name' : '+git' }
+  let g:which_key_map.g = { 'name' : '+git' }
 
-" Git Gutter
-nnoremap <silent><leader>gg :SignifyToggle<cr>
-let g:which_key_map.g.g = 'git-'
+  " Git Gutter
+  nnoremap <silent><leader>gg :SignifyToggle<cr>
+  let g:which_key_map.g.g = 'git-'
 
-" Git Gutter Highlight
-nnoremap <silent><leader>gG :SignifyToggleHighlight<cr>
-let g:which_key_map.g.G = 'git-'
+  " Git Gutter Highlight
+  nnoremap <silent><leader>gG :SignifyToggleHighlight<cr>
+  let g:which_key_map.g.G = 'git-'
 
-" Git Commit
-nnoremap <leader>gc :Gcommit<CR>
-let g:which_key_map.g.c = 'git-commit'
+  " Git Commit
+  nnoremap <leader>gc :Gcommit<CR>
+  let g:which_key_map.g.c = 'git-commit'
 
-" Git Status
-nnoremap <leader>gs :Gstatus<CR>
-let g:which_key_map.g.s = 'git-status'
+  " Git Status
+  nnoremap <leader>gs :Gstatus<CR>
+  let g:which_key_map.g.s = 'git-status'
 
-" Git Diff
-nnoremap <leader>gd :Gdiff<CR>
-let g:which_key_map.g.d = 'git-diff'
+  " Git Diff
+  nnoremap <leader>gd :Gdiff<CR>
+  let g:which_key_map.g.d = 'git-diff'
 
-" Git Blame
-nnoremap <leader>gb :Gblame<CR>
-let g:which_key_map.g.b = 'git-blame'
+  " Git Blame
+  nnoremap <leader>gb :Gblame<CR>
+  let g:which_key_map.g.b = 'git-blame'
 
-" Git Visualise
-nnoremap <leader>gv :GV<CR>
-let g:which_key_map.g.v = 'git-visualize'
+  " Git Visualise
+  nnoremap <leader>gv :GV<CR>
+  let g:which_key_map.g.v = 'git-visualize'
 
-" Git File (visualise)
-nnoremap <leader>gF :GV!<CR>
-let g:which_key_map.g.F = 'git-file'
+  " Git File (visualise)
+  nnoremap <leader>gF :GV!<CR>
+  let g:which_key_map.g.F = 'git-file'
 
-" Git Find Commits
-noremap <leader>gf :Commits<CR>
-let g:which_key_map.g.f = 'git-find-commit'
+  " Git Find Commits
+  noremap <leader>gf :Commits<CR>
+  let g:which_key_map.g.f = 'git-find-commit'
 #+end_src
 
 ** Errors