diff --git a/apps/firefox/home.nix b/apps/firefox/home.nix
index adb636b..1e09fef 100644
--- a/apps/firefox/home.nix
+++ b/apps/firefox/home.nix
@@ -1,14 +1,32 @@
-{
+{pkgs, ...}: {
   programs.firefox = {
     enable = true;
-    languagePacks = [
-      "en-US"
-    ];
+    languagePacks = ["en-US"];
+
     profiles = {
       hakase = {
         search.force = true;
         isDefault = true;
         search.default = "ddg";
+
+        # FIXED: Removed .settings and .force to allow UI interaction
+        bookmarks = [
+          {
+            name = "Toolbar Bookmarks";
+            toolbar = true;
+            bookmarks = [
+              {
+                name = "Home Manager";
+                url = "https://mynixos.com/home-manager/options/programs";
+              }
+              {
+                name = "YouTube";
+                url = "https://youtube.com";
+              }
+            ];
+          }
+        ];
+
         settings = {
           "browser.contentblocking.category" = "strict";
           "extensions.pocket.enabled" = false;
@@ -36,24 +54,6 @@
             }
           ];
         };
-        bookmarks = {
-          force = true;
-          settings = [
-            {
-              toolbar = true;
-              bookmarks = [
-                {
-                  name = "Home Manager";
-                  url = "https://mynixos.com/home-manager/options/programs";
-                }
-                {
-                  name = "YouTube";
-                  url = "https://youtube.com";
-                }
-              ];
-            }
-          ];
-        };
       };
     };
 
@@ -62,7 +62,7 @@
       DisableFirefoxStudies = true;
       EnableTrackingProtection = {
         Value = true;
-        Locked = true;
+        Locked = false; # Set to false so you can still adjust via UI
         Cryptomining = true;
         Fingerprinting = true;
       };
@@ -73,40 +73,26 @@
       OverrideFirstRunPage = "";
       OverridePostUpdatePage = "";
       DontCheckDefaultBrowser = true;
-      DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
-      DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
-      SearchBar = "unified"; # alternative: "separate"
+      DisplayBookmarksToolbar = "always";
+      SearchBar = "unified";
 
       /*
       ---- EXTENSIONS ----
       */
-      # Check about:support for extension/add-on ID strings.
-      # Valid strings for installation_mode are "allowed", "blocked",
-      # "force_installed" and "normal_installed".
       ExtensionSettings = {
-        "*".installation_mode = "allowed";
+        # Removed the "*" wildcard which was likely locking the Add-on store UI
         "uBlock0@raymondhill.net" = {
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
           installation_mode = "force_installed";
         };
         "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/file/4493940/bitwarden_password_manager-2025.5.0.xpi";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
           installation_mode = "force_installed";
         };
         "tridactyl.vim@cmcaine.co.uk" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi";
           installation_mode = "force_installed";
         };
-        # Privacy Badger:
-        # "jid1-MnnxcxisBPnSXQ@jetpack" = {
-        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
-        #   installation_mode = "force_installed";
-        # };
-        # 1Password:
-        # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = {
-        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
-        #   installation_mode = "force_installed";
-        # };
       };
     };
   };