diff --git a/_data/su_networks.yml b/_data/su_networks.yml
index 1e1de04..1161eac 100644
--- a/_data/su_networks.yml
+++ b/_data/su_networks.yml
@@ -45,7 +45,7 @@
     - name: InspIRCd Testnet
       ircd-ver: InspIRCd-4
       net-address:
-        link:  ircs://testnet.inspircd.org:6697/
+        link: ircs://testnet.inspircd.org:6697/
         display: testnet.inspircd.org
       link: https://www.inspircd.org/
       support:
@@ -82,7 +82,7 @@
     - name: IRCCloud Teams
       ircd-ver: irccloud-prattle
       net-address:
-        link:  ircs://team-irc.irccloud.com:6697/
+        link: ircs://team-irc.irccloud.com:6697/
         display: team-irc.irccloud.com
         exit-early: true
       link: https://blog.irccloud.com/private-teams-servers/
@@ -154,12 +154,12 @@
   note: >
     These are real-world networks that have agreed to be listed on this page and support some level of IRCv3 functionality. This is by no means an exhaustive list, just a number of networks that support IRCv3 specs.
   software:
-    - name: EsperNet
-      ircd-ver: charybdis-3.5.3
+    - name: BonoboNET
+      ircd-ver: unrealircd-6
       net-address:
-        link: ircs://irc.esper.net:6697/
-        display: irc.esper.net
-      link: https://esper.net
+        link: ircs://rany.irc.bnet.eu.org:6697/
+        display: rany.bnet.eu.org
+      link: https://bnet.eu.org
       support:
         stable:
           account-notify:
@@ -174,12 +174,12 @@
           sasl-3.1:
           starttls:
           userhost-in-names:
-    - name: IRC4Fun
-      ircd-ver: InspIRCd-3
+    - name: ergo.chat
+      ircd-ver: Ergo-2.8
       net-address:
-        link: ircs://irc.irc4fun.net:6697/
-        display: irc.irc4fun.net
-      link: https://irc4fun.net
+        link: ircs://irc.ergo.chat:6697/
+        display: ergo.chat
+      link: https://ergo.chat/about-network
       support:
         stable:
           account-notify:
@@ -189,6 +189,9 @@
           cap-3.1:
           cap-3.2:
           cap-notify:
+          account-registration:
+          channel-rename:
+          chathistory:
           chghost:
           echo-message:
           extended-join:
@@ -198,73 +201,69 @@
           monitor:
           msgid:
           multi-prefix:
+          multiline:
           sasl-3.1:
           sasl-3.2:
           server-time:
           setname:
+          sts:
           userhost-in-names:
+          utf8only:
           whox:
       partial:
         stable:
           bot-mode: Draft
-    - name: IRCHighWay
-      ircd-ver: InspIRCd-2.0
+          extended-monitor: Draft
+    - name: EsperNet
+      ircd-ver: charybdis-3.5.3
       net-address:
-        link: ircs://irc.irchighway.net:6697/
-        display: irc.irchighway.net
-      link: https://irchighway.net/
+        link: ircs://irc.esper.net:6697/
+        display: irc.esper.net
+      link: https://esper.net
       support:
         stable:
           account-notify:
           away-notify:
           cap-3.1:
+          cap-3.2:
+          cap-notify:
+          chghost:
           extended-join:
+          monitor:
           multi-prefix:
           sasl-3.1:
           starttls:
           userhost-in-names:
-    - name: Libera.Chat
+    - name: hackint
       ircd-ver: solanum-1.0-dev
       net-address:
-        link: ircs://irc.libera.chat:6697/
-        display: irc.libera.chat
-      link: https://libera.chat
+        link: ircs://irc.hackint.org:6697
+        display: irc.hackint.org
+      link: https://www.hackint.org/
       support:
         stable:
           account-notify:
-          account-tag:
           away-notify:
           cap-3.1:
           cap-3.2:
-          cap-notify:
           chghost:
-          echo-message:
           extended-join:
-          monitor:
           multi-prefix:
           sasl-3.1:
           sasl-3.2:
-    - name: Rizon
-      ircd-ver: plexus-4
-      net-address:
-        link:  ircs://irc.rizon.net:6697/
-        display: irc.rizon.net
-      link: https://rizon.net/
-      support:
-        stable:
-          away-notify:
-          cap-3.1:
-          chghost:
-          invite-notify:
-          multi-prefix:
-          sasl-3.1:
           userhost-in-names:
-    - name: Snoonet
+          account-tag:
+          cap-notify:
+          echo-message:
+          message-tags:
+          server-time:
+          whox:
+    - name: IRC4Fun
       ircd-ver: InspIRCd-3
       net-address:
-        link: ircs://irc.snoonet.org:6697/
-        display: irc.snoonet.org
-      link: https://www.snoonet.org/
+        link: ircs://irc.irc4fun.net:6697/
+        display: irc.irc4fun.net
+      link: https://irc4fun.net
       support:
         stable:
           account-notify:
@@ -279,91 +278,56 @@
           extended-join:
           invite-notify:
           labeled-response:
+          message-tags:
+          monitor:
           msgid:
           multi-prefix:
           sasl-3.1:
           sasl-3.2:
           server-time:
           setname:
-          sts:
           userhost-in-names:
           whox:
       partial:
         stable:
           bot-mode: Draft
-          message-tags: No client tags
-    - name: Teranova
-      ircd-ver: InspIRCd-4
+    - name: IRCHighWay
+      ircd-ver: InspIRCd-2.0
       net-address:
-        link:  ircs://irc.teranova.net:6697/
-        display: irc.teranova.net
-      link: https://www.teranova.net/
+        link: ircs://irc.irchighway.net:6697/
+        display: irc.irchighway.net
+      link: https://irchighway.net/
       support:
         stable:
           account-notify:
-          account-tag:
           away-notify:
-          batch:
-          bot-mode:
           cap-3.1:
-          cap-3.2:
-          cap-notify:
-          chghost:
-          echo-message:
           extended-join:
-          extended-monitor:
-          invite-notify:
-          monitor:
-          labeled-response:
-          msgid:
           multi-prefix:
           sasl-3.1:
-          sasl-3.2:
-          server-time:
-          setname:
-          standard-replies:
           starttls:
-          sts:
           userhost-in-names:
-          webirc:
-          whox:
-      partial:
-        stable:
-          message-tags: No client tags
-    - name: tilde.chat
-      ircd-ver: InspIRCd-3
+    - name: Libera.Chat
+      ircd-ver: solanum-1.0-dev
       net-address:
-        link: ircs://irc.tilde.chat:6697/
-        display: irc.tilde.chat
-      link: https://tilde.chat/
+        link: ircs://irc.libera.chat:6697/
+        display: irc.libera.chat
+      link: https://libera.chat
       support:
         stable:
           account-notify:
           account-tag:
           away-notify:
-          batch:
           cap-3.1:
           cap-3.2:
           cap-notify:
           chghost:
           echo-message:
           extended-join:
-          invite-notify:
-          labeled-response:
-          message-tags:
           monitor:
-          msgid:
           multi-prefix:
           sasl-3.1:
           sasl-3.2:
-          server-time:
-          setname:
-          starttls:
-          userhost-in-names:
-          whox:
-      partial:
-        stable:
-          bot-mode: Draft
     - name: PIRC.pl
       ircd-ver: UnrealIRCd-5
       net-address:
@@ -398,12 +362,27 @@
       partial:
         stable:
           bot-mode: Draft
-    - name: ergo.chat
-      ircd-ver: Ergo-2.8
+    - name: Rizon
+      ircd-ver: plexus-4
       net-address:
-        link: ircs://irc.ergo.chat:6697/
-        display: ergo.chat
-      link: https://ergo.chat/about-network
+        link: ircs://irc.rizon.net:6697/
+        display: irc.rizon.net
+      link: https://rizon.net/
+      support:
+        stable:
+          away-notify:
+          cap-3.1:
+          chghost:
+          invite-notify:
+          multi-prefix:
+          sasl-3.1:
+          userhost-in-names:
+    - name: Snoonet
+      ircd-ver: InspIRCd-3
+      net-address:
+        link: ircs://irc.snoonet.org:6697/
+        display: irc.snoonet.org
+      link: https://www.snoonet.org/
       support:
         stable:
           account-notify:
@@ -413,72 +392,93 @@
           cap-3.1:
           cap-3.2:
           cap-notify:
-          account-registration:
-          channel-rename:
-          chathistory:
           chghost:
           echo-message:
           extended-join:
           invite-notify:
           labeled-response:
-          message-tags:
-          monitor:
           msgid:
           multi-prefix:
-          multiline:
           sasl-3.1:
           sasl-3.2:
           server-time:
           setname:
           sts:
           userhost-in-names:
-          utf8only:
           whox:
       partial:
         stable:
           bot-mode: Draft
-          extended-monitor: Draft
-    - name: BonoboNET
-      ircd-ver: unrealircd-6
+          message-tags: No client tags
+    - name: Teranova
+      ircd-ver: InspIRCd-4
       net-address:
-        link: ircs://rany.irc.bnet.eu.org:6697/
-        display: rany.bnet.eu.org
-      link: https://bnet.eu.org
+        link: ircs://irc.teranova.net:6697/
+        display: irc.teranova.net
+      link: https://www.teranova.net/
       support:
         stable:
           account-notify:
+          account-tag:
           away-notify:
+          batch:
+          bot-mode:
           cap-3.1:
           cap-3.2:
           cap-notify:
           chghost:
+          echo-message:
           extended-join:
+          extended-monitor:
+          invite-notify:
           monitor:
+          labeled-response:
+          msgid:
           multi-prefix:
           sasl-3.1:
+          sasl-3.2:
+          server-time:
+          setname:
+          standard-replies:
           starttls:
+          sts:
           userhost-in-names:
-    - name: hackint
-      ircd-ver: solanum-1.0-dev
+          webirc:
+          whox:
+      partial:
+        stable:
+          message-tags: No client tags
+    - name: tilde.chat
+      ircd-ver: InspIRCd-3
       net-address:
-        link: ircs://irc.hackint.org:6697
-        display: irc.hackint.org
-      link: https://www.hackint.org/
+        link: ircs://irc.tilde.chat:6697/
+        display: irc.tilde.chat
+      link: https://tilde.chat/
       support:
         stable:
           account-notify:
+          account-tag:
           away-notify:
+          batch:
           cap-3.1:
           cap-3.2:
+          cap-notify:
           chghost:
+          echo-message:
           extended-join:
+          invite-notify:
+          labeled-response:
+          message-tags:
+          monitor:
+          msgid:
           multi-prefix:
           sasl-3.1:
           sasl-3.2:
-          userhost-in-names:
-          account-tag:
-          cap-notify:
-          echo-message:
-          message-tags:
           server-time:
+          setname:
+          starttls:
+          userhost-in-names:
           whox:
+      partial:
+        stable:
+          bot-mode: Draft