diff --git a/config/qutebrowser/keys.conf b/config/qutebrowser/keys.conf
index 35f3bbd..c473511 100644
--- a/config/qutebrowser/keys.conf
+++ b/config/qutebrowser/keys.conf
@@ -466,6 +466,9 @@ record-macro
 run-macro
     @
 
+wq
+    ZZ
+
 [insert]
 # Keybindings for insert mode.
 # Since normal keypresses are passed through, only special keys are
diff --git a/config/qutebrowser/qutebrowser.conf b/config/qutebrowser/qutebrowser.conf
index 8567507..00bdfc8 100644
--- a/config/qutebrowser/qutebrowser.conf
+++ b/config/qutebrowser/qutebrowser.conf
@@ -100,6 +100,8 @@
 # print-element-backgrounds (Bool):
 #     Whether the background color and images are also drawn when the
 #     page is printed.
+#     This setting only works with Qt 5.8 or newer when using the
+#     QtWebEngine backend.
 #     Valid values: true, false
 #     Default: true
 #
@@ -113,7 +115,7 @@
 #     Default: false
 #
 # site-specific-quirks (Bool):
-#     Enable workarounds for broken sites.
+#     Enable QtWebKit workarounds for broken sites.
 #     Valid values: true, false
 #     Default: true
 #
@@ -179,7 +181,7 @@ default-page = ${startpage}
 auto-search = naive
 auto-save-config = true
 auto-save-interval = 15000
-editor = urxvtc -e nvim "{}"
+editor = st -e nvim "{}"
 editor-encoding = utf-8
 private-browsing = false
 developer-extras = true
@@ -191,7 +193,7 @@ new-instance-open-target = tab-silent
 new-instance-open-target.window = last-focused
 log-javascript-console = none
 save-session = false
-session-default-name = 
+session-default-name = default
 url-incdec-segments = path,query
 
 [ui]
@@ -369,6 +371,8 @@ prompt-filebrowser = true
 #     The proxy to use.
 #     In addition to the listed values, you can use a `socks://...` or
 #     `http://...` URL.
+#     This setting only works with Qt 5.8 or newer when using the
+#     QtWebEngine backend.
 #         system: Use the system wide proxy.
 #         none: Don't use any proxy
 #     Default: system
@@ -682,7 +686,7 @@ select-on-remove = next
 new-tab-position = next
 new-tab-position-explicit = next
 last-close = close
-show = always
+show = multiple
 show-switching-delay = 800
 wrap = true
 movable = true
@@ -770,8 +774,8 @@ indicator-padding = 2,2,0,4
 #     Default: true
 #
 # cache-size (Int):
-#     Size of the HTTP network cache.
-#     Default: 52428800
+#     Size of the HTTP network cache. Empty to use the default value.
+#     Default:
 download-directory = /data/temporary
 prompt-download-directory = true
 remember-download-directory = true
@@ -805,8 +809,7 @@ cache-size = 52428800
 #     Default: false
 #
 # webgl (Bool):
-#     Enables or disables WebGL. For QtWebEngine, Qt/PyQt >= 5.7 is
-#     required for this setting.
+#     Enables or disables WebGL.
 #     Valid values: true, false
 #     Default: true
 #
@@ -848,6 +851,8 @@ cache-size = 52428800
 #
 # javascript-can-access-clipboard (Bool):
 #     Whether JavaScript programs can read or write to the clipboard.
+#     With QtWebEngine, writing the clipboard as response to a user
+#     interaction is always allowed.
 #     Valid values: true, false
 #     Default: false
 #
@@ -883,7 +888,8 @@ cache-size = 52428800
 #     Default: no-3rdparty
 #
 # cookies-store (Bool):
-#     Whether to store cookies.
+#     Whether to store cookies. Note this option needs a restart with
+#     QtWebEngine.
 #     Valid values: true, false
 #     Default: true
 #
@@ -935,7 +941,7 @@ local-content-can-access-file-urls = true
 cookies-accept = no-3rdparty
 cookies-store = true
 host-block-lists = http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
-host-blocking-enabled = false
+host-blocking-enabled = true
 host-blocking-whitelist = piwik.org
 enable-pdfjs = false
 
@@ -948,7 +954,9 @@ enable-pdfjs = false
 #
 # mode (String):
 #     Mode to use for hints.
-#         number: Use numeric hints.
+#         number: Use numeric hints. (In this mode you can also type
+#     letters form the hinted element to filter and reduce the number of
+#     elements that are hinted.)
 #         letter: Use the chars in the hints -> chars setting.
 #         word: Use hints words based on the html elements and the extra
 #     words.
diff --git a/local/bin/qutebrowser b/local/bin/qutebrowser
index c6f20bc..ab1a257 100755
--- a/local/bin/qutebrowser
+++ b/local/bin/qutebrowser
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
-# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.9.1','gui_scripts','qutebrowser'
-__requires__ = 'qutebrowser==0.9.1'
+# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.10.1','gui_scripts','qutebrowser'
+__requires__ = 'qutebrowser==0.10.1'
 import re
 import sys
 from pkg_resources import load_entry_point
@@ -8,5 +8,5 @@ from pkg_resources import load_entry_point
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
     sys.exit(
-        load_entry_point('qutebrowser==0.9.1', 'gui_scripts', 'qutebrowser')()
+        load_entry_point('qutebrowser==0.10.1', 'gui_scripts', 'qutebrowser')()
     )