diff --git a/conf.d/nvim/keybindings.vim b/conf.d/nvim/keybindings.vim
index 12b46fa..4f71605 100644
--- a/conf.d/nvim/keybindings.vim
+++ b/conf.d/nvim/keybindings.vim
@@ -239,16 +239,17 @@ map <leader>r :call RenameFile()<cr>
 " Open file under cursor
 map <leader>o :call GotoFile("")<cr>
 
-map <leader>' ciw''<esc>P
-map <leader>" c""<esc>P
-map <leader>[ c[]<esc>P
-map <leader>{ c{}<esc>P
+" Surround
+map <leader>' S'<cr>
+map <leader>" S"<cr>
+map <leader>[ S[<cr>
+map <leader>{ S{<cr>
 
-" Rewrap paragraph using <S-q>
-map <silent> <S-q> {gq}<Bar>:echo "Rewrapped paragraph"<CR>
+" " Rewrap paragraph using <S-q>
+" map <silent> <S-q> {gq}<Bar>:echo "Rewrapped paragraph"<CR>
 
 " Git
-map <silent> <leader>Gs :Git status<cr>
+map <leader>Gs :Git status<cr>
 map <leader>Ga :Git add
 map <leader>Gc :Git commit
 " -----
diff --git a/conf.d/nvim/plug.vim b/conf.d/nvim/plug.vim
index 367921d..6a846b8 100644
--- a/conf.d/nvim/plug.vim
+++ b/conf.d/nvim/plug.vim
@@ -6,7 +6,7 @@
 
 """"""""""""""""""""""""""""""""""""""""""""""""
 " __     _____ __  __   ____  _    _   _  ____
-" \ \   / /_ _|  \/  | |  _ \| |  | | | |/ ___| 
+" \ \   / /_ _|  \/  | |  _ \| |  | | | |/ ___|
 "  \ \ / / | || |\/| | | |_) | |  | | | | |  _
 "   \ V /  | || |  | | |  __/| |__| |_| | |_| |
 "    \_/  |___|_|  |_| |_|   |_____\___/ \____|
@@ -57,6 +57,9 @@ Plug 'editorconfig/editorconfig-vim'
 " Folding
 Plug 'Konfekt/FastFold'
 
+" Grammalecte
+Plug 'dpelle/vim-Grammalecte'
+
 " Markdown
 Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() } }
 " Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }