diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim
index c0791456b..f68f8b0b9 100644
--- a/autoload/SpaceVim/layers/autocomplete.vim
+++ b/autoload/SpaceVim/layers/autocomplete.vim
@@ -52,3 +52,11 @@ function! SpaceVim#layers#autocomplete#plugins() abort
     endif
     return plugins
 endfunction
+
+
+function SpaceVim#layers#autocomplete#config()
+    if g:spacevim_autocomplete_method ==# 'ycm'
+        iunmap <S-TAB>
+        sunmap <S-TAB>
+    endif
+endfunction
diff --git a/autoload/SpaceVim/layers/colorscheme.vim b/autoload/SpaceVim/layers/colorscheme.vim
index 2562a96d8..e9d07dc69 100644
--- a/autoload/SpaceVim/layers/colorscheme.vim
+++ b/autoload/SpaceVim/layers/colorscheme.vim
@@ -160,5 +160,6 @@ function! SpaceVim#layers#colorscheme#plugins() abort
                 \ ['gregsexton/Atom'],
                 \ ['gilgigilgil/anderson.vim'],
                 \ ['romainl/Apprentice'],
+                \ ['icymind/NeoSolarized'],
                 \ ]
 endfunction