diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 1c4f0ee..9dcb917 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -14,15 +14,10 @@ Plug 'axelf4/vim-strip-trailing-whitespace'
 Plug 'ap/vim-buftabline'
 " Manage Project sessions
 Plug 'thaerkh/vim-workspace'
-" Commenter
-Plug 'tpope/vim-commentary'
 " Theme
 Plug 'nanotech/jellybeans.vim'
 " Syntax highlighting
 Plug 'sheerun/vim-polyglot'
-" Autoload and read from dish if file changes
-Plug 'tmux-plugins/vim-tmux-focus-events'
-Plug 'wellle/tmux-complete.vim'
 " For LaTeX support
 Plug 'lervag/vimtex'
 " Git support
@@ -39,9 +34,7 @@ Plug 'sakhnik/nvim-gdb', { 'do': ':UpdateRemotePlugins' }
 " Haskell
 Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' }
 Plug 'Twinside/vim-hoogle', { 'for': 'haskell' }
-Plug 'hspec/hspec.vim'
 Plug 'pbrisbin/vim-syntax-shakespeare'
-Plug 'zenzike/vim-haskell-unicode', { 'for': 'haskell' }
 Plug 'godlygeek/tabular', { 'for': 'haskell' }
 Plug 'Twinside/vim-haskellFold'
 " Purescript
@@ -63,6 +56,7 @@ Plug 'deoplete-plugins/deoplete-jedi', { 'for': 'python' }
 Plug 'sebastianmarkow/deoplete-rust', { 'for': 'rust' }
 Plug 'Shougo/neco-syntax'
 Plug 'deoplete-plugins/deoplete-tag'
+Plug 'wellle/tmux-complete.vim'
 " Neo/Async stuff
 Plug 'sbdchd/neoformat'
 Plug 'neomake/neomake'
@@ -83,11 +77,13 @@ Plug 'wellle/targets.vim'
 Plug 'tpope/vim-surround'
 Plug 'junegunn/vim-easy-align'
 Plug 'tommcdo/vim-exchange'
-" Absolute essentials miscellaneous
+" Tim pope essentials
+Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-sleuth'
 Plug 'tpope/vim-vinegar'
+" Show indentation levels
 Plug 'Yggdroot/indentLine'
 " Floating terminal
 Plug 'voldikss/vim-floaterm'