diff --git a/flake.lock b/flake.lock
index 8229c04..33c5ebc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765900596,
-        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
+        "lastModified": 1771610171,
+        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
+        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
         "type": "github"
       },
       "original": {
@@ -52,15 +52,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -128,11 +128,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769978395,
-        "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=",
+        "lastModified": 1772380461,
+        "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a",
+        "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763733840,
-        "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
+        "lastModified": 1770511807,
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
         "type": "github"
       },
       "original": {
@@ -216,16 +216,16 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1767388857,
-        "narHash": "sha256-h70Tlpce8NEkwWqw/DDpeOKPzPyfq7P2t0HtGM5Z3Cw=",
+        "lastModified": 1772215399,
+        "narHash": "sha256-iD/OJ5f7cyYluA0aQgTPTYuY0l12oF/mowyzcR8IQOY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "ab1d80f3d6aebd57a0971b53a1993b1c1dfe0b09",
+        "rev": "0002f148c9a4fe421a9d33c0faa5528cdc411e62",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.53.1",
+        "ref": "v0.54.0",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -263,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765643131,
-        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
+        "lastModified": 1767023960,
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
@@ -317,11 +317,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764612430,
-        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
+        "lastModified": 1771866172,
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
         "type": "github"
       },
       "original": {
@@ -394,11 +394,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766160771,
-        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
+        "lastModified": 1771271487,
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
         "type": "github"
       },
       "original": {
@@ -419,11 +419,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763640274,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "lastModified": 1770501770,
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -448,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766253200,
-        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
+        "lastModified": 1771606233,
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
         "type": "github"
       },
       "original": {
@@ -467,11 +467,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1770062423,
-        "narHash": "sha256-eOaDXp895RMY+yp4P/1PoafDqISLnt/PMZw0d+bfQ4w=",
+        "lastModified": 1772134428,
+        "narHash": "sha256-HW2xGlfUwJPoF4jdNp/3S9SygNeJ9+cvpvOchcqpVfs=",
         "owner": "jordond",
         "repo": "jolt",
-        "rev": "3e3bcae0f9a1be31984ff407811a9fa7773742a3",
+        "rev": "8eda3639cc90a13d54d996906fbc55df15d1ac23",
         "type": "github"
       },
       "original": {
@@ -501,11 +501,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
@@ -548,11 +548,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1769789167,
-        "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
+        "lastModified": 1772198003,
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
         "type": "github"
       },
       "original": {
@@ -604,11 +604,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765911976,
-        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
+        "lastModified": 1771858127,
+        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
+        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
         "type": "github"
       },
       "original": {
@@ -625,16 +625,16 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1767543672,
-        "narHash": "sha256-B40zfGUOZ9x+6RFVj+BoZ4cj8GWx1FHcRZt0xkmRwn4=",
+        "lastModified": 1770552034,
+        "narHash": "sha256-qayntjpE3WYBl6idfpwtvkEo61oHtc80uNEm0m4XA2o=",
         "owner": "hyprland-community",
         "repo": "pyprland",
-        "rev": "a05c189f2c2e535f5f7374e7d7212d476fd4b02f",
+        "rev": "6a5298515bb20e3f0426a53729e029bdd7add7da",
         "type": "github"
       },
       "original": {
         "owner": "hyprland-community",
-        "ref": "2.6.0",
+        "ref": "3.1.0",
         "repo": "pyprland",
         "type": "github"
       }
@@ -737,11 +737,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1769575550,
-        "narHash": "sha256-gX8GgJhckfXDCJvmVCHxZTfTcKeHqpghZuUOZOUR24c=",
+        "lastModified": 1772244087,
+        "narHash": "sha256-W1Gkdnof/D9hHe37Xt6Ls/wVz2QqmWqhtEuA+ZVoTbE=",
         "owner": "tsowell",
         "repo": "wiremix",
-        "rev": "c2f3bcbcf93851ef2b8d78e15b35f4a29d31c394",
+        "rev": "47bc171e2e9891fd7e87634203058dbd983818bf",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7ce7174..b362cfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "hyperdeepnix - Base configuration flake";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    hyprland.url = "github:hyprwm/Hyprland/v0.53.1";
+    hyprland.url = "github:hyprwm/Hyprland/v0.54.0";
     nix-colors.url = "github:misterio77/nix-colors";
-    pyprland.url = "github:hyprland-community/pyprland/2.6.0";
+    pyprland.url = "github:hyprland-community/pyprland/3.1.0";
     wiremix.url = "github:tsowell/wiremix";
     jolt.url = "github:jordond/jolt";
     home-manager = {
diff --git a/modules/home-manager/hyprland/autostart.nix b/modules/home-manager/hyprland/autostart.nix
index 0c82aca..205f52a 100644
--- a/modules/home-manager/hyprland/autostart.nix
+++ b/modules/home-manager/hyprland/autostart.nix
@@ -1,10 +1,12 @@
 {
   ...
-}: {
+}:
+{
   wayland.windowManager.hyprland.settings = {
     exec-once = [
       "hyprsunset"
       "wl-clip-persist --clipboard regular"
+      "hyprctl setcursor Bibata-Modern_Amber 24"
       "clipse -listen"
       "mkfifo -m 600 /tmp/wobpipe"
       "tail -f /tmp/wobpipe | wob"
diff --git a/modules/home-manager/hyprland/envs.nix b/modules/home-manager/hyprland/envs.nix
index 54fcf43..dffbb00 100644
--- a/modules/home-manager/hyprland/envs.nix
+++ b/modules/home-manager/hyprland/envs.nix
@@ -23,7 +23,7 @@ in
 
       # Cursor theme
       "XCURSOR_THEME,Adwaita"
-      "HYPRCURSOR_THEME,rose-pine-hyprcursor"
+      "HYPRCURSOR_THEME,Bibata-Modern-Amber"
 
       # Force all apps to use Wayland
       "GDK_BACKEND,wayland"
diff --git a/modules/home-manager/hyprland/windows.nix b/modules/home-manager/hyprland/windows.nix
index dd06da0..96b9c4e 100644
--- a/modules/home-manager/hyprland/windows.nix
+++ b/modules/home-manager/hyprland/windows.nix
@@ -9,7 +9,7 @@ in
   wayland.windowManager.hyprland.settings = {
     windowrule = cfg.window_rules ++ [
       # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-      "match:class *, suppress_event maximize"
+      "match:class .*, suppress_event maximize"
 
       # Settings management
       "match:class ^(org.pulseaudio.pavucontrol|blueberry.py)$, float on"
diff --git a/modules/home-manager/jolt.nix b/modules/home-manager/jolt.nix
index c6550e4..3a2fa27 100644
--- a/modules/home-manager/jolt.nix
+++ b/modules/home-manager/jolt.nix
@@ -22,7 +22,7 @@ in
         log_level = "info"
 
         [history]
-        background_recording = false
+        background_recording = true
         sample_interval_secs = 60
         retention_raw_days = 30
         retention_hourly_days = 180
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index e03b997..54e83d9 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -116,7 +116,7 @@ in
             "▇"
             "█"
           ];
-          on-click = "kitty -e btm";
+          on-click = "kitty -e btop";
         };
         clock = {
           format = "{:%A %I:%M %p}";
diff --git a/modules/packages.nix b/modules/packages.nix
index eea40b8..9ebd083 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -24,6 +24,7 @@ let
     bluetui
     jocalsend
     rose-pine-hyprcursor
+    bibata-cursors
   ];
 
   # Essential system packages - cannot be excluded