diff --git a/src/components/project.html b/src/components/project/index.html
similarity index 72%
rename from src/components/project.html
rename to src/components/project/index.html
index f32adab..28d3503 100644
--- a/src/components/project.html
+++ b/src/components/project/index.html
@@ -1,6 +1,5 @@
 <script props>
   module.exports = {
-    text: props.text || '',
     onclick: props.onclick || '',
     titlestyle: 'min-width: 275px;' + (props.titlestyle || ''),
     headerstyle: props.headerstyle || '',
@@ -8,11 +7,10 @@
 </script>
 <div class="project">
   <div class="project-title" style="{{titlestyle}}">
-    <div class="figure">
-      <slot:img></slot:img>
-    </div>
-    <if condition="text != '' && !$slots.img?.filled">
-      <p style="font-size: 200px; text-align: center; margin: 0; padding: 0;">{{text}}</p>
+    <if condition="$slots.img?.filled">
+      <div class="figure">
+        <slot:img></slot:img>
+      </div>
     </if>
     <slot:title></slot:title>
     <if condition="$slots.links?.filled">
diff --git a/src/components/project/text.html b/src/components/project/text.html
new file mode 100644
index 0000000..a003844
--- /dev/null
+++ b/src/components/project/text.html
@@ -0,0 +1,3 @@
+<p style="font-size: 200px; text-align: center; margin: 0; padding: 0;">
+  <yield></yield>
+</p>
\ No newline at end of file
diff --git a/src/partials/interests.html b/src/partials/interests.html
index 8019129..8a555e2 100644
--- a/src/partials/interests.html
+++ b/src/partials/interests.html
@@ -4,7 +4,10 @@
       That's crazy
     </x-blockquote>
   </x-section-head>
-  <x-project text="?">
+  <x-project>
+    <fill:img>
+      <x-project.text>?</x-project.text>
+    </fill:img>
     <fill:title>
       <markdown>
         # Coming soon to theaters
diff --git a/src/partials/page_four.html b/src/partials/page_four.html
index b7bf0b8..8952d3f 100644
--- a/src/partials/page_four.html
+++ b/src/partials/page_four.html
@@ -4,7 +4,10 @@
       Who is this guy?
     </x-blockquote>
   </x-section-head>
-  <x-project text="?">
+  <x-project>
+    <fill:img>
+      <x-project.text>?</x-project.text>
+    </fill:img>
     <fill:title>
       <markdown>
         # Coming soon to theaters
diff --git a/src/partials/projects.html b/src/partials/projects.html
index fae3810..bb6784d 100644
--- a/src/partials/projects.html
+++ b/src/partials/projects.html
@@ -5,10 +5,6 @@
     </x-blockquote>
   </x-section-head>
   <x-project id="tysoncloud">
-    <fill:links>
-      <x-link.github href="timmyjinks/TYSONCLOUD"></x-link.github>
-      <x-link.website href="https://tysoncloud.tysonjenkins.dev/" referencing="TYSONCLOUD"></x-link.website>
-    </fill:links>
     <fill:img>
       <img src="/assets/tysoncloud.svg">
     </fill:img>
@@ -17,6 +13,10 @@
         # TYSONCLOUD
       </markdown>
     </fill:title>
+    <fill:links>
+      <x-link.github href="timmyjinks/TYSONCLOUD"></x-link.github>
+      <x-link.website href="https://tysoncloud.tysonjenkins.dev/" referencing="TYSONCLOUD"></x-link.website>
+    </fill:links>
     <fill:subtitle>
       <markdown>
         ## When she compute your serve 'till you edge
@@ -34,10 +34,6 @@
   </x-project>
   <x-project onclick="spaghetti()" class="project-alt" titlestyle="font-family: 'Apex Mk2'"
     headerstyle="font-family: 'Apex Mk2'" id="simulo">
-    <fill:links>
-      <x-link.github href="richgrov/simulo"></x-link.github>
-      <x-link.website href="https://simulo.grover.sh" referencing="Simulo"></x-link.website>
-    </fill:links>
     <fill:img>
       <img src="/assets/simulo.svg">
     </fill:img>
@@ -46,6 +42,10 @@
         # Simulo
       </markdown>
     </fill:title>
+    <fill:links>
+      <x-link.github href="richgrov/simulo"></x-link.github>
+      <x-link.website href="https://simulo.grover.sh" referencing="Simulo"></x-link.website>
+    </fill:links>
     <fill:subtitle>
       <markdown>
         ## Roblox for the real world!
@@ -67,9 +67,6 @@
     </fill:description>
   </x-project>
   <x-project id="c0re">
-    <fill:links>
-      <x-link.website href="https://c0re.com" referencing="c0re"></x-link.website>
-    </fill:links>
     <fill:img>
       <include src="assets/c0re.svg"></include>
     </fill:img>
@@ -79,6 +76,9 @@
         #### So shiny!
       </markdown>
     </fill:title>
+    <fill:links>
+      <x-link.website href="https://c0re.com" referencing="c0re"></x-link.website>
+    </fill:links>
     <fill:subtitle>
       <markdown>
         ## Git gud scrub!
@@ -128,9 +128,6 @@
   <x-project class="project-alt"
     titlestyle="background-image: linear-gradient(to right, oklch(0.714 0.203 305.504) 0px, oklch(0.718 0.202 349.761) 100%); background-clip: text; color: transparent"
     id="braindance">
-    <fill:links>
-      <x-link.website href="https://braindance.live" referencing="Braindance"></x-link.website>
-    </fill:links>
     <fill:img>
       <img src="/assets/braindance.svg">
     </fill:img>
@@ -139,6 +136,9 @@
         # Braindance
       </markdown>
     </fill:title>
+    <fill:links>
+      <x-link.website href="https://braindance.live" referencing="Braindance"></x-link.website>
+    </fill:links>
     <fill:subtitle>
       <markdown>
         ## Bringing the Coachella to you!
@@ -151,15 +151,18 @@
       </markdown>
     </fill:description>
   </x-project>
-  <x-project text="e" id="grezi">
-    <fill:links>
-      <x-link.github href="StratusFearMe21/grezi-next"></x-link.github>
-    </fill:links>
+  <x-project id="grezi">
+    <fill:img>
+      <x-project.text>e</x-project.text>
+    </fill:img>
     <fill:title>
       <markdown>
         # Grezi
       </markdown>
     </fill:title>
+    <fill:links>
+      <x-link.github href="StratusFearMe21/grezi-next"></x-link.github>
+    </fill:links>
     <fill:subtitle>
       <markdown>
         ## When the power is point
@@ -178,7 +181,10 @@
       </markdown>
     </fill:description>
   </x-project>
-  <x-project text="?" class="project-alt" id="mystery">
+  <x-project class="project-alt" id="mystery">
+    <fill:img>
+      <x-project.text>?</x-project.text>
+    </fill:img>
     <fill:title>
       <markdown>
         # Mystery
diff --git a/src/partials/who_we_are.html b/src/partials/who_we_are.html
index eb41f25..5f94303 100644
--- a/src/partials/who_we_are.html
+++ b/src/partials/who_we_are.html
@@ -5,12 +5,6 @@
     </x-blockquote>
   </x-section-head>
   <x-project>
-    <fill:links>
-      <x-link.github href="richgrov"></x-link.github>
-      <x-link.website href="https://grover.sh/" referencing="Richard"></x-link.website>
-      <x-link.linkedin href="richgrov"></x-link.linkedin>
-      <x-link.x href="richgrov"></x-link.x>
-    </fill:links>
     <fill:img>
       <img src="/assets/richard.jpg" class="person">
     </fill:img>
@@ -24,6 +18,12 @@
         </markdown>
       </x-link>
     </fill:title>
+    <fill:links>
+      <x-link.github href="richgrov"></x-link.github>
+      <x-link.website href="https://grover.sh/" referencing="Richard"></x-link.website>
+      <x-link.linkedin href="richgrov"></x-link.linkedin>
+      <x-link.x href="richgrov"></x-link.x>
+    </fill:links>
     <fill:subtitle>
       <x-blockquote cite="Richard">
         There has never been a better time to be alive
@@ -35,11 +35,6 @@
     </fill:description>
   </x-project>
   <x-project class="project-alt">
-    <fill:links>
-      <x-link.github href="Hoochymoochy"></x-link.github>
-      <x-link.website href="https://www.khaydenroberts.com/" referencing="Khayden"></x-link.website>
-      <x-link.linkedin href="khayden-roberts-5783b32b5"></x-link.linkedin>
-    </fill:links>
     <fill:img>
       <img src="/assets/khayden.jpg" class="person">
     </fill:img>
@@ -53,6 +48,11 @@
         </markdown>
       </x-link>
     </fill:title>
+    <fill:links>
+      <x-link.github href="Hoochymoochy"></x-link.github>
+      <x-link.website href="https://www.khaydenroberts.com/" referencing="Khayden"></x-link.website>
+      <x-link.linkedin href="khayden-roberts-5783b32b5"></x-link.linkedin>
+    </fill:links>
     <fill:subtitle>
       <x-blockquote>
         You only live once, die trying
@@ -65,12 +65,6 @@
     </fill:description>
   </x-project>
   <x-project>
-    <fill:links>
-      <x-link.github href="StratusFearMe21"></x-link.github>
-      <x-link.website href="https://portfolio.nations.lol/" referencing="Isaac"></x-link.website>
-      <x-link.linkedin href="isaac-mills-8b1a77336"></x-link.linkedin>
-      <x-link.listenbrainz href="StratusFearMe21"></x-link.listenbrainz>
-    </fill:links>
     <fill:img>
       <img src="/assets/isaac.jpg" class="person">
     </fill:img>
@@ -84,6 +78,12 @@
         </markdown>
       </x-link>
     </fill:title>
+    <fill:links>
+      <x-link.github href="StratusFearMe21"></x-link.github>
+      <x-link.website href="https://portfolio.nations.lol/" referencing="Isaac"></x-link.website>
+      <x-link.linkedin href="isaac-mills-8b1a77336"></x-link.linkedin>
+      <x-link.listenbrainz href="StratusFearMe21"></x-link.listenbrainz>
+    </fill:links>
     <fill:subtitle>
       <x-blockquote cite="Isaac">
         Pog