diff --git a/home/common.nix b/home/common.nix
index 37b5bdf..5984414 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./components/nethack.nix
+    ./components/firefox.nix
   ];
 }
diff --git a/home/components/firefox.nix b/home/components/firefox.nix
new file mode 100644
index 0000000..31ef9e1
--- /dev/null
+++ b/home/components/firefox.nix
@@ -0,0 +1,97 @@
+{ pkgs, ... }:
+{
+  programs.firefox = {
+    enable = true;
+
+    profiles.default = {
+      containersForce = true;
+      containers = {
+        social = {
+          color = "turquoise";
+          icon = "fence";
+          id = 1;
+        };
+
+        shopping = {
+          color = "orange";
+          icon = "cart";
+          id = 2;
+        };
+      };
+
+      search = {
+        force = true;
+        default = "DuckDuckGo";
+        engines = {
+          "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" ];
+          };
+
+          "NixOS Wiki" = {
+            urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }];
+            iconUpdateURL = "https://wiki.nixos.org/favicon.png";
+            updateInterval = 24 * 60 * 60 * 1000;
+            definedAliases = [ "@nw" ];
+          };
+
+          "MyNixOS" = {
+            urls = [{ template = "https://mynixos.com/search?q={searchTerms}"; }];
+            iconUpdateURL = "https://mynixos.com/favicon-light.svg";
+            definedAliases = [ "@mn" "@mw" ];
+          };
+
+          "Bing".metaData.hidden = true;
+          "Google".metaData.hidden = true;
+          "Amazon.com".metaData.hidden = true;
+          "eBay".metaData.hidden = true;
+        };
+      };
+    };
+
+    policies = {
+      DisableFirefoxStudies = true;
+      DisableTelemetry = true;
+      DisablePocket = true;
+
+      DontCheckDefaultBrowser = true;
+      DownloadDirectory = "\${home}";
+
+      EnableTrackingProtection = {
+        Value = true;
+        Locked = false;
+
+        Cryptomining = true;
+        EmailTracking = true;
+        Fingerprinting = true;
+
+        Exceptions = [];
+      };
+
+      FirefoxHome = {
+        SponsoredTopSites = false;
+
+        Pocket = false;
+        SponsoredPocket = false;
+      };
+
+      StartDownloadsInTempDirectory = true;
+      TranslateEnabled = true;
+
+      Preferences = {
+        "browser.translations.automaticallyPopup" = {
+          Value = false;
+          Status = "default";
+        };
+      };
+    };
+  };
+}
diff --git a/home/maidena.nix b/home/maidena.nix
index ceb4792..beeda0d 100644
--- a/home/maidena.nix
+++ b/home/maidena.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   imports = [
     ./components/hyprland.nix
diff --git a/home/tokishiko.nix b/home/tokishiko.nix
index d9d59f6..7dfcef2 100644
--- a/home/tokishiko.nix
+++ b/home/tokishiko.nix
@@ -1,103 +1,8 @@
+{ pkgs, ... }:
 {
   programs = {
     home-manager.enable = true;
 
-    firefox = {
-      enable = true;
-
-      profiles.default = {
-        containersForce = true;
-        containers = {
-          social = {
-            color = "turquoise";
-            icon = "fence";
-            id = 1;
-          };
-
-          shopping = {
-            color = "orange";
-            icon = "cart";
-            id = 2;
-          };
-        };
-
-        search = {
-          force = true;
-          default = "DuckDuckGo";
-          engines = {
-            "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" ];
-            };
-
-            "NixOS Wiki" = {
-              urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }];
-              iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-              updateInterval = 24 * 60 * 60 * 1000;
-              definedAliases = [ "@nw" ];
-            };
-
-            "MyNixOS" = {
-              urls = [{ template = "https://mynixos.com/search?q={searchTerms}"; }];
-              iconUpdateURL = "https://mynixos.com/favicon-light.svg";
-              definedAliases = [ "@mn" "@mw" ];
-            };
-
-            "Bing".metaData.hidden = true;
-            "Google".metaData.hidden = true;
-            "Amazon.com".metaData.hidden = true;
-            "eBay".metaData.hidden = true;
-          };
-        };
-      };
-
-      policies = {
-        DisableFirefoxStudies = true;
-        DisableTelemetry = true;
-        DisablePocket = true;
-
-        DontCheckDefaultBrowser = true;
-        DownloadDirectory = "\${home}";
-
-        EnableTrackingProtection = {
-          Value = true;
-          Locked = false;
-
-          Cryptomining = true;
-          EmailTracking = true;
-          Fingerprinting = true;
-
-          Exceptions = [];
-        };
-
-        FirefoxHome = {
-          # TopSites = false;
-          SponsoredTopSites = false;
-
-          Pocket = false;
-          SponsoredPocket = false;
-        };
-
-        StartDownloadsInTempDirectory = true;
-        TranslateEnabled = true;
-
-        Preferences = {
-          "browser.translations.automaticallyPopup" = {
-            Value = false;
-            Status = "default";
-          };
-        };
-      };
-    };
-
     bash = {
       enable = true;
       historyControl = [ "ignoreboth" ];