diff --git a/user/dwm.service b/user/dwm.service
index b92ab7d..b12bb6e 100644
--- a/user/dwm.service
+++ b/user/dwm.service
@@ -6,7 +6,6 @@ After=xorg@0.service
 
 [Service]
 ExecStart=/usr/local/bin/dwm
-ExecStartPost=/usr/bin/feh --randomize --bg-fill /home/caskd/Media/Pictures/wallpapers
 Restart=always
 RestartSec=1
 Type=exec
diff --git a/user/feh.service b/user/feh.service
index ba2946c..4f02edb 100644
--- a/user/feh.service
+++ b/user/feh.service
@@ -4,7 +4,7 @@ Requires=dwm.service
 After=dwm.service
 
 [Service]
-ExecStart=/usr/bin/feh --randomize --bg-fill /home/caskd/Media/Pictures/wallpapers
+ExecStart=/usr/bin/feh --randomize --bg-fill /home/caskd/Media/Pictures/Wallpapers/Active
 Type=oneshot
 
 [Install]
diff --git a/user/ffsnap.service b/user/ffsnap.service
index 745d9cb..446f072 100644
--- a/user/ffsnap.service
+++ b/user/ffsnap.service
@@ -3,7 +3,8 @@ Description=Keep recording segments to /tmp and encode them on ffmpeg kill like
 Requires=xorg@0.service
 
 [Service]
-ExecStart=/bin/zsh /home/caskd/Projects/ffsnap/script.sh
+ExecStart=/bin/ffmpeg -loglevel error -video_size 1920x1080 -framerate 30 -f x11grab -i :0 -c:v libx264rgb -crf 0 -preset ultrafast -movflags +faststart -tune zerolatency -f segment -segment_time 6 -segment_wrap 5 -segment_list /tmp/list.m3u8 -segment_list_size 5 "/tmp/seg%%d.ts"
+ExecStopPost=/bin/ffmpeg -loglevel error -y -i /tmp/list.m3u8 -c:v copy /tmp/snap.mp4
 Restart=always
 RestartSec=1
 Type=exec
diff --git a/user/xcompmgr.service b/user/xcompmgr.service
index d2cd763..d771879 100644
--- a/user/xcompmgr.service
+++ b/user/xcompmgr.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=X composite manager
-Requires=xorg@.service
-After=xorg@.service
+Requires=xorg@.service dwm.service
+After=dwm.service
 
 [Service]
 Type=exec
diff --git a/user/xorg@.service b/user/xorg@.service
index 8f7b5b3..37b93a4 100644
--- a/user/xorg@.service
+++ b/user/xorg@.service
@@ -6,5 +6,6 @@ After=xorg@%i.socket
 [Service]
 Type=exec
 SuccessExitStatus=0 1
+TTYPath=/dev/tty7
 
-ExecStart=/usr/bin/Xorg :%i -nolisten tcp -noreset -verbose 2 "vt1"
+ExecStart=/usr/bin/Xorg :%i -nolisten tcp -noreset -verbose "vt7"