diff --git a/sxhkd.org b/sxhkd.org
index 81eaa8c..40019b8 100644
--- a/sxhkd.org
+++ b/sxhkd.org
@@ -134,7 +134,7 @@ super + Return
 
 # File Manager
 super + o
-  $TERMINAL -e "tmux new-session -A -s ranger ranger"
+  $TERMINAL -e tmux new-session -A -s ranger ranger
 
 # Browser
 super + i
@@ -142,7 +142,7 @@ super + i
 
 # Mails with neomutt
 super + m
-  $TERMINAL -e "tmux new-session -A -s neomutt neomutt"
+  $TERMINAL -e tmux new-session -A -s neomutt neomutt
 
 # Emacs Client
 super + e
@@ -153,7 +153,7 @@ super + e
 #+begin_src conf
 # Network Manager
 super + shift + w
-  $TERMINAL -e 'sudo nmtui'
+  $TERMINAL --title nmtui -e sudo nmtui
 
 # Bluetooth Manager
 super + shift + b
@@ -166,9 +166,7 @@ super + shift + c
 # Sound Manager
 super + shift + s
   pavucontrol
-#+end_src
 
-#+begin_src conf
 # Bookmarks
 super + shift + f
   bukurun
@@ -179,15 +177,10 @@ super + shift + p
 #+end_src
 
 * =Super + Space= - Command Mode
-
 #+begin_src conf
 # Command line Calendar Client (khal)
 super + space ; c
-  $TERMINAL -e "khal interactive"
-
-# GUI Calendar (Google Calendar)
-super + space ; shift + c
-  $BROWSER https://calendar.google.com/
+  $TERMINAL --title khal -e ikhal
 
 # pcmanfm: GUI file manager
 super + space ; o
@@ -195,27 +188,19 @@ super + space ; o
 
 # Download with Aria2c
 super + space ; d
-  $TERMINAL -e "tmux new-session -A -s aria2p aria2p --port 6800 --host http://dl.tdehaeze.xyz --secret $(pass dl.tdehaeze.xyz/tdehaeze | sed -n 1p)"
+  $TERMINAL -e tmux new-session -A -s aria2p aria2p --port 6800 --host http://dl.tdehaeze.xyz --secret $(pass dl.tdehaeze.xyz/tdehaeze | sed -n 1p)
 
 # Run another instance of Neomutt in read-only mode
 super + space ; m
-  $TERMINAL -e "neomutt -R"
-
-# Weechat
-super + space ; w
-  $TERMINAL -e "tmux new-session -A -s weechat weechat"
+  $TERMINAL -e neomutt -R
 
 # News with newsboat
 super + space ; n
-  $TERMINAL -e "tmux new-session -A -s newsboat newsboat"
+  $TERMINAL -e tmux new-session -A -s newsboat newsboat
 
 # Music with ncmpcpp
 super + space ; p
-  $TERMINAL -e "tmux new-session -A -s ncmpcpp ncmpcpp"
-
-# Print Screen
-super + space ; shift + p
-  $HOME/.local/bin/mopidy-restart
+  $TERMINAL -e tmux new-session -A -s ncmpcpp ncmpcpp
 
 # Default Browser
 super + space ; i
@@ -223,7 +208,7 @@ super + space ; i
 
 # Start Torrent Managaer
 super + space ; t
-  $TERMINAL -e "tremc"
+  $TERMINAL -e tremc
 
 # Emacs
 super + space ; e