diff --git a/moonarch-git/PKGBUILD b/moonarch-git/PKGBUILD
index 7d28106..304ae64 100644
--- a/moonarch-git/PKGBUILD
+++ b/moonarch-git/PKGBUILD
@@ -16,14 +16,9 @@ depends=(
     # Compositor & session
     'niri'
     'greetd'
-    'moongreet-git'
-    'moonlock-git'
-    'moonset-git'
 
-    # Bar, launcher, notifications
+    # Bar & notifications
     'waybar'
-    'walker-bin'
-    'elephant-bin'
     'swaync'
 
     # Terminal
@@ -33,10 +28,8 @@ depends=(
     'cliphist'
     'wl-clipboard'
 
-    # Display & wallpaper
+    # Display
     'kanshi'
-    'awww'
-    'waypaper'
 
     # Audio
     'pipewire'
@@ -45,12 +38,7 @@ depends=(
     'alsa-utils'
     'pavucontrol'
 
-    # Idle & lock
-    'stasis'
-
     # Theming
-    'colloid-catppuccin-gtk-theme-git'
-    'sweet-cursors-git'
     'ttf-ubuntusans-nerd'
 
     # System utilities referenced by helper scripts
@@ -70,6 +58,21 @@ depends=(
 )
 
 optdepends=(
+    # Moonarch ecosystem (install via paru from AUR/local builds)
+    'moongreet-git: greetd greeter'
+    'moonlock-git: Wayland lockscreen'
+    'moonset-git: session power menu'
+
+    # AUR packages (install via paru)
+    'walker-bin: application launcher'
+    'elephant-bin: walker search daemon'
+    'awww: wallpaper daemon (swww alternative)'
+    'waypaper: wallpaper GUI'
+    'stasis: idle manager'
+    'colloid-catppuccin-gtk-theme-git: Catppuccin GTK theme'
+    'sweet-cursors-git: cursor theme'
+
+    # General tools
     'docker: container runtime'
     'docker-compose: multi-container orchestration'
     'neovim: editor (EDITOR in zshrc)'
@@ -117,6 +120,8 @@ package() {
         [[ "$_rel" == "walker/config.toml" ]] && continue
         [[ "$_rel" == "foot/foot.ini" ]] && continue
         [[ "$_rel" == "waybar/style.css" ]] && continue
+        [[ "$_rel" == "swaync/config.json" ]] && continue
+        [[ "$_rel" == "swaync/style.css" ]] && continue
         if [[ "$file" == *.sh ]]; then
             install -Dm755 "$file" "$pkgdir/etc/xdg/$_rel"
         else
@@ -162,6 +167,10 @@ package() {
         "$pkgdir/usr/share/moonarch/foot/foot.ini"
     install -Dm644 defaults/xdg/waybar/style.css \
         "$pkgdir/usr/share/moonarch/waybar/style.css"
+    install -Dm644 defaults/xdg/swaync/config.json \
+        "$pkgdir/usr/share/moonarch/swaync/config.json"
+    install -Dm644 defaults/xdg/swaync/style.css \
+        "$pkgdir/usr/share/moonarch/swaync/style.css"
 
     # --- Reference configs for greetd/moongreet (deployed by .install, not owned) ---
     install -Dm644 defaults/etc/greetd/config.toml \
diff --git a/moonarch-git/moonarch.install b/moonarch-git/moonarch.install
index 7696888..4707999 100644
--- a/moonarch-git/moonarch.install
+++ b/moonarch-git/moonarch.install
@@ -25,6 +25,10 @@ post_install() {
     # Deploy waybar style (file owned by waybar package, overwrite deliberately)
     cp /usr/share/moonarch/waybar/style.css /etc/xdg/waybar/style.css
 
+    # Deploy swaync config (files owned by swaync package, overwrite deliberately)
+    cp /usr/share/moonarch/swaync/config.json /etc/xdg/swaync/config.json
+    cp /usr/share/moonarch/swaync/style.css /etc/xdg/swaync/style.css
+
     # Deploy Walker config override to skel and existing user homes.
     # Only copies if user has no config yet — never overwrites manual edits.
     install -Dm644 /usr/share/moonarch/walker-config.toml \