diff --git a/styles/youtube/catppuccin.user.less b/styles/youtube/catppuccin.user.less
index c30f02fdf1..e4acef76e5 100644
--- a/styles/youtube/catppuccin.user.less
+++ b/styles/youtube/catppuccin.user.less
@@ -47,9 +47,6 @@
       &[dark],
       &[system-icons],
       &[darker-dark-theme] {
-        --efyt-control-bar-background-color: @mantle;
-        --dimmer-text: @text;
-
         /* Newest Variables */
         --yt-sys-color-baseline--base-background: @base;
         --yt-sys-color-baseline--menu-background: @mantle;
@@ -399,77 +396,12 @@
       background: @accent;
     }
 
-    /* Selected chapter */
-    ytd-macro-markers-list-item-renderer {
-      --ytd-macro-markers-list-item-background-color: @surface0;
-      --ytd-macro-markers-list-item-title-color: @text;
-      --ytd-macro-markers-list-item-secondary-color: @subtext1;
-      --ytd-macro-markers-list-item-timestamp-background-color: @surface1;
-    }
-
-    ytd-playlist-panel-video-renderer {
-      --yt-lightsource-section2-color: @surface1;
-      --yt-lightsource-section4-color: @surface2;
-      --yt-lightsource-primary-title-color: @text;
-      --yt-lightsource-secondary-title-color: @text;
-      --yt-active-playlist-panel-background-color: @surface0;
-    }
-
-    ytd-playlist-panel-renderer[collapsible][collapsed][use-color-palette]
-      .header.ytd-playlist-panel-renderer {
-      --iron-icon-fill-color: @text;
-      background-color: @base;
-    }
-
-    #container.ytd-masthead {
-      --iron-icon-fill-color: @text;
-    }
-
     #background.ytd-masthead,
     #frosted-glass {
       --yt-frosted-glass-desktop: @base;
       --yt-spec-frosted-glass-desktop: @base;
     }
 
-    ytd-feed-filter-chip-bar-renderer[expand-instead-of-scroll]
-      #chips-wrapper.ytd-feed-filter-chip-bar-renderer {
-      --iron-icon-fill-color: @text;
-      background-color: @base;
-    }
-
-    .ytp-progress-list when not(@flavor = latte) {
-      background: fade(@surface0, 80%);
-    }
-    .ytp-load-progress when not(@flavor = latte) {
-      background: fade(@overlay0, 100%);
-    }
-
-    ytd-expandable-metadata-renderer {
-      --yt-lightsource-section1-color: @base;
-      --yt-lightsource-section2-color: @surface0;
-      --yt-lightsource-section3-color: @surface1;
-      --yt-lightsource-section4-color: @surface2;
-      --yt-lightsource-primary-title-color: @text;
-      --yt-lightsource-secondary-title-color: @subtext0;
-    }
-
-    yt-live-chat-renderer {
-      --yt-button-default-text-color: @text;
-      --yt-button-default-background-color: @base;
-      --yt-button-dark-text-color: @base;
-      --yt-button-dark-background-color: @accent;
-      --yt-button-payment-background-color: @accent;
-    }
-
-    yt-icon-button.yt-live-chat-item-list-renderer {
-      background-color: @accent;
-      color: @base;
-
-      &:hover {
-        background-color: darken(@accent, 5%);
-      }
-    }
-
     /* Skeleton */
     #guide-skeleton,
     #home-container-skeleton,
@@ -523,7 +455,7 @@
     }
 
     yt-icon.ytd-logo [fill="white"] {
-      fill: @crust;
+      fill: @base;
     }
 
     .yt-spec-icon-shape {
@@ -852,15 +784,15 @@
 
     /* Panels, popups, tooltips */
 
-    .ytp-tooltip-bottom-text {
-      background: fade(@surface0, 90%);
-      color: @text;
+    .ytp-popup {
+      background: fade(@mantle, 70%);
       text-shadow: none;
     }
 
-    .ytp-popup {
-      background: fade(@surface0, 90%);
-      text-shadow: none;
+    .ytp-menuitem {
+      &:not([aria-disabled="true"]):hover {
+        background-color: fade(@overlay0, 50%);
+      }
     }
 
     .ytp-panel-menu,
@@ -875,15 +807,14 @@
       color: @text;
     }
 
-    .ytp-panel-footer-content-link {
-      color: @accent;
+    .ytp-menuitem-icon [fill="#fff"] {
+      fill: @text !important;
     }
 
-    .ytp-panel-back-button {
-      @svg: escape(
-        '<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 32 32" version="1.1"><path d="m19.41 20.09-4.58-4.59 4.58-4.59L18 9.5l-6 6 6 6z" fill="@{text}"/></svg>'
-      );
-      background-image: url("data:image/svg+xml,@{svg}");
+    .ytp-panel-back-button,
+    .ytp-menuitem[role="menuitemradio"][aria-checked="true"]
+      .ytp-menuitem-label {
+      filter: @text-filter;
     }
 
     .ytp-menuitem[aria-checked="false"] .ytp-menuitem-toggle-checkbox {
@@ -899,12 +830,6 @@
       }
     }
 
-    .ytp-menuitem {
-      &:not([aria-disabled="true"]):hover {
-        background-color: @surface1;
-      }
-    }
-
     /* Video player */
 
     // Shorts and video hover preview progress bars