diff --git a/astro/src/components/Footer.astro b/astro/src/components/Footer.astro
index dd43023..808a8fa 100755
--- a/astro/src/components/Footer.astro
+++ b/astro/src/components/Footer.astro
@@ -1,110 +1,21 @@
 ---
+import Buttons from "../components/footer/buttons.astro";
+import WebRings from "../components/footer/webrings.astro";
 ---
-<br>
-<footer class="footer" >
+
+<footer class="footer">
+  <br />
   <section class="content center">
-    <!--Badges-->
-    buttons i created
-      <br>
-      <a href="https://limepot.xyz/"><img src="/assets/images/badges/mine/limepotxyz.gif" alt="animation of a bunch of twinkling stars" loading="lazy"/></a>
-      <a href="https://ouroboros.gay/"><img src="/assets/images/badges/mine/ouroboros.gay.png" loading="lazy"></a>
-      <img style="cursor:pointer;" onclick="toggleTheme()" src="/assets/images/badges/mine/standard-galactic-alphabet.png" alt="animation of a bunch of twinkling stars" loading="lazy"/>
-      <br/>
-      <hr>
-      <span style="font-size: smaller;">every coin counts!</span>
-      <br>
-      <a href="https://ko-fi.com/limepot"><img src="/assets/images/badges/kofi.gif"></a>
-      <br/><hr>
-    friendly buttons
-      <br>
-      <a href="https://elke.cafe/"><img src="/assets/images/badges/friends/elke.cafe.gif" alt="dark static background, on the left side, a triquetra, in yellow/orange text 'elke.cafe'" loading="lazy"></a>
-      <a href="https://azumanga.gay/"><img src="/assets/images/badges/friends/kaitbutton.png" alt="kait" loading="lazy"></a>
-      <a href="https://lilysthings.org/"><img src="/assets/images/badges/friends/lilysthings.png" alt="the word 'lily!!' next to a microwave" loading="lazy"></a>
-      <a href="https://zvava.org/"><img src="/assets/images/badges/friends/zvava.org.png" alt="black background, with a slanted dark purple grid, and a purple outline, pink text saying 'zvava.org'" loading="lazy"></a>
-      <a href="https://void.rehab/"><img src="/assets/images/badges/friends/void.rehab.png" alt="black background, with white, uh, thingies, on the sides 'void.rehab'" loading="lazy"></a>
-      <a href="https://void.lgbt/"><img src="/assets/images/badges/friends/void.lgbt.gif" alt="gray static background, left void.lgbt icon, text on the right in black 'The Void'" loading="lazy"></a>
-      <a href="https://csillagpor.net"><img src="/assets/images/badges/friends/mira-button.png" alt="miras button'" loading="lazy"></a>
-	    <a href="https://voltrina.net"><img src="/assets/images/badges/friends/voltrina_badge.png" alt="volted rina" loading="lazy"></a>
-      <a href="https://labyrinth.zone/users/yassie_j"><img src="/assets/images/badges/friends/wide_yas.png" alt="wide yaseen" loading="lazy"></a>
-      <br>
-      <a href="https://disarray.sh/"><img src="/assets/images/badges/friends/disarray.sh.png" alt="jade disarray site" loading="lazy"></a>
-      <a href="https://astrid.tech/"><img src="/assets/images/badges/friends/astrid.tech.png" alt="astrid dot tech" loading="lazy"></a>
-      <a href="https://constellatory.net/"><img src="/assets/images/badges/friends/constellatory.net.png" alt="constellatory" loading="lazy"></a>
-      <a href="https://labyrinth.zone/"><img src="/assets/images/badges/friends/labyrinth_zone.gif" alt="constellatory" loading="lazy"></a>
-      <a href="https://enby.space/"><img src="/assets/images/badges/friends/nbsp.gif" alt="ralsei clapping next to the text 'nbsp'" loading="lazy"></a>
-      <a href="https://asahixp.pages.gay/"><img src="/assets/images/badges/friends/kel.webp" alt="Kel DeSoto" loading="lazy"></a>
-      <a href="https://micro.pages.gay/"><img src="/assets/images/badges/friends/niko.png" alt="prototype from oneshot giviing a :3c expression with a darker background and Micro in purple 500 from tailwindcss on the right with dithering between the two sections" loading="lazy"></a>
-      <a href="https://loveshock.xyz/"><img src="/assets/images/badges/friends/loveshock.gif" alt="dark background, with a curved grid/web, with the text 'vist the jukebox at loveshock.xyz'" loading="lazy"></a>
-      <br/>
-      <hr>
-    other buttons
-      <br><!-- First Line is activism stuff -->
-      <a href="https://jointhefediverse.net/"><img src="/assets/images/badges/FEDERATE-NOW.jpg" alt="Fediverse icon 'Federate Now!'" loading="lazy"/></a>
-      <a href="https://www.anera.org/"><img src="/assets/images/badges/anera.org.png" alt="Free palestine" loading="lazy"/></a>
-      <a href="https://fuckoffgoogle.de/"><img src="/assets/images/badges/google_stand.gif" alt="Fight against monopolistic practices, stand up to google!" loading="lazy"/></a>
-      <a href="https://privacytests.org/"><img src="/assets/images/badges/chrmevil.gif" alt="Google Chrome is Evil!" loading="lazy"/></a>
-      <a href="https://en.wikipedia.org/wiki/Right_to_repair"><img src="/assets/images/badges/right2repair.gif" alt="I support right to repair" loading="lazy"/></a>
-      <a href="https://privacytests.org/"><img src="/assets/images/badges/anythingbut.gif" alt="Anything But Chrome" loading="lazy"/></a>
-      <img src="/assets/images/badges/p2w.gif" alt="pay to win badge"></img>
-      <img src="/assets/images/badges/transnow2.gif" alt="Trans rights now!" loading="lazy"/>
-      <a href="https://archive.org/"><img src="/assets/images/badges/preserve.gif" alt="Preserve, internet archive" loading="lazy"/></a>
-      <br><!-- Second line is made with stuff -->
-      <a href="https://validator.w3.org/nu/?doc=https%3A%2F%2Flimepot.xyz%2F"><img src="/assets/images/badges/validator.w3.org.png" alt="Invalid w3c html" loading="lazy"/></a>
-      <a href="https://www.w3.org/TR/CSS/#css"><img src="/assets/images/badges/made-with-css.gif" alt="Made with CSS" loading="lazy"/></a>
-      <a href="https://www.w3.org/TR/CSS/#css"><img src="/assets/images/badges/css-is-difficult.gif" alt="CSS is Difficult" loading="lazy"/></a>
-      <a href="https://vscodium.com/"><img src="/assets/images/badges/vscodium.com.png" alt="Made with Vscodium" loading="lazy"/></a>
-      <a href="https://gnu.org"><img src="/assets/images/badges/gnu-linux.gif" alt="Tux mascott 'Made on GNU/Linux'" loading="lazy"/></a>
-      <a href="https://www.aseprite.org/"><img src="/assets/images/badges/ase-logo.gif" alt="Made with Aseprite" loading="lazy"/></a>
-      <a href="https://transfemscience.org/"><img src="/assets/images/badges/hrt-e2vial.gif" alt="powered by estrogen" loading="lazy"/></a>
-      <img src="/assets/images/badges/bestviewedcomp.gif" alt="best viewed with a computer" loading="lazy"/>
-      <img src="/assets/images/badges/amd_powered.gif" alt="powered by amdr" loading="lazy"/>
-      <br>
-      <a href="https://store.steampowered.com/app/70/HalfLife"><img src="/assets/images/badges/hl.gif" alt="Half-Life" loading="lazy"/></a>
-      <a href="https://store.steampowered.com/app/400/Portal/"><img src="/assets/images/badges/aperture_labs.jpg" alt="Aperture Labs" loading="lazy"/></a>
-      <a href="https://steamcommunity.com/id/limepot/"><img src="/assets/images/badges/steam.gif" alt="friend me on steam" loading="lazy"/></a>
-      <a href="https://developer.valvesoftware.com/wiki/Source"><img src="/assets/images/badges/source-poweredby-orange.png" alt="powered by source" loading="lazy"/></a>
-      <img src="/assets/images/badges/companion_cube.gif" alt="powered by source" loading="lazy"/>
-      <a href="https://minecraft.net/"><img src="/assets/images/badges/minecraft.gif" alt="Minecraft" loading="lazy"/></a>
-      <img src="/assets/images/badges/drpepper.gif" alt="dr pepper" loading="lazy"/>
-      <img src="/assets/images/badges/360.jpg" alt="xbox 360" loading="lazy"/>
-      <img src="/assets/images/badges/knbutton.gif" alt="KDE Now" loading="lazy"/>
-      <br>
-      <img src="/assets/images/badges/blink.gif" alt="Anime girl blinking" loading="lazy"/>
-      <img src="/assets/images/badges/tiredalien.gif" alt="tired alien" loading="lazy"/>
-      <a href="https://ooo.eeeee.ooo/"><img src="/assets/images/badges/miku-approved.gif" alt="this site is miku approved" loading="lazy"/></a>
-      <a href="https://www.last.fm/user/LimePotato"><img src="/assets/images/badges/lastfm-01.png" alt="lastfm" loading="lazy"/></a>
-      <img src="/assets/images/badges/2019.gif" alt="lastfmstill using buttons in 2019!" loading="lazy"/>
-      <img src="/assets/images/badges/n64.gif" alt="n64" loading="lazy"/>
-      <img src="/assets/images/badges/doombut.gif" alt="doom" loading="lazy"/>
-      <a href="https://graphics.cs.utah.edu/teapot/"><img src="/assets/images/badges/teapot.gif" alt="teapot utah now!" loading="lazy"/></a>
-      <img src="/assets/images/badges/directxnow.gif" alt="DirectX Now" loading="lazy"/>
-      <br><!-- Memes -->
-      <a href="https://www.noaa.gov/"><img src="/assets/images/badges/noaa.gif" alt="NOAA" loading="lazy"/></a>
-      <a href="https://www.java.com/"><img src="/assets/images/badges/get_java.gif" alt="Get Java Now" loading="lazy"/></a>
-      <iframe src="//incr.easrng.net/badge?key=nelle" style="background: url(//incr.easrng.net/bg.gif); border: 0;" title="increment badge" width="88" height="31" loading="lazy"></iframe>
-      <img src="/assets/images/badges/win7startup.gif" alt="Windows 7 Startup" loading="lazy"></img>
-      <a href="https://archlinux.org/"><img src="/assets/images/badges/archlinux.gif" alt="Archlinux badge" loading="lazy"/></a>
-      <img src="/assets/images/badges/youtube-dl.gif" alt="youtube-dl badge" loading="lazy">
-      <a href="https://godotengine.org/"><img src="/assets/images/badges/godot.png" alt="Godot game engine" loading="lazy"></a>
-      <img src="/assets/images/badges/queerpride.gif" alt="Queer Pride!" loading="lazy"/>
-      <a href="https://transfemscience.org/"><img src="/assets/images/badges/transfemscience.org.gif" alt="Trans Your Gender" loading="lazy"/></a>
-      <br><!-- Flags -->
-      <a href="https://new.lgbtqia.wiki/wiki/LGBT"><img src="/assets/images/badges/rainbow_bev.gif" alt="Rainbow" loading="lazy"/></a>
-      <a href="https://new.lgbtqia.wiki/wiki/Demigender#Subgenders"><img src="/assets/images/badges/demigirl.png" alt="Demigirl flag" loading="lazy"></a>
-      <a href="https://new.lgbtqia.wiki/wiki/Lesbian"><img src="/assets/images/badges/lesbian.png" alt="Lesbian flag" loading="lazy"></a>
-      <a href="https://new.lgbtqia.wiki/wiki/Lesbian"><img src="/assets/images/badges/nonbinary.png" alt="Nonbinary flag" loading="lazy"></a>
-      <a href="https://new.lgbtqia.wiki/wiki/Transgender"><img src="/assets/images/badges/trans.png" alt="Trans flag" loading="lazy"></a>
-      <hr>
-    Web Rings
-      <br>
-      <a href="https://applianceri.ng/next?host=nelle.observer"><img alt="Future Gadget 8 - PhoneWave (name subject to change)" src="/assets/webrings/phonewave.png" width="100px"></a>
-      <br>
-      <a href=href="https://stellophiliac.github.io/roboring/nelle/previous"><i class="nf nf-cod-arrow_left"></i></a>
-      <a href="https://stellophiliac.github.io/roboring"><!-- <image src="/assets/badges/fediring-badge.gif" alt="Fediring badge" loading="lazy">-->roboring</a>
-      <a href="https://stellophiliac.github.io/roboring/nelle/next"><i class="nf nf-cod-arrow_right"></i></a>
+    <Buttons />
+    <hr />
+    <WebRings />
   </section>
   <section class="content center">
     <p class="glitch-alt small-quote">El. Psy. Kongroo.</p>
-    <a class="small-quote" href="/site-info">site info</a>
+    <a
+      class="small-quote"
+      href="/site-info"
+      >site info</a
+    >
   </section>
 </footer>
diff --git a/astro/src/components/footer/buttons.astro b/astro/src/components/footer/buttons.astro
new file mode 100644
index 0000000..4f40c9e
--- /dev/null
+++ b/astro/src/components/footer/buttons.astro
@@ -0,0 +1,10 @@
+---
+import MyButtons from "./mybuttons.astro"
+import FriendlyButtons from "./friendly-buttons.astro"
+import OtherButtons from "./other-buttons.astro"
+---
+<MyButtons />
+<hr>
+<FriendlyButtons />
+<hr>
+<OtherButtons />
\ No newline at end of file
diff --git a/astro/src/components/footer/friendly-buttons.astro b/astro/src/components/footer/friendly-buttons.astro
new file mode 100644
index 0000000..943f348
--- /dev/null
+++ b/astro/src/components/footer/friendly-buttons.astro
@@ -0,0 +1,21 @@
+friendly buttons
+<br>
+<a href="https://elke.cafe/"><img src="/assets/images/badges/friends/elke.cafe.gif" alt="dark static background, on the left side, a triquetra, in yellow/orange text 'elke.cafe'" loading="lazy"></a>
+<a href="https://azumanga.gay/"><img src="/assets/images/badges/friends/kaitbutton.png" alt="kait" loading="lazy"></a>
+<a href="https://lilysthings.org/"><img src="/assets/images/badges/friends/lilysthings.png" alt="the word 'lily!!' next to a microwave" loading="lazy"></a>
+<a href="https://zvava.org/"><img src="/assets/images/badges/friends/zvava.org.png" alt="black background, with a slanted dark purple grid, and a purple outline, pink text saying 'zvava.org'" loading="lazy"></a>
+<a href="https://void.rehab/"><img src="/assets/images/badges/friends/void.rehab.png" alt="black background, with white, uh, thingies, on the sides 'void.rehab'" loading="lazy"></a>
+<a href="https://void.lgbt/"><img src="/assets/images/badges/friends/void.lgbt.gif" alt="gray static background, left void.lgbt icon, text on the right in black 'The Void'" loading="lazy"></a>
+<a href="https://csillagpor.net"><img src="/assets/images/badges/friends/mira-button.png" alt="miras button'" loading="lazy"></a>
+  <a href="https://voltrina.net"><img src="/assets/images/badges/friends/voltrina_badge.png" alt="volted rina" loading="lazy"></a>
+<a href="https://labyrinth.zone/users/yassie_j"><img src="/assets/images/badges/friends/wide_yas.png" alt="wide yaseen" loading="lazy"></a>
+<br>
+<a href="https://disarray.sh/"><img src="/assets/images/badges/friends/disarray.sh.png" alt="jade disarray site" loading="lazy"></a>
+<a href="https://astrid.tech/"><img src="/assets/images/badges/friends/astrid.tech.png" alt="astrid dot tech" loading="lazy"></a>
+<a href="https://constellatory.net/"><img src="/assets/images/badges/friends/constellatory.net.png" alt="constellatory" loading="lazy"></a>
+<a href="https://labyrinth.zone/"><img src="/assets/images/badges/friends/labyrinth_zone.gif" alt="constellatory" loading="lazy"></a>
+<a href="https://enby.space/"><img src="/assets/images/badges/friends/nbsp.gif" alt="ralsei clapping next to the text 'nbsp'" loading="lazy"></a>
+<a href="https://asahixp.pages.gay/"><img src="/assets/images/badges/friends/kel.webp" alt="Kel DeSoto" loading="lazy"></a>
+<a href="https://micro.pages.gay/"><img src="/assets/images/badges/friends/niko.png" alt="prototype from oneshot giviing a :3c expression with a darker background and Micro in purple 500 from tailwindcss on the right with dithering between the two sections" loading="lazy"></a>
+<a href="https://loveshock.xyz/"><img src="/assets/images/badges/friends/loveshock.gif" alt="dark background, with a curved grid/web, with the text 'vist the jukebox at loveshock.xyz'" loading="lazy"></a>
+<br/>
\ No newline at end of file
diff --git a/astro/src/components/footer/mybuttons.astro b/astro/src/components/footer/mybuttons.astro
new file mode 100644
index 0000000..008061a
--- /dev/null
+++ b/astro/src/components/footer/mybuttons.astro
@@ -0,0 +1,11 @@
+buttons i created
+<br>
+<a href="https://limepot.xyz/"><img src="/assets/images/badges/mine/limepotxyz.gif" alt="animation of a bunch of twinkling stars" loading="lazy"/></a>
+<a href="https://ouroboros.gay/"><img src="/assets/images/badges/mine/ouroboros.gay.png" loading="lazy"></a>
+<img style="cursor:pointer;" onclick="toggleTheme()" src="/assets/images/badges/mine/standard-galactic-alphabet.png" alt="animation of a bunch of twinkling stars" loading="lazy"/>
+<br/>
+<hr>
+<span style="font-size: smaller;">every coin counts!</span>
+<br>
+<a href="https://ko-fi.com/limepot"><img src="/assets/images/badges/kofi.gif"></a>
+<br/>
\ No newline at end of file
diff --git a/astro/src/components/footer/other-buttons.astro b/astro/src/components/footer/other-buttons.astro
new file mode 100644
index 0000000..7e6ed76
--- /dev/null
+++ b/astro/src/components/footer/other-buttons.astro
@@ -0,0 +1,57 @@
+other buttons
+<br><!-- First Line is activism stuff -->
+<a href="https://jointhefediverse.net/"><img src="/assets/images/badges/FEDERATE-NOW.jpg" alt="Fediverse icon 'Federate Now!'" loading="lazy"/></a>
+<a href="https://www.anera.org/"><img src="/assets/images/badges/anera.org.png" alt="Free palestine" loading="lazy"/></a>
+<a href="https://fuckoffgoogle.de/"><img src="/assets/images/badges/google_stand.gif" alt="Fight against monopolistic practices, stand up to google!" loading="lazy"/></a>
+<a href="https://privacytests.org/"><img src="/assets/images/badges/chrmevil.gif" alt="Google Chrome is Evil!" loading="lazy"/></a>
+<a href="https://en.wikipedia.org/wiki/Right_to_repair"><img src="/assets/images/badges/right2repair.gif" alt="I support right to repair" loading="lazy"/></a>
+<a href="https://privacytests.org/"><img src="/assets/images/badges/anythingbut.gif" alt="Anything But Chrome" loading="lazy"/></a>
+<img src="/assets/images/badges/p2w.gif" alt="pay to win badge"></img>
+<img src="/assets/images/badges/transnow2.gif" alt="Trans rights now!" loading="lazy"/>
+<a href="https://archive.org/"><img src="/assets/images/badges/preserve.gif" alt="Preserve, internet archive" loading="lazy"/></a>
+<br><!-- Second line is made with stuff -->
+<a href="https://validator.w3.org/nu/?doc=https%3A%2F%2Flimepot.xyz%2F"><img src="/assets/images/badges/validator.w3.org.png" alt="Invalid w3c html" loading="lazy"/></a>
+<a href="https://www.w3.org/TR/CSS/#css"><img src="/assets/images/badges/made-with-css.gif" alt="Made with CSS" loading="lazy"/></a>
+<a href="https://www.w3.org/TR/CSS/#css"><img src="/assets/images/badges/css-is-difficult.gif" alt="CSS is Difficult" loading="lazy"/></a>
+<a href="https://vscodium.com/"><img src="/assets/images/badges/vscodium.com.png" alt="Made with Vscodium" loading="lazy"/></a>
+<a href="https://gnu.org"><img src="/assets/images/badges/gnu-linux.gif" alt="Tux mascott 'Made on GNU/Linux'" loading="lazy"/></a>
+<a href="https://www.aseprite.org/"><img src="/assets/images/badges/ase-logo.gif" alt="Made with Aseprite" loading="lazy"/></a>
+<a href="https://transfemscience.org/"><img src="/assets/images/badges/hrt-e2vial.gif" alt="powered by estrogen" loading="lazy"/></a>
+<img src="/assets/images/badges/bestviewedcomp.gif" alt="best viewed with a computer" loading="lazy"/>
+<img src="/assets/images/badges/amd_powered.gif" alt="powered by amdr" loading="lazy"/>
+<br>
+<a href="https://store.steampowered.com/app/70/HalfLife"><img src="/assets/images/badges/hl.gif" alt="Half-Life" loading="lazy"/></a>
+<a href="https://store.steampowered.com/app/400/Portal/"><img src="/assets/images/badges/aperture_labs.jpg" alt="Aperture Labs" loading="lazy"/></a>
+<a href="https://steamcommunity.com/id/limepot/"><img src="/assets/images/badges/steam.gif" alt="friend me on steam" loading="lazy"/></a>
+<a href="https://developer.valvesoftware.com/wiki/Source"><img src="/assets/images/badges/source-poweredby-orange.png" alt="powered by source" loading="lazy"/></a>
+<img src="/assets/images/badges/companion_cube.gif" alt="powered by source" loading="lazy"/>
+<a href="https://minecraft.net/"><img src="/assets/images/badges/minecraft.gif" alt="Minecraft" loading="lazy"/></a>
+<img src="/assets/images/badges/drpepper.gif" alt="dr pepper" loading="lazy"/>
+<img src="/assets/images/badges/360.jpg" alt="xbox 360" loading="lazy"/>
+<img src="/assets/images/badges/knbutton.gif" alt="KDE Now" loading="lazy"/>
+<br>
+<img src="/assets/images/badges/blink.gif" alt="Anime girl blinking" loading="lazy"/>
+<img src="/assets/images/badges/tiredalien.gif" alt="tired alien" loading="lazy"/>
+<a href="https://ooo.eeeee.ooo/"><img src="/assets/images/badges/miku-approved.gif" alt="this site is miku approved" loading="lazy"/></a>
+<a href="https://www.last.fm/user/LimePotato"><img src="/assets/images/badges/lastfm-01.png" alt="lastfm" loading="lazy"/></a>
+<img src="/assets/images/badges/2019.gif" alt="lastfmstill using buttons in 2019!" loading="lazy"/>
+<img src="/assets/images/badges/n64.gif" alt="n64" loading="lazy"/>
+<img src="/assets/images/badges/doombut.gif" alt="doom" loading="lazy"/>
+<a href="https://graphics.cs.utah.edu/teapot/"><img src="/assets/images/badges/teapot.gif" alt="teapot utah now!" loading="lazy"/></a>
+<img src="/assets/images/badges/directxnow.gif" alt="DirectX Now" loading="lazy"/>
+<br><!-- Memes -->
+<a href="https://www.noaa.gov/"><img src="/assets/images/badges/noaa.gif" alt="NOAA" loading="lazy"/></a>
+<a href="https://www.java.com/"><img src="/assets/images/badges/get_java.gif" alt="Get Java Now" loading="lazy"/></a>
+<iframe src="//incr.easrng.net/badge?key=nelle" style="background: url(//incr.easrng.net/bg.gif); border: 0;" title="increment badge" width="88" height="31" loading="lazy"></iframe>
+<img src="/assets/images/badges/win7startup.gif" alt="Windows 7 Startup" loading="lazy"></img>
+<a href="https://archlinux.org/"><img src="/assets/images/badges/archlinux.gif" alt="Archlinux badge" loading="lazy"/></a>
+<img src="/assets/images/badges/youtube-dl.gif" alt="youtube-dl badge" loading="lazy">
+<a href="https://godotengine.org/"><img src="/assets/images/badges/godot.png" alt="Godot game engine" loading="lazy"></a>
+<img src="/assets/images/badges/queerpride.gif" alt="Queer Pride!" loading="lazy"/>
+<a href="https://transfemscience.org/"><img src="/assets/images/badges/transfemscience.org.gif" alt="Trans Your Gender" loading="lazy"/></a>
+<br><!-- Flags -->
+<a href="https://new.lgbtqia.wiki/wiki/LGBT"><img src="/assets/images/badges/rainbow_bev.gif" alt="Rainbow" loading="lazy"/></a>
+<a href="https://new.lgbtqia.wiki/wiki/Demigender#Subgenders"><img src="/assets/images/badges/demigirl.png" alt="Demigirl flag" loading="lazy"></a>
+<a href="https://new.lgbtqia.wiki/wiki/Lesbian"><img src="/assets/images/badges/lesbian.png" alt="Lesbian flag" loading="lazy"></a>
+<a href="https://new.lgbtqia.wiki/wiki/Lesbian"><img src="/assets/images/badges/nonbinary.png" alt="Nonbinary flag" loading="lazy"></a>
+<a href="https://new.lgbtqia.wiki/wiki/Transgender"><img src="/assets/images/badges/trans.png" alt="Trans flag" loading="lazy"></a>
\ No newline at end of file
diff --git a/astro/src/components/footer/webrings.astro b/astro/src/components/footer/webrings.astro
new file mode 100644
index 0000000..f63baf9
--- /dev/null
+++ b/astro/src/components/footer/webrings.astro
@@ -0,0 +1,7 @@
+Web Rings
+<br>
+<a href="https://applianceri.ng/next?host=nelle.observer"><img alt="Future Gadget 8 - PhoneWave (name subject to change)" src="/assets/webrings/phonewave.png" width="100px"></a>
+<br>
+<a href=href="https://stellophiliac.github.io/roboring/nelle/previous"><i class="nf nf-cod-arrow_left"></i></a>
+<a href="https://stellophiliac.github.io/roboring"><!-- <image src="/assets/badges/fediring-badge.gif" alt="Fediring badge" loading="lazy">-->roboring</a>
+<a href="https://stellophiliac.github.io/roboring/nelle/next"><i class="nf nf-cod-arrow_right"></i></a>
\ No newline at end of file
diff --git a/astro/src/components/bsod-head.astro b/astro/src/components/fuckchrome/bsod-head.astro
similarity index 96%
rename from astro/src/components/bsod-head.astro
rename to astro/src/components/fuckchrome/bsod-head.astro
index ff533f2..f52ff26 100755
--- a/astro/src/components/bsod-head.astro
+++ b/astro/src/components/fuckchrome/bsod-head.astro
@@ -1,5 +1,5 @@
 ---
-import { SITE_DESCRIPTION } from "../consts";
+import { SITE_DESCRIPTION } from "../../consts";
 
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
diff --git a/astro/src/components/mobile-warn.astro b/astro/src/components/fuckchrome/mobile-warn.astro
similarity index 96%
rename from astro/src/components/mobile-warn.astro
rename to astro/src/components/fuckchrome/mobile-warn.astro
index 70b1dd6..74e6171 100755
--- a/astro/src/components/mobile-warn.astro
+++ b/astro/src/components/fuckchrome/mobile-warn.astro
@@ -1,5 +1,5 @@
 ---
-import { SITE_DESCRIPTION } from "../consts";
+import { SITE_DESCRIPTION } from "../../consts";
 
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
diff --git a/astro/src/components/main-page/about.astro b/astro/src/components/main-page/about.astro
new file mode 100644
index 0000000..878ea6f
--- /dev/null
+++ b/astro/src/components/main-page/about.astro
@@ -0,0 +1,18 @@
+<section class="content center">
+    <h2>hello, creature.</h2>
+    <p>
+      my name is <span class="glitch">nelle</span> (not Nelle, nelle), some call me <span class="glitch">[data expunged]</span>. 
+      <br>
+      my prounouns are <span class="glitch"><plain>[she/her] ** [they/them]</plain></span>, alternatively, view <a href="https://pronouns.cc/@LimePotato">my pronouns.cc page</a>.
+      <br />
+      i am a 20-something year old girl-thingamabob, <span class="glitch">[data expunged]</span>, who lives solely and entirely on the internet.
+      <br>
+      <br>
+      i like putting computers together and fixing them, i do linux sysadmin, sometimes i dabble in kotlin/java (usually minecraft mods), i love space and the science adventure series!!!!!
+      <br>
+      <br>
+      i will put more stuff here eventually.
+      <br>
+      :3:3:3:3:3:3:3:3:3:3:3
+    </p>
+  </section>
\ No newline at end of file
diff --git a/astro/src/components/main-page/contact.astro b/astro/src/components/main-page/contact.astro
new file mode 100644
index 0000000..8dd6352
--- /dev/null
+++ b/astro/src/components/main-page/contact.astro
@@ -0,0 +1,13 @@
+<section class="content center">
+    <h2>points of contact</h2>
+    <p><a href="https://steamcommunity.com/id/limepot/"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-fa-steam"></i> steam</a></p>
+    <p><a href="mailto:rzqqihgbo@mozmail.com"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-md-email"></i> email</a></p>
+    <p>
+      <a href="https://www.youtube.com/channel/UCk_yKIpDnMv_DvuDb9RGfcA"
+        ><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-md-youtube"></i> youtube</a>
+    </p>      <p>
+      <a href="https://ouroboros.gay/@limepot"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-seti-graphql"></i> the fediverse</a><a
+        href="https://jointhefediverse.net/"
+        ><span style="color: var(--alt-accent);">*</span></a>
+    </p>
+  </section>
\ No newline at end of file
diff --git a/astro/src/components/main-page/silly-widgets.astro b/astro/src/components/main-page/silly-widgets.astro
new file mode 100644
index 0000000..6f9e9e3
--- /dev/null
+++ b/astro/src/components/main-page/silly-widgets.astro
@@ -0,0 +1,29 @@
+<section class="content center">
+    <div id="lastfm-widget">
+    <div id="widget">
+      <a href="https://www.last.fm/user/LimePotato"
+        ><span style="color: var(--alt-accent-600);"><i class="nf nf-md-music"></i></span> - <span id="song">&#8987</span></a>
+    </div>
+    <div>
+      <span style="font-size: small;"
+        >latest played song on <a href="http://last.fm" target="_blank"
+          >last.fm</a
+        ></span
+      >
+    </div>
+    <hr>
+    <div class="ntfy-box">
+      <h4 style="margin-bottom: 0px;">send me a notification! type words and press send</h4>
+      <small style="font-size: 15px;">music recs, questions, jokes, confessions of your sins, etc, welcome, I respond to all or most as vagueposts on the fediverse.</small>
+      <div style="display: flex; justify-content: space-between;">
+      <br style="margin-bottom: 10px;">
+      <textarea id="ntfy-input" placeholder="Hi nelle! (｡>﹏<｡)" rows=2></textarea>
+      <button
+        class="custom-btn btn-1"
+        onclick="ntfyClick()"
+        id="ntfy-send"><span>Send</span></button
+      >
+    </div>
+    <small>if it doesnt seem to be working, or you have javascript disabled, <br>you can POST to <span class="glitch">https://ntfy.ouroboros.group/beep</span>.</small>
+    </div>
+  </section>
\ No newline at end of file
diff --git a/astro/src/components/FormattedDate.astro b/astro/src/components/misc/FormattedDate.astro
similarity index 100%
rename from astro/src/components/FormattedDate.astro
rename to astro/src/components/misc/FormattedDate.astro
diff --git a/astro/src/components/nochrome-scripts.astro b/astro/src/components/scripts/nochrome-scripts.astro
similarity index 100%
rename from astro/src/components/nochrome-scripts.astro
rename to astro/src/components/scripts/nochrome-scripts.astro
diff --git a/astro/src/components/normal-scripts.astro b/astro/src/components/scripts/normal-scripts.astro
similarity index 100%
rename from astro/src/components/normal-scripts.astro
rename to astro/src/components/scripts/normal-scripts.astro
diff --git a/astro/src/components/site-info/credits.astro b/astro/src/components/site-info/credits.astro
new file mode 100644
index 0000000..9602d4c
--- /dev/null
+++ b/astro/src/components/site-info/credits.astro
@@ -0,0 +1,18 @@
+<h2 class="subtitle">credits</h2>
+<ul>
+  <li><s>uh, god and my country</s></li>
+  <li>all the cool creatures in my <b>friendly buttons</b> section</li>
+  <li>
+    last.fm presence widget powered by<a
+      href="https://github.com/biancarosa/lastfm-last-played"
+      target="_blank"
+    >
+      @biancarosa/lastfm-last-played</a>
+  </li>
+  <li>
+    the <a
+      href="https://git.zvava.org/zvava/zvava.org/src/branch/master/src/templates/misc/notify-me.html"
+      >notification sender</a
+    > on main page adapted from <a href="https://zvava.org/">sophia/zvava</a>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/astro/src/components/site-info/frameworks.astro b/astro/src/components/site-info/frameworks.astro
new file mode 100644
index 0000000..29008d3
--- /dev/null
+++ b/astro/src/components/site-info/frameworks.astro
@@ -0,0 +1,24 @@
+<h2 class="subtitle">frameworks, hosts, colors n' Stuff</h2>
+<ul>
+  <li>build with: 
+      <ul>
+          <li><a href="https://ktor.io/">ktor</a></li>
+          <li><a href="https://astro.build/">astro</a></li>
+      </ul>
+  </li>
+  <li>
+    color scheme: custom made!
+  </li>
+  <li>domain registrar: <a href="https://porkbun.com/">porkbun</a></li>
+  <li>host: <a href="/blog/my-setup/">me :3</a></li>
+</ul>
+<hr /><!-- 
+<a
+  href="https://git.nullafati.xyz/limepotato/nelle-observer/src/branch/main/LICENSE"
+  ><p style="text-align: center;">License</p></a
+>-->
+<a href="https://git.nullafati.xyz/limepotato/nelle-observer"
+  ><p style="text-align: center;">source code</p></a
+>
+<p style="text-align: center;">made with love, by nelle.</p>
+<p style="text-align: center;">any issues? contact me on <a href="https://ouroboros.gay/@limepot">the fediverse</a> or send me an <a href="mailto:rzqqihgbo@mozmail.com">email</a>.</p>
\ No newline at end of file
diff --git a/astro/src/components/site-info/privacy.astro b/astro/src/components/site-info/privacy.astro
new file mode 100644
index 0000000..2709d94
--- /dev/null
+++ b/astro/src/components/site-info/privacy.astro
@@ -0,0 +1,23 @@
+<h2 class="subtitle">privacy & security</h2>
+<ul>
+  <li>i dont do shit with your data!</li>
+  <li>
+    some javascript is used, just for fun little effects (and detering
+    chrome users), nothing is stored in cookies.
+  </li>
+  <li>
+    various places i found 88x31 buttons
+    <ul>
+      <li>
+        <a href="https://cyber.dabamos.de/88x31/">cyber.dabamos.de</a>
+      </li>
+      <li>
+        <a href="https://neonaut.neocities.org/cyber/88x31">neonaut</a>
+      </li>
+      <li>stolen from friends websites. :3</li>
+      <li>
+        most buttons are linked, but not necessarily to their creator.
+      </li>
+    </ul>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/astro/src/layouts/BlogPost.astro b/astro/src/layouts/BlogPost.astro
index 7e3be67..b7b22c1 100644
--- a/astro/src/layouts/BlogPost.astro
+++ b/astro/src/layouts/BlogPost.astro
@@ -1,6 +1,6 @@
 ---
 import type { CollectionEntry } from "astro:content";
-import FormattedDate from "../components/FormattedDate.astro";
+import FormattedDate from "../components/misc/FormattedDate.astro";
 import Layout from "../layouts/Layout.astro";
 
 type Props = CollectionEntry<"blog">["data"];
diff --git a/astro/src/layouts/Layout.astro b/astro/src/layouts/Layout.astro
index 9f70936..ba6283a 100755
--- a/astro/src/layouts/Layout.astro
+++ b/astro/src/layouts/Layout.astro
@@ -2,7 +2,7 @@
 import Head from "../components/Head.astro";
 import Header from "../components/Header.astro";
 import Footer from "../components/Footer.astro";
-import NormalScripts from "../components/normal-scripts.astro";
+import NormalScripts from "../components/scripts/normal-scripts.astro";
 
 interface Props {
 	title: string;
diff --git a/astro/src/layouts/Layout-nochrome.astro b/astro/src/layouts/fuckchrome/Layout-nochrome.astro
similarity index 62%
rename from astro/src/layouts/Layout-nochrome.astro
rename to astro/src/layouts/fuckchrome/Layout-nochrome.astro
index d1f7739..2343ca7 100755
--- a/astro/src/layouts/Layout-nochrome.astro
+++ b/astro/src/layouts/fuckchrome/Layout-nochrome.astro
@@ -1,8 +1,8 @@
 ---
-import Header from "../components/Header.astro";
-import Head from "../components/Head.astro";
-import Footer from "../components/Footer.astro";
-import NochromeScripts from "../components/nochrome-scripts.astro";
+import Header from "../../components/Header.astro";
+import Head from "../../components/Head.astro";
+import Footer from "../../components/Footer.astro";
+import NochromeScripts from "../../components/scripts/nochrome-scripts.astro";
 interface Props {
   title: string;
 }
diff --git a/astro/src/layouts/bsod.astro b/astro/src/layouts/fuckchrome/bsod.astro
similarity index 68%
rename from astro/src/layouts/bsod.astro
rename to astro/src/layouts/fuckchrome/bsod.astro
index b2f8529..96e1d98 100755
--- a/astro/src/layouts/bsod.astro
+++ b/astro/src/layouts/fuckchrome/bsod.astro
@@ -1,5 +1,5 @@
 ---
-import Head from "../components/bsod-head.astro";
+import Head from "../../components/fuckchrome/bsod-head.astro";
 ---
 
 <!doctype html>
diff --git a/astro/src/layouts/mobile-warn.astro b/astro/src/layouts/fuckchrome/mobile-warn.astro
similarity index 100%
rename from astro/src/layouts/mobile-warn.astro
rename to astro/src/layouts/fuckchrome/mobile-warn.astro
diff --git a/astro/src/pages/bsod.astro b/astro/src/pages/bsod.astro
index 5ee7b08..36ef057 100644
--- a/astro/src/pages/bsod.astro
+++ b/astro/src/pages/bsod.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from "../layouts/bsod.astro";
+import Layout from "../layouts/fuckchrome/bsod.astro";
 ---
 <Layout>
   <main>
diff --git a/astro/src/pages/index.astro b/astro/src/pages/index.astro
index eaee5e1..86eddc5 100644
--- a/astro/src/pages/index.astro
+++ b/astro/src/pages/index.astro
@@ -1,69 +1,15 @@
 ---
 import Layout from "../layouts/Layout.astro";
+import About from "../components/main-page/about.astro"
+import Contact from "../components/main-page/contact.astro"
+import SillyWidgets from "../components/main-page/silly-widgets.astro"
 ---
 
 <Layout title="nelle.observer">
   <main>
     <!-- Title Area -->
-    <section class="content center">
-      <h2>hello, creature.</h2>
-      <p>
-        my name is <span class="glitch">nelle</span> (not Nelle, nelle), some call me <span class="glitch">[data expunged]</span>. 
-        <br>
-        my prounouns are <span class="glitch"><plain>[she/her] ** [they/them]</plain></span>, alternatively, view <a href="https://pronouns.cc/@LimePotato">my pronouns.cc page</a>.
-        <br />
-        i am a 20-something year old girl-thingamabob, <span class="glitch">[data expunged]</span>, who lives solely and entirely on the internet.
-        <br>
-        <br>
-        i like putting computers together and fixing them, i do linux sysadmin, sometimes i dabble in kotlin/java (usually minecraft mods), i love space and the science adventure series!!!!!
-        <br>
-        <br>
-        i will put more stuff here eventually.
-        <br>
-        :3:3:3:3:3:3:3:3:3:3:3
-      </p>
-    </section>
-    <section class="content center">
-      <h2>points of contact</h2>
-      <p><a href="https://steamcommunity.com/id/limepot/"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-fa-steam"></i> steam</a></p>
-      <p><a href="mailto:rzqqihgbo@mozmail.com"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-md-email"></i> email</a></p>
-      <p>
-        <a href="https://www.youtube.com/channel/UCk_yKIpDnMv_DvuDb9RGfcA"
-          ><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-md-youtube"></i> youtube</a>
-      </p>      <p>
-        <a href="https://ouroboros.gay/@limepot"><span style="color: var(--alt-accent-600);"><i class="nf nf-cod-arrow_right"></i></span> <i class="nf nf-seti-graphql"></i> the fediverse</a><a
-          href="https://jointhefediverse.net/"
-          ><span style="color: var(--alt-accent);">*</span></a>
-      </p>
-    </section>
-    <section class="content center">
-      <div id="lastfm-widget">
-      <div id="widget">
-        <a href="https://www.last.fm/user/LimePotato"
-          ><span style="color: var(--alt-accent-600);"><i class="nf nf-md-music"></i></span> - <span id="song">&#8987</span></a>
-      </div>
-      <div>
-        <span style="font-size: small;"
-          >latest played song on <a href="http://last.fm" target="_blank"
-            >last.fm</a
-          ></span
-        >
-      </div>
-      <hr>
-      <div class="ntfy-box">
-        <h4 style="margin-bottom: 0px;">send me a notification! type words and press send</h4>
-        <small style="font-size: 15px;">music recs, questions, jokes, confessions of your sins, etc, welcome, I respond to all or most as vagueposts on the fediverse.</small>
-        <div style="display: flex; justify-content: space-between;">
-        <br style="margin-bottom: 10px;">
-        <textarea id="ntfy-input" placeholder="Hi nelle! (｡>﹏<｡)" rows=2></textarea>
-        <button
-          class="custom-btn btn-1"
-          onclick="ntfyClick()"
-          id="ntfy-send"><span>Send</span></button
-        >
-      </div>
-      <small>if it doesnt seem to be working, or you have javascript disabled, <br>you can POST to <span class="glitch">https://ntfy.ouroboros.group/beep</span>.</small>
-      </div>
-    </section>
+    <About />
+    <Contact />
+    <SillyWidgets />
   </main>
 </Layout>
diff --git a/astro/src/pages/mobile-warn.astro b/astro/src/pages/mobile-warn.astro
index 2b8a034..2b29f8d 100644
--- a/astro/src/pages/mobile-warn.astro
+++ b/astro/src/pages/mobile-warn.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from "../layouts/mobile-warn.astro";
+import Layout from "../layouts/fuckchrome/mobile-warn.astro";
 ---
 <Layout>
   <main>
diff --git a/astro/src/pages/nochrome.astro b/astro/src/pages/nochrome.astro
index 6c48397..efbf622 100644
--- a/astro/src/pages/nochrome.astro
+++ b/astro/src/pages/nochrome.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from "../layouts/Layout-nochrome.astro";
+import Layout from "../layouts/fuckchrome/Layout-nochrome.astro";
 ---
 
 <Layout title="chrome bad">
diff --git a/astro/src/pages/site-info.astro b/astro/src/pages/site-info.astro
index 4299a38..f18759d 100644
--- a/astro/src/pages/site-info.astro
+++ b/astro/src/pages/site-info.astro
@@ -1,77 +1,18 @@
 ---
 import Layout from "../layouts/Layout.astro";
+import Credits from "../components/site-info/credits.astro"
+import Privacy from "../components/site-info/privacy.astro"
+import Frameworks from "../components/site-info/frameworks.astro"
 ---
 
 <Layout title="site info">
   <main>
-    <div class="content">
-      <h2 class="subtitle">credits</h2>
-      <ul>
-        <li><s>uh, god and my country</s></li>
-        <li>all the cool creatures in my <b>friendly buttons</b> section</li>
-        <li>
-          last.fm presence widget powered by<a
-            href="https://github.com/biancarosa/lastfm-last-played"
-            target="_blank"
-          >
-            @biancarosa/lastfm-last-played</a>
-        </li>
-        <li>
-          the <a
-            href="https://git.zvava.org/zvava/zvava.org/src/branch/master/src/templates/misc/notify-me.html"
-            >notification sender</a
-          > on main page adapted from <a href="https://zvava.org/">sophia/zvava</a>
-        </li>
-      </ul>
+    <section class="content">
+      <Credits />
       <hr />
-      <h2 class="subtitle">privacy & security</h2>
-      <ul>
-        <li>i dont do shit with your data!</li>
-        <li>
-          some javascript is used, just for fun little effects (and detering
-          chrome users), nothing is stored in cookies.
-        </li>
-        <li>
-          various places i found 88x31 buttons
-          <ul>
-            <li>
-              <a href="https://cyber.dabamos.de/88x31/">cyber.dabamos.de</a>
-            </li>
-            <li>
-              <a href="https://neonaut.neocities.org/cyber/88x31">neonaut</a>
-            </li>
-            <li>stolen from friends websites. :3</li>
-            <li>
-              most buttons are linked, but not necessarily to their creator.
-            </li>
-          </ul>
-        </li>
-      </ul>
+      <Privacy />
       <hr />
-      <h2 class="subtitle">frameworks, hosts, colors n' Stuff</h2>
-      <ul>
-        <li>build with: 
-            <ul>
-                <li><a href="https://ktor.io/">ktor</a></li>
-                <li><a href="https://astro.build/">astro</a></li>
-            </ul>
-        </li>
-        <li>
-          color scheme: custom made!
-        </li>
-        <li>domain registrar: <a href="https://porkbun.com/">porkbun</a></li>
-        <li>host: <a href="/blog/my-setup/">me :3</a></li>
-      </ul>
-      <hr /><!-- 
-      <a
-        href="https://git.nullafati.xyz/limepotato/nelle-observer/src/branch/main/LICENSE"
-        ><p style="text-align: center;">License</p></a
-      >-->
-      <a href="https://git.nullafati.xyz/limepotato/nelle-observer"
-        ><p style="text-align: center;">source code</p></a
-      >
-      <p style="text-align: center;">made with love, by nelle.</p>
-      <p style="text-align: center;">any issues? contact me on <a href="https://ouroboros.gay/@limepot">the fediverse</a> or send me an <a href="mailto:rzqqihgbo@mozmail.com">email</a>.</p>
-    </div>
+      <Frameworks />
+    </section>
   </main>
 </Layout>