v17.21.3-2.1

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

.gitignore

@@ -2,5 +2,6 @@
 .DS_Store
 packages
 obj
+tmp
 Tweaks/uYou/*
 !Tweaks/uYou/.gitkeep

.gitmodules

@@ -30,3 +30,7 @@
 	path = Tweaks/YTSpeed
 	url = https://github.com/qnblackcat/YTSpeed.git
 	branch = main
+[submodule "Extensions"]
+	path = Extensions
+	url = https://github.com/CokePokes/YoutubeExtensions.git
+	branch = main

Header.h

@@ -1,27 +1,43 @@
 #import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
 
+@interface SSOConfiguration : NSObject
+@end
+
+@interface YTMainAppControlsOverlayView: UIView
+@end
+
+@interface YTPlaylistHeaderViewController : UIViewController
+@property (nonatomic, strong, readwrite) UIView *downloadsButton;
+@end
+
+@interface ASWAppSwitcherCollectionViewCell: UIView
+@end
+
 @interface YTMainAppVideoPlayerOverlayView : UIView
--(UIViewController *)_viewControllerForAncestor;
+- (UIViewController *)_viewControllerForAncestor;
 @end
 
 @interface YTWatchMiniBarView : UIView
 @end
 
-@interface YTAsyncCollectionView : UIView
-@end
-
 @interface YTPlayerViewController (YTAFS)
 - (void)autoFullscreen;
 @end
 
-//@interface ASCollectionView : UIView
-//@end
-
-@interface YTLightweightQTMButton : UIView
+@interface ASScrollView : UIView
 @end
 
-@interface YTELMView : UIView
+@interface UIKeyboardLayoutStar : UIView
 @end
 
-@interface NIAttributedLabel : UIView
+@interface UIKeyboardDockView : UIView
 @end
+
+@interface UICandidateViewController : UIViewController
+@end
+
+@interface UIPredictionViewController : UIViewController
+@end
+
+@interface SponsorBlockSettingsController : UITableViewController 
+@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
@@ -11,8 +13,7 @@ DISPLAY_NAME = YouTube
 BUNDLE_ID = com.google.ios.youtube
  
 uYouPlus_FILES = uYouPlus.xm Settings.xm
-uYouPlus_IPA = /path/to/your/decrypted/YouTube/IPA
-### Important: edit the path to your decrypted YouTube IPA!!! 
+uYouPlus_IPA = ./tmp/Payload/YouTube.app
 
 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,17 +19,18 @@
 
 - [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: [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/)
 
+- [YouTube Extensions](https://github.com/CokePokes/YoutubeExtensions) by [CokePokes](https://github.com/CokePokes/).
+
 - [Al4ise](https://github.com/Al4ise) for [Azule](https://github.com/Al4ise/Azule), a tool used to inject jailbreak tweaks into jailed iOS apps.
 
 - [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!
@@ -57,7 +56,11 @@
 
 10. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
 
-11. **YTSpeed**: add 2.25, 2.5, 2.75, and 3x playback speed
+11. **NoYTPremium**: remove YouTube Premium upshells.
+
+12. **YTSpeed**: add 2.25, 2.5, 2.75, and 3x playback speed
+
+13. **YTMiniplayerEnabler**: enable Miniplayer for all YouTube videos.
 
 </details>
 
@@ -67,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).
@@ -76,32 +78,36 @@
 
   - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
 
-  - [Open in AltStore (v17.16.4-2.1)](https://tinyurl.com/2p8t49r2) - It will take a while to install because AltStore needs to download the IPA.
+  - [Open in AltStore (v17.21.3-2.1)](https://tinyurl.com/52j8xeee) - It will take a while to install because AltStore needs to download the IPA.
 
-- Version info: _(last update: Apr 25)_
+- Version info: _(last update: June 01)_
 
 <details>
-  <summary>  Expand</summary>
+  <summary> ▶︎ Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 17.16.4 | ✖︎  |
-| **uYou** | 2.1 | ✖︎ |
+| **YouTube** | 17.21.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) |
 | **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) |
 | **YTNoCheckLocalNetwork** | 1.0.2 | [✔︎](https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html) |
 | **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.6.11 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YouPiP** | 1.7.0 | [✔︎](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>
 
@@ -111,7 +117,7 @@ See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installati
 # Support the developers
 
 <details>
-  <summary>MiRO92</summary>
+  <summary>▶︎ MiRO92</summary>
   
 - CashApp: https://cash.app/$MiRO92M
  
@@ -119,14 +125,14 @@ See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installati
 </details>
 
 <details>
-  <summary>Poomsmart</summary>
+  <summary>▶︎ Poomsmart</summary>
 
 - Paypal: https://poomsmart.github.io/
 
 </details>
 
 <details>
-  <summary>Galactic-dev</summary>
+  <summary>▶︎ Galactic-dev</summary>
   
 - Paypal: https://www.paypal.com/paypalme/DBrett684 
 

Settings.xm

@@ -1,7 +1,16 @@
+#import "Tweaks/YouTubeHeader/YTSettingsViewController.h"
 #import "Tweaks/YouTubeHeader/YTSettingsSectionItem.h"
+#import "Tweaks/YouTubeHeader/YTSettingsSectionItemManager.h"
+
+@interface YTSettingsSectionItemManager (YouPiP)
+- (void)updateuYouPlusSectionWithEntry:(id)entry;
+@end
+
+static const NSInteger uYouPlusSection = 500;
 
 extern BOOL hideHUD();
 extern BOOL oled();
+extern BOOL oledKB();
 extern BOOL autoFullScreen();
 extern BOOL noHoverCard();
 extern BOOL ReExplore();
@@ -9,107 +18,142 @@ extern BOOL bigYTMiniPlayer();
 extern BOOL hideCC();
 extern BOOL hideAutoplaySwitch();
 extern BOOL castConfirm();
+extern BOOL ytMiniPlayer();
+extern BOOL hidePreviousAndNextButton();
 
 // Settings
-%hook YTSettingsViewController
-- (void)setSectionItems:(NSMutableArray <YTSettingsSectionItem *>*)sectionItems forCategory:(NSInteger)category title:(NSString *)title titleDescription:(NSString *)titleDescription headerHidden:(BOOL)headerHidden {
-	if (category == 1) {
-		    NSUInteger statsForNerdsIndex = [sectionItems indexOfObjectPassingTest:^BOOL (YTSettingsSectionItem *item, NSUInteger idx, BOOL *stop) { 
-            return item.settingItemId == 265;
-		}];
-		if (statsForNerdsIndex != NSNotFound) {
-	                //
-			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;
-			castConfirm.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"castConfirm_enabled"];
-			castConfirm.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"castConfirm_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:castConfirm atIndex:statsForNerdsIndex + 1];
-			// 
-			YTSettingsSectionItem *hoverCardItem = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Show End screens hover cards (YTNoHoverCards)" titleDescription:@"Allows creator End screens (thumbnails) to appear at the end of videos."];
-			hoverCardItem.hasSwitch = YES;
-			hoverCardItem.switchVisible = YES;
-			hoverCardItem.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"];
-			hoverCardItem.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hover_cards_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:hoverCardItem atIndex:statsForNerdsIndex + 1];
-			//
-			YTSettingsSectionItem *bigYTMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"New miniplayer bar style (BigYTMiniPlayer)" titleDescription:@"App restart is required."];
-			bigYTMiniPlayer.hasSwitch = YES;
-			bigYTMiniPlayer.switchVisible = YES;
-			bigYTMiniPlayer.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"bigYTMiniPlayer_enabled"];
-			bigYTMiniPlayer.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"bigYTMiniPlayer_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:bigYTMiniPlayer atIndex:statsForNerdsIndex + 2];
-			//
-			YTSettingsSectionItem *reExplore = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Replace Shorts tab with Explore tab (YTReExplore)" titleDescription:@"App restart is required."];
-			reExplore.hasSwitch = YES;
-			reExplore.switchVisible = YES;
-			reExplore.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"reExplore_enabled"];
-			reExplore.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"reExplore_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:reExplore atIndex:statsForNerdsIndex + 2];
-			//
-			YTSettingsSectionItem *hideCC = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Subtitles button" titleDescription:@"Hide the Subtitles button in video controls overlay. "];
-			hideCC.hasSwitch = YES;
-			hideCC.switchVisible = YES;
-			hideCC.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideCC_enabled"];
-			hideCC.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideCC_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:hideCC atIndex:statsForNerdsIndex + 1];	
-			//
-			YTSettingsSectionItem *hideAutoplaySwitch = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Autoplay switch" titleDescription:@"Hide the Autoplay switch button in video controls overlay."];
-			hideAutoplaySwitch.hasSwitch = YES;
-			hideAutoplaySwitch.switchVisible = YES;
-			hideAutoplaySwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideAutoplaySwitch_enabled"];
-			hideAutoplaySwitch.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideAutoplaySwitch_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:hideAutoplaySwitch atIndex:statsForNerdsIndex + 1];
-			//
-			YTSettingsSectionItem *autoFUll = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Auto Full Screen (YTAutoFullScreen)" titleDescription:@"Autoplay videos at full screen."];
-			autoFUll.hasSwitch = YES;
-			autoFUll.switchVisible = YES;
-			autoFUll.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"autofull_enabled"];
-			autoFUll.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"autofull_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:autoFUll atIndex:statsForNerdsIndex + 3];
-			//
-			YTSettingsSectionItem *hideHUD = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide HUD Messages" titleDescription:@"Example: CC is turned on/off, Video loop is on,..."];
-			hideHUD.hasSwitch = YES;
-			hideHUD.switchVisible = YES;
-			hideHUD.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
-			hideHUD.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideHUD_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:hideHUD atIndex:statsForNerdsIndex + 1];
-	               	//	
-			YTSettingsSectionItem *Oleditem = [[%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."];
-			Oleditem.hasSwitch = YES;
-			Oleditem.switchVisible = YES;
-			Oleditem.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"oled_enabled"];
-			Oleditem.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
-				[[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"oled_enabled"];
-				return YES;
-			};
-			[sectionItems insertObject:Oleditem atIndex:statsForNerdsIndex + 1];
-		}
-	}	
-	%orig;
-  }
+%hook YTAppSettingsPresentationData
++ (NSArray *)settingsCategoryOrder {
+    NSArray *order = %orig;
+    NSMutableArray *mutableOrder = [order mutableCopy];
+    NSUInteger insertIndex = [order indexOfObject:@(1)];
+    if (insertIndex != NSNotFound)
+        [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;
+    castConfirm.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"castConfirm_enabled"];
+    castConfirm.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"castConfirm_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *hoverCardItem = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide End screens hover cards (YTNoHoverCards)" titleDescription:@"Hide creator End screens (thumbnails) at the end of videos."];
+    hoverCardItem.hasSwitch = YES;
+    hoverCardItem.switchVisible = YES;
+    hoverCardItem.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"];
+    hoverCardItem.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hover_cards_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *bigYTMiniPlayer = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"New miniplayer bar style (BigYTMiniPlayer)" titleDescription:@"App restart is required."];
+    bigYTMiniPlayer.hasSwitch = YES;
+    bigYTMiniPlayer.switchVisible = YES;
+    bigYTMiniPlayer.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"bigYTMiniPlayer_enabled"];
+    bigYTMiniPlayer.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"bigYTMiniPlayer_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *reExplore = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Replace Shorts tab with Explore tab (YTReExplore)" titleDescription:@"App restart is required."];
+    reExplore.hasSwitch = YES;
+    reExplore.switchVisible = YES;
+    reExplore.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"reExplore_enabled"];
+    reExplore.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"reExplore_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *hideCC = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Subtitles button" titleDescription:@"Hide the Subtitles button in video controls overlay. "];
+    hideCC.hasSwitch = YES;
+    hideCC.switchVisible = YES;
+    hideCC.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideCC_enabled"];
+    hideCC.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideCC_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *hideAutoplaySwitch = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide Autoplay switch" titleDescription:@"Hide the Autoplay switch button in video controls overlay."];
+    hideAutoplaySwitch.hasSwitch = YES;
+    hideAutoplaySwitch.switchVisible = YES;
+    hideAutoplaySwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideAutoplaySwitch_enabled"];
+    hideAutoplaySwitch.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideAutoplaySwitch_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *autoFull = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Auto Full Screen (YTAutoFullScreen)" titleDescription:@"Autoplay videos at full screen."];
+    autoFull.hasSwitch = YES;
+    autoFull.switchVisible = YES;
+    autoFull.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"autofull_enabled"];
+    autoFull.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"autofull_enabled"];
+        return YES;
+    };
+
+    YTSettingsSectionItem *hideHUD = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Hide HUD Messages" titleDescription:@"Example: CC is turned on/off, Video loop is on,..."];
+    hideHUD.hasSwitch = YES;
+    hideHUD.switchVisible = YES;
+    hideHUD.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
+    hideHUD.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"hideHUD_enabled"];
+        return YES;
+    };
+
+    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"];
+    oledDarkMode.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"oled_enabled"];
+        return YES;
+    };
+
+    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"];
+    oledKeyBoard.switchBlock = ^BOOL (YTSettingsCell *cell, BOOL enabled) {
+        [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"oledKeyBoard_enabled"];
+        return YES;
+    };
+
+    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];
+}
+
+- (void)updateSectionForCategory:(NSUInteger)category withEntry:(id)entry {
+    if (category == uYouPlusSection) {
+        [self updateuYouPlusSectionWithEntry:entry];
+        return;
+    }
+    %orig;
+}
 %end

buildapp.sh

@@ -4,34 +4,49 @@
 cd "$(dirname "$0")"	
 	
 # Check uYou
-	if [[ ! -f Tweaks/uYou/com.miro.uyou_2.1_iphoneos-arm.deb ]]
+if 	[ ! -f Tweaks/uYou/com.miro.uyou_2.1_iphoneos-arm.deb ]
 then
-    	echo -e "==> \033[1muYou v2.1 is not found. Downloading uYou (v2.1)...\033[0m"
+	echo -e "==> \033[1muYou v2.1 is not found. Downloading uYou (v2.1)...\033[0m"
 	(set -x ; curl https://miro92.com/repo/debs/com.miro.uyou_2.1_iphoneos-arm.deb --output Tweaks/uYou/com.miro.uyou_2.1_iphoneos-arm.deb)
 else
-    	echo -e "==> \033[1mFounded uYou (v2.1)!\033[0m"
-	fi
+	echo -e "==> \033[1mFounded uYou (v2.1)!\033[0m"
+fi
 
 # Extract uYou
 	echo -e "==> \033[1mExtracting uYou...\033[0m"
-	if (cd Tweaks/uYou && tar -xf com.miro.uyou_2.1_iphoneos-arm.deb && tar -xf data.tar.*)
+if 	(cd Tweaks/uYou && tar -xf com.miro.uyou_2.1_iphoneos-arm.deb && tar -xf data.tar.*)
 then
 	echo -e "\033[1m> Extracted uYou!\033[0m"
 else
 	echo "> \033[1mCouldn't extract uYou\033[0m"
-	fi
+fi
 
 # Makefile
-	read -e -p "==> Path to the decrypted YouTube iPA: " PATHTOIPA
-	if [[ $PATHTOIPA == *.ipa ]]
+if 	[ -d ./tmp ]
+then
+	rm -rf ./tmp
+fi
+	read -e -p "==> Path to the decrypted YouTube.ipa or YouTube.app: " PATHTOYT
+if 	[[ $PATHTOYT == *.ipa ]]
 then 
-	sed -i '' "14s#.*#uYouPlus_IPA = $PATHTOIPA#g" ./Makefile
+	unzip -q "$PATHTOYT" -d ./tmp
+	rm -rf ./tmp/Payload/YouTube.app/PlugIns/*.appex
+	cp -R Extensions/*.appex tmp/Payload/YouTube.app/PlugIns 
+	make package
+	open ./packages
+
+elif 	[[ $PATHTOYT == *.app ]]
+then
+	mkdir -p ./tmp/Payload/
+	cp -R "$PATHTOYT" ./tmp/Payload 2>/dev/null
+	rm -rf ./tmp/Payload/YouTube.app/PlugIns/*.appex
+	cp -R Extensions/*.appex tmp/Payload/YouTube.app/PlugIns 
 	make package
 	open ./packages
 else
-	echo "This is not an iPA"
-	fi
+	echo "This is not an ipa/app!"
+fi
 # Clean up	
 	tput setaf 1 && echo -e "==> \033[1mCleaning up...\033[0m"
 	find Tweaks/uYou -mindepth 1 ! -name "com.miro.uyou_2.1_iphoneos-arm.deb" ! -name ".gitkeep" -exec rm -rf {} \; 2>/dev/null
-	rm -rf Resources .theos/_/Payload
+	rm -rf tmp/ Resources .theos/_/Payload

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,7 +11,10 @@
 #import "Tweaks/YouTubeHeader/YTIPivotBarSupportedRenderers.h"
 #import "Tweaks/YouTubeHeader/YTIPivotBarRenderer.h"
 #import "Tweaks/YouTubeHeader/YTIBrowseRequest.h"
-#include <RemoteLog.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"];
@@ -19,6 +22,12 @@ BOOL hideHUD() {
 BOOL oled() {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"oled_enabled"];
 }
+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"];
 }
@@ -37,41 +46,58 @@ 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
 
 // Hide HUD Messages
 %hook YTHUDMessageView
 - (id)initWithMessage:(id)arg1 dismissHandler:(id)arg2 {
-    if (hideHUD()) {
-    return NULL;
-    } else { return %orig; }
+    return hideHUD() ? nil : %orig;
 }
 %end
 
 // YTAutoFullScreen: https://github.com/PoomSmart/YTAutoFullScreen/
 %hook YTPlayerViewController
 - (void)loadWithPlayerTransition:(id)arg1 playbackConfig:(id)arg2 {
-	if (autoFullScreen()) {
     %orig;
-    [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(autoFullscreen) userInfo:nil repeats:NO];
-   } else { return %orig; }
+    if (autoFullScreen())
+        [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(autoFullscreen) userInfo:nil repeats:NO];
 }
 %new
 - (void)autoFullscreen {
@@ -83,45 +109,46 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 // YTNoHoverCards: https://github.com/level3tjg/YTNoHoverCards
 %hook YTCreatorEndscreenView
 - (void)setHidden:(BOOL)hidden {
-	if (!noHoverCard())
-		hidden = YES;
-	%orig;
+    if (noHoverCard())
+        hidden = YES;
+    %orig;
 }
 %end
  
 //YTCastConfirm: https://github.com/JamieBerghmans/YTCastConfirm
 %hook MDXPlaybackRouteButtonController
--(void)didPressButton:(id)arg1 {
-	if (castConfirm()) {
-    UIAlertController* alertController = [%c(UIAlertController) alertControllerWithTitle:@"Casting"
-                               message:@"Are you sure you want to start casting?"
-                               preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction* defaultAction = [%c(UIAlertAction) actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
-        %orig;
-    }];
+- (void)didPressButton:(id)arg1 {
+    if (castConfirm()) {
+        UIAlertController* alertController = [%c(UIAlertController) alertControllerWithTitle:@"Casting"
+                                message:@"Are you sure you want to start casting?"
+                                preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertAction* defaultAction = [%c(UIAlertAction) actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+            %orig;
+        }];
 
-    UIAlertAction* noButton = [%c(UIAlertAction)
-                               actionWithTitle:@"Cancel"
-                               style:UIAlertActionStyleDefault
-                               handler: ^(UIAlertAction * action) {
-        return;
-    }];
+        UIAlertAction* noButton = [%c(UIAlertAction)
+                                actionWithTitle:@"Cancel"
+                                style:UIAlertActionStyleDefault
+                                handler: ^(UIAlertAction * action) {
+            return;
+        }];
 
-    [alertController addAction:defaultAction];
-    [alertController addAction:noButton];
-    
-    id rootViewController = [%c(UIApplication) sharedApplication].delegate.window.rootViewController;
-    if([rootViewController isKindOfClass:[%c(UINavigationController) class]]) {
-        rootViewController = ((UINavigationController *)rootViewController).viewControllers.firstObject;
-    }
-    if([rootViewController isKindOfClass:[%c(UITabBarController) class]]) {
-        rootViewController = ((UITabBarController *)rootViewController).selectedViewController;
-    }
-    if ([rootViewController presentedViewController] != nil) {
-        rootViewController = [rootViewController presentedViewController];
-    }
-    [rootViewController presentViewController:alertController animated:YES completion:nil];
+        [alertController addAction:defaultAction];
+        [alertController addAction:noButton];
+        
+        id rootViewController = [%c(UIApplication) sharedApplication].delegate.window.rootViewController;
+        if ([rootViewController isKindOfClass:[%c(UINavigationController) class]]) {
+            rootViewController = ((UINavigationController *)rootViewController).viewControllers.firstObject;
+        }
+        if ([rootViewController isKindOfClass:[%c(UITabBarController) class]]) {
+            rootViewController = ((UITabBarController *)rootViewController).selectedViewController;
+        }
+        if ([rootViewController presentedViewController] != nil) {
+            rootViewController = [rootViewController presentedViewController];
+        }
+        [rootViewController presentViewController:alertController animated:YES completion:nil];
 	} else { return %orig; }
+        
 }
 %end
 
@@ -148,380 +175,368 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 %hook YTColdConfig
 - (BOOL)shouldUseAppThemeSetting { return YES; }
 - (BOOL)respectDeviceCaptionSetting { return NO; }
+- (BOOL)isEnhancedSearchBarEnabled { return YES; }
 %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"
+// NOYTPremium - https://github.com/PoomSmart/NoYTPremium/
+%hook YTCommerceEventGroupHandler
+- (void)addEventHandlers {}
+%end
+
+%hook YTInterstitialPromoEventGroupHandler
+- (void)addEventHandlers {}
+%end
+
+%hook YTPromosheetEventGroupHandler
+- (void)addEventHandlers {}
+%end
+
+%hook YTPromoThrottleController
+- (BOOL)canShowThrottledPromo { return NO; }
+- (BOOL)canShowThrottledPromoWithFrequencyCap:(id)arg1 { return NO; }
+- (BOOL)canShowThrottledPromoWithFrequencyCaps:(id)arg1 { return NO; }
+%end
+
+%hook YTIShowFullscreenInterstitialCommand
+- (BOOL)shouldThrottleInterstitial { return YES; }
+%end
+
+%hook YTSurveyController
+- (void)showSurveyWithRenderer:(id)arg1 surveyParentResponder:(id)arg2 {}
+%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(DownloadedVC)])  //uYou
-	arg1 = oledColor;
-	if ([self.nextResponder isKindOfClass:%c(DownloadsPagerVC)]) //uYou
-	arg1 = oledColor;
-	if ([self.nextResponder isKindOfClass:%c(DownloadingVC)]) //uYou
-	arg1 = oledColor;
-	if ([self.nextResponder isKindOfClass:%c(PlayerVC)]) //uYou
-	arg1 = oledColor;
-	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(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;
-	%orig;
-}
-//- (void)layoutSubviews {
-//	%orig;	
-//  if ([self.nextResponder isKindOfClass:%c(YTALDialog)])
-//	self.backgroundColor = oledColor;
-//}
-%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 YTTopAlignedView // Example from Dune - https://github.com/Skittyblock/Dune/blob/9b1df9790230115b7553cc9dbadf36889018d7f9/Tweak.xm#L700
--(void)layoutSubviews {
-	%orig;
-	MSHookIvar<UIView *>(self, "_contentView").backgroundColor = oledColor;
+// Account view controller
+%hook YTAccountPanelBodyViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
 }
 %end
 
-%hook MDXQueueView // Cast queue
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+%hook YTInnerTubeCollectionViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
 }
 %end
 
-%hook YTChannelProfileEditorView 
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+// Explore
+%hook ASScrollView 
+- (void)didMoveToWindow {
+    if (isDarkMode()) {
+        self.backgroundColor = oledColor;
+        %orig;
+    }
 }
 %end
 
-%hook YTChannelSubMenuView // 
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+// uYou's page
+%hook DownloadedVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
 }
 %end
 
-%hook YTChannelListSubMenuView // sub - 
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+%hook DownloadsPagerVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
 }
 %end
 
-%hook YTCommentView 
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+%hook DownloadingVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
 }
 %end
 
-%hook YTCreateCommentAccessoryView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+%hook PlayerVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
+%end
+
+// SponsorBlock settings
+%hook SponsorBlockSettingsController
+- (void)viewDidLoad {
+    if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+        %orig;
+        self.tableView.backgroundColor = oledColor;
+    } else { return %orig; }
+}
+%end
+
+// 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
+
+// Search View
+%hook YTSearchBarView 
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
+%end
+
+%hook YTSearchBoxView 
+- (void)setBackgroundColor:(UIColor *)color { 
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
+%end
+
+// 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 {
-	arg1 = oledColor;
-	%orig;
+- (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 {
-	arg1 = oledColor;
-	%orig;
+%hook YTFormattedStringLabel  // YT is werid...
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig ([UIColor clearColor]);
+    }
+        return %orig;
 }
 %end
 
-%hook YTEmojiTextView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+%hook YCHLiveChatActionPanelView  // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
 }
 %end
 
-%hook YTShareTitleView // Share sheet
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+%hook YTEmojiTextView // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
 }
 %end
 
-%hook YTNavigationBar
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
--(void)setBarTintColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTPrivacyTosFooterView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTWatchMiniBarView 
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9];
-	%orig;
-}
-%end
-
-%hook YTPlaylistMiniBarView 
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.9];
-	%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 YTEngagementPanelHeaderView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTChannelMobileHeaderView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTInlineSignInView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTHeaderView //Stt bar
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook YTTabTitlesView // Tab bar - mychannel
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook YTSettingsCell // Settings 
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook GOODialogView // 3 dots menu
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTCollectionView //sharesheet
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+// Separation lines
+%hook YTCollectionSeparatorView
+- (void)didMoveToWindow {
+    if (isDarkMode()) {}
+    else { return %orig; }
 }
 %end
 
+// Open link with...
 %hook ASWAppSwitchingSheetHeaderView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
 }
 %end
 
 %hook ASWAppSwitchingSheetFooterView
--(void)setBackgroundColor:(id)arg1 {
-	arg1 = oledColor;
-	%orig;
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
 }
 %end
 
-%hook YTCollectionSeparatorView
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
+%hook ASWAppSwitcherCollectionViewCell
+- (void)didMoveToWindow {
+    if (isDarkMode()) { 
+        self.subviews[1].backgroundColor = oledColor;
+        %orig;        
+    }
 }
-- (void)layoutSubviews {}
+%end
 %end
 
-%hook YTLightweightQTMButton
--(void)setBackgroundColor:(id)arg1 {
-    if([self.nextResponder isKindOfClass:%c(YTShareMainView)]) {
-    arg1 = oledColor;
+%group gOLEDKB // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
+%hook UIPredictionViewController
+- (void)loadView {
     %orig;
-	}
+    [self.view setBackgroundColor:oledColor];
 }
--(void)setCustomTitleColor:(id)arg1 {
-    arg1 = [UIColor whiteColor];
+%end
+
+%hook UICandidateViewController
+- (void)loadView {
+    %orig;
+    [self.view setBackgroundColor:oledColor];
+}
+%end
+
+%hook UIKeyboardDockView
+- (void)didMoveToWindow {
+    self.backgroundColor = oledColor;
     %orig;
 }
 %end
 
-%hook YTShareBusyView // sharesheet load
--(void)setBackgroundColor:(id)arg1 { 
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook YTSearchSuggestionCollectionViewCell
--(void)updateColors {}
-%end
-
-%hook UISearchBarBackground
--(void)setBarTintColor:(id)arg1 {
-    arg1 = oledColor;
+%hook UIKeyboardLayoutStar 
+- (void)didMoveToWindow {
+    self.backgroundColor = oledColor;
     %orig;
 }
 %end
 
-%hook YTELMView // upload videos
--(void)layoutSubviews {
-	%orig;
-	self.backgroundColor = oledColor;
-}
+%hook UIKBRenderConfig // Prediction text color
+- (void)setLightKeyboard:(BOOL)arg1 { %orig(NO); }
 %end
-
-%hook YTMealBarPromoView
--(void)setBackgroundColor:(id)arg1 { // Offline
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-%hook NIAttributedLabel
--(void)setBackgroundColor:(id)arg1 {
-	if ([self.nextResponder isKindOfClass:%c(UIScrollView)])
-	arg1 = oledColor;
-	%orig;
-}
-%end
-
-////
-/*
-%hook YTShortsGalleryHeaderView  // upload videos heaer (gallery)
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook _ASDisplayView // edit your videos
--(void)layoutSubviews {
-	if ([self.nextResponder isKindOfClass:%c(ELMView)])  //uYou
-	self.backgroundColor = oledColor;
-}
-%end
-
-%hook ASCollectionView
--(void)layoutSubviews {
-	self.backgroundColor = oledColor;
-	%orig;
-}
-%end
-
-%hook YTChannelProfileDescriptionEditorView // edit profile Description
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
-}
-%end
-
-%hook YTChannelProfileNameEditorView  // edit profile Name
--(void)setBackgroundColor:(id)arg1 {
-    arg1 = oledColor;
-    %orig;
-}
-%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
 
 // YTReExplore: https://github.com/PoomSmart/YTReExplore/
@@ -561,20 +576,20 @@ static void replaceTab(YTIGuideResponse *response) {
 // BigYTMiniPlayer: https://github.com/Galactic-Dev/BigYTMiniPlayer
 %group Main
 %hook YTWatchMiniBarView
--(void)setWatchMiniPlayerLayout:(int)arg1 {
-	%orig(1);
+- (void)setWatchMiniPlayerLayout:(int)arg1 {
+    %orig(1);
 }
--(int)watchMiniPlayerLayout {
-	return 1;
+- (int)watchMiniPlayerLayout {
+    return 1;
 }
--(void)layoutSubviews {
+- (void)layoutSubviews {
     %orig;
     self.frame = CGRectMake(([UIScreen mainScreen].bounds.size.width - self.frame.size.width), self.frame.origin.y, self.frame.size.width, self.frame.size.height);
 }
 %end
 
 %hook YTMainAppVideoPlayerOverlayView
--(BOOL)isUserInteractionEnabled {
+- (BOOL)isUserInteractionEnabled {
     if([[self _viewControllerForAncestor].parentViewController.parentViewController isKindOfClass:%c(YTWatchMiniBarViewController)]) {
         return NO;
     }
@@ -585,13 +600,16 @@ static void replaceTab(YTIGuideResponse *response) {
 
 %ctor {
     %init;
-    if (oled() && ([[NSUserDefaults standardUserDefaults] integerForKey:@"page_style"] == 1)) {
+    if (oled()) {
        %init(gOLED);
     }
+    if (oledKB()) {
+       %init(gOLEDKB);
+    }
     if (ReExplore()) {
-       %init(gReExplore)
+       %init(gReExplore);
     }
     if (bigYTMiniPlayer() && (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPad)) {
-       %init(Main)
+       %init(Main);
     }
 }