diff --git a/home-manager/modules/firefox/config/bookmarks.nix b/home-manager/modules/firefox/config/bookmarks.nix
index ee0595b..a52aa47 100755
--- a/home-manager/modules/firefox/config/bookmarks.nix
+++ b/home-manager/modules/firefox/config/bookmarks.nix
@@ -19,25 +19,25 @@ in {
           bookmarks = [
             {
               name = "PubMed";
-              url = "https://pubmed.ncbi.nlm.nih.gov/";
+              url = "https://pubmed.ncbi.nlm.nih.gov";
               tags = ["pub" "pubmed" "science" "research" "academic"];
               keyword = "Pub";
             }
             {
               name = "Sci-Hub";
-              url = "https://sci-hub.ee/";
+              url = "https://sci-hub.ee";
               tags = ["sci" "sci-hub" "scihub" "science" "research" "academic" "torrent"];
               keyword = "Sci";
             }
             {
               name = "Stanford Encyclopedia of Philosophy";
-              url = "https://plato.stanford.edu/";
+              url = "https://plato.stanford.edu";
               tags = ["standford" "encyclopedia" "philosophy" "phil"];
               keyword = "Phil";
             }
             {
               name = "Zotero Bibliography";
-              url = "https://zbib.org/";
+              url = "https://zbib.org";
               tags = ["votero" "bibliography" "bib" "zbib"];
               keyword = "Bib";
             }
@@ -93,7 +93,7 @@ in {
             }
             {
               name = "Hackage";
-              url = "https://hackage.haskell.org/";
+              url = "https://hackage.haskell.org";
               tags = ["hackage" "hack" "haskell"];
               keyword = "Hack";
             }
@@ -117,19 +117,19 @@ in {
             }
             {
               name = "Lichess";
-              url = "https://lichess.org/";
+              url = "https://lichess.org";
               tags = ["lichess" "chess"];
               keyword = "Li";
             }
             {
               name = "ProtonDB";
-              url = "https://www.protondb.com/";
+              url = "https://www.protondb.com";
               tags = ["steam" "db"];
               keyword = "DB";
             }
             {
               name = "SteamDB";
-              url = "https://steamdb.info/";
+              url = "https://steamdb.info";
               tags = ["steamdb" "steam" "db"];
               keyword = "SteamDB";
             }
@@ -153,7 +153,7 @@ in {
             }
             {
               name = "Credit Karma";
-              url = "https://www.creditkarma.ca/";
+              url = "https://www.creditkarma.ca";
               tags = ["credit" "karma" "bank" "banking"];
               keyword = "Credit";
             }
@@ -165,7 +165,7 @@ in {
             }
             {
               name = "LiberaPay";
-              url = "https://liberapay.com/TheNutrivore/";
+              url = "https://liberapay.com/TheNutrivore";
               tags = ["libera" "liberapay" "donations" "bank" "banking" "money" "nutrivore"];
               keyword = "Libera";
             }
@@ -249,7 +249,7 @@ in {
             }
             {
               name = "Namecheap";
-              url = "https://www.namecheap.com/";
+              url = "https://www.namecheap.com";
               tags = ["namecheap" "name" "cheap" "dns"];
               keyword = "Name";
             }
@@ -343,37 +343,37 @@ in {
           bookmarks = [
             {
               name = "Amazon";
-              url = "https://www.amazon.ca/";
+              url = "https://www.amazon.ca";
               tags = ["amazon" "shopping" "supply"];
               keyword = "Amazon";
             }
             {
               name = "Door Dash";
-              url = "https://www.doordash.com/";
+              url = "https://www.doordash.com";
               tags = ["doordash" "door" "dash" "food"];
               keyword = "Amazon";
             }
             {
               name = "FTY Supplies";
-              url = "https://fytsupplies.ca/";
+              url = "https://fytsupplies.ca";
               tags = ["tattoo tat" "fyt" "shopping" "supply"];
               keyword = "FYT";
             }
             {
               name = "Skip the Dishes";
-              url = "https://www.skipthedishes.com/";
+              url = "https://www.skipthedishes.com";
               tags = ["skip" "dishes" "food"];
               keyword = "Skip";
             }
             {
               name = "Uber Eats";
-              url = "https://www.ubereats.com/";
+              url = "https://www.ubereats.com";
               tags = ["uber" "eats" "food"];
               keyword = "Uber";
             }
             {
               name = "TatSoul";
-              url = "https://www.tatsoul.com/";
+              url = "https://www.tatsoul.com";
               tags = ["tattoo" "tat" "tatsoul" "shopping" "supply"];
               keyword = "TatSoul";
             }
@@ -403,13 +403,13 @@ in {
             }
             {
               name = "Lemmy";
-              url = "https://lemmy.world/";
+              url = "https://lemmy.world";
               tags = ["lemmy" "social"];
               keyword = "Lem";
             }
             {
               name = "OnlyFans";
-              url = "https://onlyfans.com/";
+              url = "https://onlyfans.com";
               tags = ["onlyfans" "only" "fans"];
               keyword = "Only";
             }
@@ -439,7 +439,7 @@ in {
             }
             {
               name = "Reddit";
-              url = "https://www.reddit.com/";
+              url = "https://www.reddit.com";
               tags = ["reddit" "social"];
               keyword = "Reddit";
             }
@@ -457,7 +457,7 @@ in {
             }
             {
               name = "YouTube";
-              url = "https://www.youtube.com/";
+              url = "https://www.youtube.com";
               tags = youtubeTags;
               keyword = "You";
             }
@@ -483,7 +483,7 @@ in {
           bookmarks = [
             {
               name = "Uncensored AI";
-              url = "https://www.aiuncensored.info/";
+              url = "https://www.aiuncensored.info";
               tags = ["uncensored" "ai"];
               keyword = "AI";
             }
@@ -495,13 +495,13 @@ in {
             }
             {
               name = "Chmod Calculator";
-              url = "https://chmod-calculator.com/";
+              url = "https://chmod-calculator.com";
               tags = ["chmod" "calculator"];
               keyword = "Chmod";
             }
             {
               name = "ChatGPT";
-              url = "https://chatgpt.com/";
+              url = "https://chatgpt.com";
               tags = ["chat" "chatgpt" "gpt"];
               keyword = "Chat";
             }
@@ -519,7 +519,7 @@ in {
             }
             {
               name = "DNS Checker";
-              url = "https://dnschecker.org/";
+              url = "https://dnschecker.org";
               tags = ["dns" "checker"];
               keyword = "DNS";
             }
@@ -531,19 +531,19 @@ in {
             }
             {
               name = "Google Maps";
-              url = "https://www.maps.google.com/";
+              url = "https://www.google.com/maps";
               tags = ["maps" "google"];
               keyword = "Map";
             }
             {
               name = "ListenBrainz";
-              url = "https://listenbrainz.org/user/BRBWaffles/";
+              url = "https://listenbrainz.org/user/BRBWaffles";
               tags = ["listenbrainz" "listen" "brains"];
               keyword = "Listen";
             }
             {
               name = "Memory Express";
-              url = "https://www.memoryexpress.com/";
+              url = "https://www.memoryexpress.com";
               tags = ["memoryexpress" "memory" "mem" "express"];
               keyword = "Mem";
             }
@@ -555,37 +555,37 @@ in {
             }
             {
               name = "Portchecker";
-              url = "https://portchecker.co/";
+              url = "https://portchecker.co";
               tags = ["portchecker" "port" "checker"];
               keyword = "Port";
             }
             {
               name = "Proof Tree";
-              url = "https://www.umsu.de/trees/";
+              url = "https://www.umsu.de/trees";
               tags = ["proof" "tree" "logic" "academic"];
               keyword = "Logic";
             }
             {
               name = "RhymeZone";
-              url = "https://www.rhymezone.com/";
+              url = "https://www.rhymezone.com";
               tags = ["rhymezone" "rhyme" "zone"];
               keyword = "Rhyme";
             }
             {
               name = "Sci-Hub";
-              url = "https://sci-hub.ee/";
+              url = "https://sci-hub.ee";
               tags = ["sci" "sci-hub" "scihub" "science" "research" "academic" "torrent"];
               keyword = "Sci";
             }
             {
               name = "Speedtest";
-              url = "https://www.speedtest.net/";
+              url = "https://www.speedtest.net";
               tags = ["speedtest" "speed" "test"];
               keyword = "Speed";
             }
             {
               name = "Stanford Encyclopedia of Philosophy";
-              url = "https://plato.stanford.edu/";
+              url = "https://plato.stanford.edu";
               tags = ["standford" "encyclopedia" "philosophy" "phil"];
               keyword = "Phil";
             }
@@ -597,13 +597,13 @@ in {
             }
             {
               name = "TinEye";
-              url = "https://tineye.com/";
+              url = "https://tineye.com";
               tags = ["tineye" "tin" "eye"];
               keyword = "Tin";
             }
             {
               name = "Zotero Bibliography";
-              url = "https://zbib.org/";
+              url = "https://zbib.org";
               tags = ["votero" "bibliography" "bib" "zbib"];
               keyword = "Bib";
             }
@@ -615,25 +615,25 @@ in {
           bookmarks = [
             {
               name = "1337";
-              url = "https://1337x.to/";
+              url = "https://1337x.to";
               tags = ["torrent" "1337"];
               keyword = "1337";
             }
             {
               name = "Core Radio";
-              url = "https://coreradio.online/";
+              url = "https://coreradio.online";
               tags = ["core" "radio" "metal"];
               keyword = "Core";
             }
             {
               name = "Metal Tracker";
-              url = "https://en.metal-tracker.com/";
+              url = "https://en.metal-tracker.com";
               tags = ["metaltracker" "metal" "tracker"];
               keyword = "Metal";
             }
             {
               name = "Torrent Leech";
-              url = "https://www.torrentleech.org/";
+              url = "https://www.torrentleech.org";
               tags = ["torrent" "leech"];
               keyword = "Leech";
             }
diff --git a/home-manager/modules/firefox/config/icons/cr.png b/home-manager/modules/firefox/config/icons/cr.png
new file mode 100644
index 0000000..4625510
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/cr.png differ
diff --git a/home-manager/modules/firefox/config/icons/dn.png b/home-manager/modules/firefox/config/icons/dn.png
new file mode 100644
index 0000000..d7347a6
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/dn.png differ
diff --git a/home-manager/modules/firefox/config/icons/do.png b/home-manager/modules/firefox/config/icons/do.png
new file mode 100644
index 0000000..0b78a5f
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/do.png differ
diff --git a/home-manager/modules/firefox/config/icons/ki.png b/home-manager/modules/firefox/config/icons/ki.png
new file mode 100644
index 0000000..9d650e3
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/ki.png differ
diff --git a/home-manager/modules/firefox/config/icons/me.png b/home-manager/modules/firefox/config/icons/me.png
new file mode 100644
index 0000000..8f9bb1c
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/me.png differ
diff --git a/home-manager/modules/firefox/config/icons/pd.png b/home-manager/modules/firefox/config/icons/pd.png
new file mode 100644
index 0000000..80264ad
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/pd.png differ
diff --git a/home-manager/modules/firefox/config/icons/pt.png b/home-manager/modules/firefox/config/icons/pt.png
new file mode 100644
index 0000000..98b4b62
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/pt.png differ
diff --git a/home-manager/modules/firefox/config/icons/rz.png b/home-manager/modules/firefox/config/icons/rz.png
new file mode 100644
index 0000000..08a642f
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/rz.png differ
diff --git a/home-manager/modules/firefox/config/icons/sd.png b/home-manager/modules/firefox/config/icons/sd.png
new file mode 100644
index 0000000..206935d
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/sd.png differ
diff --git a/home-manager/modules/firefox/config/icons/sk.png b/home-manager/modules/firefox/config/icons/sk.png
new file mode 100644
index 0000000..1707950
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/sk.png differ
diff --git a/home-manager/modules/firefox/config/icons/tw.png b/home-manager/modules/firefox/config/icons/tw.png
new file mode 100644
index 0000000..a34710a
Binary files /dev/null and b/home-manager/modules/firefox/config/icons/tw.png differ
diff --git a/home-manager/modules/firefox/config/search.nix b/home-manager/modules/firefox/config/search.nix
index 3ec1185..1acdaa2 100755
--- a/home-manager/modules/firefox/config/search.nix
+++ b/home-manager/modules/firefox/config/search.nix
@@ -1,7 +1,21 @@
-{
+{flake, ...}: let
+  inherit (flake.config.services) instances;
+in {
   force = true;
   default = "Kagi";
   engines = {
+    # Self-Hosted
+    "${instances.jellyfin.label}" = {
+      definedAliases = ["@jf"];
+      icon = ./icons/jf.png;
+      urls = [{template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";}];
+    };
+    "${instances.peertube.label}" = {
+      definedAliases = ["@pt"];
+      icon = ./icons/pt.png;
+      urls = [{template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}";}];
+    };
+    # General
     "AlternativeTo" = {
       definedAliases = ["@al"];
       icon = ./icons/al.png;
@@ -17,10 +31,20 @@
       icon = ./icons/br.png;
       urls = [{template = "https://search.brave.com/search?q={searchTerms}&source=web";}];
     };
-    "Jellyfin" = {
-      definedAliases = ["@jf"];
-      icon = ./icons/ka.png;
-      urls = [{template = "https://jellyfin.cloudbert.fun/web/#/search.html?query={searchTerms}";}];
+    "Core Radio" = {
+      definedAliases = ["@cr"];
+      icon = ./icons/cr.png;
+      urls = [{template = "https://coreradio.online/?do=search&subaction=search&story={searchTerms}";}];
+    };
+    "DNS Checker" = {
+      definedAliases = ["@dn"];
+      icon = ./icons/dn.png;
+      urls = [{template = "https://dnschecker.org/#A/{searchTerms}";}];
+    };
+    "Door Dash" = {
+      definedAliases = ["@do"];
+      icon = ./icons/do.png;
+      urls = [{template = "https://www.doordash.com/search/store/{searchTerms}";}];
     };
     "Hackage" = {
       definedAliases = ["@ha"];
@@ -42,6 +66,16 @@
       icon = ./icons/ho.png;
       urls = [{template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}";}];
     };
+    "Kijiji" = {
+      definedAliases = ["@ki"];
+      icon = ./icons/ki.png;
+      urls = [{template = "https://www.kijiji.ca/b-winnipeg/{searchTerms}";}];
+    };
+    "Memory Express" = {
+      definedAliases = ["@me"];
+      icon = ./icons/me.png;
+      urls = [{template = "https://www.memoryexpress.com/Search/Products?Search={searchTerms}";}];
+    };
     "Netflix" = {
       definedAliases = ["@ne"];
       icon = ./icons/ne.png;
@@ -72,21 +106,41 @@
       icon = ./icons/pi.png;
       urls = [{template = "https://thepiratebay.org/search.php?q={searchTerms}&all=on&search=Pirate+Search&page=0&orderby=";}];
     };
+    "Proton DB" = {
+      definedAliases = ["@pd"];
+      icon = ./icons/pd.png;
+      urls = [{template = "https://www.protondb.com/search?q={searchTerms}";}];
+    };
     "Reddit" = {
       definedAliases = ["@re"];
       icon = ./icons/re.png;
       urls = [{template = "https://www.reddit.com/search/?q={searchTerms}";}];
     };
+    "Rhyme Zone" = {
+      definedAliases = ["@rz"];
+      icon = ./icons/rz.png;
+      urls = [{template = "https://www.rhymezone.com/r/rhyme.cgi?Word={searchTerms}&typeofrhyme=perfect&org1=syl&org2=l&org3=y";}];
+    };
     "Sci-Hub" = {
       definedAliases = ["@sc"];
       icon = ./icons/sc.png;
       urls = [{template = "https://sci-hub.ee/{searchTerms}";}];
     };
+    "Skip The Dishes" = {
+      definedAliases = ["@sk"];
+      icon = ./icons/sk.png;
+      urls = [{template = "https://www.skipthedishes.com/winnipeg/items?search={searchTerms}";}];
+    };
     "Stanford Encyclopedia of Philosophy" = {
       definedAliases = ["@ph"];
       icon = ./icons/ph.png;
       urls = [{template = "https://plato.stanford.edu/search/searcher.py?query={searchTerms}";}];
     };
+    "Steam DB" = {
+      definedAliases = ["@sd"];
+      icon = ./icons/sd.png;
+      urls = [{template = "https://steamdb.info/search/?a=all&q={searchTerms}";}];
+    };
     "Urban Dictionary" = {
       definedAliases = ["@ur"];
       icon = ./icons/ur.png;
@@ -122,6 +176,11 @@
       icon = ./icons/tl.png;
       urls = [{template = "https://www.torrentleech.org/torrents/browse/index/query/{searchTerms}";}];
     };
+    "X" = {
+      definedAliases = ["@tw"];
+      icon = ./icons/tw.png;
+      urls = [{template = "https://x.com/search?q={searchTerms}";}];
+    };
     "Amazon.ca".metaData.hidden = true;
     "Bing".metaData.hidden = true;
     "eBay".metaData.hidden = true;