diff --git a/README.org b/README.org
index f992fb8..78218ab 100644
--- a/README.org
+++ b/README.org
@@ -936,16 +936,16 @@ Emacs.  Try {{{kbd(C-h o)}}} instead of {{{kbd(C-h f)}}} or {{{kbd(C-h v)}}}.
 #+caption[Help key bindings]:
 #+caption: Help key bindings.
 #+name: tab:help-key-bindings
-|------------------------------+----------+------------------|
-| command                      | key map  | keys             |
-|------------------------------+----------+------------------|
-| Info-goto-emacs-command-node | help-map | {{{kbd(C-h F)}}} |
-| describe-function            | help-map | {{{kbd(C-h f)}}} |
-| describe-key                 | help-map | {{{kbd(C-h k)}}} |
-| describe-symbol              | help-map | {{{kbd(C-h o)}}} |
-| describe-variable            | help-map | {{{kbd(C-h v)}}} |
-| info                         | help-map | {{{kbd(C-h i)}}} |
-|------------------------------+----------+------------------|
+|--------------------------------+----------+------------------|
+| command                        | key map  | keys             |
+|--------------------------------+----------+------------------|
+| *Info-goto-emacs-command-node* | help-map | {{{kbd(C-h F)}}} |
+| *describe-function*            | help-map | {{{kbd(C-h f)}}} |
+| *describe-key*                 | help-map | {{{kbd(C-h k)}}} |
+| *describe-symbol*              | help-map | {{{kbd(C-h o)}}} |
+| *describe-variable*            | help-map | {{{kbd(C-h v)}}} |
+| *info*                         | help-map | {{{kbd(C-h i)}}} |
+|--------------------------------+----------+------------------|
 
 ** [[info:emacs#Name Help][Shortdoc-display-group (info)]]
 :PROPERTIES:
@@ -1343,25 +1343,25 @@ NOTE: Play with =vertico-buffer-mode=, =vertico-flat-mode=, =vertico-grid-mode=,
 #+caption[Vertico key map bindings]:
 #+caption: Vertico key map bindings.
 #+name: tab:vertico-keymap-bindings
-|-------------------------------+----------------------------------+---------------------|
-| command                       | remap                            | keys                |
-|-------------------------------+----------------------------------+---------------------|
-| vertico-exit                  | exit-minibuffer                  | {{{kbd(C-j)}}}      |
-| vertico-exit-input            |                                  | {{{kbd(C-RET)}}}    |
-| vertico-first                 | beginning-of-buffer              | {{{kbd(M-<)}}}      |
-| vertico-first                 | minibuffer-beginning-of-buffer   | {{{kbd(M-<)}}}      |
-| vertico-insert                |                                  | {{{kbd(TAB)}}}      |
-| vertico-last                  | end-of-buffer                    | {{{kbd(M->)}}}      |
-| vertico-next-group            | forward-paragraph                | {{{kbd(C-<down>)}}} |
-| vertico-next                  | next-line-or-history-element     | {{{kbd(<down>)}}}   |
-| vertico-next                  | next-line                        | {{{kbd(C-n)}}}      |
-| vertico-previous-group        | backward-paragraph               | {{{kbd(C-<up>)}}}   |
-| vertico-previous              | previous-line-or-history-element | {{{kbd(<up>)}}}     |
-| vertico-previous              | previous-line                    | {{{kbd(C-p)}}}      |
-| vertico-save                  | kill-ring-save                   | {{{kbd(M-w)}}}      |
-| vertico-scroll-down           | scroll-down-command              | {{{kbd(M-v)}}}      |
-| vertico-scroll-up             | scroll-up-command                | {{{kbd(C-v)}}}      |
-|-------------------------------+----------------------------------+---------------------|
+|--------------------------+------------------------------------+---------------------|
+| command                  | remap                              | keys                |
+|--------------------------+------------------------------------+---------------------|
+| *vertico-exit*           | *exit-minibuffer*                  | {{{kbd(C-j)}}}      |
+| *vertico-exit-input*     |                                    | {{{kbd(C-RET)}}}    |
+| *vertico-first*          | *beginning-of-buffer*              | {{{kbd(M-<)}}}      |
+| *vertico-first*          | *minibuffer-beginning-of-buffer*   | {{{kbd(M-<)}}}      |
+| *vertico-insert*         |                                    | {{{kbd(TAB)}}}      |
+| *vertico-last*           | *end-of-buffer*                    | {{{kbd(M->)}}}      |
+| *vertico-next-group*     | *forward-paragraph*                | {{{kbd(C-<down>)}}} |
+| *vertico-next*           | *next-line-or-history-element*     | {{{kbd(<down>)}}}   |
+| *vertico-next*           | *next-line*                        | {{{kbd(C-n)}}}      |
+| *vertico-previous-group* | *backward-paragraph*               | {{{kbd(C-<up>)}}}   |
+| *vertico-previous*       | *previous-line-or-history-element* | {{{kbd(<up>)}}}     |
+| *vertico-previous*       | *previous-line*                    | {{{kbd(C-p)}}}      |
+| *vertico-save*           | *kill-ring-save*                   | {{{kbd(M-w)}}}      |
+| *vertico-scroll-down*    | *scroll-down-command*              | {{{kbd(M-v)}}}      |
+| *vertico-scroll-up*      | *scroll-up-command*                | {{{kbd(C-v)}}}      |
+|--------------------------+------------------------------------+---------------------|
 
 ** [[info:marginalia#Top][Marginalia (info)]]
 :PROPERTIES:
@@ -1455,45 +1455,45 @@ Consult usage tips are:
 #+caption[Configuration specific key bindings]:
 #+caption: Configuration specific key-bindings.
 #+name: tab:configuration-specific-key-bindings
-|-----------------------------+----------------------+--------------------|
-| command                     | key map              | keys               |
-|-----------------------------+----------------------+--------------------|
-| consult-bookmark            | ctl-x-r-keymap       | {{{kbd(C-x r b)}}} |
-| consult-buffer-other-frame  | ctl-x-5-keymap       | {{{kbd(C-x 5 b)}}} |
-| consult-buffer-other-window | ctl-x-4-keymap       | {{{kbd(C-x 4 b)}}} |
-| consult-buffer              | ctl-x-keymap         | {{{kbd(C-x b)}}}   |
-| consult-compile-error       | goto-map             | {{{kbd(M-g e)}}}   |
-| consult-complex-command     | ctl-x-keymap         | {{{kbd(C-x M-:)}}} |
-| consult-find                | search-map           | {{{kbd(M-s f)}}}   |
-| consult-focus-lines         | search-map           | {{{kbd(M-s u)}}}   |
-| consult-git-grep            | search-map           | {{{kbd(M-s g)}}}   |
-| consult-global-mark         | goto-map             | {{{kbd(M-g k)}}}   |
-| consult-goto-line           | goto-map             | {{{kbd(M-g M-g)}}} |
-| consult-goto-line           | goto-map             | {{{kbd(M-g g)}}}   |
-| consult-history             | global-map           | {{{kbd(C-c h)}}}   |
-| consult-imenu               | goto-map             | {{{kbd(M-g i)}}}   |
-| consult-keep-lines          | search-map           | {{{kbd(M-s k)}}}   |
-| consult-line                | search-map           | {{{kbd(M-s l)}}}   |
-| consult-mark                | goto-map             | {{{kbd(M-g m)}}}   |
-| consult-mode-command        | global-map           | {{{kbd(C-c m)}}}   |
-| consult-multi-occur         | search-map           | {{{kbd(M-s m)}}}   |
-| consult-org-heading         | org-mode-map         | {{{kbd(C-c C-h)}}} |
-| consult-outline             | goto-map             | {{{kbd(M-g o)}}}   |
-| consult-register            | ctl-x-r-keymap       | {{{kbd(C-x r x)}}} |
-| consult-yank-pop            | global-map           | {{{kbd(M-y)}}}     |
-|-----------------------------+----------------------+--------------------|
-| elfeed                      | global-map           | {{{kbd(C-x w)}}}   |
-| iedit-mode                  | global-map           | {{{kbd(C-;)}}}     |
-| minibuffer-complete-history | minibuffer-local-map | {{{kbd(C-<tab>)}}} |
-| narrow-or-widen-dwim        | ctl-x-keymap         | {{{kbd(C-x C-n)}}} |
-| org-agenda                  | global-map           | {{{kbd(C-c a)}}}   |
-| org-capture                 | global-map           | {{{kbd(C-c c)}}}   |
-| org-cite                    | org-mode-map         | {{{kbd(C-c b)}}}   |
-| org-goto                    | org-goto             | {{{kbd(C-c C-j)}}} |
-| org-insert-link-global      | global-map           | {{{kbd(C-c C-l)}}} |
-| org-narrow-to-table         | ctl-x-keymap         | {{{kbd(C-x n t)}}} |
-| org-store-link              | global-map           | {{{kbd(C-c l)}}}   |
-|-----------------------------+----------------------+--------------------|
+|-------------------------------+----------------------+--------------------|
+| command                       | key map              | keys               |
+|-------------------------------+----------------------+--------------------|
+| *consult-bookmark*            | ctl-x-r-keymap       | {{{kbd(C-x r b)}}} |
+| *consult-buffer-other-frame*  | ctl-x-5-keymap       | {{{kbd(C-x 5 b)}}} |
+| *consult-buffer-other-window* | ctl-x-4-keymap       | {{{kbd(C-x 4 b)}}} |
+| *consult-buffer*              | ctl-x-keymap         | {{{kbd(C-x b)}}}   |
+| *consult-compile-error*       | goto-map             | {{{kbd(M-g e)}}}   |
+| *consult-complex-command*     | ctl-x-keymap         | {{{kbd(C-x M-:)}}} |
+| *consult-find*                | search-map           | {{{kbd(M-s f)}}}   |
+| *consult-focus-lines*         | search-map           | {{{kbd(M-s u)}}}   |
+| *consult-git-grep*            | search-map           | {{{kbd(M-s g)}}}   |
+| *consult-global-mark*         | goto-map             | {{{kbd(M-g k)}}}   |
+| *consult-goto-line*           | goto-map             | {{{kbd(M-g M-g)}}} |
+| *consult-goto-line*           | goto-map             | {{{kbd(M-g g)}}}   |
+| *consult-history*             | global-map           | {{{kbd(C-c h)}}}   |
+| *consult-imenu*               | goto-map             | {{{kbd(M-g i)}}}   |
+| *consult-keep-lines*          | search-map           | {{{kbd(M-s k)}}}   |
+| *consult-line*                | search-map           | {{{kbd(M-s l)}}}   |
+| *consult-mark*                | goto-map             | {{{kbd(M-g m)}}}   |
+| *consult-mode-command*        | global-map           | {{{kbd(C-c m)}}}   |
+| *consult-multi-occur*         | search-map           | {{{kbd(M-s m)}}}   |
+| *consult-org-heading*         | org-mode-map         | {{{kbd(C-c C-h)}}} |
+| *consult-outline*             | goto-map             | {{{kbd(M-g o)}}}   |
+| *consult-register*            | ctl-x-r-keymap       | {{{kbd(C-x r x)}}} |
+| *consult-yank-pop*            | global-map           | {{{kbd(M-y)}}}     |
+|-------------------------------+----------------------+--------------------|
+| *elfeed*                      | global-map           | {{{kbd(C-x w)}}}   |
+| *iedit-mode*                  | global-map           | {{{kbd(C-;)}}}     |
+| *minibuffer-complete-history* | minibuffer-local-map | {{{kbd(C-<tab>)}}} |
+| *narrow-or-widen-dwim*        | ctl-x-keymap         | {{{kbd(C-x C-n)}}} |
+| *org-agenda*                  | global-map           | {{{kbd(C-c a)}}}   |
+| *org-capture*                 | global-map           | {{{kbd(C-c c)}}}   |
+| *org-cite*                    | org-mode-map         | {{{kbd(C-c b)}}}   |
+| *org-goto*                    | org-goto             | {{{kbd(C-c C-j)}}} |
+| *org-insert-link-global*      | global-map           | {{{kbd(C-c C-l)}}} |
+| *org-narrow-to-table*         | ctl-x-keymap         | {{{kbd(C-x n t)}}} |
+| *org-store-link*              | global-map           | {{{kbd(C-c l)}}}   |
+|-------------------------------+----------------------+--------------------|
 
 * [[info:emacs#Search][Search and replace (info)]]
 :PROPERTIES:
@@ -5033,16 +5033,16 @@ representation of src_emacs-lisp[:results none]{(describe-variable
 #+caption[Eglot related key bindings]:
 #+caption: Eglot related key-bindings.
 #+name: tab:eglot-related-key-bindings
-|-------------------------+----------------+------------------|
-| command                 | key map        | keys             |
-|-------------------------+----------------+------------------|
-| xref-find-definition    | global-map     | {{{kbd(M-.)}}}   |
-| xref-pop                | global-map     | {{{kbd(M-\,)}}}  |
-| flymake-goto-next-error | eglot-mode-map | {{{kbd(C-c n)}}} |
-| flymake-goto-prev-error | eglot-mode-map | {{{kbd(C-c p)}}} |
-| eglot-rename            | eglot-mode-map | {{{kbd(C-c r)}}} |
-| eldoc-doc-buffer        | eglot-mode-map | {{{kbd(C-h .)}}} |
-|-------------------------+----------------+------------------|
+|---------------------------+----------------+------------------|
+| command                   | key map        | keys             |
+|---------------------------+----------------+------------------|
+| *xref-find-definition*    | global-map     | {{{kbd(M-.)}}}   |
+| *xref-pop*                | global-map     | {{{kbd(M-\,)}}}  |
+| *flymake-goto-next-error* | eglot-mode-map | {{{kbd(C-c n)}}} |
+| *flymake-goto-prev-error* | eglot-mode-map | {{{kbd(C-c p)}}} |
+| *eglot-rename*            | eglot-mode-map | {{{kbd(C-c r)}}} |
+| *eldoc-doc-buffer*        | eglot-mode-map | {{{kbd(C-h .)}}} |
+|---------------------------+----------------+------------------|
 
 *** [[https://jedi.readthedocs.io/en/latest/][Jedi]]
 :PROPERTIES:
@@ -5323,36 +5323,36 @@ contrary to for instance [[https://github.com/Fanael/rainbow-delimiters#readme][
 #+caption[Smartparens commands with key bindings in this setup]:
 #+caption: Smartparens commands with key bindings in this setup.
 #+name: tab:smartparens-commands-and-bindings
-|--------------------------------+----------------------------+----------|
-| command                        | keys                       | status   |
-|--------------------------------+----------------------------+----------|
-| sp-forward-sexp                | {{{kbd(C-M-f)}}}           |          |
-| sp-backward-sexp               | {{{kbd(C-M-b)}}}           |          |
-| sp-next-sexp                   | {{{kbd(C-M-n)}}}           |          |
-| sp-prev-sexp                   | {{{kbd(C-M-p)}}}           |          |
-| sp-down-sexp                   | {{{kbd(C-M-d)}}}           | shadowed |
-| sp-backward-down-sexp          | {{{kbd(C-M-a)}}}           |          |
-| sp-beginning-of-sexp           | {{{kbd(C-S-d)}}}           |          |
-| sp-end-of-sexp                 | {{{kbd(C-S-a)}}}           |          |
-| sp-up-sexp                     | {{{kbd(C-M-e)}}}           |          |
-| sp-backward-up-sexp            | {{{kbd(C-M-u)}}}           |          |
-| sp-kill-sexp                   | {{{kbd(C-M-k)}}}           |          |
-| sp-copy-sexp                   | {{{kbd(C-M-w)}}}           |          |
-| sp-forward-slurp-sexp          | {{{kbd(C-))}}}             | override |
-| sp-backward-slurp-sexp         | {{{kbd(C-()}}}             | override |
-| sp-forward-barf-sexp           | {{{kbd(C-M-))}}}           | override |
-| sp-backward-barf-sexp          | {{{kbd(C-M-()}}}           | override |
-| sp-forward-symbol              | {{{kbd(M-F)}}}             |          |
-| sp-backward-symbol             | {{{kbd(M-B)}}}             |          |
-| sp-unwrap-sexp                 | {{{kbd(M-<delete>)}}}      | shadowed |
-| sp-backward-unwrap-sexp        | {{{kbd(M-<backspace>)}}}   |          |
-| sp-splice-sexp                 | {{{kbd(M-D)}}}             |          |
-| sp-splice-killing-backward     | {{{kbd(C-M-<backspace>)}}} |          |
-| sp-splice-sexp-killing-forward | {{{kbd(C-M-<delete>)}}}    | shadowed |
-| sp-select-next-thing           | {{{kbd(C-M-])}}}           |          |
-| sp-select-next-thing-exchange  | {{{kbd(C-])}}}             |          |
-| sp-mark-sexp                   | {{{kbd(C-M-SPC)}}}         |          |
-|--------------------------------+----------------------------+----------|
+|----------------------------------+----------------------------+----------|
+| command                          | keys                       | status   |
+|----------------------------------+----------------------------+----------|
+| *sp-forward-sexp*                | {{{kbd(C-M-f)}}}           |          |
+| *sp-backward-sexp*               | {{{kbd(C-M-b)}}}           |          |
+| *sp-next-sexp*                   | {{{kbd(C-M-n)}}}           |          |
+| *sp-prev-sexp*                   | {{{kbd(C-M-p)}}}           |          |
+| *sp-down-sexp*                   | {{{kbd(C-M-d)}}}           | shadowed |
+| *sp-backward-down-sexp*          | {{{kbd(C-M-a)}}}           |          |
+| *sp-beginning-of-sexp*           | {{{kbd(C-S-d)}}}           |          |
+| *sp-end-of-sexp*                 | {{{kbd(C-S-a)}}}           |          |
+| *sp-up-sexp*                     | {{{kbd(C-M-e)}}}           |          |
+| *sp-backward-up-sexp*            | {{{kbd(C-M-u)}}}           |          |
+| *sp-kill-sexp*                   | {{{kbd(C-M-k)}}}           |          |
+| *sp-copy-sexp*                   | {{{kbd(C-M-w)}}}           |          |
+| *sp-forward-slurp-sexp*          | {{{kbd(C-))}}}             | override |
+| *sp-backward-slurp-sexp*         | {{{kbd(C-()}}}             | override |
+| *sp-forward-barf-sexp*           | {{{kbd(C-M-))}}}           | override |
+| *sp-backward-barf-sexp*          | {{{kbd(C-M-()}}}           | override |
+| *sp-forward-symbol*              | {{{kbd(M-F)}}}             |          |
+| *sp-backward-symbol*             | {{{kbd(M-B)}}}             |          |
+| *sp-unwrap-sexp*                 | {{{kbd(M-<delete>)}}}      | shadowed |
+| *sp-backward-unwrap-sexp*        | {{{kbd(M-<backspace>)}}}   |          |
+| *sp-splice-sexp*                 | {{{kbd(M-D)}}}             |          |
+| *sp-splice-killing-backward*     | {{{kbd(C-M-<backspace>)}}} |          |
+| *sp-splice-sexp-killing-forward* | {{{kbd(C-M-<delete>)}}}    | shadowed |
+| *sp-select-next-thing*           | {{{kbd(C-M-])}}}           |          |
+| *sp-select-next-thing-exchange*  | {{{kbd(C-])}}}             |          |
+| *sp-mark-sexp*                   | {{{kbd(C-M-SPC)}}}         |          |
+|----------------------------------+----------------------------+----------|
 
 #+caption[Define =sp-eval-expression= with =smartparens= support]:
 #+caption: Define =sp-eval-expression= enabling =smartparens-strict-mode=