diff --git a/moonarch-git/PKGBUILD b/moonarch-git/PKGBUILD
index 3934793..cc67c5d 100644
--- a/moonarch-git/PKGBUILD
+++ b/moonarch-git/PKGBUILD
@@ -180,11 +180,21 @@ package() {
     install -Dm644 defaults/etc/moongreet/moongreet.toml \
         "$pkgdir/usr/share/moonarch/moongreet/moongreet.toml"
 
+    # --- Systemd user services -> /etc/systemd/user/ ---
+    install -Dm644 defaults/etc/systemd/user/*.service -t "$pkgdir/etc/systemd/user/"
+
+    # Enable services by creating the WantedBy symlinks directly
+    install -dm755 "$pkgdir/etc/systemd/user/graphical-session.target.wants"
+    for svc in defaults/etc/systemd/user/*.service; do
+        ln -sf "../$(basename "$svc")" \
+            "$pkgdir/etc/systemd/user/graphical-session.target.wants/$(basename "$svc")"
+    done
+
     # --- User config templates (for post-install.sh / transform.sh) ---
     while IFS= read -r -d '' file; do
         local _rel="${file#defaults/user/}"
         install -Dm644 "$file" "$pkgdir/usr/share/moonarch/user-defaults/$_rel"
-    done < <(find defaults/user -type f -print0)
+    done < <(find defaults/user -type f -print0 2>/dev/null || true)
 }
 
 backup=(
diff --git a/moonarch-git/moonarch.install b/moonarch-git/moonarch.install
index c565bdf..dec49ea 100644
--- a/moonarch-git/moonarch.install
+++ b/moonarch-git/moonarch.install
@@ -54,11 +54,15 @@ post_install() {
         fi
     fi
 
-    # Cleanup legacy user-level paru config (moved to /etc/paru.conf)
+    # Cleanup legacy user-level configs (moved to system-level)
     while IFS=: read -r _ _ uid _ _ home _; do
         if [ "$uid" -ge 1000 ] && [ "$uid" -lt 60000 ] && [ -d "$home" ]; then
             rm -f "$home/.config/paru/paru.conf" 2>/dev/null || true
             rmdir "$home/.config/paru" 2>/dev/null || true
+            for svc in cliphist kanshi nautilus walker; do
+                rm -f "$home/.config/systemd/user/${svc}.service" 2>/dev/null || true
+                rm -f "$home/.config/systemd/user/graphical-session.target.wants/${svc}.service" 2>/dev/null || true
+            done
         fi
     done < /etc/passwd