diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java
index 6274353e4..f5d13757f 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java
@@ -10,6 +10,7 @@ import static ru.vtosters.lite.utils.Preferences.checkupdates;
 import static ru.vtosters.lite.utils.Preferences.preferences;
 import static ru.vtosters.lite.utils.ServerDialog.sendRequest;
 import static ru.vtosters.lite.utils.Themes.isDarkTheme;
+import static ru.vtosters.lite.utils.Themes.setNeededTheme;
 
 import android.app.Activity;
 import android.app.Application;
@@ -81,6 +82,7 @@ public class Globals{
     }
 
     public static void MainActivityInit(Activity activity){
+        setNeededTheme(activity);
         ServerDialog.activity = activity;
         sendRequest();
         if (checkupdates()) OTADialog.checkUpdates(activity);
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index 5944b879b..e9bb0ef7a 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -8,10 +8,13 @@ import static ru.vtosters.lite.utils.Globals.getCurrentActivity;
 import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getResources;
+import static ru.vtosters.lite.utils.Globals.sendToast;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
+import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.navbar;
 import static ru.vtosters.lite.utils.Preferences.systemtheme;
 import static ru.vtosters.lite.utils.Preferences.vkme;
+import static ru.vtosters.lite.utils.ReflectionUtils.getField;
 import static ru.vtosters.lite.utils.VKUIInjector.isLoaded;
 
 import android.annotation.SuppressLint;
@@ -39,8 +42,14 @@ import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
 
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import kotlin.u.KProperty5;
 
 public class Themes{
     public static List<String> accentColors = Arrays.asList(
@@ -301,7 +310,7 @@ public class Themes{
     public static int getAlertStyle(){
         if (isDarkTheme()) return R.style.Theme_MaterialComponents_Dialog_Alert;
         return R.style.Theme_MaterialComponents_Light_Dialog_Alert;
-    } // Android Support color injector + accent color checker
+    }
 
     public static String getBackgroundStickers(){
         if (getWallpaper() != null) {
@@ -310,6 +319,30 @@ public class Themes{
         return "images";
     }
 
+    public static VKTheme getCurrentTheme(){
+        return VKThemeHelper.l();
+    }
+
+    public static void setNeededTheme(Activity activity){
+        if (milkshake()) {
+            if (getCurrentTheme() == VKTheme.VKAPP_LIGHT){
+                setTheme(VKTheme.VKAPP_MILK_LIGHT, activity);
+            }
+
+            if (getCurrentTheme() == VKTheme.VKAPP_DARK){
+                setTheme(VKTheme.VKAPP_MILK_DARK, activity);
+            }
+        } else {
+            if (getCurrentTheme() == VKTheme.VKAPP_MILK_LIGHT){
+                setTheme(VKTheme.VKAPP_LIGHT, activity);
+            }
+
+            if (getCurrentTheme() == VKTheme.VKAPP_MILK_DARK){
+                setTheme(VKTheme.VKAPP_DARK, activity);
+            }
+        }
+    }
+
     public static void setNavbarColor(Window window, int i){
         if (navbar()) {
             window.setNavigationBarColor(getTabbarBackground());
diff --git a/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali b/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali
index 5e62a3d5e..37655e24f 100644
--- a/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali
+++ b/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali
@@ -231,6 +231,12 @@
 .method public static final e()Z
     .locals 3
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->milkshake()Z
+
+    move-result v0
+
+    return v0
+
     .line 1
     sget-object v0, Lcom/vk/core/ui/themes/MilkshakeHelper;->a:Ljava/lang/Boolean;