diff --git a/home/linux.nix b/home/linux.nix
index 0dc7905..fa21ebd 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -53,7 +53,7 @@
     ../modules/tmux
     ../modules/tmuxinator/personal.nix
     ../modules/zen
-    ../modules/librewolf
+    ../modules/firefox
     ../modules/wm/swaync
     ../modules/wm/cliphist
     ../modules/wm/awww
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 6f8e46c..377f0cd 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -1,9 +1,13 @@
-{ config, pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   programs.firefox = {
     enable = true;
-    languagePacks = [ "en-US" "de" ];
+    nativeMessagingHosts = [ pkgs.firefoxpwa ];
+    languagePacks = [
+      "en-US"
+      "de"
+    ];
     policies = {
       DisableTelemetry = true;
       DisableFirefoxStudies = true;
@@ -21,86 +25,136 @@
       OverrideFirstRunPage = "";
       OverridePostUpdatePage = "";
       EnableTrackingProtection = {
-        Value= true;
+        Value = true;
         Locked = true;
         Cryptomining = true;
         Fingerprinting = true;
       };
       DefaultDownloadDirectory = "\${home}/Downloads";
-      ExtensionSettings = {
-        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/%7B446900e4-71c2-419f-a6a7-df9c091e268b%7D/latest.xpi";
-          installation_mode = "force_installed";
-          private_browsing = true;
-        };
-        "uBlock0@raymondhill.net" = {
-          default_area = "menupanel";
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          installation_mode = "force_installed";
-          private_browsing = true;
-        };
-        "sponsorBlocker@ajay.app" = {
-          default_area = "menupanel";
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/sponsorBlocker@ajay.app/latest.xpi";
-          installation_mode = "force_installed";
-          private_browsing = true;
-        };
-      };
     };
+
     profiles = {
       "dennis" = {
         id = 0;
         isDefault = true;
-        search.force = true;
-        search.engines = {
-          "Nix Packages" = {
-            urls = [
-              {
-                template = "https://search.nixos.org/packages";
-                params = [
-                  { name = "query"; value = "{searchTerms}"; }
-                ];
-              }
-            ];
-            icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-            definedAliases = [ "@np" ];
+
+        containersForce = true;
+        containers = {
+          default = {
+            name = "personal";
+            color = "turquoise";
+            icon = "chill";
+            id = 1;
           };
-          "Nix Options" = {
-            definedAliases = [ "@no" ];
-            urls = [
-              {
-                template = "https://search.nixos.org/options";
-                params = [
-                  { name = "query"; value = "{searchTerms}"; }
-                ];
-              }
-            ];
-          };
-          "NixOS Wiki" = {
-            urls = [
-              {
-                template = "https://wiki.nixos.org/w/index.php";
-                params = [
-                  { name = "search"; value = "{searchTerms}"; }
-                ];
-              }
-            ];
-            icon           = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-            definedAliases = [ "@nw" ];
-          };
-          bing.metaData.hidden = true;
-          perplexity.metaData.hidden = true;
-          wikipedia.metaData.hidden = true;
-          ddg.metaData.hidden = true;
         };
+
+        extensions.force = true;
+        extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
+          ublock-origin
+          dearrow
+          bitwarden
+          sponsorblock
+          vimium
+        ];
+
+        search = {
+          default = "google";
+          force = true;
+          engines = {
+            bing.metaData.hidden = true;
+            perplexity.metaData.hidden = true;
+            wikipedia.metaData.hidden = true;
+            ddg.metaData.hidden = true;
+
+            nix-packages = {
+              name = "Nix Packages";
+              urls = [
+                {
+                  template = "https://search.nixos.org/packages";
+                  params = [
+                    {
+                      name = "type";
+                      value = "packages";
+                    }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@np" ];
+            };
+
+            nix-options = {
+              name = "Nix Options";
+              urls = [
+                {
+                  template = "https://search.nixos.org/options";
+                  params = [
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@no" ];
+            };
+
+            nix-home-manager = {
+              name = "Nix Home Manager";
+              urls = [
+                {
+                  template = "https://home-manager-options.extranix.com";
+                  params = [
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nh" ];
+            };
+
+            nix-wiki = {
+              name = "Nix Wiki";
+              urls = [
+                {
+                  template = "https://wiki.nixos.org/w/index.php";
+                  params = [
+                    {
+                      name = "search";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nw" ];
+            };
+          };
+        };
+
         settings = {
           "browser.startup.homepage" = "https://home.dnsc.io";
-          "browser.newtabpage.pinned" = [{
-            title = "[dnsc] Home";
-            url = "https://home.dnsc.io";
-          }];
+          "browser.newtabpage.pinned" = [
+            {
+              title = "[dnsc] Home";
+              url = "https://home.dnsc.io";
+            }
+          ];
           "browser.search.region" = "DE";
           "general.useragent.locale" = "en-US";
+          "layout.css.prefers-color-scheme.content-override" = 0;
         };
       };
     };
diff --git a/modules/glance/default.nix b/modules/glance/default.nix
index a3f9590..47096f9 100644
--- a/modules/glance/default.nix
+++ b/modules/glance/default.nix
@@ -33,7 +33,7 @@
                     }
                     {
                       title = "Actual";
-                      url = "https://192.168.178.69:9002";
+                      url = "https://finance.dnsc.io";
                       icon = "si:actualbudget";
                     }
                     {
@@ -55,6 +55,7 @@
                       title = "Jellyfin";
                       url = "http://192.168.178.69:8096";
                       icon = "si:jellyfin";
+                      allow-insecure = true;
                     }
                   ];
                 }
diff --git a/modules/zen/default.nix b/modules/zen/default.nix
index eb64533..7367d30 100644
--- a/modules/zen/default.nix
+++ b/modules/zen/default.nix
@@ -183,6 +183,83 @@
         search = {
           default = "google";
           force = true;
+          engines = {
+            nix-packages = {
+              name = "Nix Packages";
+              urls = [
+                {
+                  template = "https://search.nixos.org/packages";
+                  params = [
+                    {
+                      name = "type";
+                      value = "packages";
+                    }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@np" ];
+            };
+
+            nix-options = {
+              name = "Nix Options";
+              urls = [
+                {
+                  template = "https://search.nixos.org/options";
+                  params = [
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@no" ];
+            };
+
+            nix-home-manager = {
+              name = "Nix Home Manager";
+              urls = [
+                {
+                  template = "https://home-manager-options.extranix.com";
+                  params = [
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nh" ];
+            };
+
+            nix-wiki = {
+              name = "Nix Wiki";
+              urls = [
+                {
+                  template = "https://wiki.nixos.org/w/index.php";
+                  params = [
+                    {
+                      name = "search";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@nw" ];
+            };
+          };
         };
 
         extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
@@ -190,6 +267,7 @@
           dearrow
           bitwarden
           sponsorblock
+          vimium
         ];
       };
   };