diff --git a/dotfiles/i3.org b/dotfiles/i3.org
index 6081022..3411755 100644
--- a/dotfiles/i3.org
+++ b/dotfiles/i3.org
@@ -4,47 +4,47 @@
 #+PROPERTY: header-args:conf+ :tangle ~/.config/i3/config
 
 * Mod Key
+Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+BEGIN_SRC conf
-# Set mod key (Mod1=<Alt>, Mod4=<Super>)
-set $mod Mod4
+  set $mod Mod4
 #+end_src
 
 * Border Style
 #+begin_src conf
-# Configure border style <normal|1pixel|pixel xx|none|pixel>
-new_window pixel 2
-new_float normal
-# Hide borders
-hide_edge_borders none
+  # Configure border style <normal|1pixel|pixel xx|none|pixel>
+  new_window pixel 2
+  new_float normal
+  # Hide borders
+  hide_edge_borders none
 #+end_src
 
 * Font for window titles
 #+begin_src conf
-font SauceCodePro Nerd Font 11
+  font SauceCodePro Nerd Font 11
 #+end_src
 
-* TODO Multimedia keys
+* TODO [#C] Multimedia keys
 #+begin_src conf
-# Sound
-bindsym XF86AudioMute exec --no-startup-id amixer -D pulse sset Master toggle
-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%-
+  # Sound
+  bindsym XF86AudioMute exec --no-startup-id amixer -D pulse sset Master toggle
+  bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+
+  bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%-
 
-# Backlight
-bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10
-bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10
+  # Backlight
+  bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10
+  bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10
 
-# Tracks
-bindsym XF86AudioPlay exec --no-startup-id mpc toggle
-bindsym XF86AudioNext exec --no-startup-id mpc next
-bindsym XF86AudioPrev exec --no-startup-id mpc prev
+  # Tracks
+  bindsym XF86AudioPlay exec --no-startup-id mpc toggle
+  bindsym XF86AudioNext exec --no-startup-id mpc next
+  bindsym XF86AudioPrev exec --no-startup-id mpc prev
 
-# Screenshots
-bindsym $mod+XF86LaunchA --release exec --no-startup-id i3-scrot -w
-bindsym $mod+Shift+XF86LaunchA --release exec --no-startup-id i3-scrot -s
+  # Screenshots
+  bindsym $mod+XF86LaunchA --release exec --no-startup-id i3-scrot -w
+  bindsym $mod+Shift+XF86LaunchA --release exec --no-startup-id i3-scrot -s
 
-# Other
-bindsym XF86LaunchB fullscreen toggle
+  # Other
+  bindsym XF86LaunchB fullscreen toggle
 #+end_src
 
 * Start Applications
@@ -53,10 +53,6 @@ bindsym XF86LaunchB fullscreen toggle
   bindsym $mod+d exec --no-startup-id rofi -show run
   # Windows Switch
   bindsym $mod+w exec --no-startup-id rofi -show window
-  # CheatSheets
-  # bindsym $mod+Shift+c exec --no-startup-id rofi -show CheatSheets -modi CheatSheets:~/scripts/rofi_cheatsheets.sh
-  # Program Launcher with Icons
-  # bindsym $mod+Shift+d exec --no-startup-id rofi -show drun -show-icons
   # Launch categorized menu
   bindsym $mod+z       exec --no-startup-id rofimenu
   # Bookmarks
@@ -489,7 +485,7 @@ To display names or symbols instead of plain workspace numbers you can use somet
   exec --no-startup-id redshift
 
   # Start mopidy
-  # exec --no-startup-id mopidy
+  exec --no-startup-id mopidy
 
   # PulseAudio Server
   # exec --no-startup-id pulseaudio --daemon
@@ -642,9 +638,9 @@ Colors are gathered based on the documentation https://i3wm.org/docs/userguide.h
 * Keyboard Configuration
 #+begin_src conf
   # Set repetition keyboard rate
-  exec --no-startup-id xset r rate 200 40
+  # exec --no-startup-id xset r rate 200 40
   # Set International US keyboard layout
-  exec --no-startup-id setxkbmap -layout us -variant intl -option caps:escape
+  # exec --no-startup-id setxkbmap -layout us -variant intl -option caps:escape
   # Default numpad on
   # exec --no-startup-id numlockx &
 #+END_SRC