diff --git a/docs/calendar.html b/docs/calendar.html
index d08fad6..ff5456b 100644
--- a/docs/calendar.html
+++ b/docs/calendar.html
@@ -281,7 +281,7 @@ for the JavaScript code in this tag.
 <span class="org-variable-name">type</span> = <span class="org-string">"google_calendar"</span>
 <span class="org-variable-name">token_file</span> = <span class="org-string">"~/.config/dotfiles/private/token_file"</span>
 <span class="org-variable-name">client_id</span> = <span class="org-string">"188415318767-802h28ig8gromo0f72blrbg6cgcop6m8.apps.googleusercontent.com"</span>
-<span class="org-variable-name">client_secret</span> = <span class="org-string">"***REMOVED***"</span>
+<span class="org-variable-name">client_secret</span> = <span class="org-string">"KdepTEIgZtKdVvPRgm3olwgM"</span>
 
 [<span class="org-type">storage google_calendar_local</span>]
 <span class="org-variable-name">type</span> = <span class="org-string">"filesystem"</span>
@@ -304,7 +304,7 @@ for the JavaScript code in this tag.
 <span class="org-variable-name">type</span> = <span class="org-string">"google_contacts"</span>
 <span class="org-variable-name">token_file</span> = <span class="org-string">"~/.config/dotfiles/private/token_file_carddav"</span>
 <span class="org-variable-name">client_id</span> = <span class="org-string">"188415318767-802h28ig8gromo0f72blrbg6cgcop6m8.apps.googleusercontent.com"</span>
-<span class="org-variable-name">client_secret</span> = <span class="org-string">"***REMOVED***"</span>
+<span class="org-variable-name">client_secret</span> = <span class="org-string">"KdepTEIgZtKdVvPRgm3olwgM"</span>
 </pre>
 </div>
 </div>
diff --git a/docs/music.html b/docs/music.html
index 9ca6e38..bfec918 100644
--- a/docs/music.html
+++ b/docs/music.html
@@ -809,7 +809,7 @@ import:
 <span class="org-variable-name">username</span> = dehaeze.thomas@gmail.com
 <span class="org-variable-name">password</span> = &lt;&lt;get-password(passname=<span class="org-string">"spotify.com/dehaeze.thomas@gmail.com"</span>)&gt;&gt;
 <span class="org-variable-name">client_id</span> = 3b740ab1-f26f-4c38-aee0-4dcb9e58b375
-<span class="org-variable-name">client_secret</span> = ***REMOVED***
+<span class="org-variable-name">client_secret</span> = mspixJ52Yq5xQKF980Rij8_geTM_2VU1Euk5K86uwfg=
 <span class="org-variable-name">bitrate</span> = <span class="org-highlight-numbers-number">320</span>
 
 [<span class="org-type">mpd</span>]
diff --git a/dotfiles/applications.org b/dotfiles/applications.org
index c0f0942..df7c511 100644
--- a/dotfiles/applications.org
+++ b/dotfiles/applications.org
@@ -70,24 +70,6 @@
   StartupNotify=true
 #+end_src
 
-* Zathura
-:PROPERTIES:
-:header-args: :tangle ~/.local/share/applications/zathura.desktop
-:header-args+: :comments both :mkdirp yes
-:END:
-#+begin_src conf
-  [Desktop Entry]
-  Version=1.0
-  Type=Application
-  Name=Zathura
-  Comment=A minimalistic document viewer
-  Exec=zathura %U
-  Icon=/usr/share/icons/Papirus/64x64/apps/zathura.svg
-  Terminal=false
-  Categories=Office;Viewer;
-  Keywords=PDF;PS;PostScript;DjVU;document;presentation;viewer;
-#+end_src
-
 * Weechat
 :PROPERTIES:
 :header-args: :tangle ~/.local/share/applications/weechat.desktop
@@ -147,18 +129,6 @@
   MimeType=text/english;text/plain;text/x-makefile;
 #+end_src
 
-* TODO Transmission
-:PROPERTIES:
-:header-args: :tangle ~/.local/share/applications/transmission.desktop
-:header-args+: :comments both :mkdirp yes
-:END:
-
-#+begin_src conf
-  [Desktop Entry]
-  Type=Application
-  Name=Torrent
-  Exec=/usr/bin/env transadd %U
-#+end_src
 * Images
 :PROPERTIES:
 :header-args: :tangle ~/.local/share/applications/img.desktop
@@ -171,37 +141,6 @@
   Exec=/usr/bin/sxiv -a %u
 #+end_src
 
-* TODO RSS
-:PROPERTIES:
-:header-args: :tangle ~/.local/share/applications/rss.desktop
-:header-args+: :comments both :mkdirp yes
-:END:
-#+begin_src conf
-  [Desktop Entry]
-  Type=Application
-  Name=RSS feed addition
-  Exec=/usr/bin/env rssadd %U
-#+end_src
-* Qutebrowser
-:PROPERTIES:
-:header-args: :tangle ~/.local/share/applications/qutebrowser.desktop
-:header-args+: :comments both :mkdirp yes
-:END:
-#+begin_src conf
-  [Desktop Entry]
-  Name=qutebrowser
-  GenericName=Web Browser
-  Comment=A keyboard-driven, vim-like browser based on PyQt5
-  Icon=qutebrowser
-  Type=Application
-  Categories=Network;WebBrowser;
-  Exec=qutebrowser %u
-  Terminal=false
-  StartupNotify=false
-  MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/qute;
-  Keywords=Browser
-  Actions=new-window;preferences;
-#+end_src
 * Org-Protocol
 :PROPERTIES:
 :header-args: :tangle ~/.local/share/applications/org-protocol.desktop
diff --git a/dotfiles/calendar.org b/dotfiles/calendar.org
index 94542b0..4e12862 100644
--- a/dotfiles/calendar.org
+++ b/dotfiles/calendar.org
@@ -20,7 +20,7 @@
 * Vdirsyncer
 :PROPERTIES:
 :header-args:  :tangle ~/.config/vdirsyncer/config
-:header-args+: :comments both :mkdirp yes
+:header-args+: :comments both :mkdirp yes :noweb no-export
 :END:
 
 #+BEGIN_SRC conf
@@ -37,7 +37,7 @@
   type = "google_calendar"
   token_file = "~/.config/dotfiles/private/token_file"
   client_id = "188415318767-802h28ig8gromo0f72blrbg6cgcop6m8.apps.googleusercontent.com"
-  client_secret = "***REMOVED***"
+  client_secret = "<<get-password(passname="calendar/google_client_secret")>>"
 
   [storage google_calendar_local]
   type = "filesystem"
@@ -60,7 +60,7 @@
   type = "google_contacts"
   token_file = "~/.config/dotfiles/private/token_file_carddav"
   client_id = "188415318767-802h28ig8gromo0f72blrbg6cgcop6m8.apps.googleusercontent.com"
-  client_secret = "***REMOVED***"
+  client_secret = "<<get-password(passname="contacts/google_client_secret")>>"
 #+END_SRC
 
 * Khal
diff --git a/dotfiles/mail.org b/dotfiles/mail.org
index 835075f..eca9941 100644
--- a/dotfiles/mail.org
+++ b/dotfiles/mail.org
@@ -337,8 +337,6 @@ https://marlam.de/msmtp/
 
 * TODO Mail Indexer - Mu
 http://www.djcbsoftware.nl/code/mu/
-
-** Cheatsheet
 http://www.djcbsoftware.nl/code/mu/cheatsheet.html
 
 * Mail Client - NeoMutt
diff --git a/dotfiles/music.org b/dotfiles/music.org
index 181889e..ea0e01a 100644
--- a/dotfiles/music.org
+++ b/dotfiles/music.org
@@ -132,7 +132,7 @@ http://beets.io/
   username = dehaeze.thomas@gmail.com
   password = <<get-password(passname="spotify.com/dehaeze.thomas@gmail.com")>>
   client_id = 3b740ab1-f26f-4c38-aee0-4dcb9e58b375
-  client_secret = ***REMOVED***
+  client_secret = <<get-password(passname="spotify/client_secret")>>
   bitrate = 320
 
   [mpd]