diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index ce73b43..b49037b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -414,20 +414,16 @@ INSERT MODE                                            *vimwiki-list-mappings*
                         *vimwiki_i_<C-D>_list*
 <C-D>                   Decrease the level of a list item.
 
-XXX: should not use <C-A> we override default increase number.
-
-                        *vimwiki_i_<C-A>_list*
-<C-A>                   Change the marker of the current list item to the next
+                        *vimwiki_i_<C-L>_<C-J>_list*
+<C-L><C-J>              Change the marker of the current list item to the next
                         available. From * to - to # to 1. to a).
 
-XXX: this hangs vim
-                        *vimwiki_i_<C-S>_list*
-<C-S>                   Change the marker of the current list item to the prev
+                        *vimwiki_i_<C-L>_<C-K>_list*
+<C-L><C-K>              Change the marker of the current list item to the prev
                         available. From * to a) to 1. to # to -.
 
-XXX: Propose another mapping here.
-                        *vimwiki_i_<C-B>_list*
-<C-B>                   Create/remove a marker from a list item.
+                        *vimwiki_i_<C-L>_<C-M>_list*
+<C-L><C-M>              Create/remove a marker from a list item.
 
 
 ------------------------------------------------------------------------------
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 71d8822..b1607f0 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -463,14 +463,14 @@ map <silent> <buffer> gLH glH
 map <silent> <buffer> gLL gLl
 inoremap <buffer> <C-D> <C-O>:VimwikiListDecreaseLvl 0<CR>
 inoremap <buffer> <C-T> <C-O>:VimwikiListIncreaseLvl 0<CR>
-inoremap <buffer> <C-A> <C-O>:VimwikiListChangeMarker next<CR>
-inoremap <buffer> <C-S> <C-O>:VimwikiListChangeMarker prev<CR>
+inoremap <buffer> <C-L><C-J> <C-O>:VimwikiListChangeMarker next<CR>
+inoremap <buffer> <C-L><C-K> <C-O>:VimwikiListChangeMarker prev<CR>
 nmap <silent> <buffer> glr :call vimwiki#lst#adjust_numbered_list()<CR>
 nmap <silent> <buffer> gLr :call vimwiki#lst#adjust_whole_buffer()<CR>
 nmap <silent> <buffer> gLR gLr
 noremap <silent> <buffer> gl<Space> :VimwikiListRemoveCB<CR>
 map <silent> <buffer> gL<Space> :call vimwiki#lst#remove_cb_in_list()<CR>
-inoremap <silent> <buffer> <C-B> <Esc>:call vimwiki#lst#toggle_list_item()<CR>
+inoremap <silent> <buffer> <C-L><C-M> <Esc>:call vimwiki#lst#toggle_list_item()<CR>
 
 for s:k in keys(g:vimwiki_bullet_points)
   exe 'noremap <silent> <buffer> gl'.s:k.' :VimwikiListChangeMarker '.s:k.'<CR>'