diff --git a/README.md b/README.md
index 9b251b2..8627387 100644
--- a/README.md
+++ b/README.md
@@ -138,8 +138,6 @@ Features in *italics* are in the master branch, but not in the latest release.
   - Disabled by default, enable in config
 - [x] Proxying
   - Schemes like Gopher or HTTP can be proxied through a Gemini server
-- [x] *Configure applications to open particular mediatypes*
-    - [ ] Allow piping/streaming content instead of downloading it first
 - [x] Client certificate support
   - [ ] Full client certificate UX within the client
     - Create transient and permanent certs within the client, per domain
@@ -149,6 +147,8 @@ Features in *italics* are in the master branch, but not in the latest release.
 - [x] Subscriptions
   - Subscribing to RSS, Atom, and [JSON Feeds](https://jsonfeed.org/) are all supported
   - So is subscribing to a page, to know when it changes
+- [x] *Open non-text files in another application*
+  - [ ] Allow piping/streaming content instead of downloading it first
 - [ ] Stream support
 - [ ] Table of contents for pages
 - [ ] Search in pages with <kbd>Ctrl-F</kbd>
diff --git a/config/default.go b/config/default.go
index 2624c61..ab80185 100644
--- a/config/default.go
+++ b/config/default.go
@@ -154,44 +154,49 @@ emoji_favicons = false
 other = 'off'
 
 
-# [[mediatype-handlers]]
+# [[mediatype-handlers]] section
+# ---------------------------------
+#
 # Specify what applications will open certain media types.
 # By default your default application will be used to open the file when you select "Open".
 # You only need to configure this section if you want to override your default application,
 # or do special things like streaming.
 #
 # To open jpeg files with the feh command:
-#   [[mediatype-handlers]]
-#   cmd = ["feh"]
-#   types = ["image/jpeg"]
+#
+# [[mediatype-handlers]]
+# cmd = ["feh"]
+# types = ["image/jpeg"]
 #
 # Each command that you specify must come under its own [[mediatype-handlers]]. You may
 # specify as many [[mediatype-handlers]] as you want to setup multiple commands.
 #
 # If the subtype is omitted then the specified command will be used for the
 # entire type:
-#   [[mediatype-handlers]]
-#   command = ["vlc", "--flag"]
-#   types = ["audio", "video"]
+#
+# [[mediatype-handlers]]
+# command = ["vlc", "--flag"]
+# types = ["audio", "video"]
 #
 # A catch-all handler can by specified with "*".
 # Note that there are already catch-all handlers in place for all OSes,
 # that open the file using your default application. This is only if you
 # want to override that.
-#   [[mediatype-handlers]]
-#   cmd = ["some-command"]
-#   types = [
-#           "application/pdf",
-#           "*",
-#   ]
+#
+# [[mediatype-handlers]]
+# cmd = ["some-command"]
+# types = [
+#         "application/pdf",
+#         "*",
+# ]
 #
 # If you want to always open a type in its viewer without the download or open
 # prompt appearing, you can add no_prompt = true
 #
-#   [[mediatype-handlers]]
-#   cmd = ["feh"]
-#   types = ["image"]
-#   no_prompt = true
+# [[mediatype-handlers]]
+# cmd = ["feh"]
+# types = ["image"]
+# no_prompt = true
 #
 # Note: Multiple handlers cannot be defined for the same full media type, but
 # still there needs to be an order for which handlers are used. The following
diff --git a/default-config.toml b/default-config.toml
index e5a6272..5653f75 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -151,44 +151,49 @@ emoji_favicons = false
 other = 'off'
 
 
-# [[mediatype-handlers]]
+# [[mediatype-handlers]] section
+# ---------------------------------
+#
 # Specify what applications will open certain media types.
 # By default your default application will be used to open the file when you select "Open".
 # You only need to configure this section if you want to override your default application,
 # or do special things like streaming.
 #
 # To open jpeg files with the feh command:
-#   [[mediatype-handlers]]
-#   cmd = ["feh"]
-#   types = ["image/jpeg"]
+#
+# [[mediatype-handlers]]
+# cmd = ["feh"]
+# types = ["image/jpeg"]
 #
 # Each command that you specify must come under its own [[mediatype-handlers]]. You may
 # specify as many [[mediatype-handlers]] as you want to setup multiple commands.
 #
 # If the subtype is omitted then the specified command will be used for the
 # entire type:
-#   [[mediatype-handlers]]
-#   command = ["vlc", "--flag"]
-#   types = ["audio", "video"]
+#
+# [[mediatype-handlers]]
+# command = ["vlc", "--flag"]
+# types = ["audio", "video"]
 #
 # A catch-all handler can by specified with "*".
 # Note that there are already catch-all handlers in place for all OSes,
 # that open the file using your default application. This is only if you
 # want to override that.
-#   [[mediatype-handlers]]
-#   cmd = ["some-command"]
-#   types = [
-#           "application/pdf",
-#           "*",
-#   ]
+#
+# [[mediatype-handlers]]
+# cmd = ["some-command"]
+# types = [
+#         "application/pdf",
+#         "*",
+# ]
 #
 # If you want to always open a type in its viewer without the download or open
 # prompt appearing, you can add no_prompt = true
 #
-#   [[mediatype-handlers]]
-#   cmd = ["feh"]
-#   types = ["image"]
-#   no_prompt = true
+# [[mediatype-handlers]]
+# cmd = ["feh"]
+# types = ["image"]
+# no_prompt = true
 #
 # Note: Multiple handlers cannot be defined for the same full media type, but
 # still there needs to be an order for which handlers are used. The following