diff --git a/assets/pages/xmpp.png b/assets/pages/xmpp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3f353265d9253a896c98c634d5e4f23793dda5
Binary files /dev/null and b/assets/pages/xmpp.png differ
diff --git a/assets/svgs/xmpp.svg b/assets/svgs/xmpp.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ca4bcab04250961996abdc961e0f4757f566140b
--- /dev/null
+++ b/assets/svgs/xmpp.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="xmpp.svg"
+   inkscape:export-filename="/home/amolith/repos/blog/assets/pages/gen-safety.png"
+   inkscape:export-xdpi="98.599998"
+   inkscape:export-ydpi="98.599998">
+  <defs
+     id="defs2">
+    <symbol
+       id="shield-alt">
+      <title
+         id="shield-alt-title">Alternate Shield</title>
+      <path
+         style="stroke-width:0.26458332"
+         inkscape:connector-curvature="0"
+         d="m 131.23333,33.866667 c 0,58.547529 -35.965868,91.187323 -58.615524,100.623153 a 12.7,12.7 0 0 1 -9.76921,0 C 34.526802,122.69073 4.2333333,86.383019 4.2333333,33.866667 A 12.7,12.7 0 0 1 12.04886,22.143508 l 50.8,-21.16666633 a 12.7,12.7 0 0 1 9.769211,0 L 123.41807,22.143508 a 12.7,12.7 0 0 1 7.81526,11.723159 z m -63.499997,84.220313 0.01746,0.009 C 92.551515,105.74285 113.39063,76.739485 114.26904,36.676012 L 67.733333,17.286023 Z"
+         id="path26851" />
+    </symbol>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="265.71429"
+     inkscape:cy="460"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:window-width="1336"
+     inkscape:window-height="698"
+     inkscape:window-x="15"
+     inkscape:window-y="35"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-32.41665)">
+    <rect
+       style="opacity:1;fill:#323232;fill-opacity:1;stroke:none;stroke-width:4.23333311;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect99612"
+       width="264.58334"
+       height="264.58334"
+       x="-5.0862632e-06"
+       y="32.416645" />
+    <path
+       id="path96037"
+       d="m 204.1819,96.974829 -8.70049,2.90007 -25.7675,7.634841 c 0.11461,1.48869 0.11452,2.97738 0.11452,4.58051 0,28.23278 -14.34327,62.67841 -38.16427,87.28415 -23.16496,-24.52128 -37.069869,-58.34132 -37.069869,-86.13893 0,-1.60322 1.8e-4,-3.09182 0.11471,-4.58051 l -25.65138,-7.60036 c 9e-5,-0.0235 7.5e-4,-0.0489 7.5e-4,-0.072 l -8.70284,-3.091731 c -4.21261,36.404151 19.76856,84.117171 59.802109,111.968611 -10.99667,8.78458 -23.487204,15.46971 -37.128969,18.91796 v 2.63364 c 6.8098,-0.84741 13.398817,-2.16944 19.750339,-3.91057 9.78916,-2.46105 19.1595,-6.20731 27.97564,-10.96088 a 132.96367,132.96367 0 0 0 3.82978,2.09325 c 0.17944,0.0943 0.35916,0.18771 0.53898,0.28118 0.0389,0.0202 0.0777,0.0407 0.11668,0.0609 a 125.10326,125.10326 0 0 0 2.8452,1.42942 c 13.26194,6.46266 27.80645,10.75344 43.30875,12.03742 v -2.51939 c -14.3769,-3.63407 -27.47499,-10.86334 -38.89358,-20.35657 42.35866,-27.68732 66.09247,-75.17918 61.68144,-112.591011 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:1.14512825;fill:#fdfdfd;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/index.html b/index.html
index fc9541041e52c6d79c19873e00ede64a2d8f7fc5..4ec57c20989cceac98233967cfbff1d01dd4248f 100644
--- a/index.html
+++ b/index.html
@@ -19,30 +19,40 @@ priority: 0.9
 <div class="flex-wrapper">
     <div class="flex-cards">
         <div class="card">
-            <h1><b>NixNet Chat</b></h1> 
-            <p>NixNet Chat is built on Rocket.Chat, an enterprise-grade real time chat application. Use this for communicating with other users and getting support for NixNet services.</p> 
+            <h1><b>Rocket.Chat</b></h1> 
+            <p>Rocket.Chat is an enterprise-grade real time chat application. Use this for communicating with other users, joining a few different communities, and getting support for NixNet services.</p> 
             <a href="https://chat.nixnet.xyz"><button class="button">Register!</button></a>
         </div>
         <div class="card">
             <h1><b>Mumble</b></h1> 
             <p>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.</p> 
-            <a href="mumble://nixnet.xyz"><button class="button">Chat!</button></a>
+            <a href="mumble://nixnet.xyz:64738"><button class="button">Chat!</button></a>
         </div>
         <div class="card">
             <h1><b>CodiMD</b></h1> 
             <p>CodiMD is an application that allows users to collaborate in real time on markdown documents and presentations. Perfect for quick and easy slideshows and documentation.</p>
             <a href="https://codi.nixnet.xyz"><button class="button">Write!</button></a>
         </div>
+        <div class="card">
+            <h1><b>PrivateBin</b></h1> 
+            <p>PrivateBin is a minimalist and open source pastebin that has zero knowledge of pasted data. Everything is encrypted and decrypted in-browser using 256bit AES in Galois Counter mode.</p> 
+            <a href="https://bin.nixnet.xyz/"><button class="button">Paste!</button></a>
+        </div>
+        <div class="card">
+            <h1><b>Gitea</b></h1> 
+            <p>Gitea is a simple, easy-to-use and yet full-featured, self-hosted code hosting solution. I just broke something so it's not useable at the moment. I'm working on fixing it right now.</p> 
+            <a href="https://git.nixnet.xyz/"><button class="button">Code!</button></a>
+        </div>
+        <div class="card">
+            <h1><b>Jabber/XMPP</b></h1> 
+            <p>Jabber/XMPP is a set of open technologies for instant messaging, multi-party chat, voice and video calls, and collaboration.XMPP stands for the Extensible Messaging and Presence Protocol.</p>
+            <a href="https://nixnet.xyz/jabber-xmpp/"><button class="button">Register!</button></a>
+        </div>
         <div class="card">
             <h1><b>searX</b></h1> 
             <p>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.</p> 
             <a href="https://searx.nixnet.xyz"><button class="button">Meta Search!</button></a>
         </div>
-        <div class="card">
-            <h1><b>YaCy</b></h1> 
-            <p>YaCy is a fully decentralized search engine; all users of its network are equal, it does not store user search requests, and it's impossible for anything to be censored from the shared index. It's also integrated into searX above.</p> 
-            <a href="https://yacy.nixnet.xyz"><button class="button">Search P2P!</button></a>
-        </div>
     </div>
 </div>
 </br>
@@ -54,19 +64,9 @@ priority: 0.9
 <div class="flex-wrapper">
     <div class="flex-cards">
         <div class="card">
-            <h1><b>Gitea</b></h1> 
-            <p>Gitea is a simple, easy-to-use and yet full-featured, self-hosted code hosting solution. I just broke something so it's not useable at the moment. I'm working on fixing it right now.</p> 
-            <a href="https://git.snopyta.org/"><button class="button">Code!</button></a>
-        </div>
-        <div class="card">
-            <h1><b>PrivateBin</b></h1> 
-            <p>PrivateBin is a minimalist and open source pastebin that has zero knowledge of pasted data. Everything is encrypted and decrypted in-browser using 256bit AES in Galois Counter mode.</p> 
-            <a href="https://bin.snopyta.org/"><button class="button">Paste!</button></a>
-        </div>
-        <div class="card">
-            <h1><b>Jabber/XMPP</b></h1> 
-            <p>XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, multi-party chat, voice and video calls, and collaboration.</p>
-            <a href="https://snopyta.org/service/xmpp/xmpp.html"><button class="button">Log in!</button></a>
+            <h1><b>YaCy</b></h1> 
+            <p>YaCy is a fully decentralized search engine; all users of its network are equal, it does not store user search requests, and it's impossible for anything to be censored from the shared index.</p> 
+            <a href="https://yacy.snopyta.org/"><button class="button">Search P2P!</button></a>
         </div>
     </div>
 </div>
diff --git a/jabber-xmpp/jabber-xmpp.md b/jabber-xmpp/jabber-xmpp.md
new file mode 100644
index 0000000000000000000000000000000000000000..cbd99a82ce4a1dd1ae104c0e4753e445242e881d
--- /dev/null
+++ b/jabber-xmpp/jabber-xmpp.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: Jabber/XMPP
+description: "Set up a Jabber/XMPP account on NixNet.xyz"
+cover: /assets/pages/xmpp.png
+permalink: /jabber-xmpp/
+---
+# Registration
+Client registration is open so all you have to do to start using Jabber/XMPP on NixNet is open your favourite client, enter `<username>@nixnet.xyz`, come up with a strong password, and register!  
+
+---
+# Clients
+If you're not sure what client to use, I recommend [Conversations](https://f-droid.org/en/packages/eu.siacs.conversations/) for Android,  [AstraChat](https://itunes.apple.com/us/app/astrachat-direct-xmpp-voip/id923002139?mt=8) or [Monal IM](https://monal.im/) for iOS/macOS (I haven't tested them and AstraChat seems to be proprietary), and [Gajim](https://gajim.org/) for Linux and Windows. If you're ok with an alpha-level client, I recommend and use [Dino](https://github.com/dino/dino/wiki/Distribution-Packages) for Linux.