diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix
index dbcbb00..b89ff74 100644
--- a/modules/home/appearance/base/default.nix
+++ b/modules/home/appearance/base/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "appearance.base";
+  options.marleyos = mkEnableModule "appearance.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 92368e6..2ed598f 100644
--- a/modules/home/appearance/gtk/default.nix
+++ b/modules/home/appearance/gtk/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "appearance.gtk";
+  options.marleyos = mkEnableModule "appearance.gtk";
 
   config = mkIf cfg.enable {
     gtk = {
diff --git a/modules/home/appearance/qt/default.nix b/modules/home/appearance/qt/default.nix
index 0060a99..cc26c4a 100644
--- a/modules/home/appearance/qt/default.nix
+++ b/modules/home/appearance/qt/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "appearance.qt";
+  options.marleyos = mkEnableModule "appearance.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 e2af653..ecb49a6 100644
--- a/modules/home/programs/amfora/default.nix
+++ b/modules/home/programs/amfora/default.nix
@@ -19,7 +19,7 @@ let
   themeFile = themeFiles."${colors.base}";
 in
 {
-  options = mkEnableModule "programs.amfora";
+  options.marleyos = mkEnableModule "programs.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 2aa557d..efe804f 100644
--- a/modules/home/programs/bat/default.nix
+++ b/modules/home/programs/bat/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.bat";
+  options.marleyos = mkEnableModule "programs.bat";
 
   config = mkIf cfg.enable {
     programs.bat = {
diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix
index 9467e65..e1aa373 100644
--- a/modules/home/programs/btop/default.nix
+++ b/modules/home/programs/btop/default.nix
@@ -11,7 +11,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.btop";
+  options.marleyos = mkEnableModule "programs.btop";
 
   config = mkIf cfg.enable {
     programs.btop = {
diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/cava/default.nix
index 82c7f1e..3064fe9 100644
--- a/modules/home/programs/cava/default.nix
+++ b/modules/home/programs/cava/default.nix
@@ -11,7 +11,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.cava";
+  options.marleyos = mkEnableModule "programs.cava";
 
   config = mkIf cfg.enable {
     programs.cava = {
diff --git a/modules/home/programs/cheat/default.nix b/modules/home/programs/cheat/default.nix
index adf0d46..1ad25a5 100644
--- a/modules/home/programs/cheat/default.nix
+++ b/modules/home/programs/cheat/default.nix
@@ -14,7 +14,7 @@ let
   toYAML = (pkgs.formats.yaml { }).generate;
 in
 {
-  options = mkEnableModule "programs.cheat";
+  options.marleyos = mkEnableModule "programs.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 702cf81..540439c 100644
--- a/modules/home/programs/curl/default.nix
+++ b/modules/home/programs/curl/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.curl;
 in
 {
-  options = mkEnableModule "programs.curl";
+  options.marleyos = mkEnableModule "programs.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 70bd4a4..f9199b4 100644
--- a/modules/home/programs/eza/default.nix
+++ b/modules/home/programs/eza/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.marleyos.programs.eza;
 in
 {
-  options = mkEnableModule "programs.eza";
+  options.marleyos = mkEnableModule "programs.eza";
 
   config = mkIf cfg.enable {
     programs.eza = {
diff --git a/modules/home/programs/figlet/default.nix b/modules/home/programs/figlet/default.nix
index ab96ddd..135bea9 100644
--- a/modules/home/programs/figlet/default.nix
+++ b/modules/home/programs/figlet/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.figlet;
 in
 {
-  options = mkEnableModule "programs.figlet";
+  options.marleyos = mkEnableModule "programs.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 a53598e..fd07c45 100644
--- a/modules/home/programs/fish/default.nix
+++ b/modules/home/programs/fish/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.fish";
+  options.marleyos = mkEnableModule "programs.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 f354b6b..a243c2c 100644
--- a/modules/home/programs/fzf/default.nix
+++ b/modules/home/programs/fzf/default.nix
@@ -19,7 +19,7 @@ let
   has-difft = config.programs.git.difftastic.enable;
 in
 {
-  options = mkEnableModule "programs.fzf";
+  options.marleyos = mkEnableModule "programs.fzf";
 
   config = mkIf cfg.enable {
     programs.fzf = {
diff --git a/modules/home/programs/gh/default.nix b/modules/home/programs/gh/default.nix
index 060ebe8..b598ca6 100644
--- a/modules/home/programs/gh/default.nix
+++ b/modules/home/programs/gh/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.gh;
 in
 {
-  options = mkEnableModule "programs.gh";
+  options.marleyos = mkEnableModule "programs.gh";
 
   config = mkIf cfg.enable {
     programs.gh = {
diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix
index 28af6b4..5d6887e 100644
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.git;
 in
 {
-  options = mkEnableModule "programs.git";
+  options.marleyos = mkEnableModule "programs.git";
 
   imports = [
     ./aliases.nix
diff --git a/modules/home/programs/glow/default.nix b/modules/home/programs/glow/default.nix
index 40d5fae..319a192 100644
--- a/modules/home/programs/glow/default.nix
+++ b/modules/home/programs/glow/default.nix
@@ -13,7 +13,7 @@ let
   toYAML = (pkgs.formats.yaml { }).generate;
 in
 {
-  options = mkEnableModule "programs.glow";
+  options.marleyos = mkEnableModule "programs.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 b882cb8..38e9742 100644
--- a/modules/home/programs/gpg/default.nix
+++ b/modules/home/programs/gpg/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.gpg;
 in
 {
-  options = mkEnableModule "programs.gpg";
+  options.marleyos = mkEnableModule "programs.gpg";
 
   config = mkIf cfg.enable {
     programs.gpg = {
diff --git a/modules/home/programs/hyfetch/default.nix b/modules/home/programs/hyfetch/default.nix
index ce332aa..4dbf4be 100644
--- a/modules/home/programs/hyfetch/default.nix
+++ b/modules/home/programs/hyfetch/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.hyfetch;
 in
 {
-  options = mkEnableModule "programs.hyfetch";
+  options.marleyos = mkEnableModule "programs.hyfetch";
 
   imports = [
     ./neofetch.nix
diff --git a/modules/home/programs/journalctl/default.nix b/modules/home/programs/journalctl/default.nix
index 691db0a..ecdf441 100644
--- a/modules/home/programs/journalctl/default.nix
+++ b/modules/home/programs/journalctl/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.journalctl;
 in
 {
-  options = mkEnableModule "programs.journalctl";
+  options.marleyos = mkEnableModule "programs.journalctl";
 
   config = mkIf cfg.enable {
     home.shellAbbrs = {
diff --git a/modules/home/programs/just/default.nix b/modules/home/programs/just/default.nix
index f208a5f..2506e17 100644
--- a/modules/home/programs/just/default.nix
+++ b/modules/home/programs/just/default.nix
@@ -12,7 +12,7 @@ let
   cfg = config.marleyos.programs.just;
 in
 {
-  options = mkEnableModule "programs.just";
+  options.marleyos = mkEnableModule "programs.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 3e4698f..962f4a2 100644
--- a/modules/home/programs/lazygit/default.nix
+++ b/modules/home/programs/lazygit/default.nix
@@ -13,7 +13,7 @@ let
   has-difft = config.programs.git.difftastic.enable;
 in
 {
-  options = mkEnableModule "programs.lazygit";
+  options.marleyos = mkEnableModule "programs.lazygit";
 
   config = mkIf cfg.enable {
     programs.lazygit = {
diff --git a/modules/home/programs/less/default.nix b/modules/home/programs/less/default.nix
index 76abb11..ced0b2f 100644
--- a/modules/home/programs/less/default.nix
+++ b/modules/home/programs/less/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.less;
 in
 {
-  options = mkEnableModule "programs.less";
+  options.marleyos = mkEnableModule "programs.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 818cb0a..11adbec 100644
--- a/modules/home/programs/man/default.nix
+++ b/modules/home/programs/man/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.man;
 in
 {
-  options = mkEnableModule "programs.man";
+  options.marleyos = mkEnableModule "programs.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 9f8e82f..41707a3 100644
--- a/modules/home/programs/ncmpcpp/default.nix
+++ b/modules/home/programs/ncmpcpp/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.ncmpcpp;
 in
 {
-  options = mkEnableModule "programs.ncmpcpp";
+  options.marleyos = mkEnableModule "programs.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 457a051..bc8cd1f 100644
--- a/modules/home/programs/neo/default.nix
+++ b/modules/home/programs/neo/default.nix
@@ -12,7 +12,7 @@ let
   cfg = config.marleyos.programs.neo;
 in
 {
-  options = mkEnableModule "programs.neo";
+  options.marleyos = mkEnableModule "programs.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 d491971..4963f36 100644
--- a/modules/home/programs/rbw/default.nix
+++ b/modules/home/programs/rbw/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.rbw;
 in
 {
-  options = mkEnableModule "programs.rbw";
+  options.marleyos = mkEnableModule "programs.rbw";
 
   config = mkIf cfg.enable {
     programs.rbw = {
diff --git a/modules/home/programs/ripgrep/default.nix b/modules/home/programs/ripgrep/default.nix
index 163efdb..9289280 100644
--- a/modules/home/programs/ripgrep/default.nix
+++ b/modules/home/programs/ripgrep/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.ripgrep;
 in
 {
-  options = mkEnableModule "programs.ripgrep";
+  options.marleyos = mkEnableModule "programs.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 3092803..4f8cecc 100644
--- a/modules/home/programs/ssh/default.nix
+++ b/modules/home/programs/ssh/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.ssh;
 in
 {
-  options = mkEnableModule "programs.ssh";
+  options.marleyos = mkEnableModule "programs.ssh";
 
   config = mkIf cfg.enable {
     programs.ssh = {
diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix
index d0c60f8..1250be2 100644
--- a/modules/home/programs/starship/default.nix
+++ b/modules/home/programs/starship/default.nix
@@ -15,7 +15,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.starship";
+  options.marleyos = mkEnableModule "programs.starship";
 
   imports = [
     ./nerd-font-symbols.nix
diff --git a/modules/home/programs/systemctl/default.nix b/modules/home/programs/systemctl/default.nix
index 6953321..4d51525 100644
--- a/modules/home/programs/systemctl/default.nix
+++ b/modules/home/programs/systemctl/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.systemctl;
 in
 {
-  options = mkEnableModule "programs.systemctl";
+  options.marleyos = mkEnableModule "programs.systemctl";
 
   config = mkIf cfg.enable {
     home.shellAbbrs = {
diff --git a/modules/home/programs/tmux/default.nix b/modules/home/programs/tmux/default.nix
index 6c79463..20a5681 100644
--- a/modules/home/programs/tmux/default.nix
+++ b/modules/home/programs/tmux/default.nix
@@ -12,7 +12,7 @@ let
   inherit (config.marleyos.theme) colors;
 in
 {
-  options = mkEnableModule "programs.tmux";
+  options.marleyos = mkEnableModule "programs.tmux";
 
   config = mkIf cfg.enable {
     programs.tmux = {
diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/wezterm/default.nix
index 4ca689b..412e565 100644
--- a/modules/home/programs/wezterm/default.nix
+++ b/modules/home/programs/wezterm/default.nix
@@ -14,7 +14,7 @@ let
   isGenericLinux = config.targets.genericLinux.enable;
 in
 {
-  options = mkEnableModule "programs.wezterm";
+  options.marleyos = mkEnableModule "programs.wezterm";
 
   config = mkIf cfg.enable {
     programs.wezterm = {
diff --git a/modules/home/programs/wget/default.nix b/modules/home/programs/wget/default.nix
index 8dfb4ad..fac3364 100644
--- a/modules/home/programs/wget/default.nix
+++ b/modules/home/programs/wget/default.nix
@@ -12,7 +12,7 @@ let
   cfg = config.marleyos.programs.wget;
 in
 {
-  options = mkEnableModule "programs.wget";
+  options.marleyos = mkEnableModule "programs.wget";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/zoxide/default.nix b/modules/home/programs/zoxide/default.nix
index c9e3598..29d59a0 100644
--- a/modules/home/programs/zoxide/default.nix
+++ b/modules/home/programs/zoxide/default.nix
@@ -11,7 +11,7 @@ let
   cfg = config.marleyos.programs.zoxide;
 in
 {
-  options = mkEnableModule "programs.zoxide";
+  options.marleyos = mkEnableModule "programs.zoxide";
 
   config = mkIf cfg.enable {
     programs.zoxide = {
diff --git a/modules/home/services/clipboard/default.nix b/modules/home/services/clipboard/default.nix
index 071a9f8..ac0da34 100644
--- a/modules/home/services/clipboard/default.nix
+++ b/modules/home/services/clipboard/default.nix
@@ -12,7 +12,7 @@ let
   cfg = config.marleyos.services.clipboard;
 in
 {
-  options = mkEnableModule "services.clipboard";
+  options.marleyos = mkEnableModule "services.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 87e443d..5bf0d85 100644
--- a/modules/home/services/dunst/default.nix
+++ b/modules/home/services/dunst/default.nix
@@ -16,7 +16,7 @@ let
   isRosePine = colors.base == "rose-pine";
 in
 {
-  options = mkEnableModule "services.dunst";
+  options.marleyos = mkEnableModule "services.dunst";
 
   config = mkIf cfg.enable {
     services.dunst = {
diff --git a/modules/home/services/syncthing/default.nix b/modules/home/services/syncthing/default.nix
index 0163552..2f69053 100644
--- a/modules/home/services/syncthing/default.nix
+++ b/modules/home/services/syncthing/default.nix
@@ -12,7 +12,7 @@ let
   cfg = config.marleyos.services.syncthing;
 in
 {
-  options = mkEnableModule "services.syncthing";
+  options.marleyos = mkEnableModule "services.syncthing";
 
   config = mkIf cfg.enable {
     home.packages = [
diff --git a/modules/home/xorg/xsession/default.nix b/modules/home/xorg/xsession/default.nix
index 9665279..d5522d7 100644
--- a/modules/home/xorg/xsession/default.nix
+++ b/modules/home/xorg/xsession/default.nix
@@ -10,7 +10,7 @@ let
   cfg = config.marleyos.xorg.xsession;
 in
 {
-  options = mkEnableModule "xorg.xsession";
+  options.marleyos = mkEnableModule "xorg.xsession";
 
   config = mkIf cfg.enable {
     xsession = {