diff --git a/keyswap_service.sh b/keyswap_service.sh
index 3b9841b..aea1719 100755
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -4,8 +4,6 @@ systemctl --user stop keyswap >/dev/null 2>&1
 systemctl --user disable keyswap >/dev/null 2>&1
 systemctl --user stop keyswap.timer >/dev/null 2>&1
 systemctl --user disable keyswap.timer >/dev/null 2>&1
-swapcmd="\/bin\/bash -c \"\/home\/`whoami`\/.config\/kinto\/xactive.sh carrots\""
-swapstopcmd="\/bin\/bash \/home\/`whoami`\/.config\/kinto\/cleanup.sh"
 mkdir -p ~/.config/systemd/user
 mkdir -p ~/.config/autostart
 cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
@@ -16,6 +14,11 @@ cp ./system-config/caret_status.sh ~/.config/kinto/caret_status.sh
 cp ./system-config/cleanup.sh ~/.config/kinto/cleanup.sh
 cp ./system-config/.firefox-nw ~/.config/kinto/.firefox-nw
 sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
+sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/systemd/user/keyswap.service
+if [ "${#DISPLAY}" -gt 2 ]
+	then
+	sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service
+fi
 systemctl --user daemon-reload
 systemctl --user enable keyswap
 systemctl --user start keyswap
diff --git a/system-config/keyswap.service b/system-config/keyswap.service
index e0da960..cfc5896 100755
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -5,7 +5,8 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 Restart=always
-#Environment=DISPLAY=:0.0
+# eg DISPLAY=:0.0
+#Environment=DISPLAY={displayid}
 RestartSec=1
 WorkingDirectory=/home/{username}/.config/kinto
 ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"