diff --git a/html/channel.ejs b/html/channel.ejs
index 344eee8a..a957fb16 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -1,4 +1,4 @@
- <% try { %>
+  <% try { %>
 
 <!--
     This Source Code Form is subject to the terms of the GNU General Public License:
@@ -24,15 +24,15 @@
     <% if (ID === "UCFAiFyGs6oDiF1Nf-rRJpZA") { %> 
     <title>Technoblade Never Dies! | Poke</title>
  <% } %>
-    <title><%=j.Channel?.Metadata.Name%> | Poke</title>
+    <title><%=cinv.author%> | Poke</title>
     <link rel="manifest" href="/manifest.json">
     <link href="css/yt-ukraine.svg?v=7" rel=icon>
     <meta content=website property=og:type>
     <link rel="alternate" type="application/rss+xml" href="/feeds/videos.xml?channel_id=<%=ID%>">
-    <meta content="<%=j.Channel?.Metadata.Name%> - Poke" property=og:title>
+    <meta content="<%=cinv.author%> - Poke" property=og:title>
     <meta content="<%- cinv?.description %>" property=twitter:description>
     <meta name="darkreader-lock"> <!-- tells dark reader that the site has a dark theme and to turn itself off -->
-    <meta content="<%=j.Channel?.Metadata.Avatars.Thumbnail?.$t%>" property=og:image>
+    <meta content="<%=cinv.authorThumbnails[1].url%>" property=og:image>
         <meta name="viewport" content="width=device-width, initial-scale=1"> 
   <style> 
     * {
@@ -608,7 +608,7 @@ color:#ea9999 !important;
   <i onclick="window.history.back()" style="color:#fff;padding: 10px;" class="fa-solid fa-chevron-left"></i>
          
         
-        <p style="font-family:Ginto Nord,sans-serif;font-weight:900;white-space:yes;"><%=j.Channel?.Metadata.Name%></p>
+        <p style="font-family:Ginto Nord,sans-serif;font-weight:900;white-space:yes;"><%=cinv.author%></p>
 
         </div>                                    
      
@@ -683,7 +683,7 @@ height: 100%;
 
 <div class="channel-info" style="margin-bottom: 3em;margin-left:2em;margin-top: -11em;">
 		<a href="/avatars/<%=j.Channel?.Metadata.Avatars.Thumbnail?.$t.replace("https://yt3.googleusercontent.com/", "")%>" class="avatar">
-				<img src="/avatars/<%=j.Channel?.Metadata.Avatars.Thumbnail?.$t.replace("https://yt3.googleusercontent.com/", "")%>" alt="Channel Avatar" style="border: 1px solid gray;border-radius: 50%;">
+				<img src="/avatars/<%=cinv.authorThumbnails[1].url.replace("https://yt3.googleusercontent.com/", "")%>" alt="Channel Avatar" style="border: 1px solid gray;border-radius: 50%;">
 			</a>
       
     
@@ -701,7 +701,7 @@ height: 100%;
                                                <% } %>
 
 			<div class="name" style="background: #333;border-radius: 12px;padding: 17px;height: 7em;margin-left: 4em;margin-top: 7px;gap: 3px;">
-				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;margin-top: 16px;margin-bottom: 15px;"><%=j.Channel?.Metadata.Name%>
+				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;margin-top: 16px;margin-bottom: 15px;"><%=cinv.author%>
           
                 <% if (firstVideo?.authorVerified) { %>
                 <span style="padding: 1px;padding-top:  2.5px !important;display: inline-flex;border-radius: 3px;">
@@ -1003,7 +1003,7 @@ width: fit-content;
 				<img src="https://p.poketube.fun/<%=j.Channel?.Metadata.Avatars.Thumbnail.$t%>" alt="Channel Avatar">
 			</a>
 			<div class="name">
-				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;white-space:yes;"> <%=j.Channel?.Metadata.Name%>  </p>
+				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;white-space:yes;"> <%=cinv.author%>  </p>
           <p style="margin: -9px;">
             			<%= subs %> subscribers - <%- pronoun %>
 
@@ -1518,7 +1518,7 @@ width: fit-content;
                                                            
 
                 <p class="comments-author">
-                  				<a href="" style="color: var(--text-color);text-decoration: none;"><%=j.Channel?.Metadata.Name%> 
+                  				<a href="" style="color: var(--text-color);text-decoration: none;"><%=cinv.author%> 
 
                                                                                                   </a>
                             
@@ -1654,7 +1654,7 @@ var userID = localStorage.getItem("UserID");
 
 if (userID) {
     // If user ID exists in localStorage, set the href attribute
-    anchor.href = `/api/set-channel-subs?ID=${userID}&channelName=<%=j.Channel?.Metadata.Name%>&avatar=https://p.poketube.fun/<%- j.Channel?.Metadata.Avatars.Thumbnail?.$t %>&channelID=<%= ID %>`;
+    anchor.href = `/api/set-channel-subs?ID=${userID}&channelName=<%=cinv.author%>&avatar=https://p.poketube.fun/<%- j.Channel?.Metadata.Avatars.Thumbnail?.$t %>&channelID=<%= ID %>`;
 } else {
     // If user ID doesn't exist in localStorage, you can handle it as needed
      anchor.href = "/account-create"