diff --git a/Source/Themes.xm b/Source/Themes.xm
index 75123db..4ea44b7 100644
--- a/Source/Themes.xm
+++ b/Source/Themes.xm
@@ -6,11 +6,8 @@ static BOOL IsEnabled(NSString *key) {
 static BOOL isDarkMode() {
     return ([[NSUserDefaults standardUserDefaults] integerForKey:@"page_style"] == 1);
 }
-static BOOL oledDarkTheme() {
-    return ([[NSUserDefaults standardUserDefaults] integerForKey:@"appTheme"] == 1);
-}
 static BOOL oldDarkTheme() {
-    return ([[NSUserDefaults standardUserDefaults] integerForKey:@"appTheme"] == 2);
+    return ([[NSUserDefaults standardUserDefaults] integerForKey:@"appTheme"] == 1);
 }
 
 // Themes.xm - Theme Options
@@ -402,7 +399,7 @@ UIColor *customColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alpha:
 %end
 
 // OLED dark mode by @BandarHL and modified by @arichorn
-UIColor* raisedColor = [UIColor blackColor];
+/*
 %group gOLED
 %hook YTCommonColorPalette
 - (UIColor *)background1 {
@@ -788,6 +785,7 @@ UIColor* raisedColor = [UIColor blackColor];
 }
 %end
 %end
+*/
 
 // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e
 %group gOLEDKB 
@@ -837,9 +835,6 @@ UIColor* raisedColor = [UIColor blackColor];
     if (IsEnabled(@"oledKeyBoard_enabled")) {
         %init(gOLEDKB);
     }
-    if (oledDarkTheme()) {
-        %init(gOLED);
-    }
     if (oldDarkTheme()) {
         %init(gOldDarkTheme);
     }
diff --git a/YTLitePlus.xm b/YTLitePlus.xm
index a799e20..bd0938b 100644
--- a/YTLitePlus.xm
+++ b/YTLitePlus.xm
@@ -568,12 +568,19 @@ BOOL isTabSelected = NO;
 
 // Hide Autoplay Mini Preview - @bhackel
 %hook YTAutonavPreviewView
-- (void)didMoveToWindow {
+- (void)layoutSubviews {
     %orig;
     if (IsEnabled(@"hideAutoplayMiniPreview_enabled")) {
         self.hidden = YES;
     }
 }
+- (void)setHidden:(BOOL)arg1 {
+    if (IsEnabled(@"hideAutoplayMiniPreview_enabled")) {
+        %orig(YES);
+    } else {
+        %orig(arg1);
+    }
+}
 %end
 
 /*