diff --git a/html/poketube.ejs b/html/poketube.ejs
index ecbd4957..dbbb9081 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -378,9 +378,6 @@ a[data-onclick="jump_to_time"] {
   <link href="/css/watch-util.css?v=9893448" rel=stylesheet>
   <link href="/css/watch-navbar.css?v=9893448" rel=stylesheet>
   <link href="/css/poketube.css?v=948934774844" rel=stylesheet>
-  
-  <link href="https://vjs.zencdn.net/8.16.1/video-js.css" rel="stylesheet" />
-  <script src="https://vjs.zencdn.net/8.16.1/video.min.js"></script>
   <!-- css files end -->
 
 <% if (k.Video.Channel.Name == "7clouds") { %> 
@@ -706,7 +703,7 @@ background-color: #0000;
     }
   </style>
 </noscript>
-<script>
+
          <% if(shortsui) { %>
                                                        <script>
         // Function to apply styles after DOM has loaded
@@ -818,7 +815,7 @@ background-color: #0000;
        </style>
       <% } %>
                            
-                                  </script>    
+                                      
     </head>
     
  
@@ -1136,6 +1133,8 @@ Offical Discord Server! :3
     
     
 		<div id="<%=sha384(inv_vid.videoId)%>" class="video-player-container">
+      
+    
       <noscript>
         <% if (!qua) { %>
           <div id="nojs-high-res-warning" class="error-card">
@@ -1151,26 +1150,75 @@ Offical Discord Server! :3
           <br/>
           <span></span>
         </p>
-        
       </div>
-      <% if (!qua) { %>
-        <video
-        id="video "
-        class="video-js player video-ambient-container"
-        controls
-        autoplay
-                style="border-radius: 16px; box-sizing: border-box; min-width: 100%; display: block;"
-
-        preload="auto"
-        data-setup="{}"
-      >
-        <source id="my-spanish-audio-track" src="https://eu-proxy.poketube.fun/latest_version?id=<%=inv_vid.videoId%>&itag=18&local=true" type="audio/ogg">
-        <source src="https://eu-proxy.poketube.fun/latest_version?id=<%=inv_vid.videoId%>&itag=136&local=true" type="video/mp4" />
-    <p class="vjs-no-js">
-      
-    </p>
-    </video>
+      <video class="video-js player video-ambient-container" id="video" style="border-radius: 16px; box-sizing: border-box; min-width: 100%; display: block;" autoplay preload onerror="showErrorCard(event)">
+      <% if (isvidious) { %>
+        <% if (!qua) { %>
+<% 
+  let itag = '136'; // Default itag
+  inv_vid.adaptiveFormats.forEach(format => {
+    if (format.itag == '298') {
+      itag = '298';
+    }
+  });
+%>
+  <% if (!qua) { //TODO - a %>
+          <source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=140&local=true" type="audio/ogg" onerror="showErrorCard(event)"/>
+      <% } else { %>
+        <audio id="aud"></audio>
+      <% } %>
+<source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=<%=itag%>&local=true" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true" onerror="showErrorCard(event)">
         <% } %>
+        <% if (qua === "medium") { %>
+          <source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=18&local=true" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true" onerror="showErrorCard(event)">
+        <% } %>
+      <% } %>
+
+      <% if (!isSchoolProxy) { %>
+        <% if (!isvidious) { %>
+          <% if (!qua) { %>
+            <source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true" onerror="showErrorCard(event)">
+          <% } %>
+          <% if (qua === "medium") { %>
+            <source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true" onerror="showErrorCard(event)">
+          <% } %>
+        <% } %>
+      <% } %>
+
+      <% if (isSchoolProxy) { %>
+        <% if (!qua) { %>
+          <source src="https://tube-proxy.ashley0143.xyz/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true" onerror="showErrorCard()">
+        <% } %>
+        <% if (qua === "medium") { %>  
+          <source src="https://tube-proxy.ashley0143.xyz/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true" onerror="showErrorCard()">
+        <% } %>
+      <% } %>
+
+      <%  if (Array.isArray( inv_vid.captions)) { %> 
+        <% inv_vid.captions?.forEach(x => { %>
+          <track src="/api/subtitles?v=<%=inv_vid.videoId%>&h=<%= x.label %>" label="<%= x.label.replace("United States","Simplified - USA") %>" kind="subtitles">      
+        <% }) %>   
+      <% } %>                     
+      
+      <%  if (!Array.isArray( inv_vid.captions)) { %> 
+        <track src="/api/subtitles?v=<%=inv_vid.videoId%>&h=<%= %>" label="<%=  video.Subtitles.Subtitle.language.replace("United States","Simplified - USA") %>" kind="subtitles">      
+      <% } %>                                                       
+    </video>
+    <div id="controls"> <!-- TODO: CONTROLS -->
+      <button id="play-pause" class="control-button">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>play-circle-outline</title><path d="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M10,16.5L16,12L10,7.5V16.5Z" /></svg>
+      </button>
+      
+      <div id="seekbar">
+          <input type="range" min="0" step="any" value="0" id="duration-slider">
+      </div>
+      <p id="timestamps">...</p>
+      <!--
+      <div>
+        <span>volume</span>
+        <input type="range" min="0" max="1" step="any" value="1" id="volume-slider">
+      </div>
+      -->
       
   </div>
     <% if (!a) { %>