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/bash/config/shellHook.nix b/src/user/modules/bash/config/shellHook.nix
index 0b348d1..be94e35 100644
--- a/src/user/modules/bash/config/shellHook.nix
+++ b/src/user/modules/bash/config/shellHook.nix
@@ -25,6 +25,7 @@ case $- in
       exec Hyprland
       ''
       }
+      exit 0
     fi
     ''}
     ${optionalString tmux.enable ''
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 0c455e8..28cacf5 100644
--- a/src/user/modules/gui/modules/browsers/default.nix
+++ b/src/user/modules/gui/modules/browsers/default.nix
@@ -1,16 +1,7 @@
-{ pkgs, lib, config, ... }:
-
-with lib;
-let
-  cfg = config.modules.user.gui.browsers;
-in
-{ options.modules.user.gui.browsers = { enable = mkEnableOption "Enable browsers"; };
-  config = mkIf cfg.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/default.nix b/src/user/modules/gui/modules/default.nix
index 6a1f9e1..86e7558 100644
--- a/src/user/modules/gui/modules/default.nix
+++ b/src/user/modules/gui/modules/default.nix
@@ -1,18 +1,10 @@
-{ config, lib, ... }:
-
-let
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues config.modules.user.gui.wm);
-  };
-
-in
 {
-  imports = if wm.enable then [
+  imports = [
     ./alacritty
     ./browsers
     ./corn
     ./fun
     ./utils
     ./writing
-  ] else [];
+  ];
 }
diff --git a/src/user/modules/gui/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix
index 8fa61b9..f2ee20d 100644
--- a/src/user/modules/gui/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"