diff --git a/xkeysnail-config/xkeysnail.service b/xkeysnail-config/xkeysnail.service
index 7ec1d79..dc9226f 100644
--- a/xkeysnail-config/xkeysnail.service
+++ b/xkeysnail-config/xkeysnail.service
@@ -5,7 +5,7 @@ Description=xkeysnail
 Type=simple
 KillMode=process
 ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && {homedir}/.config/kinto/killdups.sh && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py'
-ExecStop=/usr/bin/sudo pkill -f xkeysnail
+ExecStop=/usr/bin/sudo pkill -f xkeysnail && exit 0
 Restart=on-failure
 RestartSec=3
 Environment=DISPLAY={displayid}
diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index 992f023..a1838e4 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -364,7 +364,6 @@ elif [[ $1 == "3" || $1 == "chromebook" ]]; then
 	perl -pi -e "s/(# )(.*)(# Chromebook)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s/(\w.*)(# Default)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
-fi
 elif [[ $1 == "4" || $1 == "ibm" ]]; then
 	perl -pi -e "s/(# )(.*)(# IBM)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s=(# )(.*)(# Chromebook/IBM)=\$2\$3=g" ./xkeysnail-config/kinto.py.new
@@ -414,6 +413,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	# 	sudo systemctl enable xkeysnail.service
 	# fi
 	sudo systemctl restart xkeysnail
+	sudo pkill -f kintotray >/dev/null 2>&1
 	nohup python3 ~/.config/kinto/kintotray.py& >/dev/null 2>&1
 
 	echo -e "Adding xhost fix...\n"