diff --git a/autoload/SpaceVim/autocmds.vim b/autoload/SpaceVim/autocmds.vim
index 999acc0b2..ac51477e6 100644
--- a/autoload/SpaceVim/autocmds.vim
+++ b/autoload/SpaceVim/autocmds.vim
@@ -103,6 +103,7 @@ endfunction
 
 function! s:fix_gruvbox() abort
   hi VertSplit guibg=#282828 guifg=#181A1F
+  hi SpaceVimLeaderGuiderGroupName cterm=bold ctermfg=175 gui=bold guifg=#d3869b
 endfunction
 
 " vim:set et sw=2:
diff --git a/autoload/SpaceVim/layers/git.vim b/autoload/SpaceVim/layers/git.vim
index 5d3266dde..55f139e75 100644
--- a/autoload/SpaceVim/layers/git.vim
+++ b/autoload/SpaceVim/layers/git.vim
@@ -23,7 +23,7 @@ function! SpaceVim#layers#git#config() abort
     nnoremap <silent> <Leader>gp :Gina push<CR>
     nnoremap <silent> <Leader>ga :Gina add %<CR>
     nnoremap <silent> <Leader>gA :Gina add .<CR>
-    let g:_spacevim_mappings.g = {'name' : 'git function',
+    let g:_spacevim_mappings.g = {'name' : '+git function',
           \ 'd' : ['Gina diff', 'git diff'],
           \ 's' : ['Gina status', 'git status'],
           \ 'c' : ['Gina commit', 'git commit'],
diff --git a/autoload/SpaceVim/mapping/space.vim b/autoload/SpaceVim/mapping/space.vim
index 96d779163..5197dcddd 100644
--- a/autoload/SpaceVim/mapping/space.vim
+++ b/autoload/SpaceVim/mapping/space.vim
@@ -2,6 +2,7 @@ function! SpaceVim#mapping#space#init() abort
     nnoremap <silent><nowait> [SPC] :<c-u>LeaderGuide " "<CR>
     nmap <Space> [SPC]
     let g:_spacevim_mappings_space = {}
-    let g:_spacevim_mappings_space.t = {'name' : 'Toggle editor visuals'}
+    let g:_spacevim_mappings_space.t = {'name' : '+Toggle editor visuals'}
     nnoremap <silent> [SPC]tn  :<C-u>set nu!<CR>
+    let g:_spacevim_mappings_space.t.n = ['set nu!', 'toggle line number']
 endfunction
diff --git a/syntax/leaderGuide.vim b/syntax/leaderGuide.vim
index f30655fa4..0dd3c1e5f 100644
--- a/syntax/leaderGuide.vim
+++ b/syntax/leaderGuide.vim
@@ -7,13 +7,13 @@ syn region LeaderGuideKeys start="\["hs=e+1 end="\]\s"he=s-1
             \ contained
 syn region LeaderGuideBrackets start="\(^\|\s\+\)\[" end="\]\s\+"
             \ contains=LeaderGuideKeys keepend
-syn match LeaderGuideGroupName /+\w\+/ contained
+syn match LeaderGuideGroupName /+[^\[^\]]\+/ contained
 syn region LeaderGuideDesc start="^" end="$"
             \ contains=LeaderGuideBrackets,LeaderGuideGroupName
 
 hi def link LeaderGuideDesc Identifier
 hi def link LeaderGuideKeys Type
 hi def link LeaderGuideBrackets Delimiter
-hi def link LeaderGuideGroupName GruvboxPurpleBold
+hi def link LeaderGuideGroupName SpaceVimLeaderGuiderGroupName