diff --git a/src/system/machines/desktop/modules/home-manager/home.nix b/src/system/machines/desktop/modules/home-manager/home.nix
index 9af2e97..38cb470 100644
--- a/src/system/machines/desktop/modules/home-manager/home.nix
+++ b/src/system/machines/desktop/modules/home-manager/home.nix
@@ -35,9 +35,12 @@
 
         gui = {
           wm.hyprland.enable = true;
+          browser = {
+            firefox.enable = true;
+            chromium.enable = true;
+          };
 
           alacritty.enable = true;
-          browsers.enable = true;
           corn.enable = true;
           fun.enable = true;
           utils.enable = true;
diff --git a/src/user/modules/gui/default.nix b/src/user/modules/gui/default.nix
index 6fa08dd..2b2f944 100644
--- a/src/user/modules/gui/default.nix
+++ b/src/user/modules/gui/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./wm
     ./modules
   ];
 }
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/chromium/config/extensions/browserpass.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/browserpass.crx
new file mode 100644
index 0000000..de1cdbc
Binary files /dev/null and b/src/user/modules/gui/modules/browsers/chromium/config/extensions/browserpass.crx differ
diff --git a/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx
new file mode 100644
index 0000000..83b75ae
Binary files /dev/null and b/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx differ
diff --git a/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx
new file mode 100644
index 0000000..bdcead1
Binary files /dev/null and b/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx differ
diff --git a/src/user/modules/gui/modules/browsers/chromium/default.nix b/src/user/modules/gui/modules/browsers/chromium/default.nix
new file mode 100644
index 0000000..ec67982
--- /dev/null
+++ b/src/user/modules/gui/modules/browsers/chromium/default.nix
@@ -0,0 +1,44 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.user.gui.browser.chromium;
+
+in
+{ options.modules.user.gui.browser.chromium = { enable = mkEnableOption "Enable Chromium browser"; };
+  config = mkIf cfg.enable {
+    programs = {
+      chromium = {
+        enable = true;
+        package = pkgs.ungoogled-chromium;
+        extensions = [
+          {
+            id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/ublock.crx;
+            version = "1.58.0";
+          }
+          {
+            id = "dbepggeogbaibhgnhhndojpepiihcmeb";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/vimium.crx;
+            version = "2.1.2";
+          }
+          {
+            id = "naepdomgkenhinolocfifgehidddafch";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/browserpass.crx;
+            version = "3.8.0";
+          }
+        ];
+      };
+      browserpass = {
+        enable = true;
+      };
+    };
+
+    home = {
+      file.".config/chromium/Extensions" = {
+        source = ./config/extensions;
+        recursive = true;
+      };
+    };
+  };
+}
diff --git a/src/user/modules/gui/modules/browsers/default.nix b/src/user/modules/gui/modules/browsers/default.nix
index c500785..28cacf5 100644
--- a/src/user/modules/gui/modules/browsers/default.nix
+++ b/src/user/modules/gui/modules/browsers/default.nix
@@ -1,22 +1,7 @@
-{ pkgs, lib, config, ... }:
-
-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) {
-    programs.firefox.enable = true;
-
-    home.packages = with pkgs; [
-     tor-browser
-     brave
-    ];
-  };
+{
+  imports = [
+    ./chromium
+    ./firefox
+    #./tor
+  ];
 }
diff --git a/src/user/modules/gui/modules/browsers/firefox/default.nix b/src/user/modules/gui/modules/browsers/firefox/default.nix
new file mode 100644
index 0000000..1bb0c82
--- /dev/null
+++ b/src/user/modules/gui/modules/browsers/firefox/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.user.gui.browser.firefox;
+
+in
+{ options.modules.user.gui.browser.firefox = { enable = mkEnableOption "Enable Firefox browser"; };
+  config = mkIf cfg.enable {
+    programs.firefox.enable = true;
+  };
+}
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/default.nix b/src/user/modules/gui/modules/default.nix
index 5227a48..86e7558 100644
--- a/src/user/modules/gui/modules/default.nix
+++ b/src/user/modules/gui/modules/default.nix
@@ -6,6 +6,5 @@
     ./fun
     ./utils
     ./writing
-    ./wm
   ];
 }
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/wm/hyprland/config/wallpapers b/src/user/modules/gui/modules/wm/hyprland/config/wallpapers
deleted file mode 120000
index 5a2e9bd..0000000
--- a/src/user/modules/gui/modules/wm/hyprland/config/wallpapers
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../configs/wallpapers/
\ No newline at end of file
diff --git a/src/user/modules/gui/modules/wm/sway/config/wallpapers b/src/user/modules/gui/modules/wm/sway/config/wallpapers
deleted file mode 120000
index 5a2e9bd..0000000
--- a/src/user/modules/gui/modules/wm/sway/config/wallpapers
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../configs/wallpapers/
\ No newline at end of file
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
diff --git a/src/user/modules/gui/modules/wm/default.nix b/src/user/modules/gui/wm/default.nix
similarity index 100%
rename from src/user/modules/gui/modules/wm/default.nix
rename to src/user/modules/gui/wm/default.nix
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/rofi/config/config.rasi b/src/user/modules/gui/wm/hyprland/config/rofi/config/config.rasi
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/rofi/config/config.rasi
rename to src/user/modules/gui/wm/hyprland/config/rofi/config/config.rasi
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/rofi/config/material-ocean.rasi b/src/user/modules/gui/wm/hyprland/config/rofi/config/material-ocean.rasi
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/rofi/config/material-ocean.rasi
rename to src/user/modules/gui/wm/hyprland/config/rofi/config/material-ocean.rasi
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/rofi/default.nix b/src/user/modules/gui/wm/hyprland/config/rofi/default.nix
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/rofi/default.nix
rename to src/user/modules/gui/wm/hyprland/config/rofi/default.nix
diff --git a/src/user/modules/gui/wm/hyprland/config/wallpapers b/src/user/modules/gui/wm/hyprland/config/wallpapers
new file mode 120000
index 0000000..54444d2
--- /dev/null
+++ b/src/user/modules/gui/wm/hyprland/config/wallpapers
@@ -0,0 +1 @@
+../../../../../configs/wallpapers/
\ No newline at end of file
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/waybar/config b/src/user/modules/gui/wm/hyprland/config/waybar/config
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/waybar/config
rename to src/user/modules/gui/wm/hyprland/config/waybar/config
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/waybar/scripts/getBlock b/src/user/modules/gui/wm/hyprland/config/waybar/scripts/getBlock
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/waybar/scripts/getBlock
rename to src/user/modules/gui/wm/hyprland/config/waybar/scripts/getBlock
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/waybar/scripts/weather.sh b/src/user/modules/gui/wm/hyprland/config/waybar/scripts/weather.sh
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/waybar/scripts/weather.sh
rename to src/user/modules/gui/wm/hyprland/config/waybar/scripts/weather.sh
diff --git a/src/user/modules/gui/modules/wm/hyprland/config/waybar/style.css b/src/user/modules/gui/wm/hyprland/config/waybar/style.css
similarity index 100%
rename from src/user/modules/gui/modules/wm/hyprland/config/waybar/style.css
rename to src/user/modules/gui/wm/hyprland/config/waybar/style.css
diff --git a/src/user/modules/gui/modules/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix
similarity index 99%
rename from src/user/modules/gui/modules/wm/hyprland/default.nix
rename to src/user/modules/gui/wm/hyprland/default.nix
index 8fa61b9..f2ee20d 100644
--- a/src/user/modules/gui/modules/wm/hyprland/default.nix
+++ b/src/user/modules/gui/wm/hyprland/default.nix
@@ -98,7 +98,7 @@ in
 
         env = [
           "HYPRCURSOR_SIZE, 24"
-          "GTK_THEME, Qogir"
+          "GTK_THEME, Juno-ocean"
 
           "LIBVA_DRIVER_NAME,nvidia"
           "XDG_SESSION_TYPE,wayland"
diff --git a/src/user/modules/gui/modules/wm/sway/config/rofi/config/config.rasi b/src/user/modules/gui/wm/sway/config/rofi/config/config.rasi
similarity index 100%
rename from src/user/modules/gui/modules/wm/sway/config/rofi/config/config.rasi
rename to src/user/modules/gui/wm/sway/config/rofi/config/config.rasi
diff --git a/src/user/modules/gui/modules/wm/sway/config/rofi/config/material-ocean.rasi b/src/user/modules/gui/wm/sway/config/rofi/config/material-ocean.rasi
similarity index 100%
rename from src/user/modules/gui/modules/wm/sway/config/rofi/config/material-ocean.rasi
rename to src/user/modules/gui/wm/sway/config/rofi/config/material-ocean.rasi
diff --git a/src/user/modules/gui/modules/wm/sway/config/rofi/default.nix b/src/user/modules/gui/wm/sway/config/rofi/default.nix
similarity index 100%
rename from src/user/modules/gui/modules/wm/sway/config/rofi/default.nix
rename to src/user/modules/gui/wm/sway/config/rofi/default.nix
diff --git a/src/user/modules/gui/modules/wm/sway/config/sway.nix b/src/user/modules/gui/wm/sway/config/sway.nix
similarity index 100%
rename from src/user/modules/gui/modules/wm/sway/config/sway.nix
rename to src/user/modules/gui/wm/sway/config/sway.nix
diff --git a/src/user/modules/gui/wm/sway/config/wallpapers b/src/user/modules/gui/wm/sway/config/wallpapers
new file mode 120000
index 0000000..54444d2
--- /dev/null
+++ b/src/user/modules/gui/wm/sway/config/wallpapers
@@ -0,0 +1 @@
+../../../../../configs/wallpapers/
\ No newline at end of file
diff --git a/src/user/modules/gui/modules/wm/sway/default.nix b/src/user/modules/gui/wm/sway/default.nix
similarity index 100%
rename from src/user/modules/gui/modules/wm/sway/default.nix
rename to src/user/modules/gui/wm/sway/default.nix