diff --git a/modules/home/caem/multimedia/default.nix b/modules/home/caem/multimedia/default.nix
new file mode 100644
index 0000000..e4fb51f
--- /dev/null
+++ b/modules/home/caem/multimedia/default.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  imports = lib.getModuleImports ./.;
+}
diff --git a/modules/home/caem/multimedia/games/default.nix b/modules/home/caem/multimedia/games/default.nix
new file mode 100644
index 0000000..e79c637
--- /dev/null
+++ b/modules/home/caem/multimedia/games/default.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  
+}
diff --git a/modules/home/caem/multimedia/web/default.nix b/modules/home/caem/multimedia/web/default.nix
new file mode 100644
index 0000000..e4fb51f
--- /dev/null
+++ b/modules/home/caem/multimedia/web/default.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  imports = lib.getModuleImports ./.;
+}
diff --git a/modules/home/caem/multimedia/web/firefox.nix b/modules/home/caem/multimedia/web/firefox.nix
new file mode 100644
index 0000000..78685e3
--- /dev/null
+++ b/modules/home/caem/multimedia/web/firefox.nix
@@ -0,0 +1,68 @@
+{ pkgs, ... }:
+
+{
+  programs.firefox = {
+    enable = true;
+    package = pkgs.firefox-esr;
+    policies = {
+      EnableTrackingProtection = {
+        Value = true;
+        Cryptomining = true;
+        Fingerprinting = true;
+        EmailTracking = true;
+        Level = "strict";
+      };
+      DisableTelemetry = true;
+      DisablePocket = true;
+      DisableFirefoxStudies = true;
+      DisableFirefoxAccounts = false;
+      DisableAccounts = false;
+      DontCheckDefaultBrowser = true;
+      OverrideFirstRunPage = "";
+      OverridePostUpdatePage = "";
+      NoDefaultBookmarks = true;
+      Cookies = {
+        Behaviour = "reject-foreign";
+        BehaviourPrivateBrowsing = "reject-foreign";
+      };
+
+      UserMessaging = {
+        WhatsNew = false;
+        ExtensionRecommendations = false;
+        FeatureRecommendations = false;
+        UrlbarInterventions = false;
+        SkipOnboarding = true;
+        MoreFromMozilla = false;
+      };
+      
+      FirefoxHome = {
+        Search = true;
+        TopSites = true;
+        SponsoredTopSites = false;
+        Highlights = false;
+        Pocket = false;
+        SponsoredPocket = false;
+        Snippets = false;
+        Locked = true;
+      };
+
+      SearchSuggestEnabled = false;
+      ShowSearchSuggestionsFirst = false;
+      NewTabPage = false;
+
+      SearchEngines = { # ESR only
+        Add = [
+          {
+            Name = "Kagi";
+            URLTemplate = "https://kagi.com/search?q={searchTerms}";
+            Method = "GET";
+            IconURL = "https://kagi.com/favicon.ico";
+            Alias = "@k";
+            Default = true;
+          }
+        ];
+        Remove = [ "Bing" "Google" "DuckDuckGo" "Wikipedia (en)" ];
+      };
+    };
+  };
+}
diff --git a/modules/nixos/multimedia/web/firefox.nix b/modules/nixos/multimedia/web/firefox.nix
index 8ae0766..dca700b 100644
--- a/modules/nixos/multimedia/web/firefox.nix
+++ b/modules/nixos/multimedia/web/firefox.nix
@@ -2,7 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
-    tor-browser
+    firefox-esr
   ];
 
   environment.persistence."/nix/config" = {
@@ -10,69 +10,4 @@
       ".config/mozilla"
     ];
   };
-
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox-esr;
-    policies = {
-      EnableTrackingProtection = {
-        Value = true;
-        Cryptomining = true;
-        Fingerprinting = true;
-        EmailTracking = true;
-        Level = "strict";
-      };
-      DisableTelemetry = true;
-      DisablePocket = true;
-      DisableFirefoxStudies = true;
-      DisableFirefoxAccounts = false;
-      DisableAccounts = false;
-      DontCheckDefaultBrowser = true;
-      OverrideFirstRunPage = "";
-      OverridePostUpdatePage = "";
-      NoDefaultBookmarks = true;
-      Cookies = {
-        Behaviour = "reject-foreign";
-        BehaviourPrivateBrowsing = "reject-foreign";
-      };
-
-      UserMessaging = {
-        WhatsNew = false;
-        ExtensionRecommendations = false;
-        FeatureRecommendations = false;
-        UrlbarInterventions = false;
-        SkipOnboarding = true;
-        MoreFromMozilla = false;
-      };
-      
-      FirefoxHome = {
-        Search = true;
-        TopSites = true;
-        SponsoredTopSites = false;
-        Highlights = false;
-        Pocket = false;
-        SponsoredPocket = false;
-        Snippets = false;
-        Locked = true;
-      };
-
-      SearchSuggestEnabled = false;
-      ShowSearchSuggestionsFirst = false;
-      NewTabPage = false;
-
-      SearchEngines = { # ESR only
-        Add = [
-          {
-            Name = "Kagi";
-            URLTemplate = "https://kagi.com/search?q={searchTerms}";
-            Method = "GET";
-            IconURL = "https://kagi.com/favicon.ico";
-            Alias = "@k";
-            Default = true;
-          }
-        ];
-        Remove = [ "Bing" "Google" "DuckDuckGo" "Wikipedia (en)" ];
-      };
-    };
-  };
 }
diff --git a/overlays/nixpak/firefox.nix b/overlays/nixpak/firefox.nix
index 87b32f3..9d8511b 100644
--- a/overlays/nixpak/firefox.nix
+++ b/overlays/nixpak/firefox.nix
@@ -73,18 +73,6 @@
         };
       };
     };
-
-    wrappedFirefox = prev.wrapFirefox (sandboxed-firefox-esr.config.env // {
-      meta = prev.firefox-esr.meta;
-      gtk3 = prev.libcanberra-gtk3;
-      hasMozSystemDirPatch = true;
-    }) {
-      applicationName = "firefox-esr";
-      pname = "firefox-esr";
-      desktopName = "Firefox ESR";
-      icon = "firefox";
-      wmClass = "firefox-esr";
-    };
   in
-    wrappedFirefox;
+    sandboxed-firefox-esr.config.env;
 }