typo

Update OLED Dark mode: code clean up, better performance.

Header.h

@@ -1,5 +1,18 @@
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
 
+// IAmYouTube
+@interface SSOConfiguration : NSObject
+@end
+
+// uYouPlus
+@interface YTMainAppControlsOverlayView: UIView
+@end
+
+@interface YTPlaylistHeaderViewController : UIViewController
+@property (nonatomic, strong, readwrite) UIView *downloadsButton;
+@end
+
+// BigYTMiniPlayer
 @interface YTMainAppVideoPlayerOverlayView : UIView
 - (UIViewController *)_viewControllerForAncestor;
 @end
@@ -7,31 +20,18 @@
 @interface YTWatchMiniBarView : UIView
 @end
 
-@interface YTAsyncCollectionView : UIView
-@end
-
+// YTAutoFullScreen
 @interface YTPlayerViewController (YTAFS)
 - (void)autoFullscreen;
 @end
 
-@interface YTTopAlignedView : UIView
-@end
-
-@interface YTLightweightQTMButton : UIView
-@end
-
-@interface NIAttributedLabel : UIView
-@end
-
-@interface YTShareMainView : UIView
+// OLED Darkmode
+@interface ASWAppSwitcherCollectionViewCell: UIView
 @end
 
 @interface ASScrollView : UIView
 @end
 
-@interface ASCollectionView : UIView
-@end
-
 @interface UIKeyboardLayoutStar : UIView
 @end
 
@@ -42,4 +42,10 @@
 @end
 
 @interface UIPredictionViewController : UIViewController
+@end
+
+@interface SponsorBlockSettingsController : UITableViewController 
+@end
+
+@interface _ASDisplayView : UIView
 @end

Makefile

@@ -1,6 +1,8 @@
 uYouPlus_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YoutubeSpeed.dylib
 
+TARGET = iphone:clang:latest:12.0
 uYouPlus_USE_FLEX = 0
+uYouPlus_USE_FISHHOOK = 0
 ARCHS = arm64
 MODULES = jailed
 FINALPACKAGE = 1
@@ -12,7 +14,6 @@ BUNDLE_ID = com.google.ios.youtube
  
 uYouPlus_FILES = uYouPlus.xm Settings.xm
 uYouPlus_IPA = ./tmp/Payload/YouTube.app
-### Important: edit the path to your decrypted YouTube IPA!!! 
 
 include $(THEOS)/makefiles/common.mk
 include $(THEOS_MAKE_PATH)/tweak.mk

README.md

@@ -1,6 +1,5 @@
 ![cydia-1900000830-iphone-0-1628105716 3](https://user-images.githubusercontent.com/52943116/135612614-3d3138cb-2a3d-4ed1-9244-905bab8f5c9f.PNG)
 
-
 # Table of Contents
 
 * [Credits](#credits)
@@ -10,8 +9,7 @@
 * [Installation](#installation)
 * [Support the developers!](#support-the-developers)
 * [FAQ](#faq)
-* [Building (optional)](#building-optional)
-
+* [Building](#building-optional)
 
 # Credits
 
@@ -21,9 +19,9 @@
 
 - [HASHBANG Productions](https://github.com/hbang) for [Alderis Color Picker](https://github.com/hbang/Alderis) - a dependency of iSponsorBlock.
 
-- [PoomSmart](https://twitter.com/poomsmart) - the developer of many tweaks used by uYouPlus, include: [NoYTPremium](https://github.com/PoomSmart/NoYTPremium/), [YouRememberCaption](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/), [YTClassicVideoQuality](https://poomsmart.github.io/repo/depictions/ytclassicvideoquality.html), [YTNoCheckLocalNetwork](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html), [YTSystemAppearance](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html), [YTAutoFullScreen](https://github.com/PoomSmart/YTAutoFullScreen/), [YTReExplore](https://github.com/PoomSmart/YTReExplore/), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html), [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html), and [Return YouTube Dislike](https://github.com/PoomSmart/Return-YouTube-Dislikes)
+- [PoomSmart](https://twitter.com/poomsmart) - the developer of many tweaks used by uYouPlus, include: [NoYTPremium](https://github.com/PoomSmart/NoYTPremium/), [YouRememberCaption](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/), [YTClassicVideoQuality](https://poomsmart.github.io/repo/depictions/ytclassicvideoquality.html), [YTNoCheckLocalNetwork](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html), [YTSystemAppearance](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html), [YTAutoFullScreen](https://github.com/PoomSmart/YTAutoFullScreen/), [YTReExplore](https://github.com/PoomSmart/YTReExplore/), [IAmYouTube](https://github.com/PoomSmart/IAmYouTube), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html), [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html), and [Return YouTube Dislike](https://github.com/PoomSmart/Return-YouTube-Dislikes)
 
-- [level3tjg](https://twitter.com/level3tjg) - for [YTNoHoverCards](https://github.com/level3tjg/YTNoHoverCards).
+- [level3tjg](https://twitter.com/level3tjg) - for [YTNoHoverCards](https://github.com/level3tjg/YTNoHoverCards) and [YTMiniplayerEnabler](https://github.com/level3tjg/YTMiniplayerEnabler).
 
 - [Lyvendia](https://github.com/Lyvendia/) for [YTSpeed](https://github.com/Lyvendia/YTSpeed/)
 
@@ -33,7 +31,6 @@
 
 - [theos team](https://github.com/theos/theos) for theos & theos-jailed.
 
-
 # Features
 
 1. **uYou:** uYou has a ton of features that I can't list them all. Visit [here](https://miro92.com/repo/depictions/?p=com.miro.uyou) for more info!
@@ -63,6 +60,8 @@
 
 12. **YTSpeed**: add 2.25, 2.5, 2.75, and 3x playback speed
 
+13. **YTMiniplayerEnabler**: enable Miniplayer for all YouTube videos.
+
 </details>
 
 # Known issues 
@@ -71,7 +70,6 @@
 
 - Issues that related to **uYouPlus** are [here](https://github.com/qnblackcat/uYouPlus/issues/)
 
-
 # Download
 
 - **uYouPlus** (or you can call it uYou+) requires iOS & iPadOS 13.0 or later. The latest version of **uYouPlus** can be found in the [Release tab](https://github.com/qnblackcat/uYouPlus/releases).
@@ -80,21 +78,21 @@
 
   - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
 
-  - [Open in AltStore (v17.18.4-2.1)](https://tinyurl.com/bdzxtdrx) - It will take a while to install because AltStore needs to download the IPA.
+  - [Open in AltStore (v17.22.3-2.1)](https://tinyurl.com/4v5933pu) - It will take a while to install because AltStore needs to download the IPA.
 
-- Version info: _(last update: May 09)_
+- Version info: _(last update: June 06)_
 
 <details>
-  <summary> ▶︎ Expand</summary>
+  <summary>Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 17.18.4 | ✖︎  |
+| **YouTube** | 17.22.3 | ✖︎  |
 | [uYou](https://github.com/MiRO92/uYou-for-YouTube) | 2.1 | ✖︎ |
 | [Open in YouTube](https://github.com/CokePokes/YoutubeExtensions/) | 1.2 | ✖︎ |
-| **Return YouTube Dislike** | 1.6.4 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
+| **Return YouTube Dislike** | 1.6.5 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
 | **iSponsorBlock** | 1.0-14 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
-| **Alderis Color Picker** | 1.1.2| [✔︎](https://github.com/hbang/Alderis) |
+| **Alderis Color Picker** | 1.2| [✔︎](https://github.com/hbang/Alderis) |
 | **NoYTPremium** | 1.0.4 | [✔︎](https://github.com/PoomSmart/NoYTPremium/) |
 | **YouRememberCaption** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/youremembercaption.html) |
 | **YTClassicVideoQuality** | 1.0.1 | [✔︎](https://github.com/PoomSmart/YTClassicVideoQuality) |
@@ -102,12 +100,14 @@
 | **YTNoHoverCards** | 0.0.3 | [✔︎](https://github.com/level3tjg/YTNoHoverCards) |
 | **YTSystemAppearance** | 1.0.0 | [✔︎](https://poomsmart.github.io/repo/depictions/ytsystemappearance.html) |
 | **YTUHD** | 1.2.7 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | 1.7.0 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.7.1 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **IAmYouTube** | 1.2.0 | [✔︎](https://github.com/PoomSmart/IAmYouTube) |
 | **YTSpeed** | 1.0.1 | [✔︎](https://github.com/Lyvendia/YTSpeed) |
 | **YTAutoFullScreen** | 1.0.3 | [✔︎](https://github.com/PoomSmart/YTAutoFullScreen/) |
 | **YTReExplore** | 1.0.2 | [✔︎](https://github.com/PoomSmart/YTReExplore) |
 | **BigYTMiniPlayer** | 1.0-1 | [✔︎](https://github.com/Galactic-Dev/BigYTMiniPlayer) |
 | **YTCastConfirm** | 1.0.0 | [✔︎](https://github.com/JamieBerghmans/YTCastConfirm) |
+| **YTMiniplayerEnabler** | 0.0.2 | [✔︎](https://github.com/level3tjg/YTMiniplayerEnabler) |
 
 </details>
 

Settings.xm

@@ -18,6 +18,8 @@ extern BOOL bigYTMiniPlayer();
 extern BOOL hideCC();
 extern BOOL hideAutoplaySwitch();
 extern BOOL castConfirm();
+extern BOOL ytMiniPlayer();
+extern BOOL hidePreviousAndNextButton();
 
 // Settings
 %hook YTAppSettingsPresentationData
@@ -29,13 +31,30 @@ extern BOOL castConfirm();
         [mutableOrder insertObject:@(uYouPlusSection) atIndex:insertIndex + 1];
     return mutableOrder;
 }
-
 %end
 
 %hook YTSettingsSectionItemManager
 %new - (void)updateuYouPlusSectionWithEntry:(id)entry {
     YTSettingsViewController *delegate = [self valueForKey:@"_dataDelegate"];
 
+    YTSettingsSectionItem *hidePreviousAndNextButton = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Previous and Next button" titleDescription:@"Hide Previous and Next button in video controls overlay."];
+    hidePreviousAndNextButton.hasSwitch = YES;
+    hidePreviousAndNextButton.switchVisible = YES;
+    hidePreviousAndNextButton.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hidePreviousAndNextButton_enabled"];
+    hidePreviousAndNextButton.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hidePreviousAndNextButton_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *ytMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Enable the Miniplayer for all YouTube videos" titleDescription:@"Kid videos for example."];
+    ytMiniPlayer.hasSwitch = YES;
+    ytMiniPlayer.switchVisible = YES;
+    ytMiniPlayer.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"ytMiniPlayer_enabled"];
+    ytMiniPlayer.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"ytMiniPlayer_enabled"];
+        return YES;
+    };
+
     YTSettingsSectionItem *castConfirm = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Confirm alert before casting (YTCastConfirm)" titleDescription:@"Show a confirm alert before casting to prevent accidentally hijacking TV."];
     castConfirm.hasSwitch = YES;
     castConfirm.switchVisible = YES;
@@ -108,7 +127,7 @@ extern BOOL castConfirm();
         return YES;
     };
 
-    YTSettingsSectionItem *oledDarkMode = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Dark mode (Experimental)" titleDescription:@"WARNING: OLED Dark mode only works when YouTube is in Dark theme. App restart is required (In case OLED dark mode doesn't work: just switch between Light/Dark theme, then restart the app)."];
+    YTSettingsSectionItem *oledDarkMode = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Dark mode (Experimental)" titleDescription:@"App restart might be needed after switching between Light/Dark theme to fully apply changes. In case OLED Dark mode doesn't work: just switch between Light/Dark theme, then restart the app."];
     oledDarkMode.hasSwitch = YES;
     oledDarkMode.switchVisible = YES;
     oledDarkMode.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"oled_enabled"];
@@ -117,7 +136,7 @@ extern BOOL castConfirm();
         return YES;
     };
 
-    YTSettingsSectionItem *oledKeyBoard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Keyboard" titleDescription:@"Might not working properly in some cases . App restart is required."];
+    YTSettingsSectionItem *oledKeyBoard = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"OLED Keyboard (Experimental)" titleDescription:@"Might not working properly in some cases. App restart is required."];
     oledKeyBoard.hasSwitch = YES;
     oledKeyBoard.switchVisible = YES;
     oledKeyBoard.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"oledKeyBoard_enabled"];
@@ -126,7 +145,7 @@ extern BOOL castConfirm();
         return YES;
     };
 
-    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[autoFull, castConfirm, hideAutoplaySwitch, hideCC, hideHUD, hoverCardItem, bigYTMiniPlayer, oledKeyBoard, oledDarkMode,reExplore]];
+    NSMutableArray <YTSettingsSectionItem *> *sectionItems = [NSMutableArray arrayWithArray:@[autoFull, castConfirm, ytMiniPlayer, hideAutoplaySwitch, hideCC, hideHUD, hidePreviousAndNextButton, hoverCardItem, bigYTMiniPlayer, oledKeyBoard, oledDarkMode,reExplore]];
     [delegate setSectionItems:sectionItems forCategory:uYouPlusSection title:@"uYouPlus" titleDescription:nil headerHidden:NO];
 }
 

uYouPlus.xm

@@ -1,9 +1,9 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/runtime.h>
+#import <dlfcn.h>
 #import "Header.h"
 #import "Tweaks/YouTubeHeader/YTVideoQualitySwitchOriginalController.h"
-#import "Tweaks/YouTubeHeader/YTSettingsSectionItem.h"
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
 #import "Tweaks/YouTubeHeader/YTWatchController.h"
 #import "Tweaks/YouTubeHeader/YTIGuideResponse.h"
@@ -11,6 +11,10 @@
 #import "Tweaks/YouTubeHeader/YTIPivotBarSupportedRenderers.h"
 #import "Tweaks/YouTubeHeader/YTIPivotBarRenderer.h"
 #import "Tweaks/YouTubeHeader/YTIBrowseRequest.h"
+#import "Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+
+#define YT_BUNDLE_ID @"com.google.ios.youtube"
+#define YT_NAME @"YouTube"
 
 BOOL hideHUD() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
@@ -21,6 +25,9 @@ BOOL oled() {
 BOOL oledKB() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"oledKeyBoard_enabled"];
 }
+BOOL isDarkMode() {
+    return ([[NSUserDefaults standardUserDefaults] integerForKey:@"page_style"] == 1);
+}
 BOOL autoFullScreen() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"autofull_enabled"];
 }
@@ -39,20 +46,42 @@ BOOL hideCC() {
 BOOL hideAutoplaySwitch() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideAutoplaySwitch_enabled"];
 }
+BOOL hidePreviousAndNextButton() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hidePreviousAndNextButton_enabled"];
+}
 BOOL castConfirm() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"castConfirm_enabled"];
 }
+BOOL ytMiniPlayer() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"ytMiniPlayer_enabled"];
+}
 
-UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
+// Tweaks
+// YTMiniPlayerEnabler: https://github.com/level3tjg/YTMiniplayerEnabler/
+%hook YTWatchMiniBarViewController
+- (void)updateMiniBarPlayerStateFromRenderer {
+    if (ytMiniPlayer()) {}
+    else { return %orig; }
+}
+%end
 
 // Hide CC / Autoplay switch
 %hook YTMainAppControlsOverlayView
+- (void)setClosedCaptionsOrSubtitlesButtonAvailable:(BOOL)arg1 { // hide CC?!
+    if (hideCC()) { return %orig(NO); }   
+    else { return %orig; }
+}
+- (void)setAutoplaySwitchButtonRenderer:(id)arg1 {
+    if (hideAutoplaySwitch()) {}
+    else { return %orig; }
+}
 - (void)layoutSubviews {
-    %orig;
-    if (hideAutoplaySwitch())
-        MSHookIvar<UIView *>(self, "_autonavSwitch").hidden = YES;
-    if (hideCC())
-        MSHookIvar<UIView *>(self, "_closedCaptionsOrSubtitlesButton").hidden = YES;
+    if (hidePreviousAndNextButton()) {
+	    MSHookIvar<YTMainAppControlsOverlayView *>(self, "_nextButton").hidden = YES;
+    	MSHookIvar<YTMainAppControlsOverlayView *>(self, "_previousButton").hidden = YES;        
+        %orig;
+    }
+        return %orig;
 }
 %end
 
@@ -118,8 +147,8 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
             rootViewController = [rootViewController presentedViewController];
         }
         [rootViewController presentViewController:alertController animated:YES completion:nil];
-    }
-    return %orig;
+	} else { return %orig; }
+        
 }
 %end
 
@@ -176,333 +205,318 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 - (void)showSurveyWithRenderer:(id)arg1 surveyParentResponder:(id)arg2 {}
 %end
 
-// OLED 
-// Thanks u/DGh0st for his very well explained comment - https://www.reddit.com/r/jailbreakdevelopers/comments/9uape7/comment/e94sq80/
-// Thanks sinfool for his flex patch which brings OLED Dark mode for YouTube - "Color Customizer (YouTube) OLED"
+// Enable Shorts scroll bar - level3tjg - https://reddit.com/r/jailbreak/comments/v29yvk/_/iasl1l0/
+%hook YTReelPlayerViewControllerSub
+- (BOOL)shouldEnablePlayerBar { return YES; }
+%end
+
+// Hide the download playlist button of uYou cuz it's broken
+%hook YTPlaylistHeaderViewController
+- (void)viewDidLoad {
+    %orig;
+    self.downloadsButton.hidden = YES;
+}
+%end
+
+// IAmYouTube - https://github.com/PoomSmart/IAmYouTube/
+%hook YTVersionUtils
++ (NSString *)appName { return YT_NAME; }
++ (NSString *)appID { return YT_BUNDLE_ID; }
+%end
+
+%hook GCKBUtils
++ (NSString *)appIdentifier { return YT_BUNDLE_ID; }
+%end
+
+%hook GPCDeviceInfo
++ (NSString *)bundleId { return YT_BUNDLE_ID; }
+%end
+
+%hook OGLBundle
++ (NSString *)shortAppName { return YT_NAME; }
+%end
+
+%hook GVROverlayView
++ (NSString *)appName { return YT_NAME; }
+%end
+
+%hook OGLPhenotypeFlagServiceImpl
+- (NSString *)bundleId { return YT_BUNDLE_ID; }
+%end
+
+%hook SSOConfiguration
+- (id)initWithClientID:(id)clientID supportedAccountServices:(id)supportedAccountServices {
+    self = %orig;
+    [self setValue:YT_NAME forKey:@"_shortAppName"];
+    [self setValue:YT_BUNDLE_ID forKey:@"_applicationIdentifier"];
+    return self;
+}
+%end
+
+%hook NSBundle
+- (NSString *)bundleIdentifier {
+    NSArray *address = [NSThread callStackReturnAddresses];
+    Dl_info info = {0};
+    if (dladdr((void *)[address[2] longLongValue], &info) == 0)
+        return %orig;
+    NSString *path = [NSString stringWithUTF8String:info.dli_fname];
+    if ([path hasPrefix:NSBundle.mainBundle.bundlePath])
+        return YT_BUNDLE_ID;
+    return %orig;
+}
+- (id)objectForInfoDictionaryKey:(NSString *)key {
+    if ([key isEqualToString:@"CFBundleIdentifier"])
+        return YT_BUNDLE_ID;
+    if ([key isEqualToString:@"CFBundleDisplayName"] || [key isEqualToString:@"CFBundleName"])
+        return YT_NAME;
+    return %orig;
+}
+%end
+
+// Workaround for issue #54
+// %hook YTMainAppVideoPlayerOverlayViewController
+// - (void)updateRelatedVideos {
+//     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"relatedVideosAtTheEndOfYTVideos"] == NO) {}
+//     else { return %orig; }
+// }
+// %end
+
+// OLED dark mode by BandarHL
+UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
+
 %group gOLED
-%hook UIView
-- (void)setBackgroundColor:(id)arg1 {
-    if ([self.nextResponder isKindOfClass:%c(YTLinkCell)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTCommentsHeaderView)]) 
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTSearchView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTSearchBoxView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTEngagementPanelHeaderView)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTEngagementPanelView)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTPivotBarView)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTHUDMessageView)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTChipCloudCell)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YCHLiveChatTextCell)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YCHLiveChatView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YCHLiveChatViewerEngagementCell)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTSlideForActionsView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTPlaylistHeaderView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTAsyncCollectionView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTFeedHeaderView)])
-    arg1 = oledColor;
-    if ([self.nextResponder isKindOfClass:%c(YTMessageCell)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTPlaylistPanelProminentThumbnailVideoCell)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(ASWAppSwitcherCollectionViewCell)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTEditSheetControllerHeader)])
-    arg1 = oledColor;	
-    if ([self.nextResponder isKindOfClass:%c(YTDialogContainerScrollView)])
-    arg1 = oledColor;	
-    %orig;
-}
-%end
-
-%hook YTLightweightQTMButton
-- (void)setBackgroundColor:(id)arg1 {
-    if ([self.nextResponder isKindOfClass:%c(YTShareMainView)])
-    arg1 = oledColor;
-    %orig;
-}
-- (void)setCustomTitleColor:(id)arg1 { %orig([UIColor whiteColor]); }
-%end
-
-%hook NIAttributedLabel
-- (void)setBackgroundColor:(id)arg1 {
-    if ([self.nextResponder isKindOfClass:%c(UIScrollView)])
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook UIControl // this sucks I know :/
-- (void)setBackgroundColor:(id)arg1 {
-    if ([self.nextResponder isKindOfClass:%c(YTShareMainView)]) 
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook YTAsyncCollectionView
-- (void)setBackgroundColor:(id)arg1 {
-    if([self.nextResponder isKindOfClass:%c(YTRelatedVideosCollectionViewController)]) {
-        arg1 = [oledColor colorWithAlphaComponent:0.0];
-    } else if([self.nextResponder isKindOfClass:%c(YTFullscreenMetadataHighlightsCollectionViewController)]) {
-        arg1 = [oledColor colorWithAlphaComponent:0.0];
-    } else {
-        arg1 = oledColor;
+%hook YTCommonColorPalette
+- (UIColor *)brandBackgroundSolid {
+    if (self.pageStyle == 1) {
+        return oledColor;
     }
-    %orig;
+        return %orig;
+}
+- (UIColor *)brandBackgroundPrimary {
+    if (self.pageStyle == 1) {
+        return oledColor;
+    }
+        return %orig;
+}
+- (UIColor *)brandBackgroundSecondary {
+    if (self.pageStyle == 1) {
+        return oledColor;
+    }
+        return %orig;
+}
+- (UIColor *)staticBrandBlack {
+    if (self.pageStyle == 1) {
+        return oledColor;
+    }
+        return %orig;
+}
+- (UIColor *)generalBackgroundA {
+    if (self.pageStyle == 1) {
+        return oledColor;
+    }
+        return %orig;
 }
 %end
 
-%hook YTWatchMiniBarView 
-- (void)setBackgroundColor:(id)arg1 {
-    arg1 = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9];
-    %orig;
+// Account view controller
+%hook YTAccountPanelBodyViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
 }
 %end
 
-%hook YTPlaylistMiniBarView 
-- (void)setBackgroundColor:(id)arg1 {
-    arg1 = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9];
-    %orig;
+%hook YTInnerTubeCollectionViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
 }
 %end
 
-%hook _LNPopupBarContentView // uYou player
-- (void)setBackgroundColor:(id)arg1 {
-    arg1 = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9];
-    %orig;
-}
-%end
-
-%hook YTTopAlignedView 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-- (void)didMoveToWindow {  // Dune - https://github.com/Skittyblock/Dune/blob/9b1df9790230115b7553cc9dbadf36889018d7f9/Tweak.xm#L70
-    MSHookIvar<UIView *>(self, "_contentView").backgroundColor = oledColor;
-	%orig;
+// Explore
+%hook ASScrollView 
+- (void)didMoveToWindow {
+    if (isDarkMode()) {
+        self.backgroundColor = oledColor;
+        %orig;
+    }
 }
 %end
 
+// uYou's page
 %hook DownloadedVC
-- (id)ytBackgroundColor { return oledColor; }
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
 %end
 
 %hook DownloadsPagerVC
-- (id)ytBackgroundColor { return oledColor; }
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
 %end
 
 %hook DownloadingVC
-- (id)ytBackgroundColor { return oledColor; }
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
 %end
 
 %hook PlayerVC
-- (id)ytBackgroundColor { return oledColor; }
-%end
-
-%hook ASScrollView  // Explore
-- (void)didMoveToWindow { 
-    self.backgroundColor = oledColor;
-    %orig;
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
 }
 %end
 
-%hook ASCollectionView  // your videos
-- (void)didMoveToWindow {
-    self.backgroundColor = oledColor;
-    %orig;
+// SponsorBlock settings
+%hook SponsorBlockSettingsController
+- (void)viewDidLoad {
+    if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+        %orig;
+        self.tableView.backgroundColor = oledColor;
+    } else { return %orig; }
 }
 %end
 
-%hook YTDialogContainerScrollView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+// YT player
+%hook YTWatchMiniBarView 
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig([UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9]);
+    }
+        return %orig;
+}
 %end
 
-%hook MDXQueueView // Cast queue
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+// Search View
+%hook YTSearchBarView 
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
 %end
 
-%hook YTChannelProfileEditorView 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+%hook YTSearchBoxView 
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
 %end
 
-%hook YTChannelSubMenuView // 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTChannelListSubMenuView // sub - 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTCommentView 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTCreateCommentAccessoryView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+// Comment view
+%hook YTCreateCommentAccessoryView // community reply comment
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
 %end
 
 %hook YTCreateCommentTextView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-- (void)setTextColor:(id)arg1       { %orig([UIColor whiteColor]); }
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
+- (void)setTextColor:(UIColor *)color { // fix black text in #Shorts video's comment
+    if (isDarkMode()) { 
+        return %orig ([UIColor whiteColor]); 
+    }
+        return %orig;
+}
 %end
 
-%hook YCHLiveChatActionPanelView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+%hook _ASDisplayView // comment reply under videos
+- (void)didMoveToWindow {
+    if (isDarkMode() && [self.accessibilityIdentifier isEqualToString:@"id.elements.components.comment_composer"]) {
+        %orig;
+        self.backgroundColor = oledColor;
+    }
+}
 %end
 
-%hook YTEmojiTextView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+%hook YTFormattedStringLabel  // YT is werid...
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig ([UIColor clearColor]);
+    }
+        return %orig;
+}
 %end
 
-%hook YTShareTitleView // Share sheet
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+%hook YCHLiveChatActionPanelView  // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
 %end
 
-%hook YTNavigationBar
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-- (void)setBarTintColor:(id)arg1    { %orig(oledColor); }
+%hook YTEmojiTextView // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
 %end
 
-%hook YTPrivacyTosFooterView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTEngagementPanelHeaderView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTChannelMobileHeaderView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTInlineSignInView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTHeaderView //Stt bar
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTTabTitlesView // Tab bar - mychannel
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTSettingsCell // Settings 
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTHorizontalCardListView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTShortsGalleryHeaderView  // upload videos heaer (gallery)
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook GOODialogView // 3 dots menu
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTCollectionView //sharesheet
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+// Separation lines
+%hook YTCollectionSeparatorView
+- (void)didMoveToWindow {
+    if (isDarkMode()) {}
+    else { return %orig; }
+}
 %end
 
+// Open link with...
 %hook ASWAppSwitchingSheetHeaderView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+}
 %end
 
 %hook ASWAppSwitchingSheetFooterView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTCollectionSeparatorView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-- (void)didMoveToWindow {}
-%end
-
-%hook YTShareBusyView // sharesheet load
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTPageView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTWatchView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTSearchBarView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTSearchBoxView
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTSearchSuggestionCollectionViewCell
-- (void)updateColors {}
-%end
-
-%hook UISearchBarBackground
-- (void)setBarTintColor:(id)arg1    { %orig(oledColor); }
-%end
-
-%hook YTMealBarPromoView // Offline
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-////
-/*
-%hook UICollectionView
-- (void)setBackgroundColor:(id)arg1 {
-    if ([self.nextResponder isKindOfClass:%c(UICollectionViewControllerWrapperView)])
-    arg1 = oledColor;
-    %orig;
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
 }
 %end
 
-%hook _ASDisplayView // edit your videos
-- (void)layoutSubviews {
-    if ([self.nextResponder isKindOfClass:%c(ELMView)])
-    self.backgroundColor = oledColor;
+%hook ASWAppSwitcherCollectionViewCell
+- (void)didMoveToWindow {
+    if (isDarkMode()) { 
+        self.subviews[1].backgroundColor = oledColor;
+        %orig;        
+    }
 }
 %end
-
-%hook YTChannelProfileDescriptionEditorView // edit profile Description
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-%hook YTChannelProfileNameEditorView  // edit profile Name
-- (void)setBackgroundColor:(id)arg1 { %orig(oledColor); }
-%end
-
-hook GOOTextField 
-- (void)setBackgroundColor:(id)arg1 {  // edit profile Description
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook GOOMultilineTextField// 
-- (void)setBackgroundColor:(id)arg1 { // edit profile Name
-    arg1 = oledColor;
-    %orig;
-}
-%end
-*/
 %end
 
 %group gOLEDKB // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
@@ -600,7 +614,7 @@ static void replaceTab(YTIGuideResponse *response) {
 
 %ctor {
     %init;
-    if (oled() && ([[NSUserDefaults standardUserDefaults] integerForKey:@"page_style"] == 1)) {
+    if (oled()) {
        %init(gOLED);
     }
     if (oledKB()) {