diff --git a/user/chromium.service b/user/chromium.service
index 0112108..52f716b 100644
--- a/user/chromium.service
+++ b/user/chromium.service
@@ -2,8 +2,7 @@
 Description=Chromium
 
 [Service]
-Environment=DISPLAY=:0
 ExecStart=/usr/bin/chromium
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/claws-mail.service b/user/claws-mail.service
new file mode 100644
index 0000000..7657789
--- /dev/null
+++ b/user/claws-mail.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Claws Mail
+
+[Service]
+ExecStart=/usr/bin/claws-mail
+
+[Install]
+WantedBy=wm.target
diff --git a/user/copyq.service b/user/copyq.service
index 7241687..d3bd8f2 100644
--- a/user/copyq.service
+++ b/user/copyq.service
@@ -2,8 +2,7 @@
 Description=Evolution
 
 [Service]
-Environment=DISPLAY=:0
 ExecStart=/usr/bin/copyq
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/default.target.wants/btsync.service b/user/default.target.wants/btsync.service
new file mode 120000
index 0000000..1fafa7a
--- /dev/null
+++ b/user/default.target.wants/btsync.service
@@ -0,0 +1 @@
+/usr/lib/systemd/user/btsync.service
\ No newline at end of file
diff --git a/user/default.target.wants/gpg-agent.service b/user/default.target.wants/gpg-agent.service
new file mode 120000
index 0000000..67d7182
--- /dev/null
+++ b/user/default.target.wants/gpg-agent.service
@@ -0,0 +1 @@
+/home/joerg/.config/systemd/user/gpg-agent.service
\ No newline at end of file
diff --git a/user/dropbox.service b/user/dropbox.service
deleted file mode 100644
index ee94ba3..0000000
--- a/user/dropbox.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Dropbox
-
-[Service]
-Environment=DISPLAY=:0
-ExecStart=/usr/bin/dropboxd
-
-[Install]
-WantedBy=mystuff.target
diff --git a/user/dunst.service b/user/dunst.service
index 6e0b620..ff072d8 100644
--- a/user/dunst.service
+++ b/user/dunst.service
@@ -1,10 +1,8 @@
 [Unit]
 Description=small notification daemon
-After=dbus.socket
 
 [Service]
-Environment=DISPLAY=:0
 ExecStart=/usr/bin/dunst
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/evolution.service b/user/evolution.service
deleted file mode 100644
index 3a042cd..0000000
--- a/user/evolution.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Evolution
-
-[Service]
-Environment=DISPLAY=:0
-ExecStart=/usr/bin/evolution
-
-[Install]
-WantedBy=mystuff.target
diff --git a/user/gajim.service b/user/gajim.service
index 79c90d3..81c6494 100644
--- a/user/gajim.service
+++ b/user/gajim.service
@@ -2,8 +2,7 @@
 Description=Gajim
 
 [Service]
-Environment=DISPLAY=:0
 ExecStart=/usr/bin/gajim
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/gpg-agent.service b/user/gpg-agent.service
new file mode 100644
index 0000000..02ebb2d
--- /dev/null
+++ b/user/gpg-agent.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=gpg-agent daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/gpg-agent --daemon
+Restart=always
+
+[Install]
+WantedBy=default.target
diff --git a/user/i3.service b/user/i3.service
deleted file mode 100644
index 9621664..0000000
--- a/user/i3.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=An improved dynamic tiling window manager
-After=xorg.target
-
-[Service]
-Environment=DISPLAY=:0
-ExecStart=/usr/bin/i3
-Restart=on-failure
-
-[Install]
-WantedBy=wm.target
diff --git a/user/mpd.service b/user/mpd.service
deleted file mode 100644
index b89bc65..0000000
--- a/user/mpd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Music Player Daemon
-
-[Service]
-ExecStart=/usr/bin/mpd --no-daemon
diff --git a/user/mystuff.target b/user/mystuff.target
deleted file mode 100644
index a3cdf2e..0000000
--- a/user/mystuff.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Xinitrc Stuff
-#After=xorg.target
-
-[Install]
-Alias=default.target
diff --git a/user/mystuff.target.wants/dropbox.service b/user/mystuff.target.wants/dropbox.service
deleted file mode 120000
index ce42784..0000000
--- a/user/mystuff.target.wants/dropbox.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/joerg/.config/systemd/user/dropbox.service
\ No newline at end of file
diff --git a/user/mystuff.target.wants/evolution.service b/user/mystuff.target.wants/evolution.service
deleted file mode 120000
index 4e2ea2f..0000000
--- a/user/mystuff.target.wants/evolution.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/joerg/.config/systemd/user/evolution.service
\ No newline at end of file
diff --git a/user/mystuff.target.wants/pulseaudio.service b/user/mystuff.target.wants/pulseaudio.service
deleted file mode 120000
index deaea97..0000000
--- a/user/mystuff.target.wants/pulseaudio.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/joerg/.config/systemd/user/pulseaudio.service
\ No newline at end of file
diff --git a/user/pulseaudio.service b/user/pulseaudio.service
deleted file mode 100644
index 0b99e85..0000000
--- a/user/pulseaudio.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=PulseAudio Sound System
-
-[Service]
-BusName=org.pulseaudio.Server
-ExecStart=/usr/bin/pulseaudio
-Restart=on-failure
-
-[Install]
-WantedBy=mystuff.target
diff --git a/user/setxkbmap.service b/user/setxkbmap.service
index 6e5a201..4d9da3c 100644
--- a/user/setxkbmap.service
+++ b/user/setxkbmap.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Enable zapping
-After=xorg.target
 
 [Service]
 Type=oneshot
@@ -8,4 +7,4 @@ RemainAfterExit=yes
 ExecStart=setxkbmap -option terminate:ctrl_alt_bksp
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/sockets.target.wants/pulseaudio.socket b/user/sockets.target.wants/pulseaudio.socket
new file mode 120000
index 0000000..b166523
--- /dev/null
+++ b/user/sockets.target.wants/pulseaudio.socket
@@ -0,0 +1 @@
+/usr/lib/systemd/user/pulseaudio.socket
\ No newline at end of file
diff --git a/user/wm.target b/user/wm.target
index cbdc176..9ec8255 100644
--- a/user/wm.target
+++ b/user/wm.target
@@ -1,9 +1,3 @@
 [Unit]
 Description=Window Manager
-Wants=xorg.target
-Wants=mystuff.target
-Requires=dbus.socket
 AllowIsolate=true
-
-[Install]
-Alias=default.target
diff --git a/user/mystuff.target.wants/chromium.service b/user/wm.target.wants/chromium.service
similarity index 100%
rename from user/mystuff.target.wants/chromium.service
rename to user/wm.target.wants/chromium.service
diff --git a/user/wm.target.wants/claws-mail.service b/user/wm.target.wants/claws-mail.service
new file mode 120000
index 0000000..1c300d5
--- /dev/null
+++ b/user/wm.target.wants/claws-mail.service
@@ -0,0 +1 @@
+/home/joerg/.config/systemd/user/claws-mail.service
\ No newline at end of file
diff --git a/user/mystuff.target.wants/copyq.service b/user/wm.target.wants/copyq.service
similarity index 100%
rename from user/mystuff.target.wants/copyq.service
rename to user/wm.target.wants/copyq.service
diff --git a/user/mystuff.target.wants/dunst.service b/user/wm.target.wants/dunst.service
similarity index 100%
rename from user/mystuff.target.wants/dunst.service
rename to user/wm.target.wants/dunst.service
diff --git a/user/mystuff.target.wants/gajim.service b/user/wm.target.wants/gajim.service
similarity index 100%
rename from user/mystuff.target.wants/gajim.service
rename to user/wm.target.wants/gajim.service
diff --git a/user/mystuff.target.wants/setxkbmap.service b/user/wm.target.wants/setxkbmap.service
similarity index 100%
rename from user/mystuff.target.wants/setxkbmap.service
rename to user/wm.target.wants/setxkbmap.service
diff --git a/user/wm.target.wants/xmodmap.service b/user/wm.target.wants/xmodmap.service
new file mode 120000
index 0000000..ce4d09b
--- /dev/null
+++ b/user/wm.target.wants/xmodmap.service
@@ -0,0 +1 @@
+/home/joerg/.config/systemd/user/xmodmap.service
\ No newline at end of file
diff --git a/user/mystuff.target.wants/xrdb.service b/user/wm.target.wants/xrdb.service
similarity index 100%
rename from user/mystuff.target.wants/xrdb.service
rename to user/wm.target.wants/xrdb.service
diff --git a/user/mystuff.target.wants/xset.service b/user/wm.target.wants/xset.service
similarity index 100%
rename from user/mystuff.target.wants/xset.service
rename to user/wm.target.wants/xset.service
diff --git a/user/xmodmap.service b/user/xmodmap.service
index 36c7fe9..5dce980 100644
--- a/user/xmodmap.service
+++ b/user/xmodmap.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Capslock is escape
-After=xorg.target
 
 [Service]
 Type=oneshot
@@ -8,4 +7,4 @@ RemainAfterExit=yes
 ExecStart=xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/xorg.target b/user/xorg.target
deleted file mode 100644
index d4dede5..0000000
--- a/user/xorg.target
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# X server target
-#
-
-# xorg.target is a virtual target - it becomes active as soon as Xorg
-# is ready to accept incoming connections. If your service requires
-# Xorg to be ready, include 'After=xorg.target' in your service file.
-
-[Unit]
-Description=The basic Xorg server
diff --git a/user/xorg.target.wants/xorg@0.socket b/user/xorg.target.wants/xorg@0.socket
deleted file mode 120000
index 87b1062..0000000
--- a/user/xorg.target.wants/xorg@0.socket
+++ /dev/null
@@ -1 +0,0 @@
-xorg@.socket
\ No newline at end of file
diff --git a/user/xorg@.service b/user/xorg@.service
deleted file mode 100644
index 343db2a..0000000
--- a/user/xorg@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Xorg server at display %i
-
-Requires=xorg@%i.socket
-After=xorg@%i.socket
-
-[Service]
-Type=simple
-SuccessExitStatus=0 1
-
-ExecStart=/usr/bin/Xorg :%i -nolisten tcp -noreset -verbose 2 vt1
diff --git a/user/xorg@.socket b/user/xorg@.socket
deleted file mode 100644
index c667cce..0000000
--- a/user/xorg@.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Socket for xorg at display %i
-
-[Socket]
-ListenStream=/tmp/.X11-unix/X%i
-
-[Install]
-WantedBy=xorg.target
diff --git a/user/xrdb.service b/user/xrdb.service
index d1d388a..36bb073 100644
--- a/user/xrdb.service
+++ b/user/xrdb.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Capslock is escape
-After=xorg.target
 
 [Service]
 Type=oneshot
@@ -8,4 +7,4 @@ RemainAfterExit=yes
 ExecStart=/usr/bin/xrdb -merge %h/.Xresources
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target
diff --git a/user/xset.service b/user/xset.service
index a8aabf9..8bc6ec5 100644
--- a/user/xset.service
+++ b/user/xset.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Xorg Blanking
-After=xorg.target
 
 [Service]
 Type=oneshot
@@ -8,4 +7,4 @@ RemainAfterExit=yes
 ExecStart=/usr/bin/xset -b +dpms 0 0 300
 
 [Install]
-WantedBy=mystuff.target
+WantedBy=wm.target