diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix
index 2f579174..b2c33133 100644
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@@ -19,10 +19,7 @@
   # Modules
   modules = {
     desktop = {
-      browser = {
-        chrome.enable = true;
-        firefox.enable = true;
-      };
+      browser.enable = true;
       gnome = {
         enable = true;
         wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/bulwark.png}";
diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index 57f9f5d1..2f98329b 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -35,10 +35,7 @@
   # Modules 
   modules = {
     desktop = {
-      browser = {
-        chrome.enable = true;
-        firefox.enable = true;
-      };
+      browser.enable = true;
       gnome = {
         enable = true;
         wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/kestrel.png}";
diff --git a/provision/hosts/shivan/configuration.nix b/provision/hosts/shivan/configuration.nix
index 8c7d8a93..62348dbf 100644
--- a/provision/hosts/shivan/configuration.nix
+++ b/provision/hosts/shivan/configuration.nix
@@ -22,10 +22,7 @@
   # Modules
   modules = {
     desktop = {
-      browser = {
-        chrome.enable = true;
-        firefox.enable = true;
-      };
+      browser.enable = true;
       gnome = {
         enable = true;
         # TODO: Add Shivan wallpaper
diff --git a/provision/modules/desktop/browser/chrome-bookmarks.nix b/provision/modules/desktop/browser/bookmarks/chrome.nix
similarity index 100%
rename from provision/modules/desktop/browser/chrome-bookmarks.nix
rename to provision/modules/desktop/browser/bookmarks/chrome.nix
diff --git a/provision/modules/desktop/browser/firefox-bookmarks.nix b/provision/modules/desktop/browser/bookmarks/firefox.nix
similarity index 100%
rename from provision/modules/desktop/browser/firefox-bookmarks.nix
rename to provision/modules/desktop/browser/bookmarks/firefox.nix
diff --git a/provision/modules/desktop/browser/chrome.nix b/provision/modules/desktop/browser/chrome.nix
index 38bb6156..aa49734e 100644
--- a/provision/modules/desktop/browser/chrome.nix
+++ b/provision/modules/desktop/browser/chrome.nix
@@ -1,16 +1,16 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg = config.modules.desktop.browser.chrome;
+let cfg = config.modules.desktop.browser;
 in {
-  options.modules.desktop.browser.chrome.enable = lib.mkEnableOption "chrome";
+  # Enable option declared in firefox.nix
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       google-chrome # Web browser developed by Google.
     ];
+
     programs.chromium = {
       enable = true;
       extraOpts = {
-
         # Disable all manner of account-related things.
         "BrowserSignin" = 0; # disable
         "BrowserAddPersonEnabled" = false;
@@ -46,10 +46,11 @@ in {
         # Setup bookmarks
         "BookmarkBarEnabled" = true;
         "ShowAppsShortcutInBookmarkBar" = false;
-        "ManagedBookmarks" = import ./chrome-bookmarks.nix; 
+        "ManagedBookmarks" = import ./bookmarks/chrome.nix; 
       };
     };
 
+    # Host blank webpage for default new-tab
     networking.firewall.allowedTCPPorts = [ 8080 ];
     services.static-web-server = {
       enable = true;
diff --git a/provision/modules/desktop/browser/firefox.nix b/provision/modules/desktop/browser/firefox.nix
index ac22cbc5..7c04414e 100644
--- a/provision/modules/desktop/browser/firefox.nix
+++ b/provision/modules/desktop/browser/firefox.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg = config.modules.desktop.browser.firefox;
+let cfg = config.modules.desktop.browser;
 in {
-  options.modules.desktop.browser.firefox.enable = lib.mkEnableOption "firefox";
+  options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
   config = lib.mkIf cfg.enable {
     # Install applications for CAC
     environment.systemPackages = with pkgs; [
@@ -15,7 +15,7 @@ in {
       programs.firefox = {
         enable = true;
         profiles.default = {
-          bookmarks = import ./firefox-bookmarks.nix;
+          bookmarks = import ./bookmarks/firefox.nix;
           isDefault = true;
           name = "default";
           settings = {