diff --git a/flake.lock b/flake.lock
index 7165d9c..388c5da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -230,11 +230,27 @@
         "type": "github"
       }
     },
+    "nur": {
+      "locked": {
+        "lastModified": 1717357486,
+        "narHash": "sha256-7lRZjv5NJAJQsEv1x4k+TJSbWEJG27gi4XDzZbq+fvY=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "da0cb74fd7d4bf8744bc2cbc1e2ed02adc50ed69",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_2",
+        "nur": "nur",
         "split-monitor-workspaces": "split-monitor-workspaces",
         "waybar": "waybar"
       }
diff --git a/flake.nix b/flake.nix
index c028914..ef64501 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,12 +19,14 @@
       url = "github:Duckonaut/split-monitor-workspaces";
       inputs.hyprland.follows = "hyprland";
     };
+    nur.url = "github:nix-community/NUR";
   };
 
   outputs =
     { self
     , nixpkgs
     , home-manager
+    , nur
     , ...
     }@inputs:
     let
@@ -32,6 +34,7 @@
       pkgs = nixpkgs.legacyPackages.${system};
       commonModules = host: user: [
         ./hosts/${host}/hardware-configuration.nix
+        { nixpkgs.overlays = [ nur.overlay ]; }
         {
           networking.hostName = host;
           boot.loader.systemd-boot.enable = true;
diff --git a/home/Kell.nix b/home/Kell.nix
index 00b2a22..d3d461d 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -5,9 +5,9 @@
       (import ./common.nix { inherit inputs config pkgs; })
       (import ./hyprland { inherit inputs pkgs; })
       (import ./waybar { inherit inputs pkgs; })
-      (import ./firefox { inherit inputs pkgs; })
       ./rofi
       ./alacritty
+      ./firefox
   ];
 
   services.hyprpaper = {
diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index 37be9a0..38e3dac 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -15,7 +15,6 @@ in
         policies = {
             DisableTelemetry = true;
             DisableFirefoxStudies = true;
-            DisablePocket = true;
             DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
                 EnableTrackingProtection = {
                     Value = true;
@@ -24,16 +23,8 @@ in
                     Fingerprinting = true;
                 };
             ExtensionSettings = {
-                "uBlock0@raymondhill.net" = {
-                    install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-                    installation_mode = "force_installed";
-                };
-                "jid1-MnnxcxisBPnSXQ@jetpack" = {
-                    install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
-                    installation_mode = "force_installed";
-                };
                 "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
-                    install_url = "${./files/signed.xpi}";
+                    install_url = "file://${./files/signed.xpi}";
                     installation_mode = "force_installed";
                 };
             };
@@ -49,6 +40,11 @@ in
                     default = "DuckDuckGo";
                     order = [ "DuckDuckGo" "Google" ];
                 };
+                extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+                    ublock-origin
+                    bitwarden
+                    privacy-badger
+                ];
                 settings = {
                     "browser.disableResetPrompt" = true;
                     "browser.download.panel.shown" = true;
@@ -56,12 +52,15 @@ in
                     "browser.shell.defaultBrowserCheckCount" = 1;
                     "browser.startup.homepage" = "https://start.duckduckgo.com";
                     "browser.compactmode.show" = true;
+                    "browser.uidensity" = 1;
+                    "extensions.update.enabled" = false;
                     "extensions.pocket.enabled" = lock-false;
+                    "extensions.autoDisableScopes" = 0;
                     "browser.newtabpage.activity-stream.showSponsored" = lock-false;
                     "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
                     "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
                     "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; };
-                    "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":["fxa-toolbar-menu-button","developer-button"],"unified-extensions-area":["sponsorblocker_ajay_app-browser-action","_testpilot-containers-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_contain-facebook-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","chrome-gnome-shell_gnome_org-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","ublock0_raymondhill_net-browser-action","reset-pbm-toolbar-button","adguardadblocker_adguard_com-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","profiler-button","chrome-gnome-shell_gnome_org-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_contain-facebook-browser-action","_testpilot-containers-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","adguardadblocker_adguard_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","sponsorblocker_ajay_app-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list","unified-extensions-area"],"currentVersion":20,"newElementCount":11}'';
+                    "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":["fxa-toolbar-menu-button","developer-button"],"unified-extensions-area":["sponsorblocker_ajay_app-browser-action","_testpilot-containers-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_contain-facebook-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","chrome-gnome-shell_gnome_org-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","ublock0_raymondhill_net-browser-action","reset-pbm-toolbar-button","adguardadblocker_adguard_com-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["developer-button","profiler-button","chrome-gnome-shell_gnome_org-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_contain-facebook-browser-action","_testpilot-containers-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","adguardadblocker_adguard_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","sponsorblocker_ajay_app-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list","unified-extensions-area"],"currentVersion":20,"newElementCount":11}'';
                     "privacy.trackingprotection.enabled" = true;
                 };
             };