diff --git a/README.asciidoc b/README.asciidoc
index b645ee9fc..d4b90f71e 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -2,34 +2,34 @@
 :toc:
 :toc-placement!:
 // START_SHORTCUT_BLOCK
-:sc_paste_from_clipboard: ctrl+shift+v
-:sc_paste_from_selection: ctrl+shift+s
-:sc_copy_to_clipboard: ctrl+shift+c
-:sc_scroll_line_up: ctrl+shift+up
-:sc_scroll_line_down: ctrl+shift+down
-:sc_scroll_page_up: ctrl+shift+page_up
-:sc_scroll_page_down: ctrl+shift+page_down
-:sc_scroll_home: ctrl+shift+home
-:sc_scroll_end: ctrl+shift+end
-:sc_new_window: ctrl+shift+enter
-:sc_next_window: ctrl+shift+]
-:sc_previous_window: ctrl+shift+[
-:sc_close_window: ctrl+shift+w
-:sc_next_layout: ctrl+shift+l
-:sc_first_window: ctrl+shift+1
-:sc_second_window: ctrl+shift+2
-:sc_third_window: ctrl+shift+3
-:sc_fourth_window: ctrl+shift+4
-:sc_fifth_window: ctrl+shift+5
-:sc_sixth_window: ctrl+shift+6
-:sc_seventh_window: ctrl+shift+7
-:sc_eighth_window: ctrl+shift+8
-:sc_ninth_window: ctrl+shift+9
-:sc_tenth_window: ctrl+shift+0
-:sc_next_tab: ctrl+shift+right
-:sc_previous_tab: ctrl+shift+left
-:sc_new_tab: ctrl+shift+t
-:sc_close_tab: ctrl+shift+q
+:sc_close_tab: pass:quotes[`ctrl+shift+q`]
+:sc_close_window: pass:quotes[`ctrl+shift+w`]
+:sc_copy_to_clipboard: pass:quotes[`ctrl+shift+c`]
+:sc_eighth_window: pass:quotes[`ctrl+shift+8`]
+:sc_fifth_window: pass:quotes[`ctrl+shift+5`]
+:sc_first_window: pass:quotes[`ctrl+shift+1`]
+:sc_fourth_window: pass:quotes[`ctrl+shift+4`]
+:sc_new_tab: pass:quotes[`ctrl+shift+t`]
+:sc_new_window: pass:quotes[`ctrl+shift+enter`]
+:sc_next_layout: pass:quotes[`ctrl+shift+l`]
+:sc_next_tab: pass:quotes[`ctrl+shift+right`]
+:sc_next_window: pass:quotes[`ctrl+shift+]`]
+:sc_ninth_window: pass:quotes[`ctrl+shift+9`]
+:sc_paste_from_clipboard: pass:quotes[`ctrl+shift+v`]
+:sc_paste_from_selection: pass:quotes[`ctrl+shift+s`]
+:sc_previous_tab: pass:quotes[`ctrl+shift+left`]
+:sc_previous_window: pass:quotes[`ctrl+shift+[`]
+: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`]
+:sc_scroll_line_up: pass:quotes[`ctrl+shift+up` or `ctrl+shift+k`]
+:sc_scroll_page_down: pass:quotes[`ctrl+shift+page_down`]
+:sc_scroll_page_up: pass:quotes[`ctrl+shift+page_up`]
+:sc_second_window: pass:quotes[`ctrl+shift+2`]
+:sc_seventh_window: pass:quotes[`ctrl+shift+7`]
+:sc_sixth_window: pass:quotes[`ctrl+shift+6`]
+:sc_tenth_window: pass:quotes[`ctrl+shift+0`]
+:sc_third_window: pass:quotes[`ctrl+shift+3`]
 // END_SHORTCUT_BLOCK
 
 image::https://travis-ci.org/kovidgoyal/kitty.svg?branch=master[Build status, link=https://travis-ci.org/kovidgoyal/kitty]
@@ -117,16 +117,46 @@ manager. The keyboard controls (which are all customizable) for tabs and
 windows are:
 
 [options="header"]
+.Scrolling
+|===
+|Action |Shortcut
+
+|Scroll line up   | {sc_scroll_line_up}
+|Scroll line down | {sc_scroll_line_down}
+|Scroll page up   | {sc_scroll_page_up}
+|Scroll page down | {sc_scroll_page_down}
+|Scroll to top    | {sc_scroll_home}
+|Scroll to bottom | {sc_scroll_end}
+
+|===
+
+[options="header"]
+.Tabs
 |===
 |Action |Shortcut
 
 |New tab   | {sc_new_tab}
-
 |Close tab | {sc_close_tab}
-
+|Next tab  | {sc_next_tab}
+|Previous tab | {sc_previous_tab}
+|Next layout | {sc_next_layout}
 
 |===
 
+
+[options="header"]
+.Windows
+|===
+|Action |Shortcut
+
+|New window   | {sc_new_window}
+|Close window | {sc_close_window}
+|Next window  | {sc_next_window}
+|Previous window | {sc_previous_window}
+
+|===
+
+
 == Configuration
 
 kitty is highly customizable, everything from keyboard shortcuts, to
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index f2942e12d..aff87bcc8 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -131,6 +131,8 @@ map ctrl+shift+c        copy_to_clipboard
 # Scrolling
 map ctrl+shift+up        scroll_line_up
 map ctrl+shift+down      scroll_line_down
+map ctrl+shift+k         scroll_line_up
+map ctrl+shift+j         scroll_line_down
 map ctrl+shift+page_up   scroll_page_up
 map ctrl+shift+page_down scroll_page_down
 map ctrl+shift+home      scroll_home
@@ -141,7 +143,6 @@ map ctrl+shift+enter    new_window
 map ctrl+shift+]        next_window
 map ctrl+shift+[        previous_window
 map ctrl+shift+w        close_window
-map ctrl+shift+l        next_layout
 map ctrl+shift+1        first_window
 map ctrl+shift+2        second_window
 map ctrl+shift+3        third_window
@@ -158,3 +159,4 @@ map ctrl+shift+right    next_tab
 map ctrl+shift+left     previous_tab
 map ctrl+shift+t        new_tab
 map ctrl+shift+q        close_tab
+map ctrl+shift+l        next_layout
diff --git a/preprocess-readme.py b/preprocess-readme.py
index f9db71877..720b57b8e 100755
--- a/preprocess-readme.py
+++ b/preprocess-readme.py
@@ -4,18 +4,20 @@
 
 import os
 import re
+from collections import defaultdict
 
 base = os.path.dirname(os.path.abspath(__file__))
 os.chdir(base)
 
 
-defns = []
+defns = defaultdict(list)
 
 for line in open('kitty/kitty.conf'):
     if line.startswith('map '):
         _, sc, name = line.split(maxsplit=3)
-        defns.append(':sc_{}: {}'.format(name, sc))
+        defns[name].append('`' + sc + '`')
 
+defns = [':sc_{}: pass:quotes[{}]'.format(name, ' or '.join(defns[name])) for name in sorted(defns)]
 defns = '\n'.join(defns)
 
 raw = open('README.asciidoc').read()