diff --git a/src/user/modules/gui/modules/browsers/default.nix b/src/user/modules/gui/modules/browsers/default.nix
index fe150bb..c500785 100644
--- a/src/user/modules/gui/modules/browsers/default.nix
+++ b/src/user/modules/gui/modules/browsers/default.nix
@@ -3,10 +3,15 @@
 with lib;
 let
   cfg = config.modules.user.gui.browsers;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
 
 in
 { options.modules.user.gui.browsers = { enable = mkEnableOption "user.gui.browsers"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && wm.enable) {
     programs.firefox.enable = true;
 
     home.packages = with pkgs; [
diff --git a/src/user/modules/gui/modules/corn/default.nix b/src/user/modules/gui/modules/corn/default.nix
index 381df11..0bc0b52 100644
--- a/src/user/modules/gui/modules/corn/default.nix
+++ b/src/user/modules/gui/modules/corn/default.nix
@@ -3,16 +3,20 @@
 with lib;
 let
   cfg = config.modules.user.gui.corn;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
 
 in
 { options.modules.user.gui.corn = { enable = mkEnableOption "user.gui.corn"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && wm.enable) {
     home.packages = with pkgs; [
       trezor-suite
       trezorctl
       trezord
 
-      electrum
       bisq-desktop
 
       sparrow
diff --git a/src/user/modules/gui/modules/fun/default.nix b/src/user/modules/gui/modules/fun/default.nix
index 847993e..79e1b8c 100644
--- a/src/user/modules/gui/modules/fun/default.nix
+++ b/src/user/modules/gui/modules/fun/default.nix
@@ -3,10 +3,15 @@
 with lib;
 let
   cfg = config.modules.user.gui.fun;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
 
 in
 { options.modules.user.gui.fun = { enable = mkEnableOption "user.gui.fun"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && wm.enable) {
     programs.obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [
diff --git a/src/user/modules/gui/modules/utils/default.nix b/src/user/modules/gui/modules/utils/default.nix
index 8409ee3..ec26bec 100644
--- a/src/user/modules/gui/modules/utils/default.nix
+++ b/src/user/modules/gui/modules/utils/default.nix
@@ -3,10 +3,15 @@
 with lib;
 let
   cfg = config.modules.user.gui.utils;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
 
 in
 { options.modules.user.gui.utils = { enable = mkEnableOption "user.gui.utils"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && wm.enable) {
     programs.btop.enable = true;
     home.packages = with pkgs; [
       gimp
diff --git a/src/user/modules/gui/modules/writing/default.nix b/src/user/modules/gui/modules/writing/default.nix
index 4bca46a..b2a13ed 100644
--- a/src/user/modules/gui/modules/writing/default.nix
+++ b/src/user/modules/gui/modules/writing/default.nix
@@ -3,10 +3,15 @@
 with lib;
 let
   cfg = config.modules.user.gui.writing;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
 
 in
 { options.modules.user.gui.writing = { enable = mkEnableOption "user.gui.writing"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && wm.enable) {
     home.packages = with pkgs; [
       mdbook
       texlive.combined.scheme-tetex