diff --git a/flake.lock b/flake.lock
index c7ed992b..31ca5191 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724006173,
-        "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=",
+        "lastModified": 1724273991,
+        "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7f8df01d4297b9068a9592400f16044602844f86",
+        "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1724028259,
-        "narHash": "sha256-3gjLkj67hnvJ/3M5u1fQwoGXqSHOyJak8LO5T1q1ysc=",
+        "lastModified": 1724456070,
+        "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=",
         "owner": "koverstreet",
         "repo": "bcachefs-tools",
-        "rev": "8e0023ed4acdb3c736d77d775a790394a9701632",
+        "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1724009118,
-        "narHash": "sha256-JgYoscHr9n49fde9quBtc1B8SWDxXWpDg/AZssQAEMQ=",
+        "lastModified": 1724441111,
+        "narHash": "sha256-sExdYIrUIKfCQc0h8V4cedQhRA7ejOC1omr6h3mPse4=",
         "owner": "nix-community",
         "repo": "browser-previews",
-        "rev": "347bfcfc8b7ecdec36bed38068c4419f6554c69f",
+        "rev": "2ae31b3b7b1a7090c1af2634f8366fa6925ba3aa",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1724095579,
-        "narHash": "sha256-m9NMAfOAQiwEHK4elMDAXVmeId3kZZrbixLbbXdo8rI=",
+        "lastModified": 1724534339,
+        "narHash": "sha256-IA/Y0WSx4s1X6O6FkY06IEnafR8fUe3jSFA0Zopiwbs=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "82a186ae09473ad61d4b28f2f10a9d13ac078503",
+        "rev": "c99c254d336cacb8c7a622cac675ea6c7768dc73",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1724144412,
-        "narHash": "sha256-gOOmkzc7F6/lbm9xFFYC13FGFYsVkzuRMvv5+4oc2mk=",
+        "lastModified": 1724504184,
+        "narHash": "sha256-gP6000c2+zHKJHAxCD3BftvAjmb4CPAZamRAHNxN2MM=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "bd79132088803517ac158fcfe2c103fe71e1206a",
+        "rev": "51338b58fd666f448db7486ec145dbe52db9b829",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
         "rust-analyzer-src": "rust-analyzer-src_2"
       },
       "locked": {
-        "lastModified": 1723703304,
-        "narHash": "sha256-7ehq0nfRHpU3oNAkRpklaDxQZUpuaUig2sR2LI+IL/U=",
+        "lastModified": 1724394478,
+        "narHash": "sha256-JSiv2uwI4UJo/4pxt4255BfzWCiEberJmBC6pCxnzas=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "6e4233dc54850e8aff6eff401400e9a9343881eb",
+        "rev": "2e7bcdc4ef73aa56abd2f970e5a8b9c0cc87e614",
         "type": "github"
       },
       "original": {
@@ -314,7 +314,7 @@
     },
     "fenix_3": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "rust-analyzer-src": "rust-analyzer-src_3"
       },
       "locked": {
@@ -574,7 +574,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_10"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -592,7 +592,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_12"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -660,11 +660,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1724412708,
+        "narHash": "sha256-tLr1k+UZLVumyqXRU8E5lBtLjsvHSy8e2NiamfkjpYg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "b18f3ebc4029c22d437e3424014c8597a8b459a0",
         "type": "github"
       },
       "original": {
@@ -680,11 +680,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -775,18 +775,16 @@
         "hyprlang": "hyprlang_3",
         "hyprutils": "hyprutils_3",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_4",
         "systems": "systems_8",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1724085862,
-        "narHash": "sha256-qIPLv+MmTVZ0sjhx99EZhe/2aGzy5JOskmlqPd6DNFQ=",
+        "lastModified": 1724596623,
+        "narHash": "sha256-pLbNiAfpE8rW2e1Ih7Epi0LfyDmFv+UYU2BXg7Sj66U=",
         "ref": "refs/heads/main",
-        "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
-        "revCount": 5115,
+        "rev": "b672118f9238a48a18efd741cbcda387c5552238",
+        "revCount": 5136,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -920,11 +918,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324361,
-        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+        "lastModified": 1724174162,
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
         "type": "github"
       },
       "original": {
@@ -935,18 +933,25 @@
     },
     "hyprlang_4": {
       "inputs": {
+        "hyprutils": [
+          "hyprlock",
+          "hyprutils"
+        ],
         "nixpkgs": [
           "hyprlock",
           "nixpkgs"
         ],
-        "systems": "systems_9"
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1713121246,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "lastModified": 1721324361,
+        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
         "type": "github"
       },
       "original": {
@@ -957,12 +962,12 @@
     },
     "hyprlang_5": {
       "inputs": {
-        "hyprutils": "hyprutils_4",
+        "hyprutils": "hyprutils_5",
         "nixpkgs": [
           "xdph",
           "nixpkgs"
         ],
-        "systems": "systems_15"
+        "systems": "systems_14"
       },
       "locked": {
         "lastModified": 1721324361,
@@ -981,23 +986,23 @@
     "hyprlock": {
       "inputs": {
         "hyprlang": "hyprlang_4",
+        "hyprutils": "hyprutils_4",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
-        "lastModified": 1714659497,
-        "narHash": "sha256-CJH9xc2y0AU+2GQSg2dubcPep/iIwb5f/cr2+0LGBWY=",
+        "lastModified": 1724235914,
+        "narHash": "sha256-QEVuZNXkytS1lqAtRMBAriJREcCTOeprxBTisXxpe3s=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "9cca0dbb45941e13322ff95796f486676f061c6e",
+        "rev": "7bb4113a7e9cb62120e96d7c81066f0c055f0db4",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "9cca0dbb45941e13322ff95796f486676f061c6e",
         "type": "github"
       }
     },
@@ -1079,6 +1084,31 @@
       }
     },
     "hyprutils_4": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprlock",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721324102,
+        "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "962582a090bc233c4de9d9897f46794280288989",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprutils_5": {
       "inputs": {
         "nixpkgs": [
           "xdph",
@@ -1139,11 +1169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723916191,
-        "narHash": "sha256-wbkh2Tyo1dUwY+35OtF2117u1QqdVAlvDx4vgaW/InU=",
+        "lastModified": 1724304322,
+        "narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "dcc9afeea9d086cde9731ca90362c7bda62db6d0",
+        "rev": "924a18ea8df89a39166dd202f3e73cd022825768",
         "type": "github"
       },
       "original": {
@@ -1299,11 +1329,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724117347,
-        "narHash": "sha256-/nfm6P0owPtCRjT8ktq/8OChtg2HpkrvNaDJGm9N1Lk=",
+        "lastModified": 1724550116,
+        "narHash": "sha256-rYqlNdIfvfawpS3yY8t16BAaT2qyszFbLCHDwc6oIP0=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "2ef60116ef361d988317cbe52a09acfeda7d3416",
+        "rev": "3e09d2ab8f4ee0a6da534e7d2753ba5c2b2eee45",
         "type": "github"
       },
       "original": {
@@ -1341,11 +1371,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723991338,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -1357,11 +1387,26 @@
     },
     "nixpkgs-edge": {
       "locked": {
-        "lastModified": 1724160137,
-        "narHash": "sha256-ITsp/n429F5RQN0M/cc3bgys7PVv5gOCwJHOoLkhkbY=",
+        "lastModified": 1724558323,
+        "narHash": "sha256-uPXidysk1BXSayGzpxDW8JUgGvLWS+L1CTlBV3xcQB4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ba0c72cea47a45556ccd5bc566433bd1242a0f93",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable-small",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1724602416,
+        "narHash": "sha256-DELupfoOE9vf+vidYiyiW5n9GHcOsYAJ/VJFvDKrK54=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2b8d7ce72d51b55ee5903d50d6382705449f9c3",
+        "rev": "e69fc881bb11a8280c2cdf94c1aaf391ef3e3677",
         "type": "github"
       },
       "original": {
@@ -1468,11 +1513,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1723991338,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -1481,13 +1542,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1722630782,
-        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -1497,7 +1558,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1719506693,
         "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
@@ -1515,11 +1576,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1724159175,
-        "narHash": "sha256-3z9wRL+h+gTVFtecCUGrRaW6nvPPAtBCIDE9KAmZj7c=",
+        "lastModified": 1724601229,
+        "narHash": "sha256-L4gCGHGPYAqNxxh6xBZZ0Gi3A1zk9u722dZq7Kk48MY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0b86d5643d99e3982471f0d79e553871c6f35396",
+        "rev": "5253994d2afaaa0567026d7f44a24dbdcc5e82b0",
         "type": "github"
       },
       "original": {
@@ -1561,7 +1622,7 @@
           "pyprland",
           "nixpkgs"
         ],
-        "systems": "systems_13",
+        "systems": "systems_12",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
@@ -1640,14 +1701,14 @@
           "nixpkgs"
         ],
         "poetry2nix": "poetry2nix_2",
-        "systems": "systems_14"
+        "systems": "systems_13"
       },
       "locked": {
-        "lastModified": 1723839421,
-        "narHash": "sha256-zmi7juoLmcKkhcD3WpSlnPIXe+z4veOxHo4HZxukbHI=",
+        "lastModified": 1724358314,
+        "narHash": "sha256-l2XiBhfN6boRliX8XNGtJPIg7/JEgiIW5cW4JwXweN4=",
         "owner": "hyprland-community",
         "repo": "pyprland",
-        "rev": "2d99d6b553ee536c859f7e09800e4baed77f744b",
+        "rev": "f0db9d474e1a4f7b20165bcab73c155c3cbbeacb",
         "type": "github"
       },
       "original": {
@@ -1672,15 +1733,17 @@
         "lanzaboote": "lanzaboote",
         "nix-flatpak": "nix-flatpak",
         "nix-vscode-extensions": "nix-vscode-extensions",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-edge": "nixpkgs-edge",
+        "nixpkgs-master": "nixpkgs-master",
         "nur": "nur",
         "pyprland": "pyprland",
         "ucodenix": "ucodenix",
         "uwsm-test-nixpkgs": "uwsm-test-nixpkgs",
         "wallust": "wallust",
         "waybar": "waybar",
-        "xdph": "xdph_2"
+        "xdph": "xdph_2",
+        "zen-browser": "zen-browser"
       }
     },
     "rust-analyzer-src": {
@@ -1703,11 +1766,11 @@
     "rust-analyzer-src_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1723648323,
-        "narHash": "sha256-AT6K9JREduWC1zcIJIx8JTZa4sYZD6VvyB/xRnjphqY=",
+        "lastModified": 1724345276,
+        "narHash": "sha256-MKvjkqVL/RJ3QXOA8tSUoK7HHXVGSB2AL+vKxU4Cf+c=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "64a140527b383e3a2fe95908881624fc5374c60c",
+        "rev": "9b724459b5900c2424f5069023d6596a8617284b",
         "type": "github"
       },
       "original": {
@@ -1771,21 +1834,6 @@
       }
     },
     "systems_10": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_11": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1800,7 +1848,7 @@
         "type": "github"
       }
     },
-    "systems_12": {
+    "systems_11": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1815,7 +1863,7 @@
         "type": "github"
       }
     },
-    "systems_13": {
+    "systems_12": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1829,7 +1877,7 @@
         "type": "indirect"
       }
     },
-    "systems_14": {
+    "systems_13": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1844,7 +1892,7 @@
         "type": "github"
       }
     },
-    "systems_15": {
+    "systems_14": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1859,7 +1907,7 @@
         "type": "github"
       }
     },
-    "systems_16": {
+    "systems_15": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -2039,14 +2087,14 @@
     },
     "ucodenix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1723152038,
-        "narHash": "sha256-Vm4LeY8QZnVtM0xDijL+S20589DpFF3dP5rYcmvzzAA=",
+        "lastModified": 1724363501,
+        "narHash": "sha256-A+zVs7cXAimPvhc6ZXwKjPD//LgtTVDR8TvQWUsKqN4=",
         "owner": "e-tho",
         "repo": "ucodenix",
-        "rev": "dfcd427c945c80b135725f43e0a716cdf710b9c5",
+        "rev": "73b2499526b98902f9da6a6606c400889aec59f6",
         "type": "github"
       },
       "original": {
@@ -2057,11 +2105,11 @@
     },
     "uwsm-test-nixpkgs": {
       "locked": {
-        "lastModified": 1724160440,
-        "narHash": "sha256-+DekKrQE2Sa0lXe76mCV8M8+T1//Iz3q808m7/1kvks=",
+        "lastModified": 1724602039,
+        "narHash": "sha256-8Mv4efrgNjQ1yyQ734WG4YMvkLcCi+mRzrMsmRV4ER0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd721ef65fe9167ad8352c8449eb3a4847c8a16b",
+        "rev": "a947c5e097092695666bef1369b9ef742aea7866",
         "type": "github"
       },
       "original": {
@@ -2133,11 +2181,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722365976,
-        "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
+        "lastModified": 1724073926,
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
         "type": "github"
       },
       "original": {
@@ -2153,7 +2201,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_16"
+        "systems": "systems_15"
       },
       "locked": {
         "lastModified": 1724073926,
@@ -2193,6 +2241,26 @@
         "repo": "yafas",
         "type": "github"
       }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724518795,
+        "narHash": "sha256-no9r2yJ61kWx6RN8vqaIhZaXi4/HPwUiON5M+VhpAMg=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "dc0a13e833b2bb1529d2348fa1b97b6220f9e899",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 9901a710..3fa6bb75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,8 @@
   # Main sources and repositories
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
-    nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
+    nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
+    nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
     uwsm-test-nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/335625/merge";
 
     flake-parts = {
@@ -33,10 +34,7 @@
       url = "github:Aylur/ags"; # Aylur GTK Shell, a widget manager/toolkit
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
     xdph = {
       url = "github:hyprwm/xdg-desktop-portal-hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -46,7 +44,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprlock = {
-      url = "github:hyprwm/hyprlock/9cca0dbb45941e13322ff95796f486676f061c6e"; # Beautiful lockscreen for Hyprland
+      url = "github:hyprwm/hyprlock"; # Beautiful lockscreen for Hyprland
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hypridle = {
@@ -78,6 +76,10 @@
       url = "github:nix-community/browser-previews"; # Latest Chrome stable, beta, and dev
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    zen-browser = {
+      url = "github:MarceColl/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nix-vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/flake/hosts.nix b/flake/hosts.nix
index 242f3f6d..e01a6bca 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -3,7 +3,7 @@
   self,
   ...
 }: let
-  inherit (inputs) nixpkgs nixpkgs-edge;
+  inherit (inputs) nixpkgs nixpkgs-edge nixpkgs-master;
   inherit (nixpkgs) lib; # use lib from nixpkgs
 
   inherit (import ../preferences.nix) systemSettings userSettings;
@@ -18,7 +18,16 @@
     };
   };
 
-  specialArgs = {inherit self inputs pkgs-edge systemSettings userSettings;};
+  pkgs-master = import nixpkgs-master {
+    system = systemSettings.systemarch;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = _: true;
+      android_sdk.accept_license = true;
+    };
+  };
+
+  specialArgs = {inherit self inputs pkgs-edge pkgs-master systemSettings userSettings;};
 in {
   flake = {
     nixosConfigurations.${systemSettings.hostname} = lib.nixosSystem {
diff --git a/pkgs/global-packages.nix b/pkgs/global-packages.nix
index 0747c009..de14c486 100644
--- a/pkgs/global-packages.nix
+++ b/pkgs/global-packages.nix
@@ -25,7 +25,7 @@
       curl
       wget
 
-      (callPackage ./gparted-wrapper.nix {})
+      #(callPackage ./gparted-wrapper.nix {})
     ])
     ++ (with pkgs-edge; [
       # list of latest packages from nixpkgs master
@@ -36,5 +36,6 @@
     ];
   services.flatpak.packages = [
     # Flatpak packages to be installed systemwide
+    "com.github.tchx84.Flatseal" # Customising permission of Flatpaks
   ];
 }
diff --git a/system/browsers.nix b/system/browsers.nix
index 8c44fbdf..e770712e 100644
--- a/system/browsers.nix
+++ b/system/browsers.nix
@@ -6,6 +6,7 @@
   ...
 }: {
   # Enable Firefox Wayland
+  /*
   programs.firefox = {
     enable = true;
     package = pkgs.firefox-wayland;
@@ -14,50 +15,59 @@
       HardwareAcceleration = true;
     };
   };
+  */
 
-  environment.systemPackages = with pkgs-edge; [
-    (google-chrome.override {
-      # enable video encoding and hardware acceleration, along with several
-      # suitable for my configuration
-      # change it if you have any issues
-      # note the spaces, they are required
-      # Vulkan is not stable, likely because of bad drivers
-      # Flags enabled by command line have no need to be enabled in chrome://flags
-      commandLineArgs =
-        ""
-        + " --enable-accelerated-video-decode"
-        + " --enable-accelerated-vpx-decode"
-        + " --enable-accelerated-mjpeg-decode"
-        + " --enable-gpu-compositing"
-        + " --enable-gpu-rasterization"
-        + " --enable-native-gpu-memory-buffers"
-        + " --enable-raw-draw"
-        + " --enable-zero-copy"
-        + " --ignore-gpu-blocklist"
-        # + " --use-vulkan"
-        + " --enable-features="
-        + "ParallelDownloading" # Faster downloads
-        + ",VaapiVideoEncoder" # Video encoding support
-        + ",CanvasOopRasterization"
-        + ",UseDMSAAForTiles"
-        + ",UseGpuSchedulerDfs"
-        + ",UIEnableSharedImageCacheForGpu" # Shared image cache
-        + ",UseClientGmbInterface" # new ClientGmb interface to create GpuMemoryBuffers
-        # + ",SkiaGraphite"
-        # + ",EnableDrDc"
-        # + ",Vulkan"
-        # + ",VulkanFromANGLE"
-        + ",PostQuantumKyber" # hybrid kyber for enhanced TLS security
-        + ",PulseaudioLoopbackForCast" # Audio support for casting and screen sharing
-        + ",PulseaudioLoopbackForScreenShare"
-        + ",ChromeWideEchoCancellation" # noise cancellation for WebRTC
-        + ",DesktopScreenshots"
-        + ",FluentOverlayScrollbar" # New scrollbar
-        + ",FluentScrollbar"
-        + ",EnableTabMuting" # Mute tabs from tab context
-        + ",GlobalMediaControlsUpdatedUI"
-        # New media controls, with PIP
-        ;
-    })
+  environment.systemPackages = with pkgs-edge;
+    [
+      (google-chrome.override {
+        # enable video encoding and hardware acceleration, along with several
+        # suitable for my configuration
+        # change it if you have any issues
+        # note the spaces, they are required
+        # Vulkan is not stable, likely because of bad drivers
+        # Flags enabled by command line have no need to be enabled in chrome://flags
+        commandLineArgs =
+          ""
+          + " --enable-accelerated-video-decode"
+          + " --enable-accelerated-vpx-decode"
+          + " --enable-accelerated-mjpeg-decode"
+          + " --enable-gpu-compositing"
+          + " --enable-gpu-rasterization"
+          + " --enable-native-gpu-memory-buffers"
+          + " --enable-raw-draw"
+          + " --enable-zero-copy"
+          + " --ignore-gpu-blocklist"
+          # + " --use-vulkan"
+          + " --enable-features="
+          + "ParallelDownloading" # Faster downloads
+          + ",VaapiVideoEncoder" # Video encoding support
+          + ",CanvasOopRasterization"
+          + ",UseDMSAAForTiles"
+          + ",UseGpuSchedulerDfs"
+          + ",UIEnableSharedImageCacheForGpu" # Shared image cache
+          + ",UseClientGmbInterface" # new ClientGmb interface to create GpuMemoryBuffers
+          # + ",SkiaGraphite"
+          # + ",EnableDrDc"
+          # + ",Vulkan"
+          # + ",VulkanFromANGLE"
+          + ",PostQuantumKyber" # hybrid kyber for enhanced TLS security
+          + ",PulseaudioLoopbackForCast" # Audio support for casting and screen sharing
+          + ",PulseaudioLoopbackForScreenShare"
+          + ",ChromeWideEchoCancellation" # noise cancellation for WebRTC
+          + ",DesktopScreenshots"
+          + ",FluentOverlayScrollbar" # New scrollbar
+          + ",FluentScrollbar"
+          + ",EnableTabMuting" # Mute tabs from tab context
+          + ",GlobalMediaControlsUpdatedUI"
+          # New media controls, with PIP
+          ;
+      })
+    ]
+    ++ [
+      #inputs.zen-browser.packages.${pkgs.system}.specific
+    ];
+
+  services.flatpak.packages = [
+    "io.github.zen_browser.zen"
   ];
 }
diff --git a/system/hyprland/session.nix b/system/hyprland/session.nix
index 46c18ff2..64f74301 100644
--- a/system/hyprland/session.nix
+++ b/system/hyprland/session.nix
@@ -1,5 +1,8 @@
-{pkgs, pkgs-edge, ...}:
 {
+  pkgs,
+  pkgs-edge,
+  ...
+}: {
   # Enable GDM with wayland
   services.xserver.displayManager.gdm = {
     enable = true;
@@ -25,4 +28,4 @@
 
   # Run XDG autostart, this is needed for a DE-less setup like Hyprland
   services.xserver.desktopManager.runXdgAutostartIfNone = true;
-}
\ No newline at end of file
+}
diff --git a/system/nix-settings.nix b/system/nix-settings.nix
index 133f471c..d241a85d 100644
--- a/system/nix-settings.nix
+++ b/system/nix-settings.nix
@@ -26,7 +26,7 @@
     "nix-command"
     "flakes"
   ]; # enable nix command and flakes
-  
+
   nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking
 
   # Allow unfree packages