diff --git a/Droidnix/README.org b/Droidnix/README.org
index 8a13bc581..c528b6882 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -782,18 +782,17 @@ in
 ** =generated/modules/apps/zenbrowser.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/modules/apps/zenbrowser.nix :noweb tangle :mkdirp yes :eval never-html
+# ./generated/modules/apps/zenbrowser.nix
 { pkgs, lib, ... }:
 
-let
-  packageRef = "zen-browser";
-in
 {
+  # Declare the option to enable Zen Browser
   options.mySystem.apps.zenBrowser.enable =
     lib.mkEnableOption "Enable Zen Browser";
 
-  # Top-level config without touching `config` inside
-  config = lib.mkIf (lib.getOption "mySystem.apps.zenBrowser.enable") {
-    environment.systemPackages = [ pkgs.${packageRef} ];
+  # Top-level config, fully self-contained
+  config = { config, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
+    environment.systemPackages = [ pkgs.zen-browser ];
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix
index 432e152af..a0d948adb 100644
--- a/Droidnix/generated/modules/apps/zenbrowser.nix
+++ b/Droidnix/generated/modules/apps/zenbrowser.nix
@@ -1,14 +1,13 @@
+# ./generated/modules/apps/zenbrowser.nix
 { pkgs, lib, ... }:
 
-let
-  packageRef = "zen-browser";
-in
 {
+  # Declare the option to enable Zen Browser
   options.mySystem.apps.zenBrowser.enable =
     lib.mkEnableOption "Enable Zen Browser";
 
-  # Top-level config without touching `config` inside
-  config = lib.mkIf (lib.getOption "mySystem.apps.zenBrowser.enable") {
-    environment.systemPackages = [ pkgs.${packageRef} ];
+  # Top-level config, fully self-contained
+  config = { config, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
+    environment.systemPackages = [ pkgs.zen-browser ];
   };
 }