diff --git a/home/.config/systemd/user/ydotoold.service b/home/.config/systemd/user/ydotoold.service
index 9e0cda7..2832af6 100644
--- a/home/.config/systemd/user/ydotoold.service
+++ b/home/.config/systemd/user/ydotoold.service
@@ -1,10 +1,9 @@
 [Unit]
 Description=Generic command-line automation tool
-PartOf=graphical-session.target
 
 [Service]
-Type=simple
 ExecStart=/usr/bin/ydotoold
+Restart=on-failure
 
 [Install]
-WantedBy=sway-session.target
+WantedBy=default.target
diff --git a/home/.zprofile b/home/.zprofile
index c7215bd..7131b02 100644
--- a/home/.zprofile
+++ b/home/.zprofile
@@ -1 +1 @@
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && source ~/.config/sway/env && sway > /dev/null 2>&1