diff --git a/_includes/layouts/pages/fediverse/buttons.njk b/_includes/layouts/pages/fediverse/buttons.njk
deleted file mode 100644
index 8040d5d..0000000
--- a/_includes/layouts/pages/fediverse/buttons.njk
+++ /dev/null
@@ -1,7 +0,0 @@
-        <div class="img-buttons" style="margin-top:1rem;">
-            <a href="https://synth.download"><img src="/assets/buttons/synth.download.svg" alt="Synth.Download!"></a>
-            
-            
-            <a href="https://akko.wtf"><img src="/assets/buttons/sites/akko.wtf.png" alt="Luna Nova"></a>
-            <a href="https://java.duke.social"><img src="/assets/buttons/sites/duke.social.webp" alt="Duke Social"></a>
-        </div>
\ No newline at end of file
diff --git a/_includes/layouts/pages/fediverse/intro.njk b/_includes/layouts/pages/fediverse/intro.njk
new file mode 100644
index 0000000..fbb1659
--- /dev/null
+++ b/_includes/layouts/pages/fediverse/intro.njk
@@ -0,0 +1,27 @@
+<!-- sharkey introduction -->
+<article window id="fediverse">
+    <div class="header">
+        <titlebar-icon aria-hidden="true">
+            <icon-tabler universe></icon-tabler>
+        </titlebar-icon>
+        <a href="#fediverse">Fediverse</a>
+        <window-controls aria-hidden="true">
+            <icon-tabler minimize></icon-tabler>
+            <icon-tabler maximize></icon-tabler>
+            <close-button aria-hidden="true">
+                <icon-tabler x></icon-tabler>
+            </close-button>
+        </window-controls>
+    </div>
+    <window-contents>
+        <h1><a href="#fediverse">Fediverse</a></h1>
+        <p>Synth.Download hosts a few fediverse instances that allows you to connect and explore the wider Fediverse <small>(a network of software that uses <a href="https://activitypub.rocks">ActivityPub</a> to communicate with each other)</small>, all running various software. This page is dedicated to detailing our instance options and how we manage them.</p>
+        <imgbtn-grid>
+            <a href="https://synth.download"><img src="/assets/buttons/synth.download.svg" alt="Synth.Download"></a>
+            <a href="https://akko.wtf"><img src="/assets/buttons/sites/akko.wtf.png" alt="Luna Nova"></a>
+            <a href="https://java.duke.social"><img src="/assets/buttons/sites/duke.social.webp" alt="Duke Social"></a>
+            <a href="https://labyrinth.zone"><img src="/assets/buttons/sites/labyrinth.zone.gif" alt="Labyrinth Zone"></a>
+            <a href="https://oomfie.city"><img src="/assets/buttons/sites/oomfie.city.png" alt="Oomfie City"></a>
+        </imgbtn-grid>
+    </window-contents>
+</article>
\ No newline at end of file
diff --git a/fediverse.md b/fediverse.md
new file mode 100644
index 0000000..70a94c9
--- /dev/null
+++ b/fediverse.md
@@ -0,0 +1,7 @@
+---
+title: fediverse
+layout: "layouts/base/base.njk"
+permalink: "/fediverse/"
+---
+
+{% include "layouts/pages/fediverse/intro.njk" %}
\ No newline at end of file
diff --git a/iceshrimp.md b/iceshrimp.md
deleted file mode 100644
index edede75..0000000
--- a/iceshrimp.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: icesynth!
-layout: "layouts/base/base.njk"
-permalink: "/iceshrimp/"
----
-
-{% include "layouts/pages/fediverse/iceshrimp/intro.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/info.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/features.njk" %}
-
-{% include "layouts/pages/fediverse/rules.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/fe.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/tips.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/bubble.njk" %}
-
-{% include "layouts/pages/fediverse/moderation.njk" %}
\ No newline at end of file
diff --git a/mastodon.md b/mastodon.md
deleted file mode 100644
index 6ab4f20..0000000
--- a/mastodon.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: merpstodon!
-layout: "layouts/base/base.njk"
-permalink: "/mastodon/"
----
-
-{% include "layouts/pages/fediverse/mastodon/intro.njk" %}
-
-{% include "layouts/pages/fediverse/mastodon/info.njk" %}
-
-{% include "layouts/pages/fediverse/mastodon/features.njk" %}
-
-{% include "layouts/pages/fediverse/rules.njk" %}
-
-{% include "layouts/pages/fediverse/iceshrimp/bubble.njk" %}
-
-{% include "layouts/pages/fediverse/moderation.njk" %}
\ No newline at end of file
diff --git a/sharkey.md b/sharkey.md
deleted file mode 100644
index 749f613..0000000
--- a/sharkey.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: beepkey!
-layout: "layouts/base/base.njk"
-permalink: "/sharkey/"
----
-
-{% include "layouts/pages/fediverse/sharkey/intro.njk" %}
-
-{% include "layouts/pages/fediverse/sharkey/info.njk" %}
-
-{% include "layouts/pages/fediverse/sharkey/features.njk" %}
-
-{% include "layouts/pages/fediverse/rules.njk" %}
-
-{% include "layouts/pages/fediverse/sharkey/tips.njk" %}
-
-{% include "layouts/pages/fediverse/sharkey/bubble.njk" %}
-
-{% include "layouts/pages/fediverse/moderation.njk" %}
\ No newline at end of file