diff --git a/.config/i3/config b/.config/i3/config
index a530650..b72e420 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -171,3 +171,4 @@ exec --no-startup-id "lxpolkit &" # start authentication agent (prompt)
 exec --no-startup-id "xcompmgr &" # startup composition manager (transparency)
 exec --no-startup-id "polybar" # status bar
 exec --no-startup-id "dex -a" # run autostart desktop apps
+exec --no-startup-id "emacs --daemon &" # startup emacs daemon
diff --git a/.xinitrc b/.xinitrc
index f1e075b..2adeb53 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -18,7 +18,6 @@ fi
 
 if [ -f "$usermodmap" ]; then
    xmodmap "$usermodmap"
-   xcape -e "Mode_switch=Escape"
 fi
 
 # start some nice programs
@@ -31,4 +30,4 @@ fi
 
 feh --bg-scale $HOME/Pictures/wallpaper.jpg &
 $HOME/.screenlayout/launch.sh &
-exec i3
+exec dbus-launch --exit-with-session i3