diff --git a/conf.d/nvim/functions.vim b/conf.d/nvim/functions.vim
index 5110516..c86cb0c 100644
--- a/conf.d/nvim/functions.vim
+++ b/conf.d/nvim/functions.vim
@@ -76,7 +76,7 @@ endfunction
 function! BufClose()
   if (CountBuffers() == 1 || IsExplorerBuffer() || IsEmptyBuffer())
     bwipeout
-    Startify
+    Dashboard
   else
     bwipeout
   endif
diff --git a/conf.d/nvim/init.vim b/conf.d/nvim/init.vim
index 03ff1f3..bd2ce61 100644
--- a/conf.d/nvim/init.vim
+++ b/conf.d/nvim/init.vim
@@ -126,7 +126,7 @@ set clipboard=unnamedplus
 
 " With a map leader it's possible to do extra key combinations
 " like <leader>w saves the current file
-let mapleader = ";"
+let g:mapleader = ";"
 
 " Fast saving
 nmap <leader>w :w!<cr>
@@ -298,11 +298,11 @@ endif
 " Installing the Plug plugin manager
 source ${HOME}/.config/nvim/plug.vim
 
-" Start startify if no arg
+" Start dashboard if no arg
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter *
   \ if (argc() == 0 && !exists("s:std_in") && !has('gui'))
-  \ | Startify
+  \ | Dashboard
   \ | endif
 
 " " needed so deoplete can auto select the first suggestion
@@ -435,6 +435,24 @@ let g:colorizer_auto_filetype='css,html,xml,py,js'
 "  }}}
 
 
+" Dashboard {{{
+" -----
+
+let g:dashboard_custom_shortcut={
+  \ 'last_session'       : 'SPC s l',
+  \ 'find_history'       : 'SPC f h',
+  \ 'find_file'          : 'SPC f f',
+  \ 'new_file'           : 'SPC c n',
+  \ 'change_colorscheme' : 'SPC t c',
+  \ 'find_word'          : 'SPC f a',
+  \ 'book_marks'         : 'SPC f b',
+\ }
+
+let g:dashboard_default_executive ='fzf'
+
+" -----
+"  }}}
+
 
 " Defx {{{
 " -----
@@ -771,7 +789,7 @@ let g:tex_flavor = 'latex'
 """""""""""""""""""""""""""""""""""""""""""""""""
 
 " Load functions from file
-source ${HOME}/.config/nvim/startscreen.vim
+" source ${HOME}/.config/nvim/startscreen.vim
 
 
 
diff --git a/conf.d/nvim/keybindings.vim b/conf.d/nvim/keybindings.vim
index 9e3ddcd..8ebfd4f 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: 05.05.2021
+" Last Modified Date: 06.09.2021
 " Last Modified By  : Jeff LANCE <email@jefflance.me>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -64,7 +64,7 @@ command! -bang -nargs=? -complete=dir Files
 	\ )
 map <C-w> :echom 'Close buffer' <bar> :call BufClose()<cr>
 map <C-o> :e<space>
-map <C-n> :Startify<cr>
+map <C-n> :DashboardNewFile<cr>
 map <A-PageDown> :bn<cr>
 map <A-PageUp> :bp<cr>
 
@@ -84,13 +84,17 @@ map <C-l> :call WinMove('l')<cr>
 "  }}}
 
 
-" Tabs {{{
+" Dashboard {{{
 " -----
 
-"map <leader>tn :tabnew<cr> <bar> :Startify<cr>
-"map <leader>tc :tabclose<cr>
-"map <C-]> :tabnext<cr>
-"map <C-[> :tabprev<cr>
+nmap <Leader>ss :<C-u>SessionSave<CR>
+nmap <Leader>sl :<C-u>SessionLoad<CR>
+nnoremap <silent> <Leader>fh :DashboardFindHistory<CR>
+nnoremap <silent> <Leader>ff :DashboardFindFile<CR>
+nnoremap <silent> <Leader>tc :DashboardChangeColorscheme<CR>
+nnoremap <silent> <Leader>fa :DashboardFindWord<CR>
+nnoremap <silent> <Leader>fb :DashboardJumpMark<CR>
+nnoremap <silent> <Leader>cn :DashboardNewFile<CR>
 
 " -----
 "  }}}
@@ -185,7 +189,7 @@ endfunction
 " FZF {{{
 " -----
 
-map <C-f> :Files<cr>
+map <C-f> :DashboardFindFile<cr>
 
 " -----
 "  }}}
@@ -200,17 +204,6 @@ map <f4> :AddHeader<cr>
 "  }}}
 
 
-" Plug {{{
-" -----
-
-map Pud :PlugUpdate<cr>
-map Pug :PlugUpgrade<cr>
-map Pui :PlugInstall<cr>
-
-" -----
-"  }}}
-
-
 " Vimroom {{{
 " -----
 
diff --git a/conf.d/nvim/plug.vim b/conf.d/nvim/plug.vim
index 16b59ad..3b83d22 100644
--- a/conf.d/nvim/plug.vim
+++ b/conf.d/nvim/plug.vim
@@ -39,7 +39,8 @@ call plug#begin('~/.local/share/nvim/plugged')
 " -----
 
 " Startup screen
-Plug 'mhinz/vim-startify'
+Plug 'glepnir/dashboard-nvim'
+" Plug 'mhinz/vim-startify'
 
 " Ansible
 Plug 'pearofducks/ansible-vim'