diff --git a/json/cards.json b/json/cards.json
index 8e81a7cb807a4eeb79a2387a3572a5bfcff64e5e..82c59faefa0b40d3d5b871900dc36116d24c8ecb 100644
--- a/json/cards.json
+++ b/json/cards.json
@@ -1,18 +1,11 @@
 {
   "cards" :
   [
-    {
-    "name": "Email",
-      "description": "I run a mail server powered by Postfix, Dovecot, rspamd, ClamAV and a number of other components. The result is stable, private, and anonymous email for everyone.",
-      "button_text": "Sign up!",
-      "link": "https://nixnet.email",
-      "tor":"#"
-    },
     {
     "name": "Jabber/XMPP",
       "description": "Jabber/XMPP is a set of open technologies for instant messaging, multi-party chat, and voice/video calls. XMPP stands for the Extensible Messaging and Presence Protocol.",
       "button_text": "Register!",
-      "link": "/jabber-xmpp/",
+      "link": "https://docs.nixnet.services/XMPP",
       "tor":"#"
     },
     {
@@ -44,31 +37,31 @@
       "tor":"http://qt5vr747phiq55ubqip4hflmpygzl374mum2zbyqdxg6sqbngmzlqhid.onion"
     },
     {
-    "name": "DNS",
-      "description": "I run three DNS servers that are available for public use. They are uncensored and located in Luxembourg, Las Vegas, and New York. Adblock is available with Pi-Hole.",
-      "button_text": "Query!",
-      "link": "https://docs.nixnet.services/NixNet_DNS",
+    "name": "HedgeDoc",
+      "description": "HedgeDoc is an application that allows users to collaborate in real time on markdown documents and presentations. Perfect for quick and easy slideshows and documentation.",
+      "button_text": "Collaborate!",
+      "link": "https://pad.nixnet.services/",
       "tor":"#"
     },
     {
-    "name": "Proxies",
-       "description": "At the request of some users, I proxy a few websites. These include The Tor Project's main website, their bridges directory, the EFF's Self Defense guide, and some others.",
-       "button_text": "Browse!",
-       "link": "/proxies",
-       "tor":"#"
+    "name": "Mumble",
+      "description": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. It's also great for private calls between yourself and others.",
+      "button_text": "Chat!",
+      "link": "/mumble/",
+      "tor":"#"
     },
     {
-    "name": "Tiny Tiny RSS",
-      "description": "TT-RSS is a wonderful web-based feed reader with a mobile client. It has plugins that pull feeds from websites without them, custom themes, and many other great features!",
-      "button_text": "Read!",
-      "link": "https://tt-rss.nixnet.services/",
-      "tor":"#"
+    "name": "searx",
+      "description": "searx is a meta search engine that aggregates results from more than 70 different search engines. Users are neither tracked nor profiled. searx can also be used over Tor for increased anonymity.",
+      "button_text": "Search!",
+      "link": "https://searx.nixnet.services/",
+      "tor":"http://5s4zu5bt7ndw7axniiz6ypvgxpy6bpsslyfr2uhmrnwbehisxcc3vvid.onion"
     },
     {
-    "name": "HedgeDoc",
-      "description": "HedgeDoc is an application that allows users to collaborate in real time on markdown documents and presentations. Perfect for quick and easy slideshows and documentation.",
-      "button_text": "Collaborate!",
-      "link": "https://pad.nixnet.services/",
+    "name": "wallabag",
+      "description": "wallabag is like a self-hosted version of Mozilla's Pocket. You throw it some links and it saves them to read later in a minimal UI, and downloads them to the mobile app if you have it.",
+      "button_text": "Read!",
+      "link": "https://wallabag.nixnet.xyz/",
       "tor":"#"
     },
     {
@@ -86,38 +79,17 @@
       "tor":"#"
     },
     {
-    "name": "Nitter",
-      "description": "Nitter is an open source alternative frontend to Twitter without the tracking, javascript or ads. You can view profiles, tweets, videos, stats, etc. It was inspired by Invidious.",
-      "button_text": "View!",
-      "link": "https://nitter.nixnet.services/",
-      "tor":"http://fyrq36pxze2sb3wiiwqw5v5wrc2b4f4kdjrdarml2mjrcn4oywivdlid.onion"
-    },
-    {
-    "name": "Bibliogram",
-      "description": "Also inspired by Invidious, Bibliogram is an open source, privacy-friendly, and quite attractive frontend to Instagram. You can view images, profiles, videos, and comments.",
-      "button_text": "Browse!",
-      "link": "https://bibliogram.nixnet.services/",
+    "name": "Linx",
+      "description": "Linx is a dead-simple temporary file hosting service. The max file size is 4 GB and uploads expire after 1 day.",
+      "button_text": "Upload!",
+      "link": "https://up.nixnet.services",
       "tor":"#"
     },
     {
-    "name": "Mumble",
-      "description": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. It's also great for private calls between yourself and others.",
-      "button_text": "Chat!",
-      "link": "/mumble/",
-      "tor":"#"
-    },
-    {
-    "name": "searx",
-      "description": "searx is a meta search engine that aggregates results from more than 70 different search engines. Users are neither tracked nor profiled. searx can also be used over Tor for increased anonymity.",
-      "button_text": "Search!",
-      "link": "https://searx.nixnet.services/",
-      "tor":"http://5s4zu5bt7ndw7axniiz6ypvgxpy6bpsslyfr2uhmrnwbehisxcc3vvid.onion"
-    },
-    {
-    "name": "wallabag",
-      "description": "wallabag is like a self-hosted version of Mozilla's Pocket. You throw it some links and it saves them to read later in a minimal UI, and downloads them to the mobile app if you have it.",
+    "name": "Tiny Tiny RSS",
+      "description": "TT-RSS is a wonderful web-based feed reader with a mobile client. It has plugins that pull feeds from websites without them, custom themes, and many other great features!",
       "button_text": "Read!",
-      "link": "https://wallabag.nixnet.xyz/",
+      "link": "https://tt-rss.nixnet.services/",
       "tor":"#"
     },
     {
@@ -128,10 +100,17 @@
       "tor":"#"
     },
     {
-    "name": "Framadate",
-      "description": "Framadate is a simple and wonderful poll creation tool by Framasoft. It's perfect for planning an appointment or making a decision quickly and easily. No registration is required.",
-      "button_text": "Poll!",
-      "link": "https://poll.nixnet.services/",
+    "name": "Nitter",
+      "description": "Nitter is an open source alternative frontend to Twitter without the tracking, javascript or ads. You can view profiles, tweets, videos, stats, etc. It was inspired by Invidious.",
+      "button_text": "View!",
+      "link": "https://nitter.nixnet.services/",
+      "tor":"http://fyrq36pxze2sb3wiiwqw5v5wrc2b4f4kdjrdarml2mjrcn4oywivdlid.onion"
+    },
+    {
+    "name": "Bibliogram",
+      "description": "Also inspired by Invidious, Bibliogram is an open source, privacy-friendly, and quite attractive frontend to Instagram. You can view images, profiles, videos, and comments.",
+      "button_text": "Browse!",
+      "link": "https://bibliogram.nixnet.services/",
       "tor":"#"
     },
     {
@@ -140,6 +119,13 @@
       "button_text": "Subscribe!",
       "link": "https://rss.nixnet.services/",
       "tor":"http://kf5waqrpn3vlk3fw7hs7fvy2uaa5snvtrnpss7lfbypb3ag2u7fuqoyd.onion"
+    },
+    {
+    "name": "Framadate",
+      "description": "Framadate is a simple and wonderful poll creation tool by Framasoft. It's perfect for planning an appointment or making a decision quickly and easily. No registration is required.",
+      "button_text": "Poll!",
+      "link": "https://poll.nixnet.services/",
+      "tor":"#"
     }
   ]
 }