diff --git a/index.html b/index.html
index 0e59df0..61ee10e 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
 		<p>
 			But <ziba-link>Mastodon</ziba-link> based social-media networks don't just <strong>federate</strong> with other <ziba-link>Mastodon</ziba-link> based social-media networks
 			—
-			they <strong>federate</strong> with <em>any</em> software that "speaks" the language of the <strong>Fediverse</strong> — i.e., <ziba-link>ActivityPub</ziba-link> and others.
+			they <strong>federate</strong> with <em>any</em> software that "speaks" the language of the <strong>Fediverse</strong> — i.e., <ziba-link title="activitypub">ActivityPub</ziba-link> and others.
 			These other <strong>Fediverse</strong> software includes:
 		</p>
 		<ul>
@@ -104,51 +104,110 @@
 	<section>
 		<section>
 			<h2 id="A">A</h2>
+			<ul>
+				<li><ziba-link title="activitypub">ActivityPub</ziba-link></li>
+				<li><ziba-link title="activitystreams">ActivityStreams</ziba-link></li>
+				<li><ziba-link>akkoma</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="B">B</h2>
+			<ul>
+				<li><ziba-link>bookwyrm</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="C">C</h2>
+			<ul>
+				<li><ziba-link>calckey</ziba-link></li>
+				<li><ziba-link>castopod</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="D">D</h2>
 		</section>
 		<section>
 			<h2 id="E">E</h2>
+			<ul>
+				<li><ziba-link>eternal november</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="F">F</h2>
+			<ul>
+				<li><ziba-link>firefish</ziba-link></li>
+				<li><ziba-link>forgejo</ziba-link></li>
+				<li><ziba-link>friendica</ziba-link></li>
+				<li><ziba-link>funkwhale</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="G">G</h2>
+			<ul>
+				<li><ziba-link>gitea</ziba-link></li>
+				<li><ziba-link>gnu social</ziba-link></li>
+				<li><ziba-link>gotosocial</ziba-link></li>
+				<li><ziba-link>greatape</ziba-link></li>
+				<li><ziba-link>guppe</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="H">H</h2>
+			<ul>
+				<li><ziba-link>host-meta</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="I">I</h2>
 		</section>
 		<section>
 			<h2 id="J">J</h2>
+			<ul>
+				<li><ziba-link>jrd</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="K">K</h2>
+			</ul>
+				<li><ziba-link>kbin</ziba-link></li>
+			<ul>
 		</section>
 		<section>
 			<h2 id="L">L</h2>
+			<ul>
+				<li><ziba-link>lemmy</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="M">M</h2>
+			<ul>
+				<li><ziba-link>misskey</ziba-link></li>
+				<li><ziba-link>mobilizon</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="N">N</h2>
+			<ul>
+				<li><ziba-link>nextcloud</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="O">O</h2>
+			<ul>
+				<li><ziba-link>ostatus</ziba-link></li>
+				<li><ziba-link>owncast</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="P">P</h2>
+			<ul>
+				<li><ziba-link>peertube</ziba-link></li>
+				<li><ziba-link>pixelfed</ziba-link></li>
+				<li><ziba-link>pleroma</ziba-link></li>
+				<li><ziba-link>plume</ziba-link></li>
+				<li><ziba-link>postfreely</ziba-link></li>
+				<li><ziba-link>postmarks</ziba-link></li>
+			<ul>
 		</section>
 		<section>
 			<h2 id="Q">Q</h2>
@@ -158,9 +217,15 @@
 		</section>
 		<section>
 			<h2 id="S">S</h2>
+			<ul>
+				<li><ziba-link>socialhome</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="T">T</h2>
+			<ul>
+				<li><ziba-link>threadiverse</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="U">U</h2>
@@ -170,6 +235,10 @@
 		</section>
 		<section>
 			<h2 id="W">W</h2>
+			<ul>
+				<li><ziba-link title="webfinger">WebFinger</ziba-link></li>
+				<li><ziba-link>writefreely</ziba-link></li>
+			</ul>
 		</section>
 		<section>
 			<h2 id="X">X</h2>