diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 408e20e51..efb76e189 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -46,6 +46,7 @@ function! SpaceVim#layers#tools#plugins() abort
 endfunction
 
 function! SpaceVim#layers#tools#config() abort
+  call SpaceVim#mapping#space#def('nnoremap', ['a', 'c'], 'Calendar', 'vim calendar', 1)
   nmap mm <Plug>BookmarkToggle
   nmap mi <Plug>BookmarkAnnotate
   nmap ma <Plug>BookmarkShowAll
diff --git a/autoload/SpaceVim/mapping/space.vim b/autoload/SpaceVim/mapping/space.vim
index 5454ac369..5c22753a6 100644
--- a/autoload/SpaceVim/mapping/space.vim
+++ b/autoload/SpaceVim/mapping/space.vim
@@ -3,6 +3,10 @@ function! SpaceVim#mapping#space#init() abort
     nmap <Space> [SPC]
     let g:_spacevim_mappings_space = {}
     let g:_spacevim_mappings_space.t = {'name' : '+Toggle editor visuals'}
+    let g:_spacevim_mappings_space.a = {'name' : '+Applications'}
+    let g:_spacevim_mappings_space.b = {'name' : '+Buffers'}
+    let g:_spacevim_mappings_space.e = {'name' : '+Errors'}
+    let g:_spacevim_mappings_space.B = {'name' : '+Global-uffers'}
     nnoremap <silent> [SPC]tn  :<C-u>set nu!<CR>
     let g:_spacevim_mappings_space.t.n = ['set nu!', 'toggle line number']
 endfunction
@@ -20,7 +24,7 @@ function! SpaceVim#mapping#space#def(m, keys, cmd, desc, is_cmd) abort
             let lcmd = 'call feedkeys("' . a:cmd . '", "' . feedkey_m . '")'
         endif
     endif
-    exe a:m . ' <silent> [SPC]' . join(a:keys) . ' ' . cmd
+    exe a:m . ' <silent> [SPC]' . join(a:keys, '') . ' ' . cmd
     if len(a:keys) == 2
         let g:_spacevim_mappings_space[a:keys[0]][a:keys[1]] = [lcmd, a:desc]
     elseif len(a:keys) == 1