diff --git a/uninstall.sh b/uninstall.sh
index 266eb11..e1424ca 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 
-systemctl --user stop keyswap
+systemctl --user stop keyswap 2>/dev/null
 systemctl --user disable keyswap
+systemctl --user stop keyswap.timer 2>/dev/null
+systemctl --user disable keyswap.timer
+rm ~/.config/systemd/user/keyswap.service
+rm ~/.config/systemd/user/keyswap.timer
 rm -rf ~/.config/autostart/kinto.desktop
 rm -rf ~/.config/kinto
 rm -rf ~/.xkb
-
-sed -i '/xkb/d' ~/.Xsession
\ No newline at end of file
+systemctl daemon-reload
+sed -i '/xkb/d' ~/.Xsession 2>/dev/null
\ No newline at end of file