diff --git a/lib/module/default.nix b/lib/module/default.nix
index 1022432..10bcdbd 100644
--- a/lib/module/default.nix
+++ b/lib/module/default.nix
@@ -1,42 +1,4 @@
-{ lib, ... }:
-with lib;
-rec {
-  ## Create a module option with only an enable option.
-  ## ```nix
-  ## options = lib.mkEnableModule "module-name"
-  ## ```
-  ##
-  #@ String
-  mkEnableModule = name: {
-    marleyos."${name}".enable = mkEnableOption "${name}";
-  };
-
-  ## Create a NixOS module option.
-  ##
-  ## ```nix
-  ## lib.mkOpt nixpkgs.lib.types.str "My default" "Description of my option."
-  ## ```
-  ##
-  #@ Type -> Any -> String
-  mkOpt =
-    type: default: description:
-    mkOption {
-      inherit
-        type
-        default
-        description
-        ;
-    };
-
-  ## Create a boolean NixOS module option.
-  ##
-  ## ```nix
-  ## lib.mkBoolOpt true "Description of my option."
-  ## ```
-  ##
-  #@ Type -> Any -> String
-  mkBoolOpt = mkOpt types.bool;
-
+_: {
   enabled = {
     ## Quickly enable an option.
     ##
diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix
index b89ff74..2cafdd9 100644
--- a/modules/home/appearance/base/default.nix
+++ b/modules/home/appearance/base/default.nix
@@ -5,14 +5,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.appearance.base;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "appearance.base";
+  options.marleyos.appearance.base.enable = mkEnableOption "base";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/appearance/gtk/default.nix b/modules/home/appearance/gtk/default.nix
index 2ed598f..d853ef9 100644
--- a/modules/home/appearance/gtk/default.nix
+++ b/modules/home/appearance/gtk/default.nix
@@ -1,18 +1,17 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.appearance.gtk;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "appearance.gtk";
+  options.marleyos.appearance.gtk.enable = mkEnableOption "gtk";
 
   config = mkIf cfg.enable {
     gtk = {
diff --git a/modules/home/appearance/qt/default.nix b/modules/home/appearance/qt/default.nix
index cc26c4a..702a301 100644
--- a/modules/home/appearance/qt/default.nix
+++ b/modules/home/appearance/qt/default.nix
@@ -5,14 +5,13 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.appearance.qt;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "appearance.qt";
+  options.marleyos.appearance.qt.enable = mkEnableOption "qt";
 
   config = mkIf cfg.enable {
     xdg.configFile = mkIf (colors.base == "rose-pine") {
diff --git a/modules/home/programs/amfora/default.nix b/modules/home/programs/amfora/default.nix
index ecb49a6..1b6b127 100644
--- a/modules/home/programs/amfora/default.nix
+++ b/modules/home/programs/amfora/default.nix
@@ -6,8 +6,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.amfora;
   inherit (config.marleyos.theme) colors;
@@ -19,7 +18,7 @@ let
   themeFile = themeFiles."${colors.base}";
 in
 {
-  options.marleyos = mkEnableModule "programs.amfora";
+  options.marleyos.programs.amfora = mkEnableOption "amfora";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/bat/default.nix b/modules/home/programs/bat/default.nix
index efe804f..f39f44a 100644
--- a/modules/home/programs/bat/default.nix
+++ b/modules/home/programs/bat/default.nix
@@ -5,14 +5,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.bat;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.bat";
+  options.marleyos.programs.bat = mkEnableOption "bat";
 
   config = mkIf cfg.enable {
     programs.bat = {
diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix
index e1aa373..cd9b764 100644
--- a/modules/home/programs/btop/default.nix
+++ b/modules/home/programs/btop/default.nix
@@ -4,14 +4,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.btop;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.btop";
+  options.marleyos.programs.btop = mkEnableOption "btop";
 
   config = mkIf cfg.enable {
     programs.btop = {
diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/cava/default.nix
index 3064fe9..57e60d1 100644
--- a/modules/home/programs/cava/default.nix
+++ b/modules/home/programs/cava/default.nix
@@ -4,14 +4,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.cava;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.cava";
+  options.marleyos.programs.cava = mkEnableOption "cava";
 
   config = mkIf cfg.enable {
     programs.cava = {
diff --git a/modules/home/programs/cheat/default.nix b/modules/home/programs/cheat/default.nix
index 1ad25a5..715642c 100644
--- a/modules/home/programs/cheat/default.nix
+++ b/modules/home/programs/cheat/default.nix
@@ -5,8 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.cheat;
   inherit (config.marleyos.theme) colors;
@@ -14,7 +13,7 @@ let
   toYAML = (pkgs.formats.yaml { }).generate;
 in
 {
-  options.marleyos = mkEnableModule "programs.cheat";
+  options.marleyos.programs.cheat = mkEnableOption "cheat";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/curl/default.nix b/modules/home/programs/curl/default.nix
index 540439c..1dfa12c 100644
--- a/modules/home/programs/curl/default.nix
+++ b/modules/home/programs/curl/default.nix
@@ -5,13 +5,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.curl;
 in
 {
-  options.marleyos = mkEnableModule "programs.curl";
+  options.marleyos.programs.curl = mkEnableOption "curl";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/eza/default.nix b/modules/home/programs/eza/default.nix
index f9199b4..0cdbb31 100644
--- a/modules/home/programs/eza/default.nix
+++ b/modules/home/programs/eza/default.nix
@@ -4,13 +4,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.eza;
 in
 {
-  options.marleyos = mkEnableModule "programs.eza";
+  options.marleyos.programs.eza = mkEnableOption "eza";
 
   config = mkIf cfg.enable {
     programs.eza = {
diff --git a/modules/home/programs/figlet/default.nix b/modules/home/programs/figlet/default.nix
index 135bea9..9c69230 100644
--- a/modules/home/programs/figlet/default.nix
+++ b/modules/home/programs/figlet/default.nix
@@ -5,13 +5,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.figlet;
 in
 {
-  options.marleyos = mkEnableModule "programs.figlet";
+  options.marleyos.programs.figlet = mkEnableOption "figlet";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/fish/default.nix
index fd07c45..3cee1f1 100644
--- a/modules/home/programs/fish/default.nix
+++ b/modules/home/programs/fish/default.nix
@@ -5,14 +5,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.fish;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.fish";
+  options.marleyos.programs.fish.enable = mkEnableOption "fish";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix
index a243c2c..e1ede24 100644
--- a/modules/home/programs/fzf/default.nix
+++ b/modules/home/programs/fzf/default.nix
@@ -4,8 +4,8 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.fzf;
   inherit (config.marleyos.theme) colors;
@@ -19,7 +19,7 @@ let
   has-difft = config.programs.git.difftastic.enable;
 in
 {
-  options.marleyos = mkEnableModule "programs.fzf";
+  options.marleyos.programs.fzf.enable = mkEnableOption "fzf";
 
   config = mkIf cfg.enable {
     programs.fzf = {
diff --git a/modules/home/programs/gh/default.nix b/modules/home/programs/gh/default.nix
index b598ca6..8235cf1 100644
--- a/modules/home/programs/gh/default.nix
+++ b/modules/home/programs/gh/default.nix
@@ -5,13 +5,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.gh;
 in
 {
-  options.marleyos = mkEnableModule "programs.gh";
+  options.marleyos.programs.gh.enable = mkEnableOption "gh";
 
   config = mkIf cfg.enable {
     programs.gh = {
diff --git a/modules/home/programs/git/aliases.nix b/modules/home/programs/git/aliases.nix
index 53ffed3..cabad38 100644
--- a/modules/home/programs/git/aliases.nix
+++ b/modules/home/programs/git/aliases.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix
index 5d6887e..e7ed664 100644
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -5,13 +5,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.git;
 in
 {
-  options.marleyos = mkEnableModule "programs.git";
+  options.marleyos.programs.git.enable = mkEnableOption "git";
 
   imports = [
     ./aliases.nix
diff --git a/modules/home/programs/glow/default.nix b/modules/home/programs/glow/default.nix
index 319a192..8dd8592 100644
--- a/modules/home/programs/glow/default.nix
+++ b/modules/home/programs/glow/default.nix
@@ -1,19 +1,17 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.glow;
   toYAML = (pkgs.formats.yaml { }).generate;
 in
 {
-  options.marleyos = mkEnableModule "programs.glow";
+  options.marleyos.programs.glow.enable = mkEnableOption "glow";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/gpg/default.nix b/modules/home/programs/gpg/default.nix
index 38e9742..f3f6a29 100644
--- a/modules/home/programs/gpg/default.nix
+++ b/modules/home/programs/gpg/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.gpg;
 in
 {
-  options.marleyos = mkEnableModule "programs.gpg";
+  options.marleyos.programs.gpg.enable = mkEnableOption "gpg";
 
   config = mkIf cfg.enable {
     programs.gpg = {
diff --git a/modules/home/programs/hyfetch/default.nix b/modules/home/programs/hyfetch/default.nix
index 4dbf4be..78aa882 100644
--- a/modules/home/programs/hyfetch/default.nix
+++ b/modules/home/programs/hyfetch/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.hyfetch;
 in
 {
-  options.marleyos = mkEnableModule "programs.hyfetch";
+  options.marleyos.programs.hyfetch.enable = mkEnableOption "hyfetch";
 
   imports = [
     ./neofetch.nix
diff --git a/modules/home/programs/hyfetch/neofetch.nix b/modules/home/programs/hyfetch/neofetch.nix
index cb569e8..693e2d2 100644
--- a/modules/home/programs/hyfetch/neofetch.nix
+++ b/modules/home/programs/hyfetch/neofetch.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
diff --git a/modules/home/programs/journalctl/default.nix b/modules/home/programs/journalctl/default.nix
index ecdf441..a27a000 100644
--- a/modules/home/programs/journalctl/default.nix
+++ b/modules/home/programs/journalctl/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.journalctl;
 in
 {
-  options.marleyos = mkEnableModule "programs.journalctl";
+  options.marleyos.programs.journalctl.enable = mkEnableOption "journalctl";
 
   config = mkIf cfg.enable {
     home.shellAbbrs = {
diff --git a/modules/home/programs/just/default.nix b/modules/home/programs/just/default.nix
index 2506e17..afb1bc3 100644
--- a/modules/home/programs/just/default.nix
+++ b/modules/home/programs/just/default.nix
@@ -1,18 +1,16 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.just;
 in
 {
-  options.marleyos = mkEnableModule "programs.just";
+  options.marleyos.programs.just.enable = mkEnableOption "just";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/lazygit/default.nix b/modules/home/programs/lazygit/default.nix
index 962f4a2..9c0c894 100644
--- a/modules/home/programs/lazygit/default.nix
+++ b/modules/home/programs/lazygit/default.nix
@@ -1,19 +1,17 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.lazygit;
   has-delta = config.programs.git.delta.enable;
   has-difft = config.programs.git.difftastic.enable;
 in
 {
-  options.marleyos = mkEnableModule "programs.lazygit";
+  options.marleyos.programs.lazygit.enable = mkEnableOption "lazygit";
 
   config = mkIf cfg.enable {
     programs.lazygit = {
diff --git a/modules/home/programs/less/default.nix b/modules/home/programs/less/default.nix
index ced0b2f..dde8827 100644
--- a/modules/home/programs/less/default.nix
+++ b/modules/home/programs/less/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.less;
 in
 {
-  options.marleyos = mkEnableModule "programs.less";
+  options.marleyos.programs.less.enable = mkEnableOption "less";
 
   config = mkIf cfg.enable {
     programs.less.enable = true;
diff --git a/modules/home/programs/man/default.nix b/modules/home/programs/man/default.nix
index 11adbec..22d5037 100644
--- a/modules/home/programs/man/default.nix
+++ b/modules/home/programs/man/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.man;
 in
 {
-  options.marleyos = mkEnableModule "programs.man";
+  options.marleyos.programs.man.enable = mkEnableOption "man";
 
   config = mkIf cfg.enable {
     programs.man.enable = true;
diff --git a/modules/home/programs/ncmpcpp/default.nix b/modules/home/programs/ncmpcpp/default.nix
index 41707a3..2a1d08e 100644
--- a/modules/home/programs/ncmpcpp/default.nix
+++ b/modules/home/programs/ncmpcpp/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.ncmpcpp;
 in
 {
-  options.marleyos = mkEnableModule "programs.ncmpcpp";
+  options.marleyos.programs.ncmpcpp.enable = mkEnableOption "ncmpcpp";
 
   config = mkIf cfg.enable {
     programs.ncmpcpp.enable = true;
diff --git a/modules/home/programs/neo/default.nix b/modules/home/programs/neo/default.nix
index bc8cd1f..be1a33e 100644
--- a/modules/home/programs/neo/default.nix
+++ b/modules/home/programs/neo/default.nix
@@ -1,18 +1,16 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.neo;
 in
 {
-  options.marleyos = mkEnableModule "programs.neo";
+  options.marleyos.programs.neo.enable = mkEnableOption "neo";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/rbw/default.nix b/modules/home/programs/rbw/default.nix
index 4963f36..f06ebf0 100644
--- a/modules/home/programs/rbw/default.nix
+++ b/modules/home/programs/rbw/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.rbw;
 in
 {
-  options.marleyos = mkEnableModule "programs.rbw";
+  options.marleyos.programs.rbw.enable = mkEnableOption "rbw";
 
   config = mkIf cfg.enable {
     programs.rbw = {
diff --git a/modules/home/programs/ripgrep/default.nix b/modules/home/programs/ripgrep/default.nix
index 9289280..399cfca 100644
--- a/modules/home/programs/ripgrep/default.nix
+++ b/modules/home/programs/ripgrep/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.ripgrep;
 in
 {
-  options.marleyos = mkEnableModule "programs.ripgrep";
+  options.marleyos.programs.ripgrep.enable = mkEnableOption "ripgrep";
 
   config = mkIf cfg.enable {
     programs.ripgrep.enable = true;
diff --git a/modules/home/programs/ssh/default.nix b/modules/home/programs/ssh/default.nix
index 4f8cecc..7043238 100644
--- a/modules/home/programs/ssh/default.nix
+++ b/modules/home/programs/ssh/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.ssh;
 in
 {
-  options.marleyos = mkEnableModule "programs.ssh";
+  options.marleyos.programs.ssh.enable = mkEnableOption "ssh";
 
   config = mkIf cfg.enable {
     programs.ssh = {
diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix
index 1250be2..805a98a 100644
--- a/modules/home/programs/starship/default.nix
+++ b/modules/home/programs/starship/default.nix
@@ -5,17 +5,18 @@
 }:
 let
   inherit (lib)
+    mkEnableOption
     mkIf
     mkForce
     concatStrings
     ;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.starship;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.starship";
+  options.marleyos.programs.starship.enable = mkEnableOption "starship";
 
   imports = [
     ./nerd-font-symbols.nix
diff --git a/modules/home/programs/starship/nerd-font-symbols.nix b/modules/home/programs/starship/nerd-font-symbols.nix
index fc3c6cf..232b81e 100644
--- a/modules/home/programs/starship/nerd-font-symbols.nix
+++ b/modules/home/programs/starship/nerd-font-symbols.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
diff --git a/modules/home/programs/systemctl/default.nix b/modules/home/programs/systemctl/default.nix
index 4d51525..df5422b 100644
--- a/modules/home/programs/systemctl/default.nix
+++ b/modules/home/programs/systemctl/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.systemctl;
 in
 {
-  options.marleyos = mkEnableModule "programs.systemctl";
+  options.marleyos.programs.systemctl.enable = mkEnableOption "systemctl";
 
   config = mkIf cfg.enable {
     home.shellAbbrs = {
diff --git a/modules/home/programs/tmux/default.nix b/modules/home/programs/tmux/default.nix
index 20a5681..db9d26a 100644
--- a/modules/home/programs/tmux/default.nix
+++ b/modules/home/programs/tmux/default.nix
@@ -5,14 +5,13 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.tmux;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options.marleyos = mkEnableModule "programs.tmux";
+  options.marleyos.programs.tmux.enable = mkEnableOption "tmux";
 
   config = mkIf cfg.enable {
     programs.tmux = {
diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/wezterm/default.nix
index 412e565..8ab1c46 100644
--- a/modules/home/programs/wezterm/default.nix
+++ b/modules/home/programs/wezterm/default.nix
@@ -5,8 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.wezterm;
   inherit (config.marleyos.theme) colors;
@@ -14,7 +13,7 @@ let
   isGenericLinux = config.targets.genericLinux.enable;
 in
 {
-  options.marleyos = mkEnableModule "programs.wezterm";
+  options.marleyos.programs.wezterm.enable = mkEnableOption "wezterm";
 
   config = mkIf cfg.enable {
     programs.wezterm = {
diff --git a/modules/home/programs/wget/default.nix b/modules/home/programs/wget/default.nix
index fac3364..e711b45 100644
--- a/modules/home/programs/wget/default.nix
+++ b/modules/home/programs/wget/default.nix
@@ -1,18 +1,16 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.wget;
 in
 {
-  options.marleyos = mkEnableModule "programs.wget";
+  options.marleyos.programs.wget.enable = mkEnableOption "wget";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/zathura/default.nix b/modules/home/programs/zathura/default.nix
index c7abd25..2613e80 100644
--- a/modules/home/programs/zathura/default.nix
+++ b/modules/home/programs/zathura/default.nix
@@ -4,14 +4,14 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule enabled;
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.marleyos) enabled;
 
   cfg = config.marleyos.programs.zathura;
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.zathura";
+  options.marleyos.programs.zathura.enable = mkEnableOption "zathura";
 
   config = mkIf cfg.enable {
     programs.zathura = {
diff --git a/modules/home/programs/zoxide/default.nix b/modules/home/programs/zoxide/default.nix
index 29d59a0..e8b2945 100644
--- a/modules/home/programs/zoxide/default.nix
+++ b/modules/home/programs/zoxide/default.nix
@@ -1,17 +1,15 @@
 {
   lib,
   config,
-  namespace,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.zoxide;
 in
 {
-  options.marleyos = mkEnableModule "programs.zoxide";
+  options.marleyos.programs.zoxide.enable = mkEnableOption "zoxide";
 
   config = mkIf cfg.enable {
     programs.zoxide = {
diff --git a/modules/home/services/clipboard/default.nix b/modules/home/services/clipboard/default.nix
index ac0da34..afa2763 100644
--- a/modules/home/services/clipboard/default.nix
+++ b/modules/home/services/clipboard/default.nix
@@ -1,18 +1,16 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.services.clipboard;
 in
 {
-  options.marleyos = mkEnableModule "services.clipboard";
+  options.marleyos.services.clipboard.enable = mkEnableOption "clipboard";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/services/dunst/default.nix b/modules/home/services/dunst/default.nix
index 5bf0d85..29e8c31 100644
--- a/modules/home/services/dunst/default.nix
+++ b/modules/home/services/dunst/default.nix
@@ -5,10 +5,11 @@
 }:
 let
   inherit (lib)
+    mkEnableOption
     mkIf
     mkMerge
     ;
-  inherit (lib.marleyos) mkEnableModule disabled;
+  inherit (lib.marleyos) disabled;
 
   cfg = config.marleyos.services.dunst;
   inherit (config.marleyos.theme) colors;
@@ -16,7 +17,7 @@ let
   isRosePine = colors.base == "rose-pine";
 in
 {
-  options.marleyos = mkEnableModule "services.dunst";
+  options.marleyos.services.dunst.enable = mkEnableOption "dunst";
 
   config = mkIf cfg.enable {
     services.dunst = {
diff --git a/modules/home/services/syncthing/default.nix b/modules/home/services/syncthing/default.nix
index 2f69053..20ecb74 100644
--- a/modules/home/services/syncthing/default.nix
+++ b/modules/home/services/syncthing/default.nix
@@ -1,18 +1,16 @@
 {
   lib,
   config,
-  namespace,
   pkgs,
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.services.syncthing;
 in
 {
-  options.marleyos = mkEnableModule "services.syncthing";
+  options.marleyos.services.syncthing.enable = mkEnableOption "syncthing";
 
   config = mkIf cfg.enable {
     home.packages = [
diff --git a/modules/home/xorg/xsession/default.nix b/modules/home/xorg/xsession/default.nix
index d5522d7..e220d4b 100644
--- a/modules/home/xorg/xsession/default.nix
+++ b/modules/home/xorg/xsession/default.nix
@@ -4,13 +4,12 @@
   ...
 }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.marleyos) mkEnableModule;
+  inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.xorg.xsession;
 in
 {
-  options.marleyos = mkEnableModule "xorg.xsession";
+  options.marleyos.xorg.xsession.enable = mkEnableOption "xsession";
 
   config = mkIf cfg.enable {
     xsession = {