diff --git a/README.org b/README.org
index 1ad3d67..61730ba 100644
--- a/README.org
+++ b/README.org
@@ -180,10 +180,10 @@ A repository of my personal configuration files.
 - [[https://github.com/fatih/vim-go][fatih/vim-go]]
 - [[https://github.com/godlygeek/tabular][godlygeek/tabular]]
 - [[https://github.com/neoclide/coc.nvim][neoclice/coc.nvim]]
-- [[https://github.com/preservim/nerdcommenter][preservim/nerdcommenter]]
 - [[https://github.com/RRethy/vim-hexokinase][RRethy/vim-hexokinase]]
-- [[https://github.com/sheerun/vim-polyglot][sheerun/vim-polyglot]]
+- [[https://github.com/tpope/vim-commentary][tpope/vim-commentary]]
 - [[https://github.com/tpope/vim-fugitive][tpope/vim-fugitive]]
+- [[https://github.com/tpope/vim-unimpaired][tpope/vim-unimpaired]]
 - [[https://github.com/Xuyuanp/nerdtree-git-plugin][Xuyuanp/nerdtree-git-plugin]]
 -[[https://github.com/Yggdroot/indentLine][ Yggdroot/indentLine]]
 *** UI
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 242e833..f1cb4f7 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -38,10 +38,10 @@
         Plug 'fatih/vim-go'
         Plug 'godlygeek/tabular'
         Plug 'neoclide/coc.nvim', {'branch': 'release'}
-        Plug 'preservim/nerdcommenter'
         Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
-        Plug 'sheerun/vim-polyglot'
+        Plug 'tpope/vim-commentary'
         Plug 'tpope/vim-fugitive'
+        Plug 'tpope/vim-unimpaired'
         Plug 'Xuyuanp/nerdtree-git-plugin'
         Plug 'Yggdroot/indentLine'
     " }
@@ -148,11 +148,6 @@
         map <C-e> :NERDTreeToggle<CR>
     " }
 
-    " NerdCommenter {
-        " Add spaces after comment delimiters by default
-        let g:NERDSpaceDelims = 1
-    " }
-
     " Airline {
         " Enable powerline fonts
         let g:airline_powerline_fonts=1