diff --git a/README.asciidoc b/README.asciidoc
index 86d5c185e..82453ce28 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -33,9 +33,10 @@
 :sc_previous_window: pass:quotes[`ctrl+shift+[`]
 :sc_restore_font_size: pass:quotes[`ctrl+shift+backspace`]
 :sc_run_kitten_text_hints: pass:quotes[`ctrl+shift+e`]
-:sc_run_kitten_text_hints___type_line___program__: pass:quotes[`ctrl+shift+p → l`]
-:sc_run_kitten_text_hints___type_path: pass:quotes[`ctrl+shift+p → shift+f`]
-:sc_run_kitten_text_hints___type_path___program__: pass:quotes[`ctrl+shift+p → f`]
+:sc_run_kitten_text_hints_type_line_program: pass:quotes[`ctrl+shift+p → l`]
+:sc_run_kitten_text_hints_type_path: pass:quotes[`ctrl+shift+p → shift+f`]
+:sc_run_kitten_text_hints_type_path_program: pass:quotes[`ctrl+shift+p → f`]
+:sc_run_kitten_text_hints_type_word_program: pass:quotes[`ctrl+shift+p → w`]
 :sc_scroll_end: pass:quotes[`ctrl+shift+end`]
 :sc_scroll_home: pass:quotes[`ctrl+shift+home`]
 :sc_scroll_line_down: pass:quotes[`ctrl+shift+down` or `ctrl+shift+j`]
@@ -298,7 +299,7 @@ browser.
 
 image::hints_mode.png?raw=true[URL hints mode]
 
-Similarly, you can press {sc_run_kitten_text_hints___type_path___program__} to
+Similarly, you can press {sc_run_kitten_text_hints_type_path_program} to
 select anything that looks like a path or filename and then insert it into the
 terminal, very useful for picking files from the output of a git or ls command and
 adding them to the command line for the next command.
diff --git a/preprocess-readme.py b/preprocess-readme.py
index ef277a8af..e315863b7 100755
--- a/preprocess-readme.py
+++ b/preprocess-readme.py
@@ -16,7 +16,7 @@ defns = defaultdict(list)
 for line in open('kitty/kitty.conf'):
     if line.startswith('map '):
         _, sc, name = line.split(maxsplit=2)
-        name = name.rstrip().replace(' ', '_').replace('-', '_')
+        name = name.rstrip().replace(' ', '_').replace('-', '_').replace('___', '_').replace('__', '_').strip('_')
         defns[name].append('`' + sc.replace('>', ' → ') + '`')
 
 defns = [