diff --git a/dotfiles/i3.org b/dotfiles/i3.org
index 7bd5750..3d17fe7 100644
--- a/dotfiles/i3.org
+++ b/dotfiles/i3.org
@@ -51,6 +51,10 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+end_src
 
 * Multimedia keys
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 ** Sound
 #+begin_src conf
   # Sound
@@ -91,11 +95,17 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+end_src
 
 * Start Applications
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 #+begin_src conf
   # Start program launcher
   bindsym $mod+d exec --no-startup-id rofi -show run
   # Start Sound Manager
   bindsym $mod+s exec --no-startup-id pavucontrol
+  # Start Bluetooth Manager
+  bindsym $mod+shift+b exec --no-startup-id blueman-manager
   # Windows Switch
   bindsym $mod+w exec --no-startup-id rofi -show window
   # Launch categorized menu
@@ -117,11 +127,19 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+end_src
 
 * Set shut down, restart and locking features
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 #+begin_src conf
   bindsym $mod+0 exec --no-startup-id $HOME/scripts/quit.sh
 #+end_src
 
 * Command Mode
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 #+begin_src conf
   bindsym $mod+space mode "command"
 
@@ -190,7 +208,7 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
   exec --no-startup-id xrandr --output eDP1 --mode 1920x1080 --dpi 192
 
   # Redshift
-  exec --no-startup-id redshift
+  exec --no-startup-id redshift-gtk
 
   # Start mopidy
   exec --no-startup-id mopidy
@@ -201,19 +219,33 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
   # Start polybar
   exec_always --no-startup-id $HOME/.config/polybar/scripts/launch.sh
 
-  # Megasync
-  exec --no-startup-id i3-msg 'exec megasync'
+  # Synology Cloud Station Drive
+  exec --no-startup-id synology-drive
+
+  # KDEconnect
+  exec --no-startup-id udiskie /usr/lib/kdeconnectd
 
   # Udiskie to automount usb keys
   exec --no-startup-id udiskie --automount --notify --tray --use-udisks2
+
+  # Start sxhkd
+  exec --no-startup-id sxhkd -m 1 &
 #+end_src
 
 * Kill one application
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 #+begin_src conf
   bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
 #+end_src
 
 * Change Keyboard Layout
+:PROPERTIES:
+:header-args:conf+: :tangle no
+:END:
+
 #+begin_src conf
   bindsym $mod+Ctrl+d exec --no-startup-id setxkbmap -layout us -variant intl -option caps:escape
   bindsym $mod+Shift+d exec --no-startup-id setxkbmap -layout us -option caps:escape
@@ -253,9 +285,8 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 
 ** TODO [#A] Split orientation - Use just one key bindings that alternates?
 #+begin_src conf
-  bindsym $mod+semicolon split h
+  bindsym $mod+q split h
   bindsym $mod+v split v
-  bindsym $mod+q split toggle
 #+end_src
 
 ** Kill focused window
@@ -276,7 +307,14 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 ** TODO [#A] Change container layout (stacked, tabbed, toggle split)
 #+begin_src conf
   # bindsym $mod+s layout stacking
+  # bindsym $mod+l layout toggle split
   # bindsym $mod+w layout tabbed
+
+  # Toggle between stacking/tabbed/split:
+  bindsym $mod+x layout toggle tabbed split
+
+  # bindsym $mod+Shift+s layout stacking
+  # bindsym $mod+t layout tabbed
   # bindsym $mod+e layout toggle split
 #+end_src
 
@@ -291,8 +329,10 @@ Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+end_src
 
 ** TODO Toggle sticky
+If you want a window to stick to the glass, i.e., have it stay on screen even if you switch to another workspace, you can use the sticky command.
+
 #+begin_src conf
-  bindsym $mod+Shift+s sticky toggle
+  # bindsym $mod+Shift+s sticky toggle
 #+end_src
 
 ** Resize Floating Window
@@ -409,7 +449,7 @@ To display names or symbols instead of plain workspace numbers you can use somet
 #+begin_src conf
   workspace_auto_back_and_forth yes
   bindsym $mod+b workspace back_and_forth
-  bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
+  # bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
 #+end_src
 
 ** Move to prev/next workspace