diff --git a/package.json b/package.json
index d09721e..a2939cf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "@minpluto/polestar",
   "author": "SudoVanilla <korbs@sudovanilla.org>",
   "type": "module",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "license": "AGPL-3.0-only",
   "bugs": {
     "url": "https://ark.sudovanilla.org/MinPluto/Polestar/issues",
diff --git a/src/VideoItem.astro b/src/VideoItem.astro
index e0bcde1..c787587 100644
--- a/src/VideoItem.astro
+++ b/src/VideoItem.astro
@@ -22,7 +22,7 @@ import { Image } from 'astro:assets';
         <p>{Length}</p>
     </div>
     <div class="fl-vi-content">
-        <Image src={'https://ipx.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj'} alt={'Creator Avatar'} inferSize={true} loading="lazy" format="webp"/>
+        <Image src={'https://image.proxy.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj'} alt={'Creator Avatar'} inferSize={true} loading="lazy" format="webp"/>
         <div>
             <p><strong>{Title}</strong></p>
             <span>{Date} - {Views}</span>
diff --git a/test/src/pages/index.astro b/test/src/pages/index.astro
index 62c52af..86a41ce 100644
--- a/test/src/pages/index.astro
+++ b/test/src/pages/index.astro
@@ -21,24 +21,19 @@ import MobileNavigation from '../../../src/MobileNavigation.astro'
 const TrendingFetch = 'https://yt.sudovanilla.org' + '/api/v1/trending'
 const TrendingResponse = await fetch(TrendingFetch)
 const TrendingData = await TrendingResponse.json()
-const TrendingSplit = TrendingData.slice(0, 1)
 
 const MoviesFetch = 'https://yt.sudovanilla.org' + '/api/v1/trending?type=movies'
 const MoviesResponse = await fetch(MoviesFetch)
 const MoviesData = await MoviesResponse.json()
-const MoviesSplit = MoviesData.slice(0, 1)
-
 
 const MusicFetch = 'https://yt.sudovanilla.org' + '/api/v1/trending?type=music'
 const MusicResponse = await fetch(MusicFetch)
 const MusicData = await MusicResponse.json()
-const MusicSplit = MusicData.slice(0, 1)
 
 
 const GamingFetch = 'https://yt.sudovanilla.org' + '/api/v1/trending?type=gaming'
 const GamingResponse = await fetch(GamingFetch)
 const GamingData = await GamingResponse.json()
-const GamingSplit = GamingData.slice(0, 1)
 
 // Icons
 import {
@@ -107,7 +102,7 @@ import {
 		<a href="#" onclick="OpenExampleDialog()"><OpenInBrowser/> Open Dialog</a>
 		<h2>Creators</h2>
 		<SidebarCreator
-			Avatar="https://ipx.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj"
+			Avatar="https://image.proxy.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj"
 			Name="The Linux Experiment"
 			Link="#"
 			FollowerCount="300K"
@@ -138,38 +133,6 @@ import {
 	<br/>
 
 	<div style="display: grid; grid-template-columns: repeat(auto-fit,minmax(200px,1fr)); gap: 12px;">
-		{TrendingSplit.map((category) =>
-			<Category
-				Name="Trending"
-				Link="#"
-				Thumbnail={"https://ipx.sudovanilla.org/https://img.youtube.com/vi/" + category.videoId + "/mqdefault.jpg"}
-				Platform="YouTube"
-			/>
-		)}
-		{MoviesSplit.map((category) =>
-			<Category
-				Name="Trailers"
-				Link="#"
-				Thumbnail={"https://ipx.sudovanilla.org/https://img.youtube.com/vi/" + category.videoId + "/mqdefault.jpg"}
-				Platform="YouTube"
-			/>
-		)}
-		{MusicSplit.map((category) =>
-			<Category
-				Name="Music"
-				Link="#"
-				Thumbnail={"https://ipx.sudovanilla.org/https://img.youtube.com/vi/" + category.videoId + "/mqdefault.jpg"}
-				Platform="YouTube"
-			/>
-		)}
-		{GamingSplit.map((category) =>
-			<Category
-				Name="Gaming"
-				Link="#"
-				Thumbnail={"https://ipx.sudovanilla.org/https://img.youtube.com/vi/" + category.videoId + "/mqdefault.jpg"}
-				Platform="YouTube"
-			/>
-		)}
 	</div>
 
 	<br/>
@@ -181,7 +144,7 @@ import {
 			VideoId="PuGeR075MkE"
 			CreatorId="UC5UAwBUum7CPN5buc-_N1Fw"
 			Title="Immutable Linux, without the hassle? Vanilla OS 2 Orchid"
-			Thumbnail="https://ipx.sudovanilla.org/https://yt.sudovanilla.org/vi/PuGeR075MkE/mqdefault.jpg"
+			Thumbnail="https://image.proxy.sudovanilla.org/https://yt.sudovanilla.org/vi/PuGeR075MkE/mqdefault.jpg"
 			Date="2 weeks ago"
 			Views="71K"
 			Length="16:10"
@@ -197,7 +160,7 @@ import {
 			VideoId="urC7PKlM3Qo"
 			CreatorId="UC5UAwBUum7CPN5buc-_N1Fw"
 			Title="Nvidia pilfers Youtube for AI, GNOME HDR, Immutable Manjaro: Linux & Open Source News"
-			Thumbnail="https://ipx.sudovanilla.org/https://yt.sudovanilla.org/vi/urC7PKlM3Qo/mqdefault.jpg"
+			Thumbnail="https://image.proxy.sudovanilla.org/https://yt.sudovanilla.org/vi/urC7PKlM3Qo/mqdefault.jpg"
 			Date="1 weeks ago"
 			Views="43K"
 			Length="19:57"
@@ -209,15 +172,16 @@ import {
 			<div class="fl-sk-text"></div>
 		</div>
 		</Video>
+		<!-- Video Item needs updating for live streams -->
 		<Video
 			VideoId="YFr5E2C5ex8"
-			CreatorId="UC5UAwBUum7CPN5buc-_N1Fw"
-			Title="COSMIC Desktop ALPHA: a unique & important project for Linux!"
-			Thumbnail="https://ipx.sudovanilla.org/https://yt.sudovanilla.org/vi/YFr5E2C5ex8/mqdefault.jpg"
-			Date="2 weeks ago"
-			Views="101K"
-			Length="31:18"
-			Platform="YouTube"
+			CreatorId="LeekBeats"
+			Title="♫ 24/7 chill lofi beats • Zero Ads • Playlist: LeekBeats.com • !info • DMCA Safe • Thanks for 68,000 Followers!"
+			Thumbnail="https://image.proxy.sudovanilla.org/https://twitch-backend.sudovanilla.org/proxy/img/aHR0cHM6Ly9zdGF0aWMtY2RuLmp0dm53Lm5ldC9wcmV2aWV3cy10dHYvbGl2ZV91c2VyX2xlZWtiZWF0cy00NDB4MjQ4LmpwZw=="
+			Date="Live Now"
+			Views="302 Viewers"
+			Length="Live"
+			Platform="Twitch"
 			server:defer
 		>
 		<div style="display: flex; flex-direction: column; align-items: left; gap: 12px; padding: 0px 12px;" slot="fallback">
@@ -232,7 +196,7 @@ import {
 	<br/>
 
 	<Comment
-		Avatar="https://ipx.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj"
+		Avatar="https://image.proxy.sudovanilla.org/https://invidious.private.coffee/ggpht/ytc/AIdro_lAKf-vZLoTI-gZUoP5Y3gbdGd07E4eDHUhTee6aOzDCnU=s900-c-k-c0x00ffffff-no-rj"
 		Username="The Linux Experiment"
 		Link="#"
 	>