diff --git a/nvim/.config/nvim/plugin/after/deoplete.vim b/nvim/.config/nvim/plugin/after/deoplete.vim
deleted file mode 100644
index daea336..0000000
--- a/nvim/.config/nvim/plugin/after/deoplete.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-" PLUGIN: DEOPLETE
-" For async completion
-" enable deoplete at startup
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#enable_ignore_case = 1
-let g:deoplete#enable_smart_case = 1
-let g:deoplete#enable_camel_case = 1
-let g:deoplete#enable_refresh_always = 1
-let g:deoplete#max_abbr_width = 0
-let g:deoplete#max_menu_width = 0
-
-call deoplete#custom#var('omni', 'input_patterns', {
-        \ 'pandoc': '@',
-        \})
-call deoplete#enable()
diff --git a/nvim/.config/nvim/plugin/after/lazyload_ale_deoplete_echodoc.vim b/nvim/.config/nvim/plugin/after/lazyload_ale_deoplete_echodoc.vim
deleted file mode 100644
index 16b811d..0000000
--- a/nvim/.config/nvim/plugin/after/lazyload_ale_deoplete_echodoc.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-" lazy loading since they require a lot of startup time
-let s:ide_features_loaded=0
-function! Autocomplete_linting_init() abort
-  if s:ide_features_loaded || !has('nvim')
-    return
-  endif
-  let s:ide_features_loaded=1
-
-  call plug#load('ale', 'deoplete.nvim', 'echodoc.vim')
-  call echodoc#enable()
-  call deoplete#custom#var('omni', 'input_patterns', {
-        \ 'pandoc': '@',
-        \})
-  call deoplete#enable()
-
-endfunction
-
-" augroup load_ide_features
-"   autocmd!
-"   autocmd InsertEnter * call Autocomplete_linting_init()
-" augroup END
diff --git a/nvim/.config/nvim/plugin/after/vim-pandoc.vim b/nvim/.config/nvim/plugin/after/vim-pandoc.vim
index 236544f..c121d38 100644
--- a/nvim/.config/nvim/plugin/after/vim-pandoc.vim
+++ b/nvim/.config/nvim/plugin/after/vim-pandoc.vim
@@ -1,7 +1,5 @@
 " PLUGIN: vim-pandoc
 " handle markdown files with pandoc (and pandoc syntax!)
-let g:pandoc#modules#disabled = ["folding", "keyboard"]
-let g:pandoc#modules#enabled = ["formatting", "bibliographies", "completion", "metadata", "menu", "spell", "hypertext"]
 let g:pandoc#filetypes#pandoc_markdown = 1
 let g:pandoc#filetypes#handled = [ "extra", "latex", "markdown", "pandoc", "rst", "textile" ]
 " disable all default keymaps
diff --git a/nvim/.config/nvim/plugin/deoplete.vim b/nvim/.config/nvim/plugin/deoplete.vim
new file mode 100644
index 0000000..bfe69b6
--- /dev/null
+++ b/nvim/.config/nvim/plugin/deoplete.vim
@@ -0,0 +1,22 @@
+" PLUGIN: DEOPLETE
+" For async completion
+" enable deoplete at startup
+let g:deoplete#enable_at_startup =1
+let g:deoplete#enable_ignore_case =1
+let g:deoplete#enable_smart_case =1
+let g:deoplete#enable_camel_case =1
+let g:deoplete#enable_refresh_always =1
+let g:deoplete#max_abbr_width =0
+let g:deoplete#max_menu_width =0
+
+call deoplete#custom#var('omni', 'input_patterns', {
+      \'pandoc': '@\w*',
+      \})
+call deoplete#custom#var('omni', 'functions', {
+      \'pandoc': 'pandoc#completion#Complete',
+      \})
+call deoplete#custom#option({
+ \ 'auto_complete_delay': 0,
+ \ 'smart_case': v:true,
+ \})
+
diff --git a/nvim/.config/nvim/plugin/after/echodoc.vim b/nvim/.config/nvim/plugin/echodoc.vim
similarity index 82%
rename from nvim/.config/nvim/plugin/after/echodoc.vim
rename to nvim/.config/nvim/plugin/echodoc.vim
index 1863bc2..83f08e9 100644
--- a/nvim/.config/nvim/plugin/after/echodoc.vim
+++ b/nvim/.config/nvim/plugin/echodoc.vim
@@ -1,6 +1,8 @@
 " PLUGIN: ECHODOC
 let g:echodoc#type="virtual"
+let g:echodoc_enable_at_startup=1
 set splitbelow
 set completeopt+=menuone,noinsert,noselect
 set completeopt-=preview
 autocmd CompleteDone * pclose
+
diff --git a/nvim/.config/nvim/plugin/after/vim-pandoc-syntax.vim b/nvim/.config/nvim/plugin/vim-pandoc-syntax.vim
similarity index 100%
rename from nvim/.config/nvim/plugin/after/vim-pandoc-syntax.vim
rename to nvim/.config/nvim/plugin/vim-pandoc-syntax.vim