diff --git a/dotfiles/systemd.org b/dotfiles/systemd.org
index aca1032..ed72507 100644
--- a/dotfiles/systemd.org
+++ b/dotfiles/systemd.org
@@ -346,10 +346,10 @@
 
 * Neomutt
 ** Service
-   :PROPERTIES:
-   :header-args: :tangle ~/.config/systemd/user/neomutt.service
-   :header-args+: :comments both :mkdirp yes
-   :END:
+:PROPERTIES:
+:header-args: :tangle ~/.config/systemd/user/neomutt.service
+:header-args+: :comments both :mkdirp yes
+:END:
 #+begin_src conf
   [Unit]
   Description=Neomutt - mail client
diff --git a/readme.org b/readme.org
index a2cb003..6ce644e 100644
--- a/readme.org
+++ b/readme.org
@@ -745,41 +745,21 @@ https://github.com/tinyMediaManager/tinyMediaManager
 *** subdl
 ** TODO Youtube
 https://github.com/mps-youtube/mps-youtube
-* TODO [#A] Contact Manager
-https://wiki.archlinux.org/index.php/mutt#Contact_management
-https://gitlab.com/goobook/goobook
-https://github.com/hensmith/ppl
+* TODO Contact Manager
+** Khard
 https://github.com/scheibler/khard
-http://abook.sourceforge.net/
 
-** GooBook - Contacts from Google
+This is the command line interface for contact management.
 
-*** Installation
-#+BEGIN_SRC bash
-yay -S goobook-git
-#+END_SRC
-And Then
-#+BEGIN_SRC bash
-goobook authenticate
-#+END_SRC
+** Contact synchronization
+Vdirsyncer is used for contact synchronization with Google.
 
-*** Usage
-#+BEGIN_SRC bash
-goobook query name
-#+END_SRC
-
-** TODO lbdb
-*** Installation
-#+BEGIN_SRC bash
-yay -S lbdb
-#+END_SRC
-
-** TODO Use Vdirsyncer for contact synchronization
-** TODO Mu
-This looks for contacts in your emails.
+** Mu
+This looks for contacts in all indexed emails.
 =mu cfind <name>=
 
-** TODO Integration with Mutt
+* Connect with Phone
+kdeconnect
 
 * TODO Chat Application
 ** Weechat
@@ -915,6 +895,7 @@ If you don't want to store your API token in plaintext you can use the secure fe
 
 *** Aspell
 https://blog.qoba.lt/using_aspell_in_weechat.html
+
 *** Notifications
 https://github.com/s3rvac/weechat-notify-send
 
@@ -1150,6 +1131,7 @@ yay -S sxiv
 | =\vert=, =_= | Flip the image           |
 | =n=, =p=     | Next, Previous image     |
 
+* TODO HotKeyManager - SXHKD
 * TODO [#B] Windows Manager - i3
 ** TODO Installation
 #+BEGIN_SRC bash
@@ -1237,11 +1219,6 @@ yay -S dunst
 
 ** TODO [#C] How to merge similar notifications like new mails?
 * Office Suite
-** LibreOffice
-#+begin_src bash
-  yay -S libreoffice-fresh
-#+end_src
-
 ** WPS Office
 #+begin_src bash
   yay -S wps-office wps-office-extension-french-dictionary ttf-wps-fonts
@@ -1631,13 +1608,6 @@ https://github.com/pimutils/khal
 |---------+-------|
 
 * TODO Presentation software
-** Beamer
-** Org Mode
-https://orgmode.org/worg/exporters/beamer/tutorial.html
-
-** WPS
-** Presentation setup on computer
-** PowerPoint Viewer
 ** Multi-monitor pdf presentation - pdfpc
 https://github.com/pdfpc/pdfpc
 
@@ -1645,22 +1615,27 @@ pdfpc is a great tool for showing pdf presentations. It support:
 - screen splitting
 - support for videos in pdf presentations
 - support for notes
+- support for annotations
 
 *** Installation
 #+BEGIN_SRC bash
-yay -S pdfpc
+  yay -S pdfpc
 #+END_SRC
 
 *** Video support
 #+BEGIN_SRC bash
-yay -S gst-plugins-ugly gst-plugins-good gst-plugins-base-libs gst-plugins-base gst-plugins-bad gst-libav
+  yay -S gst-plugins-ugly gst-plugins-good gst-plugins-base-libs gst-plugins-base gst-plugins-bad gst-libav
 #+END_SRC
 
 *** Usage
 #+BEGIN_SRC bash
-pdfpc filename.pdf
+  pdfpc filename.pdf
 #+END_SRC
 
+** Beamer
+** Org Mode
+https://orgmode.org/worg/exporters/beamer/tutorial.html
+
 * TODO RSS Reader
 GUI:
 - http://www.rssowl.org/