diff --git a/README.md b/README.md
index 0120899..bbfb34c 100644
--- a/README.md
+++ b/README.md
@@ -216,11 +216,6 @@ blog = {
 | `<Space>o` | Open file with system default app |
 | `<Space>f` | Show current file in Finder |
 
-**System Clipboard:**
-| Key | Action |
-|-----|--------|
-| `<Space>y` | Copy to system clipboard |
-| `<Space>p` | Paste from system clipboard |
 
 **Fuzzy Finding (Telescope):**
 | Key | Action |
diff --git a/config/firefox-bookmarks.nix b/config/firefox-bookmarks.nix
index e4b55a0..9cc765e 100644
--- a/config/firefox-bookmarks.nix
+++ b/config/firefox-bookmarks.nix
@@ -63,6 +63,10 @@
           name = "RSS";
           url = "https://rss.nas.yanlincs.com";
         }
+        {
+          name = "Immich";
+          url = "https://photo.nas.yanlincs.com/photos";
+        }
         {
           name = "My Home";
           url = "https://home.nas.yanlincs.com/lovelace/0";
@@ -70,10 +74,6 @@
         {
           name = "Media";
           bookmarks = [
-            {
-              name = "Immich";
-              url = "https://photo.nas.yanlincs.com/photos";
-            }
             {
               name = "Plex";
               url = "https://plex.nas.yanlincs.com";
@@ -83,21 +83,16 @@
               url = "https://audio.nas.yanlincs.com";
             }
             {
-              name = "Library";
-              bookmarks = [
-                {
-                  name = "Sonarr";
-                  url = "https://sonarr.nas.yanlincs.com";
-                }
-                {
-                  name = "Radarr";
-                  url = "https://radarr.nas.yanlincs.com";
-                }
-                {
-                  name = "qBittorrent";
-                  url = "https://qbit.nas.yanlincs.com";
-                }
-              ];
+              name = "Sonarr";
+              url = "https://sonarr.nas.yanlincs.com";
+            }
+            {
+              name = "Radarr";
+              url = "https://radarr.nas.yanlincs.com";
+            }
+            {
+              name = "qBittorrent";
+              url = "https://qbit.nas.yanlincs.com";
             }
           ];
         }
diff --git a/modules/firefox.nix b/modules/firefox.nix
index 211679a..887643e 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -82,10 +82,18 @@
         "browser.newtabpage.activity-stream.showSponsored" = false;
         "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
         
-        # Privacy settings
-        "privacy.trackingprotection.enabled" = true;
-        "privacy.trackingprotection.socialtracking.enabled" = true;
-        "privacy.donottrackheader.enabled" = true;
+        # Privacy settings - Disable all tracking protection
+        "privacy.trackingprotection.enabled" = false;
+        "privacy.trackingprotection.socialtracking.enabled" = false;
+        "privacy.trackingprotection.pbmode.enabled" = false;  # Disable in private browsing
+        "privacy.trackingprotection.cryptomining.enabled" = false;
+        "privacy.trackingprotection.fingerprinting.enabled" = false;
+        "privacy.trackingprotection.annotate_channels" = false;
+        "privacy.donottrackheader.enabled" = false;
+        "browser.contentblocking.category" = "custom";  # Set to custom to ensure our settings apply
+        "network.cookie.cookieBehavior" = 0;  # 0 = Accept all cookies
+        "privacy.firstparty.isolate" = false;
+        "privacy.resistFingerprinting" = false;
         
         # Performance
         "gfx.webrender.all" = true;
diff --git a/modules/nvim.nix b/modules/nvim.nix
index b70ba56..2fea6b6 100644
--- a/modules/nvim.nix
+++ b/modules/nvim.nix
@@ -168,20 +168,6 @@
         options = { desc = "Quit"; };
       }
 
-      # System clipboard keymaps
-      {
-        mode = "n";
-        key = "<leader>p";
-        action = "\"+p";
-        options = { desc = "Paste from system clipboard"; };
-      }
-      {
-        mode = "v";
-        key = "<leader>p";
-        action = "\"+p";
-        options = { desc = "Replace selection with system clipboard"; };
-      }
-
       # System integration
       {
         mode = "n";