diff --git a/config/core/plugins.vim b/config/core/plugins.vim
index 7fcf775..9783b23 100644
--- a/config/core/plugins.vim
+++ b/config/core/plugins.vim
@@ -1,18 +1,20 @@
-call plug#begin($vim_configdir . '/plugins')
+call plug#begin($vim_datadir . '/plugins')
 
 " Always load
 Plug 'tomasr/molokai'
 Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/syntastic'
 Plug 'jiangmiao/auto-pairs'
+Plug 'majutsushi/tagbar'
+Plug 'vim-pandoc/vim-pandoc'
+Plug 'vim-pandoc/vim-pandoc-syntax'
+Plug 'kien/ctrlp.vim'
+Plug 'vim-scripts/gnupg'
 
 " Load on demand
 Plug 'scrooloose/nerdtree',             { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/nerdtree-git-plugin',  { 'on': 'NERDTreeToggle' }
 Plug 'vim-scripts/Gundo',               { 'on': 'GundoToggle' }
-Plug 'vim-scripts/gnupg',               { 'for': ['gpg', 'asc'] }
 Plug 'Valloric/YouCompleteMe',          { 'do': './install.sh --clang-completer --system-libclang' }
-Plug 'kien/ctrlp.vim',                  { 'on': 'CtrlP' }
-Plug 'majutsushi/tagbar',               { 'on': 'TagbarToggle' }
 
 call plug#end()