temporary fix for issue #54

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

.github/ISSUE_TEMPLATE/bug.md

@@ -7,22 +7,23 @@ assignees: ''
 
 ---
 
-**Device info:**
+## ⚠️ Have you read the [FAQ](https://github.com/qnblackcat/uYouPlus/wiki/FAQ)? Make sure you visit the FAQ page first!!! ⚠️
+
+### Device info
 - iOS/iPadOS version: 
 - Device model:
 - Sideload tool (Ex: AltStore, Sideloadly...)
 - Version of uYouPlus: 
 
-**Describe the bug:**
-- 
+### Describe the bug
 
-**How to reproduce the bug:**
+
+### How to reproduce the bug
 _(Please attach videos or screenshots if possible)_
 
 
-**Crash log (if possible):**
+### Crash log (if possible)
 _(The crash log can be found in the  Settings app - Privacy - Analytics & Improvements - Analytics Data - Youtube...)_
 
 
-**Additional context:**
-_(Add any other context about the problem here)_
+### Additional context:

.github/ISSUE_TEMPLATE/question-help.md

@@ -7,5 +7,7 @@ assignees: ''
 
 ---
 
-### Have you read the FAQ? Make sure you visit the FAQ page before asking any question!!!
+## Have you read the FAQ? Make sure you visit the FAQ page before asking any question!!!
 https://github.com/qnblackcat/uYouPlus/wiki/FAQ
+
+###

.gitignore

@@ -2,5 +2,6 @@
 .DS_Store
 packages
 obj
-Resources/com.galacticdev.isponsorblock.bundle/
-Resources/YouPiP.bundle/
+tmp
+Tweaks/uYou/*
+!Tweaks/uYou/.gitkeep

.gitmodules

@@ -18,3 +18,19 @@
 	path = Tweaks/YouTubeHeader
 	url = https://github.com/PoomSmart/YouTubeHeader.git
 	branch = main
+[submodule "Tweaks/Alderis"]
+	path = Tweaks/Alderis
+	url = https://github.com/qnblackcat/Alderis.git
+	branch = master
+[submodule "Tweaks/PSHeader"]
+	path = Tweaks/PSHeader
+	url = https://github.com/PoomSmart/PSHeader.git
+	branch = master
+[submodule "Tweaks/YTSpeed"]
+	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

@@ -0,0 +1,40 @@
+#import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
+
+@interface YTMainAppControlsOverlayView: UIView
+@end
+
+@interface YTPlaylistHeaderViewController : UIViewController
+@property (nonatomic, strong, readwrite) UIView *downloadsButton;
+@end
+
+@interface ASWAppSwitcherCollectionViewCell: UIView
+@end
+
+@interface YTMainAppVideoPlayerOverlayView : UIView
+- (UIViewController *)_viewControllerForAncestor;
+@end
+
+@interface YTWatchMiniBarView : UIView
+@end
+
+@interface YTPlayerViewController (YTAFS)
+- (void)autoFullscreen;
+@end
+
+@interface ASScrollView : UIView
+@end
+
+@interface UIKeyboardLayoutStar : UIView
+@end
+
+@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.dylib Tweaks/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib 
+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
@@ -10,15 +12,20 @@ TWEAK_NAME = uYouPlus
 DISPLAY_NAME = YouTube
 BUNDLE_ID = com.google.ios.youtube
  
-uYouPlus_FILES = uYouPlus.x
-uYouPlus_IPA = /path/to/your/decrypted/YouTube.ipa
-### Important: edit the path to your decrypted YouTube IPA!!! 
+uYouPlus_FILES = uYouPlus.xm Settings.xm
+uYouPlus_IPA = ./tmp/Payload/YouTube.app
 
 include $(THEOS)/makefiles/common.mk
 include $(THEOS_MAKE_PATH)/tweak.mk
-SUBPROJECTS += Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes
+SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes Tweaks/YTSpeed
 include $(THEOS_MAKE_PATH)/aggregate.mk
 
-all::
-	@install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib && echo "==> Fixed executable path for iSponsorBlock!" 
-	@cp -R .theos/obj/*.bundle Resources && echo "==> Moved tweaks's bundle to Resources!"
+before-package::
+	@tput setaf 4 && echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m"
+	@mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \;
+	@cp -R Tweaks/YouPiP/layout/Library/Application\ Support/YouPiP.bundle Resources/
+	@cp -R Tweaks/iSponsorBlock/layout/Library/Application\ Support/iSponsorBlock.bundle Resources/
+	@cp -R Tweaks/uYou/Library/Application\ Support/uYouBundle.bundle Resources/
+	@tput setaf 5 && echo -e "==> \033[1mChanging the installation path of dylibs...\033[0m"
+	@codesign --remove-signature .theos/obj/iSponsorBlock.dylib && install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib
+	@codesign --remove-signature .theos/obj/libcolorpicker.dylib && install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib	

README.md

@@ -1,36 +1,36 @@
 ![cydia-1900000830-iphone-0-1628105716 3](https://user-images.githubusercontent.com/52943116/135612614-3d3138cb-2a3d-4ed1-9244-905bab8f5c9f.PNG)
 
-
 # Table of Contents
 
 * [Credits](#credits)
 * [Features](#features)
 * [Known issues](#known-issues)
 * [Download](#download)
+* [Installation](#installation)
 * [Support the developers!](#support-the-developers)
 * [FAQ](#faq)
-* [Building (optional)](#building-optional)
-
+* [Building](#building-optional)
 
 # Credits
 
-- [MiRO92](https://twitter.com/miro92?s=21) for [uYou](https://github.com/MiRO92/uYou-for-YouTube).
+- [MiRO92](https://twitter.com/miro92) for [uYou](https://github.com/MiRO92/uYou-for-YouTube).
 
-- [Galactic-Dev](https://github.com/Galactic-Dev) and [Luewii](https://github.com/Luewii) for [iSponsorBlock](https://github.com/Galactic-Dev/iSponsorBlock).
-
-- [Lillie](https://github.com/LillieWeeb001), [PoomSmart](https://twitter.com/poomsmart?s=21) and [kirb](https://twitter.com/hbkirb?s=21) for [YouTube Dislike Return](https://github.com/PoomSmart/Return-YouTube-Dislikes)
+- [Galactic-Dev](https://github.com/Galactic-Dev) and [Luewii](https://github.com/Luewii) for [iSponsorBlock](https://github.com/Galactic-Dev/iSponsorBlock) and [BigYTMiniPlayer](https://github.com/Galactic-Dev/BigYTMiniPlayer).
 
 - [HASHBANG Productions](https://github.com/hbang) for [Alderis Color Picker](https://github.com/hbang/Alderis) - a dependency of iSponsorBlock.
 
-- [PoomSmart](https://twitter.com/poomsmart?s=21) - 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), [YTUHD](https://poomsmart.github.io/repo/depictions/ytuhd.html) and [YouPiP](https://poomsmart.github.io/repo/depictions/youpip.html).
+- [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)
 
-- [level3tjg](https://twitter.com/level3tjg?s=21) - 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!
@@ -42,17 +42,26 @@
 4. **YTUHD:** unlock VP9 codec and in effect, enables video quality of 2K and 4K. You can enable/disable YTUHD in YouTube Settings - Video quality preferences.
 
 <details>
-  <summary>And more...!</summary>
+  <summary>And many more...!</summary>
 
-5. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
+5. **YTAutoFullScreen:** autoplay videos at full screen.
 
-6. **YTNoHoverCards:** offer an option to enable/disable the annoying suggested videos show up at the end of the videos.
+6. **YTClassicVideoQuality:** since YouTube v16.xx, you need one more step to change the video quality. YTClassicVideoQuality brings back the old video quality selector, which is a lot better than the new one.
 
-7. **YTSystemAppearance**: sync the YouTube theme (dark/light) with the system theme.
+7. **YTNoHoverCards:** offer an option to enable/disable the annoying suggested videos show up at the end of the videos.
 
-8. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
+8. **YTSystemAppearance**: sync the YouTube theme (dark/light) with the system theme.
+
+9. **YTNoCheckLocalNetwork**: block the Local Network permission popup.
+
+10. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
+
+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.
 
-9. **YouRememberCaption**: make YouTube remember your video caption setting (if not already).
 </details>
 
 # Known issues 
@@ -61,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).
@@ -70,34 +78,45 @@
 
   - My official AtlStore repo: https://qnblackcat.github.io/AltStore/
 
-  - [Open in AltStore (v17.01.4-2.1)](https://tinyurl.com/39auw3xj) - It will take a while to install because AltStore needs to download the IPA.
+  - [Open in AltStore (v17.19.3-2.1)](https://tinyurl.com/5n8c64zv) - It will take a while to install because AltStore needs to download the IPA.
 
-- Version info: _(last update: Jan 22)_
+- Version info: _(last update: May 20)_
 
 <details>
-  <summary>  Expand</summary>
+  <summary> ▶︎ Expand</summary>
 
 | **Tweaks/App** | **Version** | **Open source** |
 | :------------: | :----------:| :-------------: |
-| **YouTube** | 17.01.4 | ✖︎  |
-| **uYou** | 2.1 | ✖︎ |
-| **YouTube Dislike Return** | 1.5.0 | [✔︎](https://github.com/PoomSmart/Return-YouTube-Dislikes) |
-| **iSponsorBlock** | 1.0-11 | [✔︎](https://github.com/Galactic-Dev/iSponsorBlock) |
+| **YouTube** | 17.19.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) |
-| **YouRememberCaption** | 1.0.0 | [✔︎](https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/) |
+| **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.5 | [✔︎](https://github.com/PoomSmart/YTUHD) |
-| **YouPiP** | 1.6.4 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **YTUHD** | 1.2.7 | [✔︎](https://github.com/PoomSmart/YTUHD) |
+| **YouPiP** | 1.7.0 | [✔︎](https://github.com/PoomSmart/YouPiP) |
+| **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>
 
+# Installation
+See [Installation - Wiki](https://github.com/qnblackcat/uYouPlus/wiki/Installation)
+
 # Support the developers
 
 <details>
-  <summary>MiRO92</summary>
+  <summary>▶︎ MiRO92</summary>
   
 - CashApp: https://cash.app/$MiRO92M
  
@@ -105,25 +124,20 @@
 </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 
 
 - Venmo: https://venmo.com/u/DavidBrett
 </details>
 
-<details>
-  <summary>Lillie</summary>
-
-- Patreon: https://patreon.com/lillieweeb
-</details>
 
 # FAQ
 

Resources/uYouBundle.bundle/downloading.json

@@ -1 +0,0 @@
-{"v":"5.7.1","fr":25,"ip":0,"op":26,"w":24,"h":24,"nm":"folder_download","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 1","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.31,"y":1},"o":{"x":0.69,"y":0},"t":0,"s":[16.41,15.3,0],"to":[0,0.617,0],"ti":[0,-0.617,0]},{"t":25,"s":[16.41,19,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.47,0.47,0.47],"y":[1,1,1]},"o":{"x":[0.53,0.53,0.53],"y":[0,0,0]},"t":12,"s":[6,6,100]},{"t":25,"s":[0,0,100]}],"ix":6}},"ao":0,"ip":0,"op":324,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 1","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.614,-145.97,0],"ix":2},"a":{"a":0,"k":[102.114,-19.97,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.47,0.47,0.47],"y":[1,1,1]},"o":{"x":[0.53,0.53,0.53],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":12,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[250,268.441],[305.322,268.441],[305.322,194.678],[342.203,194.678],[342.203,268.441],[397.525,268.441],[323.762,342.203]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-221.648,-214.648],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":324,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"folder_download Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[12,12,0],"ix":2},"a":{"a":0,"k":[12,12,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,-1.1],[0,0],[0,0],[1.1,0],[0,0],[0,0],[0,1.1],[0,0],[0,0],[-1.1,0],[0,0]],"o":[[0,0],[0,0],[1.1,0],[0,0],[0,0],[0,1.1],[0,0],[0,0],[-1.1,0],[0,0],[0,0],[0,-1.1],[0,0],[0,0]],"v":[[-2,-8],[0,-6],[8,-6],[10,-4],[10,-4],[10,6],[8,8],[8,8],[-8,8],[-10,6],[-10,6],[-9.99,-6],[-8,-8],[-8,-8]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"tr","p":{"a":0,"k":[12,12],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9215686274509803,0.2823529411764706,0.3254901960784314,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":324,"st":0,"bm":0}],"markers":[]}

Settings.xm

@@ -0,0 +1,160 @@
+#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();
+extern BOOL bigYTMiniPlayer();
+extern BOOL hideCC();
+extern BOOL hideAutoplaySwitch();
+extern BOOL castConfirm();
+extern BOOL ytMiniPlayer();
+extern BOOL hidePreviousAndNextButton();
+
+// Settings
+%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:@""];
+    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:@""];
+    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

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Thanks Al4ise for his support
+
+cd "$(dirname "$0")"	
+	
+# Check uYou
+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"
+	(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
+
+# 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.*)
+then
+	echo -e "\033[1m> Extracted uYou!\033[0m"
+else
+	echo "> \033[1mCouldn't extract uYou\033[0m"
+fi
+
+# Makefile
+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 
+	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/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 tmp/ Resources .theos/_/Payload

uYouPlus.x

@@ -1,100 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-// Workaround for https://github.com/MiRO92/uYou-for-YouTube/issues/12
-
-%hook YTAdsInnerTubeContextDecorator
-- (void)decorateContext:(id)arg1 {
-    %orig(nil);
-}
-%end
-
-
-// YouRememberCaption: https://www.ios-repo-updates.com/repository/poomsmart/package/com.ps.youremembercaption/
-
-%hook YTColdConfig
-- (BOOL)respectDeviceCaptionSetting {
-    return NO;
-}
-%end
-
-
-// YTClassicVideoQuality: https://github.com/PoomSmart/YTClassicVideoQuality
-
-@interface YTVideoQualitySwitchOriginalController : NSObject
-- (instancetype)initWithParentResponder:(id)responder;
-@end
-
-%hook YTVideoQualitySwitchControllerFactory
-
-- (id)videoQualitySwitchControllerWithParentResponder:(id)responder {
-    Class originalClass = %c(YTVideoQualitySwitchOriginalController);
-    return originalClass ? [[originalClass alloc] initWithParentResponder:responder] : %orig;
-}
-%end
-
-
-// YTNoCheckLocalNetwork: https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html
-
-%hook YTHotConfig
-
-- (BOOL)isPromptForLocalNetworkPermissionsEnabled {
-    return NO;
-}
-%end
-
-// YTNoHoverCards: https://github.com/level3tjg/YTNoHoverCards
-
-@interface YTCollectionViewCell : UICollectionViewCell
-@end
-
-@interface YTSettingsCell : YTCollectionViewCell
-@end
-
-@interface YTSettingsSectionItem : NSObject
-@property BOOL hasSwitch;
-@property BOOL switchVisible;
-@property BOOL on;
-@property BOOL (^switchBlock)(YTSettingsCell *, BOOL);
-@property int settingItemId;
-- (instancetype)initWithTitle:(NSString *)title titleDescription:(NSString *)titleDescription;
-@end
-
-%hook YTSettingsViewController
-- (void)setSectionItems:(NSMutableArray <YTSettingsSectionItem *>*)sectionItems forCategory:(NSInteger)category title:(NSString *)title titleDescription:(NSString *)titleDescription headerHidden:(BOOL)headerHidden {
-	if (category == 1) {
-		NSInteger appropriateIdx = [sectionItems indexOfObjectPassingTest:^BOOL(YTSettingsSectionItem *item, NSUInteger idx, BOOL *stop) {
-			return item.settingItemId == 294;
-		}];
-		if (appropriateIdx != NSNotFound) {
-			YTSettingsSectionItem *hoverCardItem = [[%c(YTSettingsSectionItem) alloc] initWithTitle:@"Show End screens hover cards" 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:appropriateIdx + 1];
-		}
-	}
-	%orig;
-}
-%end
-
-%hook YTCreatorEndscreenView
-- (void)setHidden:(BOOL)hidden {
-	if (![[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"])
-		hidden = YES;
-	%orig;
-}
-%end
-
-
-// YTSystemAppearance: https://poomsmart.github.io/repo/depictions/ytsystemappearance.html
-
-%hook YTColdConfig
-- (BOOL)shouldUseAppThemeSetting {
-    return YES;
-}
-%end

uYouPlus.xm

@@ -0,0 +1,576 @@
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import <objc/runtime.h>
+#import "Header.h"
+#import "Tweaks/YouTubeHeader/YTVideoQualitySwitchOriginalController.h"
+#import "Tweaks/YouTubeHeader/YTPlayerViewController.h"
+#import "Tweaks/YouTubeHeader/YTWatchController.h"
+#import "Tweaks/YouTubeHeader/YTIGuideResponse.h"
+#import "Tweaks/YouTubeHeader/YTIGuideResponseSupportedRenderers.h"
+#import "Tweaks/YouTubeHeader/YTIPivotBarSupportedRenderers.h"
+#import "Tweaks/YouTubeHeader/YTIPivotBarRenderer.h"
+#import "Tweaks/YouTubeHeader/YTIBrowseRequest.h"
+#import "Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+
+BOOL hideHUD() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideHUD_enabled"];
+}
+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"];
+}
+BOOL noHoverCard() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hover_cards_enabled"];
+}
+BOOL ReExplore() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"reExplore_enabled"];
+}
+BOOL bigYTMiniPlayer() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"bigYTMiniPlayer_enabled"];
+}
+BOOL hideCC() {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideCC_enabled"];
+}
+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"];
+}
+
+// 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 {
+    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 {
+    return hideHUD() ? nil : %orig;
+}
+%end
+
+// YTAutoFullScreen: https://github.com/PoomSmart/YTAutoFullScreen/
+%hook YTPlayerViewController
+- (void)loadWithPlayerTransition:(id)arg1 playbackConfig:(id)arg2 {
+    %orig;
+    if (autoFullScreen())
+        [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(autoFullscreen) userInfo:nil repeats:NO];
+}
+%new
+- (void)autoFullscreen {
+    YTWatchController *watchController = [self valueForKey:@"_UIDelegate"];
+    [watchController showFullScreen];
+}
+%end
+
+// YTNoHoverCards: https://github.com/level3tjg/YTNoHoverCards
+%hook YTCreatorEndscreenView
+- (void)setHidden:(BOOL)hidden {
+    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;
+        }];
+
+        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];
+	} else { return %orig; }
+        
+}
+%end
+
+// Workaround for https://github.com/MiRO92/uYou-for-YouTube/issues/12
+%hook YTAdsInnerTubeContextDecorator
+- (void)decorateContext:(id)arg1 { %orig(nil); }
+%end
+
+// YTClassicVideoQuality: https://github.com/PoomSmart/YTClassicVideoQuality
+%hook YTVideoQualitySwitchControllerFactory
+- (id)videoQualitySwitchControllerWithParentResponder:(id)responder {
+    Class originalClass = %c(YTVideoQualitySwitchOriginalController);
+    return originalClass ? [[originalClass alloc] initWithParentResponder:responder] : %orig;
+}
+%end
+
+// YTNoCheckLocalNetwork: https://poomsmart.github.io/repo/depictions/ytnochecklocalnetwork.html
+%hook YTHotConfig
+- (BOOL)isPromptForLocalNetworkPermissionsEnabled { return NO; }
+%end
+
+// YTSystemAppearance: https://poomsmart.github.io/repo/depictions/ytsystemappearance.html
+// YouRememberCaption: https://poomsmart.github.io/repo/depictions/youremembercaption.html
+%hook YTColdConfig
+- (BOOL)shouldUseAppThemeSetting { return YES; }
+- (BOOL)respectDeviceCaptionSetting { return NO; }
+- (BOOL)isEnhancedSearchBarEnabled { return YES; }
+%end
+
+// 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
+
+// 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 YTCommonColorPalette
+- (UIColor *)brandBackgroundSolid {
+    if (self.pageStyle == 1) {
+        return oledColor;
+    }
+        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
+
+// Account view controller
+%hook YTAccountPanelBodyViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
+}
+%end
+
+%hook YTInnerTubeCollectionViewController
+- (UIColor *)backgroundColor:(NSInteger)pageStyle {
+    if (pageStyle == 1) { 
+        return oledColor; 
+    }
+        return %orig;
+}
+%end
+
+// Explore
+%hook ASScrollView 
+- (void)didMoveToWindow {
+    if (isDarkMode()) {
+        self.backgroundColor = oledColor;
+        %orig;
+    }
+}
+%end
+
+// uYou's page
+%hook DownloadedVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
+%end
+
+%hook DownloadsPagerVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
+%end
+
+%hook DownloadingVC
+- (UIColor *)ytBackgroundColor {
+    if (isDarkMode()) {
+        return oledColor;
+    }
+        return %orig;
+}
+%end
+
+%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
+
+// uYou & YT player, and downloading view controller
+%hook _LNPopupBarContentView
+- (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 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:(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 YTFormattedStringLabel  // YT is werid...
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig ([UIColor clearColor]);
+    }
+        return %orig;
+}
+%end
+
+%hook YCHLiveChatActionPanelView  // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
+%end
+
+%hook YTEmojiTextView // live chat comment
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+        return %orig;
+}
+%end
+
+// Separation lines
+%hook YTCollectionSeparatorView
+- (void)didMoveToWindow {
+    if (isDarkMode()) {}
+    else { return %orig; }
+}
+%end
+
+// Open link with...
+%hook ASWAppSwitchingSheetHeaderView
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+}
+%end
+
+%hook ASWAppSwitchingSheetFooterView
+- (void)setBackgroundColor:(UIColor *)color {
+    if (isDarkMode()) {
+        return %orig (oledColor);
+    }
+}
+%end
+
+%hook ASWAppSwitcherCollectionViewCell
+- (void)didMoveToWindow {
+    if (isDarkMode()) { 
+        self.subviews[1].backgroundColor = oledColor;
+        %orig;        
+    }
+}
+%end
+
+// this sucks :/
+// %hook UIView
+// - (void)setBackgroundColor:(UIColor *)color {
+//     if (isDarkMode()) {
+//         if ([self.nextResponder isKindOfClass:%c(YTHUDMessageView)]) { color = oledColor; }
+//         %orig;
+//     }
+//         return %orig;
+// }
+// %end
+%end
+
+%group gOLEDKB // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
+%hook UIPredictionViewController
+- (void)loadView {
+    %orig;
+    [self.view setBackgroundColor:oledColor];
+}
+%end
+
+%hook UICandidateViewController
+- (void)loadView {
+    %orig;
+    [self.view setBackgroundColor:oledColor];
+}
+%end
+
+%hook UIKeyboardDockView
+- (void)didMoveToWindow {
+    self.backgroundColor = oledColor;
+    %orig;
+}
+%end
+
+%hook UIKeyboardLayoutStar 
+- (void)didMoveToWindow {
+    self.backgroundColor = oledColor;
+    %orig;
+}
+%end
+
+%hook UIKBRenderConfig // Prediction text color
+- (void)setLightKeyboard:(BOOL)arg1 { %orig(NO); }
+%end
+%end
+
+// YTReExplore: https://github.com/PoomSmart/YTReExplore/
+%group gReExplore
+static void replaceTab(YTIGuideResponse *response) {
+    NSMutableArray <YTIGuideResponseSupportedRenderers *> *renderers = [response itemsArray];
+    for (YTIGuideResponseSupportedRenderers *guideRenderers in renderers) {
+        YTIPivotBarRenderer *pivotBarRenderer = [guideRenderers pivotBarRenderer];
+        NSMutableArray <YTIPivotBarSupportedRenderers *> *items = [pivotBarRenderer itemsArray];
+        NSUInteger shortIndex = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) {
+            return [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:@"FEshorts"];
+        }];
+        if (shortIndex != NSNotFound) {
+            [items removeObjectAtIndex:shortIndex];
+            NSUInteger exploreIndex = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) {
+                return [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:[%c(YTIBrowseRequest) browseIDForExploreTab]];
+            }];
+            if (exploreIndex == NSNotFound) {
+                YTIPivotBarSupportedRenderers *exploreTab = [%c(YTIPivotBarRenderer) pivotSupportedRenderersWithBrowseId:[%c(YTIBrowseRequest) browseIDForExploreTab] title:@"Explore" iconType:292];
+                [items insertObject:exploreTab atIndex:1];
+            }
+        }
+    }
+}
+%hook YTGuideServiceCoordinator
+- (void)handleResponse:(YTIGuideResponse *)response withCompletion:(id)completion {
+    replaceTab(response);
+    %orig(response, completion);
+}
+- (void)handleResponse:(YTIGuideResponse *)response error:(id)error completion:(id)completion {
+    replaceTab(response);
+    %orig(response, error, completion);
+}
+%end
+%end
+
+// BigYTMiniPlayer: https://github.com/Galactic-Dev/BigYTMiniPlayer
+%group Main
+%hook YTWatchMiniBarView
+- (void)setWatchMiniPlayerLayout:(int)arg1 {
+    %orig(1);
+}
+- (int)watchMiniPlayerLayout {
+    return 1;
+}
+- (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 {
+    if([[self _viewControllerForAncestor].parentViewController.parentViewController isKindOfClass:%c(YTWatchMiniBarViewController)]) {
+        return NO;
+    }
+    return %orig;
+}
+%end
+%end
+
+%ctor {
+    %init;
+    if (oled()) {
+       %init(gOLED);
+    }
+    if (oledKB()) {
+       %init(gOLEDKB);
+    }
+    if (ReExplore()) {
+       %init(gReExplore);
+    }
+    if (bigYTMiniPlayer() && (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPad)) {
+       %init(Main);
+    }
+}