diff --git a/templates/.config/niri/config.kdl.j2 b/templates/.config/niri/config.kdl.j2
index ccaac02..0de3974 100644
--- a/templates/.config/niri/config.kdl.j2
+++ b/templates/.config/niri/config.kdl.j2
@@ -189,9 +189,7 @@ layout {
 spawn-at-startup "pipewire"
 spawn-at-startup "pipewire-pulse"
 spawn-at-startup "wireplumber"
-spawn-at-startup "waybar"
-spawn-at-startup "wpaperd"
-spawn-at-startup "swayidle"
+spawn-at-startup "qs" "-c" "noctalia-shell" "--no-duplicate"
 
 cursor {
     xcursor-theme "breeze_cursors"
@@ -290,10 +288,10 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T { spawn "alacritty"; }
-    Mod+D { spawn "wofi" "--show" "drun"; }
+    Mod+D { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
     Mod+Shift+D { spawn "wofi" "--show" "run"; }
     Mod+P { spawn "wofi-pass"; }
-    Super+Alt+L { spawn "swaylock"; }
+    Super+Alt+L { spawn-sh "qs -c noctalia-shell ipc call lockScreen lock"; }
 
     // You can also use a shell. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument in the end.
@@ -301,18 +299,18 @@ binds {
 
     // Example volume keys mappings for PipeWire & WirePlumber.
     // The allow-when-locked=true property makes them work even when the session is locked.
-    XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; }
-    XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
-    XF86AudioMute        allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
-    XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
-    XF86AudioMedia       allow-when-locked=true { spawn "playerctl" "play-pause"; }
-    XF86AudioPlay        allow-when-locked=true { spawn "playerctl" "play-pause"; }
-    XF86AudioPrev        allow-when-locked=true { spawn "playerctl" "previous"; }
-    XF86AudioNext        allow-when-locked=true { spawn "playerctl" "next"; }
+    XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call volume increase"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call volume decrease"; }
+    XF86AudioMute        allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call volume muteOutput"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call volume muteInput"; }
+    XF86AudioMedia       allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call media playPause"; }
+    XF86AudioPlay        allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call media playPause"; }
+    XF86AudioPrev        allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call media previous"; }
+    XF86AudioNext        allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call media next"; }
 
     // 12 steps on an exponential scale
-    XF86MonBrightnessUp allow-when-locked=true { spawn "light" "-T" "1.4678"; }
-    XF86MonBrightnessDown allow-when-locked=true { spawn "sh" "-c" "light -N 1.0; light -T 0.68129"; }
+    XF86MonBrightnessUp allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call brightness increase"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call brightness decrease"; }
 
     Mod+Q { close-window; }
 
@@ -520,3 +518,8 @@ overview {
         off
     }
 }
+
+debug {
+  // Allows notification actions and window activation from Noctalia.
+  honor-xdg-activation-with-invalid-serial
+}