diff --git a/wayland/.config/sway/config b/wayland/.config/sway/config
index 0a63380..89cdbc2 100644
--- a/wayland/.config/sway/config
+++ b/wayland/.config/sway/config
@@ -286,6 +286,9 @@ bar {
     swaybar_command waybar
 }
 
+## Services directory
+exec runsvdir-sway
+
 ## Application specific settings
 # PDF
 assign [app_id="okular"] $wsp
diff --git a/wayland/.local/bin/kill-sway b/wayland/.local/bin/kill-sway
index 533660b..0837a53 100755
--- a/wayland/.local/bin/kill-sway
+++ b/wayland/.local/bin/kill-sway
@@ -1,3 +1,6 @@
 #!/bin/sh
+# TODO: some way of checking if this is the right runsvdir instance to kill
 
-pkill -HUP -f "^runsvdir /home/ericonr/.local/share/wayland-services"
+echo "Quitting sway"
+pkill -HUP -f "^runsvdir $HOME/.local/share/wayland-services"
+swaymsg exit
diff --git a/wayland/.local/bin/runsvdir-sway b/wayland/.local/bin/runsvdir-sway
new file mode 100755
index 0000000..c74c066
--- /dev/null
+++ b/wayland/.local/bin/runsvdir-sway
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+pgrep -f "^runsvdir $HOME/.local/share/wayland-services" &&
+	exec echo "runsvdir has already been launched"
+
+exec runsvdir "$HOME/.local/share/wayland-services" \
+	'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/wayland/.local/bin/startsway b/wayland/.local/bin/startsway
index 39effb8..7ce9131 100755
--- a/wayland/.local/bin/startsway
+++ b/wayland/.local/bin/startsway
@@ -9,6 +9,7 @@ if test -z "${XDG_RUNTIME_DIR}"; then
 	fi
 fi
 
+export XDG_SESSION_TYPE=wayland
+
 # start the compositor itself
-exec dbus-run-session runsvdir "$HOME/.local/share/wayland-services" \
-	'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+WLR_DRM_DEVICES=/dev/dri/card0 exec dbus-run-session sway --my-next-gpu-wont-be-nvidia
diff --git a/wayland/.local/share/wayland-services/mako/run b/wayland/.local/share/wayland-services/mako/run
index 0a1c350..77edb22 100755
--- a/wayland/.local/share/wayland-services/mako/run
+++ b/wayland/.local/share/wayland-services/mako/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-swaysv check sway >/dev/null || exit 1
 exec mako 2>&1
diff --git a/wayland/.local/share/wayland-services/redshift/run b/wayland/.local/share/wayland-services/redshift/run
index 28270d5..688a9b7 100755
--- a/wayland/.local/share/wayland-services/redshift/run
+++ b/wayland/.local/share/wayland-services/redshift/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-swaysv check sway || exit 1
 exec redshift 2>&1
diff --git a/wayland/.local/share/wayland-services/sway/check b/wayland/.local/share/wayland-services/sway/check
deleted file mode 100755
index 6b5cbc8..0000000
--- a/wayland/.local/share/wayland-services/sway/check
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-SWAYSOCK=$(find $XDG_RUNTIME_DIR -type s -name "sway-ipc*") \
-	exec swaymsg -t send_tick
diff --git a/wayland/.local/share/wayland-services/sway/run b/wayland/.local/share/wayland-services/sway/run
deleted file mode 100755
index d743477..0000000
--- a/wayland/.local/share/wayland-services/sway/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-export XDG_SESSION_TYPE=wayland
-cd $HOME
-WLR_DRM_DEVICES=/dev/dri/card0 exec sway --my-next-gpu-wont-be-nvidia