diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim
index 37feadd54..a73b15709 100644
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@@ -11,13 +11,9 @@ function! SpaceVim#layers#lang#plugins() abort
                 \ ['digitaltoad/vim-jade',                   { 'on_ft' : ['jade']}],
                 \ ['juvenn/mustache.vim',                    { 'on_ft' : ['mustache']}],
                 \ ['Valloric/MatchTagAlways',                { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}],
-                \ ['pangloss/vim-javascript',                { 'on_ft' : ['javascript']}],
-                \ ['maksimr/vim-jsbeautify',                 { 'on_ft' : ['javascript']}],
                 \ ['leafgarland/typescript-vim',             { 'on_ft' : ['typescript']}],
                 \ ['kchmck/vim-coffee-script',               { 'on_ft' : ['coffee']}],
-                \ ['mmalecki/vim-node.js',                   { 'on_ft' : ['javascript']}],
                 \ ['leshill/vim-json',                       { 'on_ft' : ['javascript','json']}],
-                \ ['othree/javascript-libraries-syntax.vim', { 'on_ft' : ['javascript','coffee','ls','typescript']}],
                 \ ['syngan/vim-vimlint',                     { 'on_ft' : 'vim'}],
                 \ ['ynkdir/vim-vimlparser',                  { 'on_ft' : 'vim'}],
                 \ ['todesking/vint-syntastic',               { 'on_ft' : 'vim'}],
diff --git a/autoload/SpaceVim/layers/lang/javascript.vim b/autoload/SpaceVim/layers/lang/javascript.vim
new file mode 100644
index 000000000..88f18bdc9
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/javascript.vim
@@ -0,0 +1,23 @@
+function! SpaceVim#layers#lang#javascript#plugins() abort
+    let plugins = []
+    cal add(plugins,['pangloss/vim-javascript',                { 'on_ft' : ['javascript']}])
+    if has('nvim')
+        call add(plugins,['carlitux/deoplete-ternjs',                { 'on_ft' : ['javascript']}])
+    else
+        call add(plugins,['ternjs/tern_for_vim',                { 'on_ft' : ['javascript']}])
+    endif
+    call add(plugins,['othree/javascript-libraries-syntax.vim', { 'on_ft' : ['javascript','coffee','ls','typescript']}])
+    call add(plugins,['mmalecki/vim-node.js',                   { 'on_ft' : ['javascript']}])
+    call add(plugins,['maksimr/vim-jsbeautify',                 { 'on_ft' : ['javascript']}])
+    return plugins
+endfunction
+"let g:javascript_conceal_function             = "ƒ"
+"let g:javascript_conceal_null                 = "ø"
+"let g:javascript_conceal_this                 = "@"
+"let g:javascript_conceal_return               = "⇚"
+"let g:javascript_conceal_undefined            = "¿"
+"let g:javascript_conceal_NaN                  = "ℕ"
+"let g:javascript_conceal_prototype            = "¶"
+"let g:javascript_conceal_static               = "•"
+"let g:javascript_conceal_super                = "Ω"
+"let g:javascript_conceal_arrow_function       = "⇒"
diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim
index ee511fbcd..065d480d9 100644
--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@@ -12,6 +12,7 @@ let g:deoplete#omni#input_patterns.java = [
             \'[^. \t0-9]\::\w*',
             \]
 let g:deoplete#omni#input_patterns.jsp = ['[^. \t0-9]\.\w*']
+let g:deoplete#omni#input_patterns.javascript = ['[^. \t0-9]\.\w*']
 let g:deoplete#omni#input_patterns.php = '\h\w*\|[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?'
 let g:deoplete#omni_patterns = get(g:, 'deoplete#omni_patterns', {})
 let g:deoplete#omni_patterns.php = '->\|::'