diff --git a/.gitignore b/.gitignore
index 09b347e..9785ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ hypr/.config/hypr/env
 hypr/.config/hypr/env.conf
 hypr/.config/hypr/env.sh
 hypr/.config/hypr/monitor_setup.lua
-hypr/.config/wpaperd/wallpapers/linked
+hypr/.config/hypr/hyprpaper.conf
 *~lock.*#
 lazy-lock.json
 fish_variables
diff --git a/README.md b/README.md
index 4672ab3..0b7c1a4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Personal configuration files for an Arch Linux workstation (Hyprland + Neovim +
 | Directory | Contents |
 |-----------|----------|
 | `term/`    | Fish + kitty + starship + nvim + tmux + yazi + fastfetch + opencode terminal environment |
-| `hypr/`    | Hyprland compositor config, kitty theme, wpaperd wallpapers |
+| `hypr/`    | Hyprland compositor config, kitty theme, waypaper/hyprpaper wallpapers |
 | `kreation/`| VST plugin (`MT-PowerDrumKit.vst3`) |
 | `local_ai/`| Local AI / MCP tooling config |
 | `_install_skripte/` | Miscellaneous install helper scripts |
diff --git a/hypr/.config/hypr/hyprland.lua b/hypr/.config/hypr/hyprland.lua
index 4892e0f..0b8d0ce 100644
--- a/hypr/.config/hypr/hyprland.lua
+++ b/hypr/.config/hypr/hyprland.lua
@@ -32,7 +32,8 @@ hl.on("hyprland.start", function()
 end)
 
 hl.on("hyprland.start", function()
-	hl.exec_cmd("wpaperd &")
+	hl.exec_cmd("hyprpaper &")
+	hl.exec_cmd("sleep 1; waypaper --restore &")
 	hl.exec_cmd("swaync &")
 	hl.exec_cmd("hypridle &")
 	hl.exec_cmd("nextcloud &")
@@ -669,12 +670,22 @@ hl.window_rule({
 	move = "20 monitor_h-120",
 	float = true,
 })
+hl.window_rule({
+	name = "waypaper-float",
+	match = {
+		class = ".*[Ww]aypaper.*",
+	},
+	float = true,
+	size = "1280 800",
+	center = true,
+	dim_around = true,
+})
 hl.window_rule({
 	name = "opacity-kitty-dolphin",
 	match = {
 		class = ".*(kitty|dolphin).*",
 	},
-	opacity = "0.90 0.80",
+	opacity = "0.80 0.70",
 })
 hl.layer_rule({
 	match = {
diff --git a/hypr/.config/waypaper/style.css b/hypr/.config/waypaper/style.css
new file mode 100644
index 0000000..b4fe025
--- /dev/null
+++ b/hypr/.config/waypaper/style.css
@@ -0,0 +1,24 @@
+/* Waypaper custom stylesheet (stowed to ~/.config/waypaper/style.css).
+ * Makes the currently selected wallpaper unmissable:
+ * thick Catppuccin-mocha sapphire border (#74c7ec, same as Hyprland
+ * active border) + tinted fill + outer glow.
+ * Selector `.highlighted-button` is the official waypaper hook
+ * (see waypaper docs: "Custom styles and colors"). */
+
+.highlighted-button {
+    background-image: none;
+    box-shadow: none;
+    background-color: rgba(116, 199, 236, 0.25);
+    border: 3px solid #74c7ec;
+    border-radius: 8px;
+    box-shadow: 0 0 0 2px rgba(116, 199, 236, 0.6), 0 0 14px rgba(116, 199, 236, 0.9);
+}
+
+.highlighted-button > image,
+.highlighted-button:hover > image {
+    -gtk-icon-effect: highlight;
+}
+
+button:hover {
+    border-color: #74c7ec;
+}
diff --git a/hypr/.config/wpaperd/config.toml b/hypr/.config/wpaperd/config.toml
deleted file mode 100755
index b595a97..0000000
--- a/hypr/.config/wpaperd/config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-path = "~/.config/wpaperd/wallpapers/linked"
-mode = "center"
-#recursive = true
-#sorting = "random"
-#duration = "15m"
diff --git a/hypr/.config/wpaperd/wallpapers/hypr.png b/hypr/.config/wpaperd/wallpapers/hypr.png
deleted file mode 100644
index 9553b3f..0000000
Binary files a/hypr/.config/wpaperd/wallpapers/hypr.png and /dev/null differ
diff --git a/hypr/scripts/packages.txt b/hypr/scripts/packages.txt
index a91b064..ebf4f00 100644
--- a/hypr/scripts/packages.txt
+++ b/hypr/scripts/packages.txt
@@ -19,7 +19,6 @@ hyprpolkitagent
 pantheon-shortcut-overlay
 waybar
 hyprpaper
-wpaperd
 wev
 hyprlock
 hypridle