diff --git a/src/user/modules/gui/modules/alacritty/default.nix b/src/user/modules/gui/modules/alacritty/default.nix
index c181daf..290e19f 100644
--- a/src/user/modules/gui/modules/alacritty/default.nix
+++ b/src/user/modules/gui/modules/alacritty/default.nix
@@ -3,15 +3,10 @@
 with lib;
 let
   cfg = config.modules.user.gui.alacritty;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.alacritty = { enable = mkEnableOption "user.gui.alacritty"; };
-  config = mkIf (cfg.enable && wm.enable) {
+{ options.modules.user.gui.alacritty = { enable = mkEnableOption "Enable Alacritty terminal"; };
+  config = mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
       settings = import ./config/alacritty.nix { inherit config; };
diff --git a/src/user/modules/gui/modules/browsers/default.nix b/src/user/modules/gui/modules/browsers/default.nix
index c500785..0c455e8 100644
--- a/src/user/modules/gui/modules/browsers/default.nix
+++ b/src/user/modules/gui/modules/browsers/default.nix
@@ -3,15 +3,9 @@
 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 && wm.enable) {
+{ options.modules.user.gui.browsers = { enable = mkEnableOption "Enable browsers"; };
+  config = mkIf cfg.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 0bc0b52..372343d 100644
--- a/src/user/modules/gui/modules/corn/default.nix
+++ b/src/user/modules/gui/modules/corn/default.nix
@@ -3,15 +3,10 @@
 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 && wm.enable) {
+{ options.modules.user.gui.corn = { enable = mkEnableOption "Enable Bitcoin client applications"; };
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       trezor-suite
       trezorctl
diff --git a/src/user/modules/gui/modules/fun/default.nix b/src/user/modules/gui/modules/fun/default.nix
index 79e1b8c..4d72775 100644
--- a/src/user/modules/gui/modules/fun/default.nix
+++ b/src/user/modules/gui/modules/fun/default.nix
@@ -3,15 +3,10 @@
 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 && wm.enable) {
+{ options.modules.user.gui.fun = { enable = mkEnableOption "Enable entertainment apps"; };
+  config = mkIf cfg.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 ec26bec..f162ad3 100644
--- a/src/user/modules/gui/modules/utils/default.nix
+++ b/src/user/modules/gui/modules/utils/default.nix
@@ -3,21 +3,14 @@
 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 && wm.enable) {
+{ options.modules.user.gui.utils = { enable = mkEnableOption "Enable desktop utils"; };
+  config = mkIf cfg.enable {
     programs.btop.enable = true;
     home.packages = with pkgs; [
       gimp
       libreoffice
-
-      teams-for-linux
     ];
   };
 }
diff --git a/src/user/modules/gui/modules/writing/default.nix b/src/user/modules/gui/modules/writing/default.nix
index b2a13ed..96de412 100644
--- a/src/user/modules/gui/modules/writing/default.nix
+++ b/src/user/modules/gui/modules/writing/default.nix
@@ -3,15 +3,10 @@
 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 && wm.enable) {
+{ options.modules.user.gui.writing = { enable = mkEnableOption "Enable writing tools"; };
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       mdbook
       texlive.combined.scheme-tetex