diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 19c06d1..162cee6 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -4,8 +4,8 @@
   hardware.amdgpu.opencl.enable = true;
 
   imports = [
-    ../../modules
     ./hardware.nix
-    ../../modules/apps/gui/games
+    ../../modules
+    ../../modules/games
   ];
 }
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 69265c3..5653d5b 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -6,7 +6,7 @@
   led.enable = true;
 
   imports = [
-    ../../modules
     ./hardware.nix
+    ../../modules
   ];
 }
diff --git a/modules/apps/gui/firefox/default.nix b/modules/apps/gui/firefox/default.nix
index 8e2d1fb..a4b4ec1 100644
--- a/modules/apps/gui/firefox/default.nix
+++ b/modules/apps/gui/firefox/default.nix
@@ -1,160 +1,164 @@
-{inputs, ...}: {
-  imports = [
-    ./user.nix
-  ];
-
-  home-manager.users.joy.programs.firefox = {
-    enable = true;
-    profiles.joy = {
-      search.engines = {
-        "4get" = {
-          urls = [
-            {
-              template = "https://4get.joygnu.org/web";
-              params = [
-                {
-                  name = "s";
-                  value = "{searchTerms}";
-                }
-              ];
-            }
-          ];
-          definedAliases = ["@4get"];
+{inputs,...}: 
+let 
+  userChrome = builtins.readFile (./. + "/userChrome");
+  userContent = builtins.readFile (./. + "/userContent");
+in
+{
+  home-manager.users.joy = {
+    programs.firefox = {
+      enable = true;
+      profiles.joy = {
+        search.engines = {
+          "4get" = {
+            urls = [
+              {
+                template = "https://4get.joygnu.org/web";
+                params = [
+                  {
+                    name = "s";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+            definedAliases = ["@4get"];
+          };
         };
-      };
-      search.force = true;
-      search.default = "4get";
+        search.force = true;
+        search.default = "4get";
 
-      bookmarks = [
-        {
-          name = "Bookmarks";
-          toolbar = true;
-          bookmarks = [
-            {
-              name = "Packages";
-              url = "https://search.nixos.org/packages?channel=unstable";
-            }
-            {
-              name = "Homemanager";
-              url = "https://home-manager-options.extranix.com";
-            }
-            {
-              name = "Stylix";
-              url = "https://stylix.danth.me/options/nixos.html";
-            }
-            {
-              name = "Git";
-              url = "https://git.joygnu.org/";
-            }
-            {
-              name = "Photos";
-              url = "https://immich.joygnu.org/";
-            }
-            {
-              name = "Translate";
-              url = "https://trans.joygnu.org/";
-            }
-            {
-              name = "Server";
-              url = "https://avoro.eu/cp/clientarea.php?action=productdetails&id=27920";
-            }
-            {
-              name = "Domain";
-              url = "https://ap.www.namecheap.com/domains/list/";
-            }
-            {
-              name = "Hyprland";
-              url = "https://wiki.hyprland.org/";
-            }
-            {
-              name = "Helix";
-              url = "https://helix-editor.com/";
-            }
-            {
-              name = "Monkeytype";
-              url = "https://monkeytype.com/";
-            }
-            {
-              name = "Zophar's Domain";
-              url = "https://www.zophar.net/music";
-            }
-            {
-              name = "Syncthing";
-              url = "http://localhost:8384/";
-            }
-            {
-              name = "invidious";
-              url = "http://localhost:3000/";
-            }
-          ];
-        }
-      ];
-
-      extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
-        ublock-origin
-        darkreader
-        libredirect
-        search-by-image
-        terms-of-service-didnt-read
-        istilldontcareaboutcookies
-        decentraleyes
-      ];
-
-      settings = {
-        "dom.security.https_only_mode" = true;
-        "browser.download.panel.shown" = true;
-        "identity.fxaccounts.enabled" = false;
-        "signon.rememberSignons" = false;
-        "browser.urlbar.pocket.featureGate" = false;
-        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-        "browser.shell.checkDefaultBrowser" = false;
-        "browser.shell.defaultBrowserCheckCount" = 1;
-        "privacy.trackingprotection.enabled" = true;
-        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        "browser.uiCustomization.state" = ''
+        bookmarks = [
           {
-            "placements": {
-              "widget-overflow-fixed-list": [],
-              "nav-bar": [
-                "back-button",
-                "forward-button",
-                "stop-reload-button",
-                "urlbar-container",
-                "downloads-button",
+            name = "Bookmarks";
+            toolbar = true;
+            bookmarks = [
+              {
+                name = "Packages";
+                url = "https://search.nixos.org/packages?channel=unstable";
+              }
+              {
+                name = "Homemanager";
+                url = "https://home-manager-options.extranix.com";
+              }
+              {
+                name = "Stylix";
+                url = "https://stylix.danth.me/options/nixos.html";
+              }
+              {
+                name = "Git";
+                url = "https://git.joygnu.org/";
+              }
+              {
+                name = "Photos";
+                url = "https://immich.joygnu.org/";
+              }
+              {
+                name = "Translate";
+                url = "https://trans.joygnu.org/";
+              }
+              {
+                name = "Server";
+                url = "https://avoro.eu/cp/clientarea.php?action=productdetails&id=27920";
+              }
+              {
+                name = "Domain";
+                url = "https://ap.www.namecheap.com/domains/list/";
+              }
+              {
+                name = "Hyprland";
+                url = "https://wiki.hyprland.org/";
+              }
+              {
+                name = "Helix";
+                url = "https://helix-editor.com/";
+              }
+              {
+                name = "Monkeytype";
+                url = "https://monkeytype.com/";
+              }
+              {
+                name = "Zophar's Domain";
+                url = "https://www.zophar.net/music";
+              }
+              {
+                name = "Syncthing";
+                url = "http://localhost:8384/";
+              }
+              {
+                name = "invidious";
+                url = "http://localhost:3000/";
+              }
+            ];
+          }
+        ];
+
+        extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
+          ublock-origin
+          darkreader
+          libredirect
+          search-by-image
+          terms-of-service-didnt-read
+          istilldontcareaboutcookies
+          decentraleyes
+        ];
+      userChrome = userChrome;
+      userContent = userContent;
+        settings = {
+          "dom.security.https_only_mode" = true;
+          "browser.download.panel.shown" = true;
+          "identity.fxaccounts.enabled" = false;
+          "signon.rememberSignons" = false;
+          "browser.urlbar.pocket.featureGate" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.shell.checkDefaultBrowser" = false;
+          "browser.shell.defaultBrowserCheckCount" = 1;
+          "privacy.trackingprotection.enabled" = true;
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "browser.uiCustomization.state" = ''
+            {
+              "placements": {
+                "widget-overflow-fixed-list": [],
+                "nav-bar": [
+                  "back-button",
+                  "forward-button",
+                  "stop-reload-button",
+                  "urlbar-container",
+                  "downloads-button",
+                  "ublock0_raymondhill_net-browser-action",
+                  "addon_darkreader_org-browser-action",
+                  "_testpilot-containers-browser-action"
+                ],
+                "toolbar-menubar": [
+                  "menubar-items"
+                ],
+                "TabsToolbar": [
+                  "tabbrowser-tabs",
+                  "new-tab-button",
+                  "alltabs-button"
+                ],
+                "PersonalToolbar": [
+                  "personal-bookmarks"
+                ]
+              },
+              "seen": [
+                "save-to-pocket-button",
+                "developer-button",
                 "ublock0_raymondhill_net-browser-action",
                 "addon_darkreader_org-browser-action",
                 "_testpilot-containers-browser-action"
               ],
-              "toolbar-menubar": [
-                "menubar-items"
+              "dirtyAreaCache": [
+                "nav-bar",
+                "PersonalToolbar",
+                "toolbar-menubar",
+                "TabsToolbar",
+                "widget-overflow-fixed-list"
               ],
-              "TabsToolbar": [
-                "tabbrowser-tabs",
-                "new-tab-button",
-                "alltabs-button"
-              ],
-              "PersonalToolbar": [
-                "personal-bookmarks"
-              ]
-            },
-            "seen": [
-              "save-to-pocket-button",
-              "developer-button",
-              "ublock0_raymondhill_net-browser-action",
-              "addon_darkreader_org-browser-action",
-              "_testpilot-containers-browser-action"
-            ],
-            "dirtyAreaCache": [
-              "nav-bar",
-              "PersonalToolbar",
-              "toolbar-menubar",
-              "TabsToolbar",
-              "widget-overflow-fixed-list"
-            ],
-            "currentVersion": 18,
-            "newElementCount": 4
-          }
-        '';
+              "currentVersion": 18,
+              "newElementCount": 4
+            }
+          '';
+        };
       };
     };
   };
diff --git a/modules/apps/gui/firefox/user.nix b/modules/apps/gui/firefox/user.nix
deleted file mode 100644
index 0c151b9..0000000
--- a/modules/apps/gui/firefox/user.nix
+++ /dev/null
@@ -1,380 +0,0 @@
-{
-  home-manager.users.joy.programs.firefox = {
-    enable = true;
-    profiles.joy = {
-      userChrome = ''
-
-        /*================== Gruvbox Theme for Firefox ==================
-        Author: kmason
-        Based on the color scheme of calvinchd's Gruvbox Dark Firefox Theme - https://gitlab.com/calvinchd/gruvbox-dark-firefox-theme
-        */
-        @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-        :root {
-        --background: #1d2021;
-        --secondary: #282828;
-        --foreground: #EBDBB2;
-
-        --orange-highlight: #fe8019;
-        --sound-border: #68217A;
-
-        --separator: #665e54;
-
-        --toolbar-bgcolor: var(--secondary) !important;
-
-        --tab: var(--background);
-        --tab-btn: var(--tab-inactive);
-        --tab-inactive: var(--secondary);
-        --tab-btn-inactive: var(--tab-inactive);
-        --tab-hover: #32302f;
-        --tab-btn-hover: #3C3836;
-        --toolbar-btn-hover: #49463f;
-
-        --url-bar: #3C3836;
-        --url-focus: #504945;
-        --url-bar-item-hover: #6a6257;
-
-        --sidebar: #3C3836;
-        --sidebar-button-hover: #5A544B;
-        --sidebar-highlight: #458588;
-        }
-
-        /*
-        SEARCH AND POPUPS/MENUS
-        */
-
-        .panel-arrowcontainer {
-          background-color: var(--secondary) !important;
-        }
-
-        #PopupAutoComplete,
-        #PopupSearchAutoComplete
-        {
-          background-color: var(--url-focus) !important;
-          color: var(--foreground) !important;
-        }
-
-        panelview {
-          background-color: var(--sidebar) !important;
-          color: var(--foreground) !important;
-        }
-
-        panelview toolbarbutton.subviewbutton:hover {
-          background-color: var(--sidebar-button-hover) !important;
-        }
-
-        panel[type="autocomplete-richlistbox"] {
-          --panel-background: none !important;
-          border-radius: 4px !important;
-          color: var(--foreground) !important;
-        }
-
-        /*
-         _____ ___   ___  _    ___   _   ___
-        |_   _/ _ \ / _ \| |  | _ ) / \ | _ \
-          | || (_) | (_) | |__| _ \/ = \|   /
-          |_| \___/ \___/|____|___/_/ \_\_|\_\
-
-        */
-
-        toolbarseparator,
-        menuseparator
-        {
-          border-color: var(--separator) !important;
-          border-image: none !important;
-        }
-
-        toolbar {
-          background-color: var(--secondary);
-        }
-
-        toolbar#TabsToolbar {
-          background-color: var(--background);
-        }
-        toolbar#TabsToolbar:-moz-window-inactive {
-          background-color: var(--toolbar-bgcolor) !important;
-        }
-
-        #titlebar,
-        #titlebar-spacer,
-        #titlebar-buttonbox-container
-        {
-          background-color: var(--background) !important;
-          border: none !important;
-        }
-
-        #navigator-toolbox {
-          --tabs-border-color: var(--orange-highlight) !important;
-        }
-
-        /* Remove border under navbar */
-        #navigator-toolbox::after {
-          border-bottom: 0px !important;
-        }
-
-        /* remove some borders */
-        #navigator-toolbox {
-          border: none !important;
-        }
-
-        /*
-         _   _ ___  _    ___   _   ___
-        | | | | _ \| |  | _ ) / \ | _ \
-        | |_| |   /| |__| _ \/ = \|   /
-         \___/|_|\_\____|___/_/ \_\_|\_\
-
-        */
-
-        #urlbar,
-        #searchbar
-        {
-        	box-shadow: none !important;
-        	border: none !important;
-          border-radius: 4px;
-        	color : var(--foreground) !important;
-          background-color: var(--url-bar) !important;
-          --autocomplete-popup-separator-color: var(--separator) !important;
-        }
-
-        #urlbar-input,
-        #urlbar-input-container
-        {
-          color: var(--foreground) !important;
-          background-color: var(--url-bar) !important;
-        }
-
-        #urlbar:not([open]) #urlbar-input-container:focus-within,
-        #searchbar:focus-within
-        {
-        	border: 2px solid var(--orange-highlight) !important;
-        }
-
-        #urlbar:focus-within,
-        #urlbar[open],
-        #urlbar[open] #urlbar-input-container,
-        #urlbar[open] #urlbar-input,
-        #urlbar-input-container:focus-within,
-        #urlbar-input:focus,
-        #urlbar-background,
-        .urlbarView,
-        #searchbar:focus-within,
-        menupop
-        {
-          background-color: var(--url-focus) !important;
-        }
-        #searchbar:focus-within {
-          outline: none !important;
-        }
-
-        :is(panel, menupopup)::part(content) {
-          background: none !important;
-        }
-
-        .urlbarView button:hover,
-        #searchbar button:hover,
-        .urlbarView-row:hover .urlbarView-row-inner,
-        .search-autocomplete-richlistbox-popup .autocomplete-richlistitem:hover
-        {
-        	background-color: var(--url-bar-item-hover) !important;
-        }
-
-        .urlbarView-row[type="switchtab"] > span{
-          color: var(--orange-highlight) !important;
-        }
-
-        #PopupSearchAutoComplete .autocomplete-richlistitem[selected],
-        .searchbar-engine-one-off-item[selected],
-        .urlbarView-row[selected],
-        .urlbarView-row[aria-selected="true"],
-        .urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner,
-        .urlbarView-row-inner[selected]
-        {
-          color: var(--foreground) !important;
-        	background-color: var(--sidebar-highlight) !important;
-          border-radius: 4px !important;
-        }
-
-        /*
-        BOOKMARKS BAR
-        */
-
-        #PersonalToolbar {
-          background-color: var(--secondary) !important;
-        }
-
-        /*
-          _____ _   ___ ___
-         |_   _/ \ | _ ) __|
-           | |/ = \| _ \__ \
-           |_/_/ \_\___/___/
-
-        */
-        .tab-background[selected="true"] {
-          background-color: transparent !important;
-          background-image: none !important;
-        }
-        .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"]):not([multiselected]){
-          background-color: transparent !important;
-        }
-
-        .tabbrowser-tab[soundplaying="true"] {
-          --lwt-tab-line-color: var(--sound-border) !important;
-        }
-        .tab-content[selected="true"] {
-          border-color: var(--orange-highlight) !important;
-          --sound-border: var(--orange-highlight) !important;
-        }
-        .tab-text {
-          color: var(--foreground);
-        }
-
-        tab,
-        #tabbrowser-tabs
-        {
-          background-color: var(--background) !important;
-          color : var(--foreground) !important;
-        }
-        tab:-moz-window-inactive,
-        #tabbrowser-tabs:-moz-window-inactive,
-        #nav-bar-customization-target
-        {
-          background-color: var(--secondary) !important;
-        }
-
-        .tabbrowser-tab[selected]{
-          opacity: 1;
-        }
-
-        .tab-loading-burst {
-          background-color: inherit;
-        }
-
-        .tab-content
-        {
-          border-radius: 4px;
-          margin: 5px 0px 5px 0px !important;
-          border: 1px solid transparent !important;
-        }
-        .tab-content[selected="true"]
-        {
-          background-color: var(--secondary) !important;
-          color : var(--foreground) !important;
-          border: 1px solid var(--orange-highlight) !important;
-        }
-        .tab-content:not([selected="true"]):hover {
-          background-color: var(--tab-hover) !important;
-        }
-
-        /*
-           ___ _____ ___  _  ___
-          | _ )_   _|   \| |/ __|
-          | _ \ | | | |\ | |\__ \
-          |___/ |_| |_| \__|/___/
-
-        */
-
-        /*
-        Toolbar buttons
-        */
-
-        toolbarbutton {
-          fill: var(--foreground) !important;
-          background-color: transparent !important;
-        }
-
-        /*
-        TAB BAR BUTTONS
-        */
-
-        #TabsToolbar toolbarbutton {
-          border-radius: 4px;
-          border: 1px solid transparent !important;
-        }
-        #TabsToolbar toolbarbutton:-moz-window-inactive {
-          opacity: 0.7 !important;
-        }
-
-        #alltabs-button > .toolbarbutton-badge-stack,
-        #tabs-newtab-button > .toolbarbutton-icon {
-          background-image: none;
-          border-radius: 6px;
-        }
-        #alltabs-button:hover > .toolbarbutton-badge-stack,
-        #tabs-newtab-button:hover > .toolbarbutton-icon {
-          background-color: var(--tab-btn-hover) !important;
-        }
-
-        /* Firefox View button */
-        #TabsToolbar #firefox-view-button > .toolbarbutton-icon
-        {
-          background-image: none !important;
-          border-radius: 4px;
-        }
-        #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon
-        {
-          background-color: var(--secondary) !important;
-          color : var(--foreground) !important;
-          padding: 9px !important;
-          border: 1px solid var(--orange-highlight) !important;
-        }
-        #TabsToolbar #firefox-view-button:not([open]):hover > .toolbarbutton-icon {
-          background-color: var(--tab-hover) !important;
-        }
-
-        /*
-        MIDDLE BAR (url bar) BUTTONS
-        */
-
-        #nav-bar toolbarbutton > .toolbarbutton-icon,
-        #nav-bar toolbarbutton > .toolbarbutton-badge-stack {
-          border-radius: 6px;
-        }
-        #nav-bar toolbarbutton:hover > .toolbarbutton-icon,
-        #nav-bar toolbarbutton:hover > .toolbarbutton-badge-stack {
-          background-color: var(--toolbar-btn-hover) !important;
-        }
-
-        #back-button {
-          padding-right: 2px !important;
-          padding-left: 2px !important;
-          margin-left: 6px !important;
-        }
-
-        /* Hamburger Menu */
-        #PanelUI-menu-button {
-          background-color: var(--secondary) !important;
-          padding-right: 2px !important;
-          margin-right: 6px !important;
-        }
-
-        /*
-        BOOKMARK BUTTONS
-        */
-        #PersonalToolbar toolbarbutton {
-          margin: 3px 0px 3px 3px !important;
-          border-radius: 4px;
-        }
-        #PersonalToolbar toolbarbutton:hover {
-          background-color: var(--toolbar-btn-hover) !important;
-        }
-      '';
-
-      userContent = ''
-
-        :root {
-          --background: #1d2021;
-          --secondary: #282828;
-          --newtab-body: #32302f;
-          --foreground: #EBDBB2;
-        }
-
-        @-moz-document url-prefix("about:"), url-prefix("about:newtab"), url-prefix("about:home") {
-          html, body {
-            color: var(--foreground) !important;
-            background-color: var(--newtab-body) !important;
-          }
-        }
-      '';
-    };
-  };
-}
diff --git a/modules/apps/gui/firefox/userChrome b/modules/apps/gui/firefox/userChrome
new file mode 100644
index 0000000..3891bc1
--- /dev/null
+++ b/modules/apps/gui/firefox/userChrome
@@ -0,0 +1,299 @@
+/*================== Gruvbox Theme for Firefox ==================
+Author: kmason
+Based on the color scheme of calvinchd's Gruvbox Dark Firefox Theme - https://gitlab.com/calvinchd/gruvbox-dark-firefox-theme
+*/
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+:root {
+--background: #1d2021;
+--secondary: #282828;
+--foreground: #EBDBB2;
+--orange-highlight: #fe8019;
+--sound-border: #68217A;
+--separator: #665e54;
+--toolbar-bgcolor: var(--secondary) !important;
+--tab: var(--background);
+--tab-btn: var(--tab-inactive);
+--tab-inactive: var(--secondary);
+--tab-btn-inactive: var(--tab-inactive);
+--tab-hover: #32302f;
+--tab-btn-hover: #3C3836;
+--toolbar-btn-hover: #49463f;
+--url-bar: #3C3836;
+--url-focus: #504945;
+--url-bar-item-hover: #6a6257;
+--sidebar: #3C3836;
+--sidebar-button-hover: #5A544B;
+--sidebar-highlight: #458588;
+}
+/*
+SEARCH AND POPUPS/MENUS
+*/
+.panel-arrowcontainer {
+  background-color: var(--secondary) !important;
+}
+#PopupAutoComplete,
+#PopupSearchAutoComplete
+{
+  background-color: var(--url-focus) !important;
+  color: var(--foreground) !important;
+}
+panelview {
+  background-color: var(--sidebar) !important;
+  color: var(--foreground) !important;
+}
+panelview toolbarbutton.subviewbutton:hover {
+  background-color: var(--sidebar-button-hover) !important;
+}
+panel[type="autocomplete-richlistbox"] {
+  --panel-background: none !important;
+  border-radius: 4px !important;
+  color: var(--foreground) !important;
+}
+/*
+ _____ ___   ___  _    ___   _   ___
+|_   _/ _ \ / _ \| |  | _ ) / \ | _ \
+  | || (_) | (_) | |__| _ \/ = \|   /
+  |_| \___/ \___/|____|___/_/ \_\_|\_\
+*/
+toolbarseparator,
+menuseparator
+{
+  border-color: var(--separator) !important;
+  border-image: none !important;
+}
+toolbar {
+  background-color: var(--secondary);
+}
+toolbar#TabsToolbar {
+  background-color: var(--background);
+}
+toolbar#TabsToolbar:-moz-window-inactive {
+  background-color: var(--toolbar-bgcolor) !important;
+}
+#titlebar,
+#titlebar-spacer,
+#titlebar-buttonbox-container
+{
+  background-color: var(--background) !important;
+  border: none !important;
+}
+#navigator-toolbox {
+  --tabs-border-color: var(--orange-highlight) !important;
+}
+/* Remove border under navbar */
+#navigator-toolbox::after {
+  border-bottom: 0px !important;
+}
+/* remove some borders */
+#navigator-toolbox {
+  border: none !important;
+}
+/*
+ _   _ ___  _    ___   _   ___
+| | | | _ \| |  | _ ) / \ | _ \
+| |_| |   /| |__| _ \/ = \|   /
+ \___/|_|\_\____|___/_/ \_\_|\_\
+*/
+#urlbar,
+#searchbar
+{
+	box-shadow: none !important;
+	border: none !important;
+  border-radius: 4px;
+	color : var(--foreground) !important;
+  background-color: var(--url-bar) !important;
+  --autocomplete-popup-separator-color: var(--separator) !important;
+}
+#urlbar-input,
+#urlbar-input-container
+{
+  color: var(--foreground) !important;
+  background-color: var(--url-bar) !important;
+}
+#urlbar:not([open]) #urlbar-input-container:focus-within,
+#searchbar:focus-within
+{
+	border: 2px solid var(--orange-highlight) !important;
+}
+#urlbar:focus-within,
+#urlbar[open],
+#urlbar[open] #urlbar-input-container,
+#urlbar[open] #urlbar-input,
+#urlbar-input-container:focus-within,
+#urlbar-input:focus,
+#urlbar-background,
+.urlbarView,
+#searchbar:focus-within,
+menupop
+{
+  background-color: var(--url-focus) !important;
+}
+#searchbar:focus-within {
+  outline: none !important;
+}
+:is(panel, menupopup)::part(content) {
+  background: none !important;
+}
+.urlbarView button:hover,
+#searchbar button:hover,
+.urlbarView-row:hover .urlbarView-row-inner,
+.search-autocomplete-richlistbox-popup .autocomplete-richlistitem:hover
+{
+	background-color: var(--url-bar-item-hover) !important;
+}
+.urlbarView-row[type="switchtab"] > span{
+  color: var(--orange-highlight) !important;
+}
+#PopupSearchAutoComplete .autocomplete-richlistitem[selected],
+.searchbar-engine-one-off-item[selected],
+.urlbarView-row[selected],
+.urlbarView-row[aria-selected="true"],
+.urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner,
+.urlbarView-row-inner[selected]
+{
+  color: var(--foreground) !important;
+	background-color: var(--sidebar-highlight) !important;
+  border-radius: 4px !important;
+}
+/*
+BOOKMARKS BAR
+*/
+#PersonalToolbar {
+  background-color: var(--secondary) !important;
+}
+/*
+  _____ _   ___ ___
+ |_   _/ \ | _ ) __|
+   | |/ = \| _ \__ \
+   |_/_/ \_\___/___/
+*/
+.tab-background[selected="true"] {
+  background-color: transparent !important;
+  background-image: none !important;
+}
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"]):not([multiselected]){
+  background-color: transparent !important;
+}
+.tabbrowser-tab[soundplaying="true"] {
+  --lwt-tab-line-color: var(--sound-border) !important;
+}
+.tab-content[selected="true"] {
+  border-color: var(--orange-highlight) !important;
+  --sound-border: var(--orange-highlight) !important;
+}
+.tab-text {
+  color: var(--foreground);
+}
+tab,
+#tabbrowser-tabs
+{
+  background-color: var(--background) !important;
+  color : var(--foreground) !important;
+}
+tab:-moz-window-inactive,
+#tabbrowser-tabs:-moz-window-inactive,
+#nav-bar-customization-target
+{
+  background-color: var(--secondary) !important;
+}
+.tabbrowser-tab[selected]{
+  opacity: 1;
+}
+.tab-loading-burst {
+  background-color: inherit;
+}
+.tab-content
+{
+  border-radius: 4px;
+  margin: 5px 0px 5px 0px !important;
+  border: 1px solid transparent !important;
+}
+.tab-content[selected="true"]
+{
+  background-color: var(--secondary) !important;
+  color : var(--foreground) !important;
+  border: 1px solid var(--orange-highlight) !important;
+}
+.tab-content:not([selected="true"]):hover {
+  background-color: var(--tab-hover) !important;
+}
+/*
+   ___ _____ ___  _  ___
+  | _ )_   _|   \| |/ __|
+  | _ \ | | | |\ | |\__ \
+  |___/ |_| |_| \__|/___/
+*/
+/*
+Toolbar buttons
+*/
+toolbarbutton {
+  fill: var(--foreground) !important;
+  background-color: transparent !important;
+}
+/*
+TAB BAR BUTTONS
+*/
+#TabsToolbar toolbarbutton {
+  border-radius: 4px;
+  border: 1px solid transparent !important;
+}
+#TabsToolbar toolbarbutton:-moz-window-inactive {
+  opacity: 0.7 !important;
+}
+#alltabs-button > .toolbarbutton-badge-stack,
+#tabs-newtab-button > .toolbarbutton-icon {
+  background-image: none;
+  border-radius: 6px;
+}
+#alltabs-button:hover > .toolbarbutton-badge-stack,
+#tabs-newtab-button:hover > .toolbarbutton-icon {
+  background-color: var(--tab-btn-hover) !important;
+}
+/* Firefox View button */
+#TabsToolbar #firefox-view-button > .toolbarbutton-icon
+{
+  background-image: none !important;
+  border-radius: 4px;
+}
+#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon
+{
+  background-color: var(--secondary) !important;
+  color : var(--foreground) !important;
+  padding: 9px !important;
+  border: 1px solid var(--orange-highlight) !important;
+}
+#TabsToolbar #firefox-view-button:not([open]):hover > .toolbarbutton-icon {
+  background-color: var(--tab-hover) !important;
+}
+/*
+MIDDLE BAR (url bar) BUTTONS
+*/
+#nav-bar toolbarbutton > .toolbarbutton-icon,
+#nav-bar toolbarbutton > .toolbarbutton-badge-stack {
+  border-radius: 6px;
+}
+#nav-bar toolbarbutton:hover > .toolbarbutton-icon,
+#nav-bar toolbarbutton:hover > .toolbarbutton-badge-stack {
+  background-color: var(--toolbar-btn-hover) !important;
+}
+#back-button {
+  padding-right: 2px !important;
+  padding-left: 2px !important;
+  margin-left: 6px !important;
+}
+/* Hamburger Menu */
+#PanelUI-menu-button {
+  background-color: var(--secondary) !important;
+  padding-right: 2px !important;
+  margin-right: 6px !important;
+}
+/*
+BOOKMARK BUTTONS
+*/
+#PersonalToolbar toolbarbutton {
+  margin: 3px 0px 3px 3px !important;
+  border-radius: 4px;
+}
+#PersonalToolbar toolbarbutton:hover {
+  background-color: var(--toolbar-btn-hover) !important;
+}
diff --git a/modules/apps/gui/firefox/userContent b/modules/apps/gui/firefox/userContent
new file mode 100644
index 0000000..45add7d
--- /dev/null
+++ b/modules/apps/gui/firefox/userContent
@@ -0,0 +1,14 @@
+''
+:root {
+  --background: #1d2021;
+  --secondary: #282828;
+  --newtab-body: #32302f;
+  --foreground: #EBDBB2;
+}
+@-moz-document url-prefix("about:"), url-prefix("about:newtab"), url-prefix("about:home") {
+  html, body {
+    color: var(--foreground) !important;
+    background-color: var(--newtab-body) !important;
+  }
+}
+''
diff --git a/modules/apps/gui/misc/default.nix b/modules/apps/gui/misc/default.nix
index ad3ff2f..7b2655a 100644
--- a/modules/apps/gui/misc/default.nix
+++ b/modules/apps/gui/misc/default.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    #gui
     uget
     keepassxc
     vesktop
diff --git a/modules/apps/gui/rofi/default.nix b/modules/apps/gui/rofi/default.nix
index 00e8978..63630b1 100644
--- a/modules/apps/gui/rofi/default.nix
+++ b/modules/apps/gui/rofi/default.nix
@@ -11,6 +11,7 @@
       display-ssh = "";
       display-run = "";
       display-drun = "";
+      display-dmenu = "";
       display-window = "";
       display-combi = "";
       show-icons = true;
diff --git a/modules/default.nix b/modules/default.nix
index 8d33567..2f51710 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,5 +5,6 @@
     ./hardware
     ./services
     ./system
+    ./games
   ];
 }
diff --git a/modules/apps/gui/games/default.nix b/modules/games/default.nix
similarity index 100%
rename from modules/apps/gui/games/default.nix
rename to modules/games/default.nix
diff --git a/modules/apps/gui/games/mics/default.nix b/modules/games/mics/default.nix
similarity index 100%
rename from modules/apps/gui/games/mics/default.nix
rename to modules/games/mics/default.nix
diff --git a/modules/apps/gui/games/norisk/default.nix b/modules/games/norisk/default.nix
similarity index 100%
rename from modules/apps/gui/games/norisk/default.nix
rename to modules/games/norisk/default.nix
diff --git a/modules/apps/gui/games/steam/default.nix b/modules/games/steam/default.nix
similarity index 100%
rename from modules/apps/gui/games/steam/default.nix
rename to modules/games/steam/default.nix
diff --git a/modules/apps/gui/games/suyu/default.nix b/modules/games/suyu/default.nix
similarity index 100%
rename from modules/apps/gui/games/suyu/default.nix
rename to modules/games/suyu/default.nix
diff --git a/modules/wm/ags/default.nix b/modules/wm/ags/default.nix
index dd4c841..d847d1f 100644
--- a/modules/wm/ags/default.nix
+++ b/modules/wm/ags/default.nix
@@ -1,7 +1,9 @@
 {inputs, ...}: {
-  home-manager.users.joy.imports = [inputs.ags.homeManagerModules.default];
-  home-manager.users.joy.programs.ags = {
-    enable = true;
-    configDir = ./bar;
+  home-manager.users.joy = {
+    imports = [inputs.ags.homeManagerModules.default];
+    programs.ags = {
+      enable = true;
+      configDir = ./bar;
+    };
   };
 }