diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix
deleted file mode 100644
index b73ff0c..0000000
--- a/home-manager/firefox/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.firefox = {
-    enable = true;
-    profiles.quadradical.isDefault = true;
-  };
-}
diff --git a/modules/common-desktop/firefox/colors/black.css b/modules/common-desktop/firefox/customChrome.css
similarity index 100%
rename from modules/common-desktop/firefox/colors/black.css
rename to modules/common-desktop/firefox/customChrome.css
diff --git a/modules/common-desktop/firefox/customContent.css b/modules/common-desktop/firefox/customContent.css
new file mode 120000
index 0000000..0c32a87
--- /dev/null
+++ b/modules/common-desktop/firefox/customContent.css
@@ -0,0 +1 @@
+customChrome.css
\ No newline at end of file
diff --git a/modules/common-desktop/firefox/default.nix b/modules/common-desktop/firefox/default.nix
index 2bf5a13..9ef305f 100644
--- a/modules/common-desktop/firefox/default.nix
+++ b/modules/common-desktop/firefox/default.nix
@@ -29,16 +29,39 @@
     });
   });
 
-  systemd.tmpfiles.settings.firefox."/home/quadradical/.mozilla/firefox/quadradical/chrome"."L+".argument =
-    toString
-    (pkgs.symlinkJoin {
-      name = "firefox-gnome-theme";
-      paths = [./. inputs.firefox-gnome-theme];
+  systemd.tmpfiles.settings.firefox = {
+    "/home/quadradical/.mozilla"."D".user = "quadradical";
+    "/home/quadradical/.mozilla/firefox"."D".user = "quadradical";
+    "/home/quadradical/.mozilla/firefox/quadradical"."D".user = "quadradical";
+    "/home/quadradical/.mozilla/firefox/profiles.ini"."f+".argument = builtins.toJSON (lib.generators.toINI {} {
+      General = {
+        StartWithLastProfile = 1;
+      };
+      Profile0 = {
+        Default = 1;
+        IsRelative = 1;
+        Name = "quadradical";
+        Path = "quadradical";
+      };
     });
+    "/home/quadradical/.mozilla/firefox/quadradical/chrome"."L+".argument =
+      toString
+      (pkgs.symlinkJoin {
+        name = "firefox-gnome-theme";
+        paths = [./. inputs.firefox-gnome-theme];
+      });
+  };
 
   programs.firefox = {
     enable = true;
 
+    # autoConfig = lib.concatStringsSep "\n" (lib.mapAttrsToList (pref: value: "lockPref(\"${pref}\", ${builtins.toJSON value});") {
+    preferences = {
+      "browser.aboutConfig.showWarning" = false;
+      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+      "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
+    };
+
     policies = {
       ShowHomeButton = false;
 
@@ -65,6 +88,16 @@
         Fingerprinting = true;
       };
 
+      UserMessaging = {
+        WhatsNew = false;
+        ExtensionRecommendations = false;
+        FeatureRecommendations = false;
+        UrlbarInterventions = false;
+        SkipOnboarding = true;
+        MoreFromMozilla = false;
+        FirefoxLabs = false;
+      };
+
       FirefoxHome = {
         TopSites = true;
         SponsoredTopSites = false;
@@ -82,7 +115,7 @@
         Locked = true;
       };
 
-      ExtensionSettings = lib.mkForce (lib.listToAttrs (lib.map (id: {
+      ExtensionSettings = lib.mkForce (lib.listToAttrs (map (id: {
           name = id;
           value = {
             install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${id}/latest.xpi";
@@ -111,6 +144,12 @@
             URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
             IconURL = "https://github.com/NixOS/nixos-artwork/raw/refs/heads/master/logo/nix-snowflake-white.svg";
             Alias = "np";
+            preferences = {
+              "gnomeTheme.oledBlack" = true; # Enable nord theme
+              "svg.context-properties.content.enabled" = true;
+              "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+              "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
+            };
           }
           {
             Name = "NixOS Option Search";
@@ -132,12 +171,6 @@
           }
         ];
       };
-
-      Preferences = {
-        "gnomeTheme.oledBlack" = true; # Enable nord theme
-        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
-      };
     };
   };
 }
diff --git a/modules/common-desktop/mangohud/default.nix b/modules/common-desktop/mangohud/default.nix
index 7750c0d..a12c913 100644
--- a/modules/common-desktop/mangohud/default.nix
+++ b/modules/common-desktop/mangohud/default.nix
@@ -2,7 +2,7 @@
   environment = {
     systemPackages = [pkgs.mangohud];
     sessionVariables = {
-      MANGOHUD = "1";
+      # MANGOHUD = "1";
       MANGOHUD_CONFIGFILE = ./mangohud.conf;
     };
   };
diff --git a/modules/common-desktop/vscodium.nix b/modules/common-desktop/vscodium.nix
index 4d17512..0baaecf 100644
--- a/modules/common-desktop/vscodium.nix
+++ b/modules/common-desktop/vscodium.nix
@@ -26,6 +26,7 @@
   ];
 
   systemd.tmpfiles.settings.vscodium = {
+    "/home/quadradical/.config/VSCodium/User"."D".user = "quadradical";
     "/home/quadradical/.config/VSCodium/User/settings.json"."f+".argument = builtins.toJSON {
       "dart.debugExternalPackageLibraries" = true;
       "dart.debugSdkLibraries" = true;
diff --git a/wrappers/common-desktop/steam.nix b/wrappers/common-desktop/steam.nix
new file mode 100644
index 0000000..01db76c
--- /dev/null
+++ b/wrappers/common-desktop/steam.nix
@@ -0,0 +1,6 @@
+{
+  # wrappers.steam = {
+  #   basePackage = pkgs.steam;
+  #   env.MANGOHUD.value = "1";
+  # };
+}
diff --git a/wrappers/common-desktop/todo.nix b/wrappers/common-desktop/todo.nix
deleted file mode 100644
index da0be91..0000000
--- a/wrappers/common-desktop/todo.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{pkgs, ...}: {
-}