diff --git a/config/qutebrowser/keys.conf b/config/qutebrowser/keys.conf
index d7d951c..7188c76 100644
--- a/config/qutebrowser/keys.conf
+++ b/config/qutebrowser/keys.conf
@@ -41,14 +41,14 @@
 [!normal]
 
 clear-keychain ;; leave-mode
-    <Escape>
-    <Ctrl-[>
+    <escape>
+    <ctrl-[>
 
 [normal]
 # Keybindings for normal mode.
 
 clear-keychain ;; search
-    <Escape>
+    <escape>
 
 set-cmd-text -s :goto
     o
@@ -82,11 +82,11 @@ set-cmd-text :open -w {url}
 
 open -t
     ga
-    <Ctrl-T>
+    <ctrl-t>
 
 tab-close
     d
-    <Ctrl-W>
+    <ctrl-w>
 
 tab-close -o
     D
@@ -125,7 +125,7 @@ reload -f
 
 back
     H
-    <Backspace>
+    <backspace>
 
 back -t
     th
@@ -143,7 +143,7 @@ forward -w
     wl
 
 fullscreen
-    <F11>
+    <f11>
 
 hint
     f
@@ -210,7 +210,7 @@ scroll right
 
 undo
     u
-    <Ctrl-Shift-T>
+    <ctrl-shift-t>
 
 scroll-perc 0
     gg
@@ -318,10 +318,10 @@ navigate up -t
     gU
 
 navigate increment
-    <Ctrl-A>
+    <ctrl-a>
 
 navigate decrement
-    <Ctrl-X>
+    <ctrl-x>
 
 inspector
     wi
@@ -339,76 +339,76 @@ view-source
     gf
 
 tab-focus last
-    <Ctrl-Tab>
+    <ctrl-tab>
 
 enter-mode passthrough
-    <Ctrl-V>
+    <ctrl-v>
 
 quit
-    <Ctrl-Q>
+    <ctrl-q>
 
 scroll-page 0 1
-    <Ctrl-F>
+    <ctrl-f>
 
 scroll-page 0 -1
-    <Ctrl-B>
+    <ctrl-b>
 
 scroll-page 0 0.5
-    <Ctrl-D>
+    <ctrl-d>
 
 scroll-page 0 -0.5
-    <Ctrl-U>
+    <ctrl-u>
 
 tab-focus 1
-    <Alt-1>
+    <alt-1>
 
 tab-focus 2
-    <Alt-2>
+    <alt-2>
 
 tab-focus 3
-    <Alt-3>
+    <alt-3>
 
 tab-focus 4
-    <Alt-4>
+    <alt-4>
 
 tab-focus 5
-    <Alt-5>
+    <alt-5>
 
 tab-focus 6
-    <Alt-6>
+    <alt-6>
 
 tab-focus 7
-    <Alt-7>
+    <alt-7>
 
 tab-focus 8
-    <Alt-8>
+    <alt-8>
 
 tab-focus 9
-    <Alt-9>
+    <alt-9>
 
 home
-    <Ctrl-h>
+    <ctrl-h>
 
 stop
-    <Ctrl-s>
+    <ctrl-s>
 
 print
-    <Ctrl-Alt-p>
+    <ctrl-alt-p>
 
 open qute:settings
     Ss
 
 follow-selected
-    <Return>
-    <Ctrl-M>
-    <Ctrl-J>
-    <Shift-Return>
-    <Enter>
-    <Shift-Enter>
+    <return>
+    <ctrl-m>
+    <ctrl-j>
+    <shift-return>
+    <enter>
+    <shift-enter>
 
 follow-selected -t
-    <Ctrl-Return>
-    <Ctrl-Enter>
+    <ctrl-return>
+    <ctrl-enter>
 
 bookmark-add
     M
@@ -429,7 +429,7 @@ hint links spawn youtube-viewer {hint-url}
     ;x
 
 open -w
-    <Ctrl-N>
+    <ctrl-n>
 
 enter-mode set_mark
     `
@@ -452,10 +452,10 @@ yank -ps
 #  * `paste-primary`: Paste primary selection at cursor position.
 
 open-editor
-    <Ctrl-E>
+    <ctrl-e>
 
 paste-primary
-    <Shift-Ins>
+    <shift-ins>
 
 [hint]
 # Keybindings for hint mode.
@@ -465,21 +465,21 @@ paste-primary
 #  * `follow-hint`: Follow the currently selected hint.
 
 follow-hint
-    <Return>
-    <Ctrl-M>
-    <Ctrl-J>
-    <Shift-Return>
-    <Enter>
-    <Shift-Enter>
+    <return>
+    <ctrl-m>
+    <ctrl-j>
+    <shift-return>
+    <enter>
+    <shift-enter>
 
 hint --rapid links tab-bg
-    <Ctrl-R>
+    <ctrl-r>
 
 hint links
-    <Ctrl-F>
+    <ctrl-f>
 
 hint all tab-bg
-    <Ctrl-B>
+    <ctrl-b>
 
 [command]
 # Keybindings for command mode.
@@ -493,29 +493,29 @@ hint all tab-bg
 #  * `command-accept`: Execute the command currently in the commandline.
 
 command-history-prev
-    <Ctrl-P>
+    <ctrl-p>
 
 command-history-next
-    <Ctrl-N>
+    <ctrl-n>
 
 completion-item-prev
-    <Shift-Tab>
-    <Up>
+    <shift-tab>
+    <up>
 
 completion-item-next
-    <Tab>
-    <Down>
+    <tab>
+    <down>
 
 command-accept
-    <Return>
-    <Ctrl-M>
-    <Ctrl-J>
-    <Shift-Return>
-    <Enter>
-    <Shift-Enter>
+    <return>
+    <ctrl-m>
+    <ctrl-j>
+    <shift-return>
+    <enter>
+    <shift-enter>
 
 completion-item-del
-    <Ctrl-D>
+    <ctrl-d>
 
 [prompt]
 # Keybindings for prompts in the status line.
@@ -528,12 +528,12 @@ completion-item-del
 #  * `prompt-no`: Answer no to a yes/no question.
 
 prompt-accept
-    <Return>
-    <Ctrl-M>
-    <Ctrl-J>
-    <Shift-Return>
-    <Enter>
-    <Shift-Enter>
+    <return>
+    <ctrl-m>
+    <ctrl-j>
+    <shift-return>
+    <enter>
+    <shift-enter>
 
 prompt-yes
     y
@@ -544,53 +544,53 @@ prompt-no
 [command,prompt]
 
 rl-backward-char
-    <Ctrl-B>
+    <ctrl-b>
 
 rl-forward-char
-    <Ctrl-F>
+    <ctrl-f>
 
 rl-backward-word
-    <Alt-B>
+    <alt-b>
 
 rl-forward-word
-    <Alt-F>
+    <alt-f>
 
 rl-beginning-of-line
-    <Ctrl-A>
+    <ctrl-a>
 
 rl-end-of-line
-    <Ctrl-E>
+    <ctrl-e>
 
 rl-unix-line-discard
-    <Ctrl-U>
+    <ctrl-u>
 
 rl-kill-line
-    <Ctrl-K>
+    <ctrl-k>
 
 rl-kill-word
-    <Alt-D>
+    <alt-d>
 
 rl-unix-word-rubout
-    <Ctrl-W>
-    <Alt-Backspace>
+    <ctrl-w>
+    <alt-backspace>
 
 rl-yank
-    <Ctrl-Y>
+    <ctrl-y>
 
 rl-delete-char
-    <Ctrl-?>
+    <ctrl-?>
 
 rl-backward-delete-char
-    <Ctrl-H>
+    <ctrl-h>
 
 [caret]
 
 toggle-selection
     v
-    <Space>
+    <space>
 
 drop-selection
-    <Ctrl-Space>
+    <ctrl-space>
 
 enter-mode normal
     c
@@ -645,12 +645,12 @@ yank-selected -p
 
 yank-selected
     y
-    <Return>
-    <Ctrl-M>
-    <Ctrl-J>
-    <Shift-Return>
-    <Enter>
-    <Shift-Enter>
+    <return>
+    <ctrl-m>
+    <ctrl-j>
+    <shift-return>
+    <enter>
+    <shift-enter>
 
 scroll left
     H
diff --git a/config/qutebrowser/qutebrowser.conf b/config/qutebrowser/qutebrowser.conf
index 4542230..237d2a1 100644
--- a/config/qutebrowser/qutebrowser.conf
+++ b/config/qutebrowser/qutebrowser.conf
@@ -921,7 +921,7 @@ enable-pdfjs = false
 #
 # scatter (Bool):
 #     Whether to scatter hint key chains (like Vimium) or not (like
-#     dwb).
+#     dwb). Ignored for number hints.
 #     Valid values: true, false
 #     Default: true
 #
@@ -940,6 +940,11 @@ enable-pdfjs = false
 #     Valid values: true, false
 #     Default: true
 #
+# auto-follow-timeout (Int):
+#     A timeout to inhibit normal-mode key bindings after a
+#     successfulauto-follow.
+#     Default: 0
+#
 # next-regexes (RegexList):
 #     A comma-separated list of regexes to use for 'next' links.
 #     Default:
@@ -957,6 +962,7 @@ scatter = true
 uppercase = false
 dictionary = /usr/share/dict/mnemonic
 auto-follow = true
+auto-follow-timeout = 0
 next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b
 prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b