diff --git a/overlays/default.nix b/overlays/default.nix
index 9264d0b..5cf35d2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,29 +8,31 @@
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev: {
-    n8n = import ./mods/n8n.nix {inherit prev;};
+  modifications = final: prev:
+  # Import all package modifications from mods directory
+    (import ./mods/default.nix {inherit prev;})
+    // {
+      # Direct configuration overrides
+      brave = prev.brave.override {
+        commandLineArgs = "--password-store=gnome-libsecret";
+      };
 
-    brave = prev.brave.override {
-      commandLineArgs = "--password-store=gnome-libsecret";
+      # nodejs_24 = inputs.nixpkgs-stable.legacyPackages.${prev.system}.nodejs_24;
+      # paperless-ngx = inputs.nixpkgs-45570c2.legacyPackages.${prev.system}.paperless-ngx;
+      # anytype-heart = inputs.nixpkgs-9e58ed7.legacyPackages.${prev.system}.anytype-heart;
+      # trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord;
+      # mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa;
+      # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
+      #   version = "latest"; # or whatever version you want
+      #   src = final.fetchFromGitHub {
+      #     owner = "Jas-SinghFSU";
+      #     repo = "HyprPanel";
+      #     rev = "master"; # or a specific commit hash
+      #     hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
+      #   };
+      # });
     };
 
-    # nodejs_24 = inputs.nixpkgs-stable.legacyPackages.${prev.system}.nodejs_24;
-    # paperless-ngx = inputs.nixpkgs-45570c2.legacyPackages.${prev.system}.paperless-ngx;
-    # anytype-heart = inputs.nixpkgs-9e58ed7.legacyPackages.${prev.system}.anytype-heart;
-    # trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord;
-    # mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa;
-    # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
-    #   version = "latest"; # or whatever version you want
-    #   src = final.fetchFromGitHub {
-    #     owner = "Jas-SinghFSU";
-    #     repo = "HyprPanel";
-    #     rev = "master"; # or a specific commit hash
-    #     hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
-    #   };
-    # });
-  };
-
   temp-packages = final: _prev: {
     temp = import inputs.nixpkgs-9e9486b {
       system = final.system;
diff --git a/overlays/mods/default.nix b/overlays/mods/default.nix
index 6ca16b2..e0b09aa 100644
--- a/overlays/mods/default.nix
+++ b/overlays/mods/default.nix
@@ -3,6 +3,8 @@
   # This overlay contains package overrides and modifications
 
   n8n = import ./n8n.nix {inherit prev;};
+  opencode = import ./opencode.nix {inherit prev;};
+  beads = import ./beads.nix {inherit prev;};
 
   # Add more modifications here as needed
   # example-package = prev.example-package.override { ... };