diff --git a/i3/config b/i3/config
index cf3df92..eff1409 100644
--- a/i3/config
+++ b/i3/config
@@ -111,7 +111,7 @@ bindsym XF86MyComputer exec $filemanager
 bindsym XF86Explorer   exec $filemanager
 
 # open mail client
-set $mailclient claws-mail
+set $mailclient thunderbird
 bindsym XF86Mail exec $mailclient
 
 # change display layout
@@ -150,17 +150,18 @@ mode $openmode {
 bindsym $mod+o mode $openmode
 
 
+set $mpc /usr/bin/mpc
 set $mpdmode "local mpd: [ ] play/pause, [k/j] prev/next, [h/l] rwnd/ffwd, [u/d] vol, [enter] open client"
 mode $mpdmode {
-	bindsym space     exec --no-startup-id mpc toggle
-	bindsym j         exec --no-startup-id mpc next
-	bindsym k         exec --no-startup-id mpc cdprev
-	bindsym h         exec --no-startup-id mpc seek -5
-	bindsym l         exec --no-startup-id mpc seek +5
-	bindsym Backspace exec --no-startup-id mpc seek 0%
+	bindsym space     exec --no-startup-id $mpc toggle
+	bindsym j         exec --no-startup-id $mpc next
+	bindsym k         exec --no-startup-id $mpc cdprev
+	bindsym h         exec --no-startup-id $mpc seek -5
+	bindsym l         exec --no-startup-id $mpc seek +5
+	bindsym Backspace exec --no-startup-id $mpc seek 0%
 	bindsym u         exec --no-startup-id pamixer -i $volumeStep
 	bindsym d         exec --no-startup-id pamixer -d $volumeStep
-	bindsym s         exec --no-startup-id mpc stop, mode "default"
+	bindsym s         exec --no-startup-id $mpc stop, mode "default"
 	bindsym Return    exec mpdclient, mode "default"
 	bindsym KP_Enter  exec mpdclient, mode "default"
 	bindsym o         exec mpdclient, mode "default"
@@ -172,7 +173,7 @@ mode $mpdmode {
 
 bindsym $mod+m mode $mpdmode
 
-bindsym $mod+space exec --no-startup-id mpc toggle
+bindsym $mod+space exec --no-startup-id $mpc toggle
 
 
 #############################