[qutebrowser] Integrate upstream changes in configuration

3 files changed, 560 insertions, 535 deletions

diff --git a/qutebrowser/.config/qutebrowser/keys.conf b/qutebrowser/.config/qutebrowser/keys.conf
index c7555a1..f94474f 100644
--- a/qutebrowser/.config/qutebrowser/keys.conf
+++ b/qutebrowser/.config/qutebrowser/keys.conf
@@ -469,6 +469,12 @@ fullscreen
 set-cmd-text -s :quickmark-load
     xxb
 
+wq
+    ZZ
+
+tab-focus -1
+    g$
+
 [insert]
 # Keybindings for insert mode.
 # Since normal keypresses are passed through, only special keys are
diff --git a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf
deleted file mode 100644
index b429b24..0000000
--- a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[FileDialog]
-history=file:///home/urbain/Dropbox/toprint, file:///home/urbain/Pictures/family
-lastVisited=file:///home/urbain/Pictures/family
-qtVersion=5.7.0
-shortcuts=file:, file:///home/urbain
-sidebarWidth=90
-treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff)
-viewMode=Detail
diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf
index e352b29..f782e03 100644
--- a/qutebrowser/.config/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf
@@ -24,37 +24,43 @@
 #   - # at the start of the line (at the first position of the key) (\#)
 #   - $ in a value ($$)
 
-[general]
+
 # General/miscellaneous options.
-#
+[general]
+
 # ignore-case (IgnoreCase):
 #     Whether to find text on a page case-insensitively.
 #         true: Search case-insensitively
 #         false: Search case-sensitively
 #         smart: Search case-sensitively if there are capital chars
 #     Default: smart
-#
+ignore-case = smart
+
 # startpage (List of String):
 #     The default page(s) to open at the start, separated by commas.
 #     Default: https://start.duckduckgo.com
-#
+startpage = about:blank
+
 # yank-ignored-url-parameters (List of String):
 #     The URL parameters to strip with :yank url, separated by commas.
 #     Default:
 #     ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
-#
+yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
+
 # default-open-dispatcher (String):
 #     The default program used to open downloads. Set to an empty string
 #     to use the default internal handler.
 #     Any {} in the string will be expanded to the filename, else the
 #     filename will be appended.
 #     Default:
-#
+default-open-dispatcher = 
+
 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
 #     `about:blank` for a blank page.
 #     Default: ${startpage}
-#
+default-page = https://startpage.com
+
 # auto-search (AutoSearch):
 #     Whether to start a search when something else than a URL is
 #     entered.
@@ -62,33 +68,39 @@
 #         dns: Use DNS requests (might be slow!).
 #         false: Never search automatically.
 #     Default: naive
-#
+auto-search = naive
+
 # auto-save-config (Bool):
 #     Whether to save the config automatically on quit.
 #     Valid values: true, false
 #     Default: true
-#
+auto-save-config = true
+
 # auto-save-interval (Int):
 #     How often (in milliseconds) to auto-save config/cookies/etc.
 #     Default: 15000
-#
+auto-save-interval = 15000
+
 # editor (ShellCommand):
 #     The editor (and arguments) to use for the `open-editor` command.
 #     The arguments get split like in a shell, so you can use `"` or `'`
 #     to quote them.
 #     `{}` gets replaced by the filename of the file to be edited.
 #     Default: gvim -f "{}"
-#
+editor = urxvt -e vim -f "{}"
+
 # editor-encoding (Encoding):
 #     Encoding to use for editor.
 #     Default: utf-8
-#
+editor-encoding = utf-8
+
 # private-browsing (Bool):
-#     Do not record visited pages in the history or store web page
-#     icons.
+#     Open new windows in private browsing mode which does not record
+#     visited pages.
 #     Valid values: true, false
 #     Default: false
-#
+private-browsing = false
+
 # developer-extras (Bool):
 #     Enable extra tools for Web developers.
 #     This needs to be enabled for `:inspector` to work and also adds an
@@ -96,13 +108,17 @@
 #     'qutebrowser --help' instead.
 #     Valid values: true, false
 #     Default: false
-#
+developer-extras = false
+
 # 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
-#
+print-element-backgrounds = true
+
 # xss-auditing (Bool):
 #     Whether load requests should be monitored for cross-site scripting
 #     attempts.
@@ -111,19 +127,15 @@
 #     performance.
 #     Valid values: true, false
 #     Default: false
-#
-# site-specific-quirks (Bool):
-#     Enable workarounds for broken sites.
-#     Valid values: true, false
-#     Default: true
-#
+xss-auditing = false
+
 # default-encoding (String):
 #     Default encoding to use for websites.
 #     The encoding must be a string describing an encoding such as
-#     _utf-8_, _iso-8859-1_, etc. If left empty a default value will be
-#     used.
-#     Default:
-#
+#     _utf-8_, _iso-8859-1_, etc.
+#     Default: iso-8859-1
+default-encoding = iso-8859-1
+
 # new-instance-open-target (String):
 #     How to open links in an existing instance if a new one is
 #     launched.
@@ -137,7 +149,8 @@
 #     window without activating the window.
 #         window: Open in a new window.
 #     Default: tab
-#
+new-instance-open-target = tab
+
 # new-instance-open-target.window (String):
 #     Which window to choose when opening links as new tabs.
 #         first-opened: Open new tabs in the first (oldest) opened
@@ -148,83 +161,81 @@
 #         last-visible: Open new tabs in the most recently visible
 #     window.
 #     Default: last-focused
-#
+new-instance-open-target.window = last-focused
+
 # log-javascript-console (String):
 #     How to log javascript console messages.
 #         none: Don't log messages.
 #         debug: Log messages with debug level.
 #         info: Log messages with info level.
 #     Default: debug
-#
+log-javascript-console = debug
+
 # save-session (Bool):
 #     Whether to always save the open pages.
 #     Valid values: true, false
 #     Default: false
-#
+save-session = false
+
 # session-default-name (SessionName):
 #     The name of the session to save by default, or empty for the last
 #     loaded session.
 #     Default:
-#
+session-default-name = 
+
 # url-incdec-segments (FlagList):
 #     The URL segments where `:navigate increment/decrement` will search
 #     for a number.
 #     Valid values: host, path, query, anchor
 #     Default: path,query
-ignore-case = smart
-startpage = about:blank
-yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
-default-open-dispatcher =
-default-page = https://startpage.com
-auto-search = naive
-auto-save-config = true
-auto-save-interval = 15000
-editor = urxvt -e vim -f "{}"
-editor-encoding = utf-8
-private-browsing = false
-developer-extras = false
-print-element-backgrounds = true
-xss-auditing = false
-site-specific-quirks = true
-default-encoding =
-new-instance-open-target = tab
-new-instance-open-target.window = last-focused
-log-javascript-console = debug
-save-session = false
-session-default-name =
 url-incdec-segments = path,query
 
-[ui]
+
 # General options related to the user interface.
-#
+[ui]
+
+# history-session-interval (Int):
+#     The maximum time in minutes between two history items for them to
+#     be considered being from the same session. Use -1 to disable
+#     separation.
+#     Default: 30
+history-session-interval = 30
+
 # zoom-levels (List of Perc):
 #     The available zoom levels, separated by commas.
 #     Default:
 #     25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
-#
+zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
+
 # default-zoom (Perc):
 #     The default zoom level.
 #     Default: 100%
-#
+default-zoom = 100%
+
 # downloads-position (VerticalPosition):
 #     Where to show the downloaded files.
 #     Valid values: top, bottom
 #     Default: top
-#
+downloads-position = top
+
 # status-position (VerticalPosition):
 #     The position of the status bar.
 #     Valid values: top, bottom
 #     Default: bottom
-#
+status-position = bottom
+
 # message-timeout (Int):
 #     Time (in ms) to show messages in the statusbar for.
+#     Set to 0 to never clear messages.
 #     Default: 2000
-#
+message-timeout = 2000
+
 # message-unfocused (Bool):
 #     Whether to show messages in unfocused windows.
 #     Valid values: true, false
 #     Default: false
-#
+message-unfocused = false
+
 # confirm-quit (ConfirmQuit):
 #     Whether to confirm quitting the application.
 #         always: Always show a confirmation.
@@ -233,52 +244,58 @@ url-incdec-segments = path,query
 #         downloads: Show a confirmation if downloads are running
 #         never: Never show a confirmation.
 #     Default: never
-#
+confirm-quit = never
+
 # zoom-text-only (Bool):
 #     Whether the zoom factor on a frame applies only to the text or to
 #     all content.
 #     Valid values: true, false
 #     Default: false
-#
+zoom-text-only = false
+
 # frame-flattening (Bool):
 #     Whether to  expand each subframe to its contents.
 #     This will flatten all the frames to become one scrollable page.
 #     Valid values: true, false
 #     Default: false
-#
+frame-flattening = false
+
 # user-stylesheet (File):
 #     User stylesheet to use (absolute filename or filename relative to
 #     the config directory). Will expand environment variables.
 #     Default:
-#
+user-stylesheet = 
+
 # hide-scrollbar (Bool):
 #     Hide the main scrollbar.
 #     Valid values: true, false
 #     Default: true
-#
-# css-media-type (String):
-#     Set the CSS media type.
-#     Default:
-#
+hide-scrollbar = true
+
 # smooth-scrolling (Bool):
-#     Whether to enable smooth scrolling for webpages.
+#     Whether to enable smooth scrolling for web pages. Note smooth
+#     scrolling does not work with the :scroll-px command.
 #     Valid values: true, false
 #     Default: false
-#
+smooth-scrolling = false
+
 # remove-finished-downloads (Int):
 #     Number of milliseconds to wait before removing finished downloads.
 #     Will not be removed if value is -1.
 #     Default: -1
-#
+remove-finished-downloads = 10
+
 # hide-statusbar (Bool):
 #     Whether to hide the statusbar unless a message is shown.
 #     Valid values: true, false
 #     Default: false
-#
+hide-statusbar = false
+
 # statusbar-padding (Padding):
 #     Padding for statusbar (top, bottom, left, right).
 #     Default: 1,1,0,0
-#
+statusbar-padding = 1,1,0,0
+
 # window-title-format (FormatString):
 #     The format to use for the window title. The following placeholders
 #     are defined:
@@ -291,67 +308,60 @@ url-incdec-segments = path,query
 #     * `{scroll_pos}`: The page scroll position.
 #     * `{host}`: The host of the current web page.
 #     * `{backend}`: Either 'webkit' or 'webengine'
+#     * `{private}` : Indicates when private mode is enabled.
 #     Default: {perc}{title}{title_sep}qutebrowser
-#
+window-title-format = {perc}{title}{title_sep}qutebrowser
+
 # modal-js-dialog (Bool):
 #     Use standard JavaScript modal dialog for alert() and confirm()
 #     Valid values: true, false
 #     Default: false
-#
+modal-js-dialog = false
+
 # hide-wayland-decoration (Bool):
 #     Hide the window decoration when using wayland (requires restart)
 #     Valid values: true, false
 #     Default: false
-#
+hide-wayland-decoration = false
+
 # keyhint-blacklist (List of String):
 #     Keychains that shouldn't be shown in the keyhint dialog
 #     Globs are supported, so ';*' will blacklist all keychainsstarting
 #     with ';'. Use '*' to disable keyhints
 #     Default:
-#
+keyhint-blacklist = 
+
+# keyhint-delay (Int):
+#     Time from pressing a key to seeing the keyhint dialog (ms)
+#     Default: 500
+keyhint-delay = 500
+
 # prompt-radius (Int):
 #     The rounding radius for the edges of prompts.
 #     Default: 8
-#
+prompt-radius = 8
+
 # prompt-filebrowser (Bool):
 #     Show a filebrowser in upload/download prompts.
 #     Valid values: true, false
 #     Default: true
-zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
-default-zoom = 100%
-downloads-position = top
-status-position = bottom
-message-timeout = 2000
-message-unfocused = false
-confirm-quit = never
-zoom-text-only = false
-frame-flattening = false
-user-stylesheet =
-hide-scrollbar = true
-css-media-type =
-smooth-scrolling = false
-remove-finished-downloads = 10
-hide-statusbar = false
-statusbar-padding = 1,1,0,0
-window-title-format = {perc}{title}{title_sep}qutebrowser
-modal-js-dialog = false
-hide-wayland-decoration = false
-keyhint-blacklist =
-prompt-radius = 8
 prompt-filebrowser = true
 
-[network]
+
 # Settings related to the network.
-#
+[network]
+
 # do-not-track (Bool):
 #     Value to send in the `DNT` header.
 #     Valid values: true, false
 #     Default: true
-#
+do-not-track = true
+
 # accept-language (String):
 #     Value to send in the `accept-language` header.
 #     Default: en-US,en
-#
+accept-language = en-US,en
+
 # referer-header (String):
 #     Send the Referer header
 #         always: Always send.
@@ -360,11 +370,13 @@ prompt-filebrowser = true
 #         same-domain: Only send for the same domain. This will still
 #     protect your privacy, but shouldn't break any sites.
 #     Default: same-domain
-#
+referer-header = same-domain
+
 # user-agent (UserAgent):
 #     User agent to send. Empty to send the default.
 #     Default:
-#
+user-agent = Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/601.7.7 (KHTML, like Gecko) Version/9.1.2 Safari/601.7.7
+
 # proxy (Proxy):
 #     The proxy to use.
 #     In addition to the listed values, you can use a `socks://...` or
@@ -372,146 +384,150 @@ prompt-filebrowser = true
 #         system: Use the system wide proxy.
 #         none: Don't use any proxy
 #     Default: system
-#
+proxy = system
+
 # proxy-dns-requests (Bool):
 #     Whether to send DNS requests over the configured proxy.
 #     Valid values: true, false
 #     Default: true
-#
+proxy-dns-requests = true
+
 # ssl-strict (BoolAsk):
 #     Whether to validate SSL handshakes.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+ssl-strict = ask
+
 # dns-prefetch (Bool):
 #     Whether to try to pre-fetch DNS entries to speed up browsing.
 #     Valid values: true, false
 #     Default: true
-#
+dns-prefetch = true
+
 # custom-headers (HeaderDict):
 #     Set custom headers for qutebrowser HTTP requests.
 #     Default:
-#
+custom-headers = 
+
 # netrc-file (File):
 #     Set location of a netrc-file for HTTP authentication. If empty,
 #     ~/.netrc is used.
 #     Default:
-do-not-track = true
-accept-language = en-US,en
-referer-header = same-domain
-user-agent = Mozilla/5.0 (X11; Linux x86_64; rv:53.0) Gecko/20100101 Firefox/53.0
-proxy = system
-proxy-dns-requests = true
-ssl-strict = ask
-dns-prefetch = true
-custom-headers =
-netrc-file =
+netrc-file = 
+
 
-[completion]
 # Options related to completion and command history.
-#
+[completion]
+
 # show (String):
 #     When to show the autocompletion window.
 #         always: Whenever a completion is available.
 #         auto: Whenever a completion is requested.
 #         never: Never.
 #     Default: always
-#
+show = always
+
 # download-path-suggestion (String):
 #     What to display in the download filename input.
 #         path: Show only the download path.
 #         filename: Show only download filename.
 #         both: Show download path and filename.
 #     Default: path
-#
+download-path-suggestion = path
+
 # timestamp-format (TimestampTemplate):
 #     How to format timestamps (e.g. for history)
 #     Default: %Y-%m-%d
-#
+timestamp-format = %Y-%m-%d
+
 # height (PercOrInt):
 #     The height of the completion, in px or as percentage of the
 #     window.
 #     Default: 50%
-#
+height = 50%
+
 # cmd-history-max-items (Int):
 #     How many commands to save in the command history.
 #     0: no history / -1: unlimited
 #     Default: 100
-#
+cmd-history-max-items = 100
+
 # web-history-max-items (Int):
 #     How many URLs to show in the web history.
 #     0: no history / -1: unlimited
 #     Default: 1000
-#
+web-history-max-items = 1000
+
 # quick-complete (Bool):
 #     Whether to move on to the next part when there's only one possible
 #     completion left.
 #     Valid values: true, false
 #     Default: true
-#
+quick-complete = true
+
 # shrink (Bool):
 #     Whether to shrink the completion to be smaller than the configured
 #     size if there are no scrollbars.
 #     Valid values: true, false
 #     Default: false
-#
+shrink = false
+
 # scrollbar-width (Int):
 #     Width of the scrollbar in the completion window (in px).
 #     Default: 12
-#
+scrollbar-width = 12
+
 # scrollbar-padding (Int):
 #     Padding of scrollbar handle in completion window (in px).
 #     Default: 2
-show = always
-download-path-suggestion = path
-timestamp-format = %Y-%m-%d
-height = 50%
-cmd-history-max-items = 100
-web-history-max-items = 1000
-quick-complete = true
-shrink = false
-scrollbar-width = 12
 scrollbar-padding = 2
 
-[input]
+
 # Options related to input modes.
-#
+[input]
+
 # timeout (Int):
 #     Timeout (in milliseconds) for ambiguous key bindings.
 #     If the current input forms both a complete match and a partial
 #     match, the complete match will be executed after this time.
 #     Default: 500
-#
+timeout = 500
+
 # partial-timeout (Int):
 #     Timeout (in milliseconds) for partially typed key bindings.
 #     If the current input forms only partial matches, the keystring
 #     will be cleared after this time.
 #     Default: 5000
-#
+partial-timeout = 1000
+
 # insert-mode-on-plugins (Bool):
 #     Whether to switch to insert mode when clicking flash and other
 #     plugins.
 #     Valid values: true, false
 #     Default: false
-#
+insert-mode-on-plugins = false
+
 # auto-leave-insert-mode (Bool):
 #     Whether to leave insert mode if a non-editable element is clicked.
 #     Valid values: true, false
 #     Default: true
-#
+auto-leave-insert-mode = true
+
 # auto-insert-mode (Bool):
 #     Whether to automatically enter insert mode if an editable element
 #     is focused after page load.
 #     Valid values: true, false
 #     Default: false
-#
+auto-insert-mode = false
+
 # forward-unbound-keys (String):
 #     Whether to forward unbound keys to the webview in normal mode.
 #         all: Forward all unbound keys.
 #         auto: Forward unbound non-alphanumeric keys.
 #         none: Don't forward any keys.
 #     Default: auto
-#
+forward-unbound-keys = auto
+
 # spatial-navigation (Bool):
 #     Enables or disables the Spatial Navigation feature.
 #     Spatial navigation consists in the ability to navigate between
@@ -522,41 +538,37 @@ scrollbar-padding = 2
 #     the right and which element he probably wants.
 #     Valid values: true, false
 #     Default: false
-#
+spatial-navigation = false
+
 # links-included-in-focus-chain (Bool):
 #     Whether hyperlinks should be included in the keyboard focus chain.
 #     Valid values: true, false
 #     Default: true
-#
+links-included-in-focus-chain = true
+
 # rocker-gestures (Bool):
 #     Whether to enable Opera-like mouse rocker gestures. This disables
 #     the context menu.
 #     Valid values: true, false
 #     Default: false
-#
+rocker-gestures = false
+
 # mouse-zoom-divider (Int):
 #     How much to divide the mouse wheel movements to translate them
 #     into zoom increments.
 #     Default: 512
-timeout = 500
-partial-timeout = 1000
-insert-mode-on-plugins = false
-auto-leave-insert-mode = true
-auto-insert-mode = false
-forward-unbound-keys = auto
-spatial-navigation = false
-links-included-in-focus-chain = true
-rocker-gestures = false
 mouse-zoom-divider = 512
 
-[tabs]
+
 # Configuration of the tab bar.
-#
+[tabs]
+
 # background-tabs (Bool):
 #     Whether to open new tabs (middleclick/ctrl+click) in background.
 #     Valid values: true, false
 #     Default: false
-#
+background-tabs = false
+
 # select-on-remove (SelectOnRemove):
 #     Which tab to select when the focused tab is removed.
 #         prev: Select the tab which came before the closed one (left in
@@ -565,7 +577,8 @@ mouse-zoom-divider = 512
 #     horizontal, below in vertical).
 #         last-used: Select the previously selected tab.
 #     Default: next
-#
+select-on-remove = next
+
 # new-tab-position (NewTabPosition):
 #     How new tabs are positioned.
 #         prev: Before the current tab.
@@ -573,7 +586,8 @@ mouse-zoom-divider = 512
 #         first: At the beginning.
 #         last: At the end.
 #     Default: next
-#
+new-tab-position = next
+
 # new-tab-position-explicit (NewTabPosition):
 #     How new tabs opened explicitly are positioned.
 #         prev: Before the current tab.
@@ -581,7 +595,8 @@ mouse-zoom-divider = 512
 #         first: At the beginning.
 #         last: At the end.
 #     Default: last
-#
+new-tab-position-explicit = last
+
 # last-close (String):
 #     Behavior when the last tab is closed.
 #         ignore: Don't do anything.
@@ -590,7 +605,8 @@ mouse-zoom-divider = 512
 #         default-page: Load the default page.
 #         close: Close the window.
 #     Default: ignore
-#
+last-close = ignore
+
 # show (String):
 #     When to show the tab bar
 #         always: Always show the tab bar.
@@ -598,53 +614,74 @@ mouse-zoom-divider = 512
 #         multiple: Hide the tab bar if only one tab is open.
 #         switching: Show the tab bar when switching tabs.
 #     Default: always
-#
+show = multiple
+
 # show-switching-delay (Int):
 #     Time to show the tab bar before hiding it when tabs->show is set
 #     to 'switching'.
 #     Default: 800
-#
+show-switching-delay = 800
+
 # wrap (Bool):
 #     Whether to wrap when changing tabs.
 #     Valid values: true, false
 #     Default: true
-#
+wrap = true
+
 # movable (Bool):
 #     Whether tabs should be movable.
 #     Valid values: true, false
 #     Default: true
-#
+movable = true
+
 # close-mouse-button (String):
 #     On which mouse button to close tabs.
 #         right: Close tabs on right-click.
 #         middle: Close tabs on middle-click.
 #         none: Don't close tabs using the mouse.
 #     Default: middle
-#
+close-mouse-button = middle
+
 # position (Position):
 #     The position of the tab bar.
 #     Valid values: top, bottom, left, right
 #     Default: top
-#
+position = top
+
 # show-favicons (Bool):
 #     Whether to show favicons in the tab bar.
 #     Valid values: true, false
 #     Default: true
-#
+show-favicons = false
+
+# favicon-scale (Float):
+#     Scale for favicons in the tab bar. The tab size is unchanged, so
+#     big favicons also require extra `tabs->padding`.
+#     Default: 1.0
+favicon-scale = 1.0
+
 # width (PercOrInt):
 #     The width of the tab bar if it's vertical, in px or as percentage
 #     of the window.
 #     Default: 20%
-#
+width = 20%
+
+# pinned-width (Int):
+#     The width for pinned tabs with a horizontal tabbar, in px.
+#     Default: 43
+pinned-width = 43
+
 # indicator-width (Int):
 #     Width of the progress indicator (0 to disable).
 #     Default: 3
-#
+indicator-width = 3
+
 # tabs-are-windows (Bool):
 #     Whether to open windows instead of tabs.
 #     Valid values: true, false
 #     Default: false
-#
+tabs-are-windows = true
+
 # title-format (FormatString):
 #     The format to use for the tab title. The following placeholders
 #     are defined:
@@ -658,65 +695,61 @@ mouse-zoom-divider = 512
 #     * `{scroll_pos}`: The page scroll position.
 #     * `{host}`: The host of the current web page.
 #     * `{backend}`: Either 'webkit' or 'webengine'
+#     * `{private}` : Indicates when private mode is enabled.
 #     Default: {index}: {title}
-#
+title-format = {index}: {title}
+
+# title-format-pinned (FormatString):
+#     The format to use for the tab title for pinned tabs. The same
+#     placeholders like for title-format are defined.
+#     Default: {index}
+title-format-pinned = {index}
+
 # title-alignment (TextAlignment):
 #     Alignment of the text inside of tabs
 #     Valid values: left, right, center
 #     Default: left
-#
+title-alignment = left
+
 # mousewheel-tab-switching (Bool):
 #     Switch between tabs using the mouse wheel.
 #     Valid values: true, false
 #     Default: true
-#
+mousewheel-tab-switching = true
+
 # padding (Padding):
 #     Padding for tabs (top, bottom, left, right).
 #     Default: 0,0,5,5
-#
+padding = 0,0,5,5
+
 # indicator-padding (Padding):
 #     Padding for indicators (top, bottom, left, right).
 #     Default: 2,2,0,4
-background-tabs = false
-select-on-remove = next
-new-tab-position = next
-new-tab-position-explicit = last
-last-close = ignore
-show = multiple
-show-switching-delay = 800
-wrap = true
-movable = true
-close-mouse-button = middle
-position = top
-show-favicons = false
-width = 20%
-indicator-width = 3
-tabs-are-windows = true
-title-format = {index}: {title}
-title-alignment = left
-mousewheel-tab-switching = true
-padding = 0,0,5,5
 indicator-padding = 2,2,0,4
 
-[storage]
+
 # Settings related to cache and storage.
-#
+[storage]
+
 # download-directory (Directory):
 #     The directory to save downloads to. An empty value selects a
 #     sensible os-specific default. Will expand environment variables.
 #     Default:
-#
+download-directory = 
+
 # prompt-download-directory (Bool):
 #     Whether to prompt the user for the download location.
 #     If set to false, 'download-directory' will be used.
 #     Valid values: true, false
 #     Default: true
-#
+prompt-download-directory = false
+
 # remember-download-directory (Bool):
 #     Whether to remember the last used download directory.
 #     Valid values: true, false
 #     Default: true
-#
+remember-download-directory = true
+
 # maximum-pages-in-cache (Int):
 #     The maximum number of pages to hold in the global memory page
 #     cache.
@@ -725,34 +758,10 @@ indicator-padding = 2,2,0,4
 #     resuming up to _n_ pages.
 #     For more information about the feature, please refer to:
 #     http://webkit.org/blog/427/webkit-page-cache-i-the-basics/
-#     Default:
-#
-# object-cache-capacities (List of WebKitBytes):
-#     The capacities for the global memory cache for dead objects such
-#     as stylesheets or scripts. Syntax: cacheMinDeadCapacity,
-#     cacheMaxDead, totalCapacity.
-#     The _cacheMinDeadCapacity_ specifies the minimum number of bytes
-#     that dead objects should consume when the cache is under pressure.
-#     _cacheMaxDead_ is the maximum number of bytes that dead objects
-#     should consume when the cache is *not* under pressure.
-#     _totalCapacity_ specifies the maximum number of bytes that the
-#     cache should consume *overall*.
-#     Default:
-#
-# offline-storage-default-quota (WebKitBytes):
-#     Default quota for new offline storage databases.
-#     Default:
-#
-# offline-web-application-cache-quota (WebKitBytes):
-#     Quota for the offline web application cache.
-#     Default:
-#
-# offline-storage-database (Bool):
-#     Whether support for the HTML 5 offline storage feature is enabled.
-#     Valid values: true, false
-#     Default: true
-#
-# offline-web-application-storage (Bool):
+#     Default: 0
+maximum-pages-in-cache = 0
+
+# offline-web-application-cache (Bool):
 #     Whether support for the HTML 5 web application cache feature is
 #     enabled.
 #     An application cache acts like an HTTP cache in some sense. For
@@ -763,116 +772,120 @@ indicator-padding = 2,2,0,4
 #     http://dev.w3.org/html5/spec/Overview.html#appcache
 #     Valid values: true, false
 #     Default: true
-#
+offline-web-application-cache = true
+
 # local-storage (Bool):
-#     Whether support for the HTML 5 local storage feature is enabled.
+#     Whether support for HTML 5 local storage and Web SQL is enabled.
 #     Valid values: true, false
 #     Default: true
-#
-# cache-size (Int):
-#     Size of the HTTP network cache.
-#     Default: 52428800
-download-directory =
-prompt-download-directory = false
-remember-download-directory = true
-maximum-pages-in-cache =
-object-cache-capacities =
-offline-storage-default-quota =
-offline-web-application-cache-quota =
-offline-storage-database = true
-offline-web-application-storage = true
 local-storage = true
+
+# cache-size (Int):
+#     Size of the HTTP network cache. Empty to use the default value.
+#     Default:
 cache-size = 52428800
 
-[content]
+
 # Loaded plugins/scripts and allowed actions.
-#
+[content]
+
 # allow-images (Bool):
 #     Whether images are automatically loaded in web pages.
 #     Valid values: true, false
 #     Default: true
-#
+allow-images = true
+
 # allow-javascript (Bool):
 #     Enables or disables the running of JavaScript programs.
 #     Valid values: true, false
 #     Default: true
-#
+allow-javascript = true
+
 # allow-plugins (Bool):
 #     Enables or disables plugins in Web pages.
 #     Qt plugins with a mimetype such as "application/x-qt-plugin" are
 #     not affected by this setting.
 #     Valid values: true, false
 #     Default: false
-#
+allow-plugins = false
+
 # webgl (Bool):
-#     Enables or disables WebGL. For QtWebEngine, Qt/PyQt >= 5.7 is
-#     required for this setting.
-#     Valid values: true, false
-#     Default: false
-#
-# css-regions (Bool):
-#     Enable or disable support for CSS regions.
+#     Enables or disables WebGL.
 #     Valid values: true, false
 #     Default: true
-#
+webgl = true
+
 # hyperlink-auditing (Bool):
 #     Enable or disable hyperlink auditing (<a ping>).
 #     Valid values: true, false
 #     Default: false
-#
+hyperlink-auditing = false
+
 # geolocation (BoolAsk):
 #     Allow websites to request geolocations.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+geolocation = ask
+
 # notifications (BoolAsk):
 #     Allow websites to show notifications.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+notifications = ask
+
 # media-capture (BoolAsk):
 #     Allow websites to record audio/video.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+media-capture = ask
+
 # javascript-can-open-windows-automatically (Bool):
 #     Whether JavaScript programs can open new windows without user
 #     interaction.
 #     Valid values: true, false
 #     Default: false
-#
+javascript-can-open-windows-automatically = false
+
 # javascript-can-close-windows (Bool):
 #     Whether JavaScript programs can close windows.
 #     Valid values: true, false
 #     Default: false
-#
+javascript-can-close-windows = false
+
 # 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
-#
+javascript-can-access-clipboard = false
+
 # ignore-javascript-prompt (Bool):
 #     Whether all javascript prompts should be ignored.
 #     Valid values: true, false
 #     Default: false
-#
+ignore-javascript-prompt = false
+
 # ignore-javascript-alert (Bool):
 #     Whether all javascript alerts should be ignored.
 #     Valid values: true, false
 #     Default: false
-#
+ignore-javascript-alert = false
+
 # local-content-can-access-remote-urls (Bool):
 #     Whether locally loaded documents are allowed to access remote
 #     urls.
 #     Valid values: true, false
 #     Default: false
-#
+local-content-can-access-remote-urls = false
+
 # local-content-can-access-file-urls (Bool):
 #     Whether locally loaded documents are allowed to access other local
 #     urls.
 #     Valid values: true, false
 #     Default: true
-#
+local-content-can-access-file-urls = true
+
 # cookies-accept (String):
 #     Control which cookies to accept.
 #         all: Accept all cookies.
@@ -881,12 +894,15 @@ cache-size = 52428800
 #     unless a cookie is already set for the domain.
 #         never: Don't accept cookies at all.
 #     Default: no-3rdparty
-#
+cookies-accept = no-3rdparty
+
 # cookies-store (Bool):
-#     Whether to store cookies.
+#     Whether to store cookies. Note this option needs a restart with
+#     QtWebEngine on Qt < 5.9.
 #     Valid values: true, false
 #     Default: true
-#
+cookies-store = true
+
 # host-block-lists (List of Url):
 #     List of URLs of lists which contain hosts to block.
 #     The file can be in one of the following formats:
@@ -896,12 +912,14 @@ cache-size = 52428800
 #     file named 'hosts' (with any extension).
 #     Default:
 #     https://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
-#
+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 (Bool):
 #     Whether host blocking is enabled.
 #     Valid values: true, false
 #     Default: true
-#
+host-blocking-enabled = true
+
 # host-blocking-whitelist (List of String):
 #     List of domains that should always be loaded, despite being
 #     ad-blocked.
@@ -909,74 +927,64 @@ cache-size = 52428800
 #     to exactly match the requested domain.
 #     Local domains are always exempt from hostblocking.
 #     Default: piwik.org
-#
+host-blocking-whitelist = piwik.org
+
 # enable-pdfjs (Bool):
 #     Enable pdf.js to view PDF files in the browser.
 #     Note that the files can still be downloaded by clicking the
 #     download button in the pdf.js viewer.
 #     Valid values: true, false
 #     Default: false
-allow-images = true
-allow-javascript = true
-allow-plugins = false
-webgl = true
-css-regions = true
-hyperlink-auditing = false
-geolocation = ask
-notifications = ask
-media-capture = ask
-javascript-can-open-windows-automatically = false
-javascript-can-close-windows = false
-javascript-can-access-clipboard = false
-ignore-javascript-prompt = false
-ignore-javascript-alert = false
-local-content-can-access-remote-urls = false
-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 = true
-host-blocking-whitelist = piwik.org
 enable-pdfjs = false
 
-[hints]
+
 # Hinting settings.
-#
+[hints]
+
 # border (String):
 #     CSS border value for hints.
 #     Default: 1px solid #E3BE23
-#
+border = 1px solid #E3BE23
+
 # 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.
 #     Default: letter
-#
+mode = letter
+
 # chars (UniqueCharString):
 #     Chars used for hint strings.
 #     Default: asdfghjkl
-#
+chars = aoeuidhtns
+
 # min-chars (Int):
 #     Minimum number of chars used for hint strings.
 #     Default: 1
-#
+min-chars = 1
+
 # scatter (Bool):
 #     Whether to scatter hint key chains (like Vimium) or not (like
 #     dwb). Ignored for number hints.
 #     Valid values: true, false
 #     Default: true
-#
+scatter = true
+
 # uppercase (Bool):
 #     Make chars in hint strings uppercase.
 #     Valid values: true, false
 #     Default: false
-#
+uppercase = true
+
 # dictionary (File):
 #     The dictionary file to be used by the word hints.
 #     Default: /usr/share/dict/words
-#
+dictionary = /usr/share/dict/words
+
 # auto-follow (String):
 #     Controls when a hint can be automatically followed without the
 #     user pressing Enter.
@@ -991,46 +999,39 @@ enable-pdfjs = false
 #         never: The user will always need to press Enter to follow a
 #     hint.
 #     Default: unique-match
-#
+auto-follow = unique-match
+
 # auto-follow-timeout (Int):
 #     A timeout (in milliseconds) to inhibit normal-mode key bindings
 #     after a successful auto-follow.
 #     Default: 0
-#
+auto-follow-timeout = 0
+
 # next-regexes (List of Regex):
 #     A comma-separated list of regexes to use for 'next' links.
 #     Default:
 #     \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
-#
+next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
+
 # prev-regexes (List of Regex):
 #     A comma-separated list of regexes to use for 'prev' links.
 #     Default: \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
-#
+prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
+
 # find-implementation (String):
 #     Which implementation to use to find elements to hint.
 #         javascript: Better but slower
 #         python: Slightly worse but faster
 #     Default: python
-#
+find-implementation = javascript
+
 # hide-unmatched-rapid-hints (Bool):
 #     Controls hiding unmatched hints in rapid mode.
 #     Valid values: true, false
 #     Default: true
-border = 1px solid #E3BE23
-mode = letter
-chars = aoeuidhtns
-min-chars = 1
-scatter = true
-uppercase = true
-dictionary = /usr/share/dict/words
-auto-follow = unique-match
-auto-follow-timeout = 0
-next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
-prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
-find-implementation = javascript
 hide-unmatched-rapid-hints = true
 
-[searchengines]
+
 # Definitions of search engines which can be used via the address bar.
 # The searchengine named `DEFAULT` is used when `general -> auto-search`
 # is true and something else than a URL was entered to be opened. Other
@@ -1038,15 +1039,17 @@ hide-unmatched-rapid-hints = true
 # search term, e.g. `:open google qutebrowser`. The string `{}` will be
 # replaced by the search term, use `{{` and `}}` for literal `{`/`}`
 # signs.
+[searchengines]
 DEFAULT = https://duckduckgo.com/?q={}
 
-[aliases]
+
 # Aliases for commands.
 # By default, no aliases are defined. Example which adds a new command
 # `:qtb` to open qutebrowsers website:
 # `qtb = open https://www.qutebrowser.org/`
+[aliases]
+
 
-[colors]
 # Colors used in the UI.
 # A value can be in one of the following format:
 #  * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB`
@@ -1060,183 +1063,249 @@ DEFAULT = https://duckduckgo.com/?q={}
 # regardless of how they are defined in the options. Valid values are
 # 'rgb', 'hsv', and 'hsl'.
 # The `hints.*` values are a special case as they're real CSS colors, not Qt-CSS colors. There, for a gradient, you need to use `-webkit-gradient`, see https://www.webkit.org/blog/175/introducing-css-gradients/[the WebKit documentation].
-#
+[colors]
+
 # completion.fg (QtColor):
 #     Text color of the completion widget.
 #     Default: white
-#
+completion.fg = white
+
 # completion.bg (QssColor):
 #     Background color of the completion widget.
 #     Default: #333333
-#
+completion.bg = #333333
+
 # completion.alternate-bg (QssColor):
 #     Alternating background color of the completion widget.
 #     Default: #444444
-#
+completion.alternate-bg = #444444
+
 # completion.category.fg (QtColor):
 #     Foreground color of completion widget category headers.
 #     Default: white
-#
+completion.category.fg = white
+
 # completion.category.bg (QssColor):
 #     Background color of the completion widget category headers.
 #     Default: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888,
 #     stop:1 #505050)
-#
+completion.category.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888, stop:1 #505050)
+
 # completion.category.border.top (QssColor):
 #     Top border color of the completion widget category headers.
 #     Default: black
-#
+completion.category.border.top = black
+
 # completion.category.border.bottom (QssColor):
 #     Bottom border color of the completion widget category headers.
 #     Default: ${completion.category.border.top}
-#
+completion.category.border.bottom = ${completion.category.border.top}
+
 # completion.item.selected.fg (QtColor):
 #     Foreground color of the selected completion item.
 #     Default: black
-#
+completion.item.selected.fg = black
+
 # completion.item.selected.bg (QssColor):
 #     Background color of the selected completion item.
 #     Default: #e8c000
-#
+completion.item.selected.bg = #e8c000
+
 # completion.item.selected.border.top (QssColor):
 #     Top border color of the completion widget category headers.
 #     Default: #bbbb00
-#
+completion.item.selected.border.top = #bbbb00
+
 # completion.item.selected.border.bottom (QssColor):
 #     Bottom border color of the selected completion item.
 #     Default: ${completion.item.selected.border.top}
-#
+completion.item.selected.border.bottom = ${completion.item.selected.border.top}
+
 # completion.match.fg (QssColor):
 #     Foreground color of the matched text in the completion.
 #     Default: #ff4444
-#
+completion.match.fg = #ff4444
+
 # completion.scrollbar.fg (QssColor):
 #     Color of the scrollbar handle in completion view.
 #     Default: ${completion.fg}
-#
+completion.scrollbar.fg = ${completion.fg}
+
 # completion.scrollbar.bg (QssColor):
 #     Color of the scrollbar in completion view
 #     Default: ${completion.bg}
-#
+completion.scrollbar.bg = ${completion.bg}
+
 # statusbar.fg (QssColor):
 #     Foreground color of the statusbar.
 #     Default: white
-#
+statusbar.fg = white
+
 # statusbar.bg (QssColor):
 #     Background color of the statusbar.
 #     Default: black
-#
+statusbar.bg = black
+
+# statusbar.fg.private (QssColor):
+#     Foreground color of the statusbar in private browsing mode.
+#     Default: ${statusbar.fg}
+statusbar.fg.private = ${statusbar.fg}
+
+# statusbar.bg.private (QssColor):
+#     Background color of the statusbar in private browsing mode.
+#     Default: #666666
+statusbar.bg.private = #666666
+
 # statusbar.fg.insert (QssColor):
 #     Foreground color of the statusbar in insert mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.insert = ${statusbar.fg}
+
 # statusbar.bg.insert (QssColor):
 #     Background color of the statusbar in insert mode.
 #     Default: darkgreen
-#
+statusbar.bg.insert = darkgreen
+
 # statusbar.fg.command (QssColor):
 #     Foreground color of the statusbar in command mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.command = ${statusbar.fg}
+
 # statusbar.bg.command (QssColor):
 #     Background color of the statusbar in command mode.
 #     Default: ${statusbar.bg}
-#
+statusbar.bg.command = ${statusbar.bg}
+
+# statusbar.fg.command.private (QssColor):
+#     Foreground color of the statusbar in private browsing + command
+#     mode.
+#     Default: ${statusbar.fg.private}
+statusbar.fg.command.private = ${statusbar.fg.private}
+
+# statusbar.bg.command.private (QssColor):
+#     Background color of the statusbar in private browsing + command
+#     mode.
+#     Default: ${statusbar.bg.private}
+statusbar.bg.command.private = ${statusbar.bg.private}
+
 # statusbar.fg.caret (QssColor):
 #     Foreground color of the statusbar in caret mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.caret = ${statusbar.fg}
+
 # statusbar.bg.caret (QssColor):
 #     Background color of the statusbar in caret mode.
 #     Default: purple
-#
+statusbar.bg.caret = purple
+
 # statusbar.fg.caret-selection (QssColor):
 #     Foreground color of the statusbar in caret mode with a selection
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.caret-selection = ${statusbar.fg}
+
 # statusbar.bg.caret-selection (QssColor):
 #     Background color of the statusbar in caret mode with a selection
 #     Default: #a12dff
-#
+statusbar.bg.caret-selection = #a12dff
+
 # statusbar.progress.bg (QssColor):
 #     Background color of the progress bar.
 #     Default: white
-#
+statusbar.progress.bg = white
+
 # statusbar.url.fg (QssColor):
 #     Default foreground color of the URL in the statusbar.
 #     Default: ${statusbar.fg}
-#
+statusbar.url.fg = ${statusbar.fg}
+
 # statusbar.url.fg.success (QssColor):
 #     Foreground color of the URL in the statusbar on successful load
 #     (http).
 #     Default: white
-#
+statusbar.url.fg.success = white
+
 # statusbar.url.fg.success.https (QssColor):
 #     Foreground color of the URL in the statusbar on successful load
 #     (https).
 #     Default: lime
-#
+statusbar.url.fg.success.https = lime
+
 # statusbar.url.fg.error (QssColor):
 #     Foreground color of the URL in the statusbar on error.
 #     Default: orange
-#
+statusbar.url.fg.error = orange
+
 # statusbar.url.fg.warn (QssColor):
 #     Foreground color of the URL in the statusbar when there's a
 #     warning.
 #     Default: yellow
-#
+statusbar.url.fg.warn = yellow
+
 # statusbar.url.fg.hover (QssColor):
 #     Foreground color of the URL in the statusbar for hovered links.
 #     Default: aqua
-#
+statusbar.url.fg.hover = aqua
+
 # tabs.fg.odd (QtColor):
 #     Foreground color of unselected odd tabs.
 #     Default: white
-#
+tabs.fg.odd = white
+
 # tabs.bg.odd (QtColor):
 #     Background color of unselected odd tabs.
 #     Default: grey
-#
+tabs.bg.odd = black
+
 # tabs.fg.even (QtColor):
 #     Foreground color of unselected even tabs.
 #     Default: white
-#
+tabs.fg.even = white
+
 # tabs.bg.even (QtColor):
 #     Background color of unselected even tabs.
 #     Default: darkgrey
-#
+tabs.bg.even = black
+
 # tabs.fg.selected.odd (QtColor):
 #     Foreground color of selected odd tabs.
 #     Default: white
-#
+tabs.fg.selected.odd = white
+
 # tabs.bg.selected.odd (QtColor):
 #     Background color of selected odd tabs.
 #     Default: black
-#
+tabs.bg.selected.odd = darkgreen
+
 # tabs.fg.selected.even (QtColor):
 #     Foreground color of selected even tabs.
 #     Default: ${tabs.fg.selected.odd}
-#
+tabs.fg.selected.even = ${tabs.fg.selected.odd}
+
 # tabs.bg.selected.even (QtColor):
 #     Background color of selected even tabs.
 #     Default: ${tabs.bg.selected.odd}
-#
+tabs.bg.selected.even = ${tabs.bg.selected.odd}
+
 # tabs.bg.bar (QtColor):
 #     Background color of the tab bar.
 #     Default: #555555
-#
+tabs.bg.bar = #555555
+
 # tabs.indicator.start (QtColor):
 #     Color gradient start for the tab indicator.
 #     Default: #0000aa
-#
+tabs.indicator.start = #0000aa
+
 # tabs.indicator.stop (QtColor):
 #     Color gradient end for the tab indicator.
 #     Default: #00aa00
-#
+tabs.indicator.stop = #00aa00
+
 # tabs.indicator.error (QtColor):
 #     Color for the tab indicator on errors..
 #     Default: #ff0000
-#
+tabs.indicator.error = #ff0000
+
 # tabs.indicator.system (ColorSystem):
 #     Color gradient interpolation system for the tab indicator.
 #         rgb: Interpolate in the RGB color system.
@@ -1244,41 +1313,50 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
+tabs.indicator.system = rgb
+
 # hints.fg (QssColor):
 #     Font color for hints.
 #     Default: black
-#
+hints.fg = black
+
 # hints.bg (QssColor):
 #     Background color for hints. Note that you can use a `rgba(...)`
 #     value for transparency.
 #     Default: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255,
 #     247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))
-#
+hints.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))
+
 # hints.fg.match (QssColor):
 #     Font color for the matched part of hints.
 #     Default: green
-#
+hints.fg.match = green
+
 # downloads.bg.bar (QssColor):
 #     Background color for the download bar.
 #     Default: black
-#
+downloads.bg.bar = black
+
 # downloads.fg.start (QtColor):
 #     Color gradient start for download text.
 #     Default: white
-#
+downloads.fg.start = white
+
 # downloads.bg.start (QtColor):
 #     Color gradient start for download backgrounds.
 #     Default: #0000aa
-#
+downloads.bg.start = #0000aa
+
 # downloads.fg.stop (QtColor):
 #     Color gradient end for download text.
 #     Default: ${downloads.fg.start}
-#
+downloads.fg.stop = ${downloads.fg.start}
+
 # downloads.bg.stop (QtColor):
 #     Color gradient stop for download backgrounds.
 #     Default: #00aa00
-#
+downloads.bg.stop = #00aa00
+
 # downloads.fg.system (ColorSystem):
 #     Color gradient interpolation system for download text.
 #         rgb: Interpolate in the RGB color system.
@@ -1286,7 +1364,8 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
+downloads.fg.system = rgb
+
 # downloads.bg.system (ColorSystem):
 #     Color gradient interpolation system for download backgrounds.
 #         rgb: Interpolate in the RGB color system.
@@ -1294,271 +1373,219 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
+downloads.bg.system = rgb
+
 # downloads.fg.error (QtColor):
 #     Foreground color for downloads with errors.
 #     Default: white
-#
+downloads.fg.error = white
+
 # downloads.bg.error (QtColor):
 #     Background color for downloads with errors.
 #     Default: red
-#
+downloads.bg.error = red
+
 # webpage.bg (QtColor):
 #     Background color for webpages if unset (or empty to use the
 #     theme's color)
 #     Default: white
-#
+webpage.bg = white
+
 # keyhint.fg (QssColor):
 #     Text color for the keyhint widget.
 #     Default: #FFFFFF
-#
+keyhint.fg = #FFFFFF
+
 # keyhint.fg.suffix (CssColor):
 #     Highlight color for keys to complete the current keychain
 #     Default: #FFFF00
-#
+keyhint.fg.suffix = #FFFF00
+
 # keyhint.bg (QssColor):
 #     Background color of the keyhint widget.
 #     Default: rgba(0, 0, 0, 80%)
-#
+keyhint.bg = rgba(0, 0, 0, 80%)
+
 # messages.fg.error (QssColor):
 #     Foreground color of an error message.
 #     Default: white
-#
+messages.fg.error = ${statusbar.fg}
+
 # messages.bg.error (QssColor):
 #     Background color of an error message.
 #     Default: red
-#
+messages.bg.error = red
+
 # messages.border.error (QssColor):
 #     Border color of an error message.
 #     Default: #bb0000
-#
+messages.border.error = #bb0000
+
 # messages.fg.warning (QssColor):
 #     Foreground color a warning message.
 #     Default: white
-#
+messages.fg.warning = ${statusbar.fg}
+
 # messages.bg.warning (QssColor):
 #     Background color of a warning message.
 #     Default: darkorange
-#
+messages.bg.warning = darkorange
+
 # messages.border.warning (QssColor):
 #     Border color of an error message.
 #     Default: #d47300
-#
+messages.border.warning = #d47300
+
 # messages.fg.info (QssColor):
 #     Foreground color an info message.
 #     Default: white
-#
+messages.fg.info = white
+
 # messages.bg.info (QssColor):
 #     Background color of an info message.
 #     Default: black
-#
+messages.bg.info = black
+
 # messages.border.info (QssColor):
 #     Border color of an info message.
 #     Default: #333333
-#
+messages.border.info = #333333
+
 # prompts.fg (QssColor):
 #     Foreground color for prompts.
 #     Default: white
-#
+prompts.fg = ${statusbar.fg}
+
 # prompts.bg (QssColor):
 #     Background color for prompts.
 #     Default: darkblue
-#
+prompts.bg = darkblue
+
 # prompts.selected.bg (QssColor):
 #     Background color for the selected item in filename prompts.
 #     Default: #308cc6
-completion.fg = white
-completion.bg = #333333
-completion.alternate-bg = #444444
-completion.category.fg = white
-completion.category.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888, stop:1 #505050)
-completion.category.border.top = black
-completion.category.border.bottom = ${completion.category.border.top}
-completion.item.selected.fg = black
-completion.item.selected.bg = #e8c000
-completion.item.selected.border.top = #bbbb00
-completion.item.selected.border.bottom = ${completion.item.selected.border.top}
-completion.match.fg = #ff4444
-completion.scrollbar.fg = ${completion.fg}
-completion.scrollbar.bg = ${completion.bg}
-statusbar.fg = white
-statusbar.bg = black
-statusbar.fg.insert = ${statusbar.fg}
-statusbar.bg.insert = darkgreen
-statusbar.fg.command = ${statusbar.fg}
-statusbar.bg.command = ${statusbar.bg}
-statusbar.fg.caret = ${statusbar.fg}
-statusbar.bg.caret = purple
-statusbar.fg.caret-selection = ${statusbar.fg}
-statusbar.bg.caret-selection = #a12dff
-statusbar.progress.bg = white
-statusbar.url.fg = ${statusbar.fg}
-statusbar.url.fg.success = white
-statusbar.url.fg.success.https = lime
-statusbar.url.fg.error = orange
-statusbar.url.fg.warn = yellow
-statusbar.url.fg.hover = aqua
-tabs.fg.odd = white
-tabs.bg.odd = black
-tabs.fg.even = white
-tabs.bg.even = black
-tabs.fg.selected.odd = white
-tabs.bg.selected.odd = darkgreen
-tabs.fg.selected.even = ${tabs.fg.selected.odd}
-tabs.bg.selected.even = ${tabs.bg.selected.odd}
-tabs.bg.bar = #555555
-tabs.indicator.start = #0000aa
-tabs.indicator.stop = #00aa00
-tabs.indicator.error = #ff0000
-tabs.indicator.system = rgb
-hints.fg = black
-hints.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))
-hints.fg.match = green
-downloads.bg.bar = black
-downloads.fg.start = white
-downloads.bg.start = #0000aa
-downloads.fg.stop = ${downloads.fg.start}
-downloads.bg.stop = #00aa00
-downloads.fg.system = rgb
-downloads.bg.system = rgb
-downloads.fg.error = white
-downloads.bg.error = red
-webpage.bg = white
-keyhint.fg = #FFFFFF
-keyhint.fg.suffix = #FFFF00
-keyhint.bg = rgba(0, 0, 0, 80%)
-messages.fg.error = ${statusbar.fg}
-messages.bg.error = red
-messages.border.error = #bb0000
-messages.fg.warning = ${statusbar.fg}
-messages.bg.warning = darkorange
-messages.border.warning = #d47300
-messages.fg.info = white
-messages.bg.info = black
-messages.border.info = #333333
-prompts.fg = ${statusbar.fg}
-prompts.bg = darkblue
 prompts.selected.bg = #308cc6
 
-[fonts]
+
 # Fonts used for the UI, with optional style/weight/size.
 #  * Style: `normal`/`italic`/`oblique`
 #  * Weight: `normal`, `bold`, `100`..`900`
 #  * Size: _number_ `px`/`pt`
-#
+[fonts]
+
 # _monospace (Font):
 #     Default monospace fonts.
-#     Default: Terminus, Monospace, "DejaVu Sans Mono", Monaco,
-#     "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier,
-#     "Liberation Mono", monospace, Fixed, Consolas, Terminal
-#
+#     Default: xos4 Terminus, Terminus, Monospace, "DejaVu Sans Mono",
+#     Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New",
+#     Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
+_monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Liberation Mono", "Courier New", Courier, monospace, Fixed, Consolas, Terminal
+
 # completion (Font):
 #     Font used in the completion widget.
 #     Default: 8pt ${_monospace}
-#
+completion = 8pt ${_monospace}
+
 # completion.category (Font):
 #     Font used in the completion categories.
 #     Default: bold ${completion}
-#
+completion.category = bold ${completion}
+
 # tabbar (QtFont):
 #     Font used in the tab bar.
 #     Default: 8pt ${_monospace}
-#
+tabbar = 8pt ${_monospace}
+
 # statusbar (Font):
 #     Font used in the statusbar.
 #     Default: 8pt ${_monospace}
-#
+statusbar = 8pt ${_monospace}
+
 # downloads (Font):
 #     Font used for the downloadbar.
 #     Default: 8pt ${_monospace}
-#
+downloads = 8pt ${_monospace}
+
 # hints (Font):
 #     Font used for the hints.
 #     Default: bold 13px ${_monospace}
-#
+hints = bold 13px ${_monospace}
+
 # debug-console (QtFont):
 #     Font used for the debugging console.
 #     Default: 8pt ${_monospace}
-#
+debug-console = 8pt ${_monospace}
+
 # web-family-standard (FontFamily):
 #     Font family for standard fonts.
 #     Default:
-#
+web-family-standard = 
+
 # web-family-fixed (FontFamily):
 #     Font family for fixed fonts.
 #     Default:
-#
+web-family-fixed = 
+
 # web-family-serif (FontFamily):
 #     Font family for serif fonts.
 #     Default:
-#
+web-family-serif = 
+
 # web-family-sans-serif (FontFamily):
 #     Font family for sans-serif fonts.
 #     Default:
-#
+web-family-sans-serif = 
+
 # web-family-cursive (FontFamily):
 #     Font family for cursive fonts.
 #     Default:
-#
+web-family-cursive = 
+
 # web-family-fantasy (FontFamily):
 #     Font family for fantasy fonts.
 #     Default:
-#
+web-family-fantasy = 
+
 # web-size-minimum (Int):
 #     The hard minimum font size.
-#     Default:
-#
+#     Default: 0
+web-size-minimum = 0
+
 # web-size-minimum-logical (Int):
 #     The minimum logical font size that is applied when zooming out.
-#     Default:
-#
+#     Default: 6
+web-size-minimum-logical = 6
+
 # web-size-default (Int):
 #     The default font size for regular text.
-#     Default:
-#
+#     Default: 16
+web-size-default = 16
+
 # web-size-default-fixed (Int):
 #     The default font size for fixed-pitch text.
-#     Default:
-#
+#     Default: 13
+web-size-default-fixed = 13
+
 # keyhint (Font):
 #     Font used in the keyhint widget.
 #     Default: 8pt ${_monospace}
-#
+keyhint = 8pt ${_monospace}
+
 # messages.error (Font):
 #     Font used for error messages.
 #     Default: 8pt ${_monospace}
-#
+messages.error = 8pt ${_monospace}
+
 # messages.warning (Font):
 #     Font used for warning messages.
 #     Default: 8pt ${_monospace}
-#
+messages.warning = 8pt ${_monospace}
+
 # messages.info (Font):
 #     Font used for info messages.
 #     Default: 8pt ${_monospace}
-#
+messages.info = 8pt ${_monospace}
+
 # prompts (Font):
 #     Font used for prompts.
 #     Default: 8pt sans-serif
-_monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Liberation Mono", "Courier New", Courier, monospace, Fixed, Consolas, Terminal
-completion = 8pt ${_monospace}
-completion.category = bold ${completion}
-tabbar = 8pt ${_monospace}
-statusbar = 8pt ${_monospace}
-downloads = 8pt ${_monospace}
-hints = bold 13px ${_monospace}
-debug-console = 8pt ${_monospace}
-web-family-standard =
-web-family-fixed =
-web-family-serif =
-web-family-sans-serif =
-web-family-cursive =
-web-family-fantasy =
-web-size-minimum =
-web-size-minimum-logical =
-web-size-default =
-web-size-default-fixed =
-keyhint = 8pt ${_monospace}
-messages.error = 8pt ${_monospace}
-messages.warning = 8pt ${_monospace}
-messages.info = 8pt ${_monospace}
 prompts = 8pt sans-serif