diff --git a/dotfiles/mail.org b/dotfiles/mail.org
index 6bc79f3..68f465f 100644
--- a/dotfiles/mail.org
+++ b/dotfiles/mail.org
@@ -774,9 +774,10 @@ set sendmail_wait = 0 # no please don't silently fail, email is important
 unset record
 #+END_SRC
 
-** Use Vim to compose email, with a few default options.
+** TODO [#A] Use Vim to compose email, with a few default options.
+- [ ] Add Goyo by default and when closing it, close vim at the same time
 #+BEGIN_SRC conf
-set editor = "nvim -c ':Goyo' -c '/\\n--' -c ':noh' -c 'startinsert'"
+set editor = "nvim -c '/\\n--' -c ':noh' -c 'startinsert'"
 #+END_SRC
 
 ** Basic Options
diff --git a/dotfiles/qutebrowser.org b/dotfiles/qutebrowser.org
index 9134970..b7d4fd3 100644
--- a/dotfiles/qutebrowser.org
+++ b/dotfiles/qutebrowser.org
@@ -32,30 +32,31 @@ c.confirm_quit = ['downloads']
 
 * Content
 #+BEGIN_SRC conf
-# Automatically start playing `<video>` elements
-c.content.autoplay = False
+  # Automatically start playing `<video>` elements
+  c.content.autoplay = False
 
-# Allow websites to request geolocations.
-c.content.geolocation = 'ask'
+  # Allow websites to request geolocations.
+  c.content.geolocation = 'ask'
 
-# Show javascript alerts.
-c.content.javascript.alert = True
+  # Show javascript alerts.
+  c.content.javascript.alert = True
 
-# Allow JavaScript to read from or write to the clipboard
-c.content.javascript.can_access_clipboard = True
+  # Allow JavaScript to read from or write to the clipboard
+  c.content.javascript.can_access_clipboard = True
 
-# Allow websites to record audio/video.
-c.content.media_capture = 'ask'
+  # Allow websites to record audio/video.
+  c.content.media_capture = 'ask'
 
-# Allow pdf.js to view PDF files in the browser
-c.content.pdfjs = False
+  # Allow pdf.js to view PDF files in the browser
+  c.content.pdfjs = False
 
-# Proxy to use. In addition to the listed values, you can use a
-# `socks://...` or `http://...` URL.
-# Valid values:
-#   - system: Use the system wide proxy.
-#   - none: Don't use any proxy
-c.content.proxy = 'system'
+  # Proxy to use. In addition to the listed values, you can use a
+  # `socks://...` or `http://...` URL.
+  # Valid values:
+  #   - system: Use the system wide proxy.
+  #   - none: Don't use any proxy
+  # c.content.proxy = 'http://proxy.esrf.fr:3128'
+  c.content.proxy = 'system'
 #+END_SRC
 
 * Downloads