diff --git a/bun.lockb b/bun.lockb
index 542755c..810b09f 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/source/astro.mjs b/source/astro.mjs
index b0fa006..459fc1f 100755
--- a/source/astro.mjs
+++ b/source/astro.mjs
@@ -37,7 +37,8 @@ export default defineConfig({
   // Experimental
   experimental: {
     directRenderScript: true,
-    clientPrerender: true
+    clientPrerender: true,
+    serverIslands: true
   },
   prefetch: {
     prefetchAll: true,
diff --git a/source/src/components/buttons/Telemtry.astro b/source/src/components/buttons/Telemtry.astro
index 609beab..4bbc220 100755
--- a/source/src/components/buttons/Telemtry.astro
+++ b/source/src/components/buttons/Telemtry.astro
@@ -10,8 +10,8 @@ else if (Astro.cookies.get("Telemtry").value === "Disabled") {
 }
 ---
 
-{UserIsOptedIn ? 
+{UserIsOptedIn ?
     <a style="color: white;text-decoration: none;margin-bottom: 6px;border-radius: 6px;padding: 8px 24px;background: #1a1a1a;font-size: 14px;border: 2px rgba(255, 255, 255, 0.25) solid;" href="/api/telemtry/disable">{t("TELEMTRY.OPTOUT")}</a>
     :
     <a style="color: white;text-decoration: none;margin-bottom: 6px;border-radius: 6px;padding: 8px 24px;background: #1a1a1a;font-size: 14px;border: 2px rgba(255, 255, 255, 0.25) solid;" href="/api/telemtry/enable">{t("TELEMTRY.OPTIN")}</a>
-}
\ No newline at end of file
+}
diff --git a/source/src/pages/discover.astro b/source/src/pages/discover.astro
index 9782590..7d20315 100755
--- a/source/src/pages/discover.astro
+++ b/source/src/pages/discover.astro
@@ -56,7 +56,7 @@ else if (Astro.url.href.includes('?platform=twitch')) {
     <div class="video-grid">
         {PlatformYouTube ?
             YouTubeData.map((video) =>
-                <Video
+                <Video server:defer
                     ID={video.videoId}
                     Title={video.title}
                     Creator={video.author}
@@ -70,7 +70,7 @@ else if (Astro.url.href.includes('?platform=twitch')) {
         }
         {PlatformTwitch ?
             TwitchData.data.streams.map((channel) =>
-                <Stream
+                <Stream server:defer
                     Title={channel.title}
                     Creator={channel.username}
                     Avatar={channel.streamer.pfp}