diff --git a/book/src/keymap.md b/book/src/keymap.md
index 6ae1e8d47..212ed4965 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -142,9 +142,8 @@ over text and not actively editing it).
 
 #### Goto mode
 
-Jumps to various locations.
-
-> NOTE: Some of these features are only available with the LSP present.
+Jumps to various locations. Mappings marked (**LSP**) require an
+active language server for the file to work.
 
 | Key   | Description                                      | Command                    |
 | ----- | -----------                                      | -------                    |
@@ -156,10 +155,10 @@ Jumps to various locations.
 | `t`   | Go to the top of the screen                      | `goto_window_top`          |
 | `m`   | Go to the middle of the screen                   | `goto_window_middle`       |
 | `b`   | Go to the bottom of the screen                   | `goto_window_bottom`       |
-| `d`   | Go to definition                                 | `goto_definition`          |
-| `y`   | Go to type definition                            | `goto_type_definition`     |
-| `r`   | Go to references                                 | `goto_reference`           |
-| `i`   | Go to implementation                             | `goto_implementation`      |
+| `d`   | Go to definition (**LSP**)                       | `goto_definition`          |
+| `y`   | Go to type definition (**LSP**)                  | `goto_type_definition`     |
+| `r`   | Go to references (**LSP**)                       | `goto_reference`           |
+| `i`   | Go to implementation (**LSP**)                   | `goto_implementation`      |
 | `a`   | Go to the last accessed/alternate file           | `goto_last_accessed_file`  |
 | `n`   | Go to next buffer                                | `goto_next_buffer`         |
 | `p`   | Go to previous buffer                            | `goto_previous_buffer`     |
@@ -198,15 +197,18 @@ This layer is similar to vim keybindings as kakoune does not support window.
 
 #### Space mode
 
-This layer is a kludge of mappings, mostly pickers.
+This layer is a kludge of mappings, mostly pickers. Mappings marked
+(**LSP**) require an active language server for the file to work.
+
 
 | Key     | Description                                                           | Command                             |
 | -----   | -----------                                                           | -------                             |
-| `k`     | Show documentation for the item under the cursor                      | `hover`                             |
 | `f`     | Open file picker                                                      | `file_picker`                       |
 | `b`     | Open buffer picker                                                    | `buffer_picker`                     |
-| `s`     | Open symbol picker (current document)                                 | `symbol_picker`                     |
-| `a`     | Apply code action                                                     | `code_action`                       |
+| `k`     | Show documentation for item under cursor (**LSP**)                      | `hover`                             |
+| `s`     | Open document symbol picker (**LSP**)                                     | `symbol_picker`                     |
+| `r`     | Rename symbol (**LSP**)                                                   | `rename_symbol`                     |
+| `a`     | Apply code action  (**LSP**)                                              | `code_action`                       |
 | `'`     | Open last fuzzy picker                                                | `last_picker`                       |
 | `w`     | Enter [window mode](#window-mode)                                     | N/A                                 |
 | `p`     | Paste system clipboard after selections                               | `paste_clipboard_after`             |
@@ -215,9 +217,8 @@ This layer is a kludge of mappings, mostly pickers.
 | `Y`     | Yank main selection to clipboard                                      | `yank_main_selection_to_clipboard`  |
 | `R`     | Replace selections by clipboard contents                              | `replace_selections_with_clipboard` |
 | `/`     | Global search in workspace folder                                     | `global_search`                     |
-| `r`     | Rename symbol using the language server                               | `rename_symbol`                     |
 
-> NOTE: Global search display results in a fuzzy picker, use `space + '` to bring it back up after opening a file.
+> TIP: Global search displays results in a fuzzy picker, use `space + '` to bring it back up after opening a file.
  
 #### Unimpaired
 
@@ -263,7 +264,9 @@ Keys to use within picker. Remapping currently not supported.
 | `Escape`, `Ctrl-c`           | Close picker      |
 
 # Prompt
+
 Keys to use within prompt, Remapping currently not supported.
+
 | Key                     | Description                                                             |
 | -----                   | -------------                                                           |
 | `Escape`, `Ctrl-c`      | Close prompt                                                            |
@@ -271,17 +274,17 @@ Keys to use within prompt, Remapping currently not supported.
 | `Ctrl-b`, `Left`        | Backward a char                                                         |
 | `Alt-f`, `Alt-Right`    | Forward a word                                                          |
 | `Ctrl-f`, `Right`       | Forward a char                                                          |
-| `Ctrl-e`, `End`         | move prompt end                                                         |
-| `Ctrl-a`, `Home`        | move prompt start                                                       |
-| `Ctrl-w`                | delete previous word                                                    |
-| `Ctrl-u`                | delete to start of line                                                 |
-| `Ctrl-k`                | delete to end of line                                                   |
-| `backspace`, `Ctrl-h`   | delete previous char                                                    |
-| `delete`, `Ctrl-d`      | delete previous char                                                    |
-| `Ctrl-s`                | insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later   |
-| `Ctrl-p`, `Up`          | select previous history                                                 |
-| `Ctrl-n`, `Down`        | select next history                                                     |
-| `Tab`                   | slect next completion item                                              |
-| `BackTab`               | slect previous completion item                                          |
+| `Ctrl-e`, `End`         | Move prompt end                                                         |
+| `Ctrl-a`, `Home`        | Move prompt start                                                       |
+| `Ctrl-w`                | Delete previous word                                                    |
+| `Ctrl-u`                | Delete to start of line                                                 |
+| `Ctrl-k`                | Delete to end of line                                                   |
+| `backspace`, `Ctrl-h`   | Delete previous char                                                    |
+| `delete`, `Ctrl-d`      | Delete previous char                                                    |
+| `Ctrl-s`                | Insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later   |
+| `Ctrl-p`, `Up`          | Select previous history                                                 |
+| `Ctrl-n`, `Down`        | Select next history                                                     |
+| `Tab`                   | Select next completion item                                              |
+| `BackTab`               | Select previous completion item                                          |
 | `Enter`                 | Open selected                                                           |