diff --git a/conf.d/nvim/keybindings.vim b/conf.d/nvim/keybindings.vim
index 4f71605..02ed728 100644
--- a/conf.d/nvim/keybindings.vim
+++ b/conf.d/nvim/keybindings.vim
@@ -1,7 +1,7 @@
 " File              : keybindings.vim
 " Author            : Jeff LANCE <email@jefflance.me>
 " Date              : 15.04.2015
-" Last Modified Date: 03.03.2021
+" Last Modified Date: 05.05.2021
 " Last Modified By  : Jeff LANCE <email@jefflance.me>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -26,7 +26,8 @@ nnoremap <space> za
 map <leader>s :echom 'Source file' <bar> :so %<cr>
 
 " Two semicolons to escape
-imap ;; <Esc>
+map  <leader>; <Esc>
+map! <leader>; <Esc>
 
 " Open a current file with sudo
 " map <silent> <leader>E :e suda://%<cr>
@@ -45,7 +46,7 @@ map <silent> <C-[> <<
 map <silent> <C-u> uu
 
 " Save as
-map <C-s> :saveas<cr>
+map <C-s> :saveas<space>
 " -----
 "  }}}
 
@@ -62,7 +63,7 @@ command! -bang -nargs=? -complete=dir Files
 	\ <bang>0
 	\ )
 map <C-w> :echom 'Close buffer' <bar> :call BufClose()<cr>
-map <C-o> :e
+map <C-o> :e<space>
 map <C-n> :Startify<cr>
 map <C-PageDown> :bn<cr>
 map <C-PageUp> :bp<cr>
diff --git a/conf.d/nvim/plug.vim b/conf.d/nvim/plug.vim
index 0580771..631c13b 100644
--- a/conf.d/nvim/plug.vim
+++ b/conf.d/nvim/plug.vim
@@ -136,6 +136,7 @@ Plug 'jdsimcoe/hyper.vim', { 'as': 'hyper' }
 Plug 'jacoborus/tender.vim', { 'as': 'tender' }
 Plug 'connorholyday/vim-snazzy', { 'as': 'snazzy' }
 Plug 'hardcoreplayers/oceanic-material', { 'as': 'oceanic' }
+Plug 'dylanaraps/wal.vim'
 
 " Customization
 Plug 'ryanoasis/vim-devicons'
diff --git a/conf.d/nvim/startscreen.vim b/conf.d/nvim/startscreen.vim
index aa3abb3..c166087 100644
--- a/conf.d/nvim/startscreen.vim
+++ b/conf.d/nvim/startscreen.vim
@@ -28,8 +28,11 @@ function s:config_mail()
   return [
         \ { 'line': 'afew', 'cmd': 'edit ${HOME}/.config/afew/' },
         \ { 'line': 'astroid', 'cmd': 'edit ${HOME}/.config/astroid/' },
+        \ { 'line': 'imapfilter', 'cmd': 'edit ${HOME}/.config/imapfilter' },
         \ { 'line': 'imapnotify', 'cmd': 'edit ${HOME}/.config/imapnotify' },
         \ { 'line': 'mbsync', 'cmd': 'edit ${HOME}/.mbsyncrc' },
+        \ { 'line': 'msmtp', 'cmd': 'edit ${HOME}/.msmtprc' },
+        \ { 'line': 'neomutt', 'cmd': 'edit ${HOME}/.config/neomutt' },
         \ { 'line': 'notmuch config', 'cmd': 'edit ${HOME}/.notmuch-config' },
         \ { 'line': 'notmuch dir', 'cmd': 'edit ${HOME}/Mail/.notmuch' },
         \ ]