diff --git a/CLAUDE.md b/CLAUDE.md
index 0b36b04..f540c37 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,3 +7,4 @@
 ## Testing Considerations
 
 - When you perform testing, remember you are in a non-interactive shell so things work for me might not work for your testing, unless you take your special testing environment into consideration
+- When performing hms test run, remember newly created files need to be `git add` to be recognized by nix
\ No newline at end of file
diff --git a/config/firefox-bookmarks.nix b/config/firefox/bookmarks.nix
similarity index 100%
rename from config/firefox-bookmarks.nix
rename to config/firefox/bookmarks.nix
diff --git a/config/firefox/extensions.nix b/config/firefox/extensions.nix
new file mode 100644
index 0000000..caebd5e
--- /dev/null
+++ b/config/firefox/extensions.nix
@@ -0,0 +1,15 @@
+args:
+
+{
+  packages = let
+    firefox-addons = args.firefox-addons or null;
+  in
+    if firefox-addons != null then
+      with firefox-addons.packages.${args.pkgs.system}; [
+        ublock-origin
+        linkding-extension
+        vimium
+        darkreader
+      ]
+    else [];
+}
diff --git a/config/firefox/search.nix b/config/firefox/search.nix
new file mode 100644
index 0000000..49f0bfc
--- /dev/null
+++ b/config/firefox/search.nix
@@ -0,0 +1,25 @@
+{
+  force = true;
+  default = "ddg";
+  
+  # Uncomment to enable custom search engines
+  # engines = {
+  #   "Nix Packages" = {
+  #     urls = [{
+  #       template = "https://search.nixos.org/packages";
+  #       params = [
+  #         { name = "channel"; value = "unstable"; }
+  #         { 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}"; }];
+  #     icon = "https://wiki.nixos.org/favicon.png";
+  #     definedAliases = [ "@nw" ];
+  #   };
+  # };
+}
\ No newline at end of file
diff --git a/modules/firefox.nix b/modules/firefox.nix
index f53cacd..f639883 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -25,47 +25,13 @@
       name = "yanlin";
       
       # Extensions
-      extensions = {
-        packages = let
-          firefox-addons = args.firefox-addons or null;
-        in
-          if firefox-addons != null then
-            with firefox-addons.packages.${pkgs.system}; [
-              ublock-origin
-              linkding-extension
-              vimium
-            ]
-          else [];
-      };
+      extensions = import ../config/firefox/extensions.nix args;
       
       # Bookmarks
-      bookmarks = import ../config/firefox-bookmarks.nix;
+      bookmarks = import ../config/firefox/bookmarks.nix;
       
       # Search configuration
-      search = {
-        force = true;
-        default = "ddg";
-        
-        # engines = {
-        #   "Nix Packages" = {
-        #     urls = [{
-        #       template = "https://search.nixos.org/packages";
-        #       params = [
-        #         { name = "channel"; value = "unstable"; }
-        #         { 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}"; }];
-        #     icon = "https://wiki.nixos.org/favicon.png";
-        #     definedAliases = [ "@nw" ];
-        #   };
-        # };
-      };
+      search = import ../config/firefox/search.nix;
       
       # Firefox settings
       settings = {