diff --git a/justfile b/justfile
index 2b77123..942d047 100644
--- a/justfile
+++ b/justfile
@@ -86,7 +86,7 @@ kitty-terminal:
 [group("graphical")]
 niri-window-manager:
     @just _echowarning "1) Installing niri and related tools"
-    paru -S cliphist fuzzel gdm gnome-keyring inter-font niri-git noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra polkit-kde-agent swayidle swaylock swaync ttf-firacode-nerd ttf-font-awesome waybar wl-clipboard wlsunset wpaperd xdg-desktop-portal-gnome xwayland-satellite-git
+    paru -S cliphist fuzzel gdm gnome-keyring inter-font mako niri-git noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra polkit-kde-agent swayidle swaylock ttf-firacode-nerd ttf-font-awesome waybar wl-clipboard wlsunset wpaperd xdg-desktop-portal-gnome xwayland-satellite-git
 
     @just _echowarning "\n2) Stowing niri config"
     stow --dotfiles -S niri
diff --git a/niri/dot-config/mako/config b/niri/dot-config/mako/config
new file mode 100644
index 0000000..17de04a
--- /dev/null
+++ b/niri/dot-config/mako/config
@@ -0,0 +1,14 @@
+include=~/.config/mako/tokyo_night
+
+# Binding
+on-button-right=dismiss-group
+
+# Style
+font=Inter 14
+width=400
+margin=5
+padding=4
+border-size=1
+border-radius=5
+default-timeout=30000
+group-by=app-name,summary
diff --git a/niri/dot-config/mako/tokyo_night b/niri/dot-config/mako/tokyo_night
new file mode 100644
index 0000000..02ad43d
--- /dev/null
+++ b/niri/dot-config/mako/tokyo_night
@@ -0,0 +1,3 @@
+background-color=#1a1b26e5
+text-color=#c0caf5
+border-color=#bb9af7
diff --git a/niri/dot-config/niri/config.kdl b/niri/dot-config/niri/config.kdl
index c1c605a..8c63481 100644
--- a/niri/dot-config/niri/config.kdl
+++ b/niri/dot-config/niri/config.kdl
@@ -75,7 +75,6 @@ spawn-at-startup "/usr/lib/polkit-kde-authentication-agent-1"
 spawn-at-startup "swayidle" "-w"
 spawn-at-startup "wlsunset" "-l" "-27.4" "-L" "153"
 spawn-at-startup "wpaperd" "-d"
-spawn-at-startup "swaync"
 spawn-at-startup "waybar"
 spawn-at-startup "udiskie"
 spawn-at-startup "wl-paste" "--watch" "cliphist" "store"
@@ -187,7 +186,7 @@ layer-rule {
 }
 // Block out mako notifications from screencasts.
 layer-rule {
-    match namespace="swaync-notification-window"
+    match namespace="^notifications$"
     block-out-from "screencast"
 }
 binds {
diff --git a/niri/dot-config/waybar/config.jsonc b/niri/dot-config/waybar/config.jsonc
index 78f9a76..92accb9 100644
--- a/niri/dot-config/waybar/config.jsonc
+++ b/niri/dot-config/waybar/config.jsonc
@@ -20,8 +20,7 @@
     "power-profiles-daemon",
     "wireplumber",
     "bluetooth",
-    "network",
-    "custom/notifications"
+    "network"
   ],
   "niri/workspaces": {
     "format": "{icon}",
@@ -87,25 +86,5 @@
     "tooltip-format-ethernet": "Interface: {ifname}\nIP: {ipaddr}\nGateway: {gwaddr}",
     "tooltip-format-wifi": "{frequency}GHz {signalStrength}%\n\nInterface: {ifname}\nIP: {ipaddr}\nGateway: {gwaddr}",
     "tooltip-format-disconnected": ""
-  },
-  "custom/notifications": {
-    "exec": "swaync-client -swb",
-    "exec-if": "which swaync-client",
-    "return-type": "json",
-    "format": "{icon}",
-    "format-icons": {
-      "notification": "<span foreground='red'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-none": "",
-      "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "inhibited-none": "",
-      "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-inhibited-none": ""
-    },
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "tooltip-format": "Notifications",
-    "escape": true
   }
 }
\ No newline at end of file