diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
index 119e6892e..6c0749280 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
@@ -7,7 +7,8 @@ import androidx.annotation.IdRes;
 
 import java.util.HashMap;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
+
 
 public class ThemesCore {
     // log tag
@@ -61,8 +62,8 @@ public class ThemesCore {
         themedColors.put(com.vtosters.lite.R.attr.action_sheet_action_foreground, accentColor);
 
         // messages
-        wallDarkColor = Themes.darken(accentColor, 0.25f);
-        wallLightColor = Themes.lighten(accentColor, 0.25f);
+        wallDarkColor = ThemesUtils.darken(accentColor, 0.25f);
+        wallLightColor = ThemesUtils.lighten(accentColor, 0.25f);
 
         //themedColors.put(com.vtosters.lite.R.attr.im_ic_send_msg, accentColor);
         themedColors.put(com.vtosters.lite.R.attr.im_bubble_wallpaper_outgoing, accentColor);
@@ -73,11 +74,11 @@ public class ThemesCore {
     @SuppressWarnings("ConstantConditions")
     public static int getThemedAttr(Context context, @IdRes int attr) {
         if (attr == com.vtosters.lite.R.attr.im_bubble_wallpaper_outgoing || attr == com.vtosters.lite.R.attr.im_bubble_outgoing) {
-            return (!Themes.isDarkTheme()) ? wallLightColor : wallDarkColor;
+            return (!ThemesUtils.isDarkTheme()) ? wallLightColor : wallDarkColor;
         }
 
         if (attr == com.vtosters.lite.R.attr.im_bubble_outgoing_highlighted) {
-            return (!Themes.isDarkTheme()) ? Themes.lighten(wallLightColor, 0.2f) : Themes.darken(wallDarkColor, 0.2f);
+            return (!ThemesUtils.isDarkTheme()) ? ThemesUtils.lighten(wallLightColor, 0.2f) : ThemesUtils.darken(wallDarkColor, 0.2f);
         }
 
         return themedColors.get(attr);
diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
index 3fc84ff50..333948c6e 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
@@ -12,18 +12,18 @@ import android.widget.TextView;
 
 import com.vtosters.lite.R;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class ThemesHacks {
     // Фиксит селектор (все/свои/архив) в профиле
     public static void fixProfileSelector(View view) {
-        if (!Themes.isMilkshake()) return;
+        if (!ThemesUtils.isMilkshake()) return;
         var id = view.getId();
 
         if (id == R.id.profile_wall_owner_posts || id == R.id.profile_wall_all_posts || id == R.id.profile_wall_archived_posts) {
             StateListDrawable states = (StateListDrawable) ((LayerDrawable) view.getBackground()).getDrawable(0);
             LayerDrawable selected = (LayerDrawable) ((DrawableContainer.DrawableContainerState) states.getConstantState()).getChildren()[0];
-            ((ColorDrawable) selected.getDrawable(0)).setColor(Themes.getAccentColor());
+            ((ColorDrawable) selected.getDrawable(0)).setColor(ThemesUtils.getAccentColor());
         }
     }
 
@@ -31,15 +31,15 @@ public class ThemesHacks {
         if (i != R.layout.themed_feed_tab_2) {
             return;
         }
-        textView.setTextColor(Themes.themeCSL(textView.getTextColors()));
-        ((InsetDrawable) ((DrawableContainer.DrawableContainerState) ((StateListDrawable) textView.getBackground()).getConstantState()).getChildren()[0]).getDrawable().setTint(Themes.lighten(Themes.getAccentColor(), 0.15f));
+        textView.setTextColor(ThemesUtils.themeCSL(textView.getTextColors()));
+        ((InsetDrawable) ((DrawableContainer.DrawableContainerState) ((StateListDrawable) textView.getBackground()).getConstantState()).getChildren()[0]).getDrawable().setTint(ThemesUtils.lighten(ThemesUtils.getAccentColor(), 0.15f));
     }
 
     public static void fixDropdown(Drawable drawable) {
-        if (!Themes.isDarkTheme() && Themes.isMilkshake() && ThemesCore.isCachedAccents()) {
+        if (!ThemesUtils.isDarkTheme() && ThemesUtils.isMilkshake() && ThemesCore.isCachedAccents()) {
             StateListDrawable stateListDrawable = (StateListDrawable) drawable;
-            ((BitmapDrawable) ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[0]).setTint(Themes.getAccentColor());
-            ((BitmapDrawable) ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[1]).setTint(Themes.halfAlpha(Themes.getAccentColor()));
+            ((BitmapDrawable) ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[0]).setTint(ThemesUtils.getAccentColor());
+            ((BitmapDrawable) ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[1]).setTint(ThemesUtils.halfAlpha(ThemesUtils.getAccentColor()));
         }
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java b/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java
index dd64b9dff..8b5a0a6c5 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java
@@ -14,7 +14,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class VTLResources extends Resources {
     private static final String TAG = "VTLResources";
@@ -57,7 +57,7 @@ public class VTLResources extends Resources {
 
                     if (type == TypedValue.TYPE_ATTRIBUTE && isAttrThemeable(cnt)) {
                         data[i*6] = TypedValue.TYPE_INT_COLOR_RGB8;
-                        data[(i*6)+1] = Themes.getAccentColor();
+                        data[(i*6)+1] = ThemesUtils.getAccentColor();
                         data[(i*6)+2] = 0; // clear reference content
                     }
                 }
@@ -79,7 +79,7 @@ public class VTLResources extends Resources {
     }
 
     private static boolean isAttrThemeable(int attrID) {
-        return !Themes.isDarkTheme() && attrID == com.vtosters.lite.R.attr.button_primary_background;
+        return !ThemesUtils.isDarkTheme() && attrID == com.vtosters.lite.R.attr.button_primary_background;
     }
 
     private static int[] getArrayData(TypedArray arr) {
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java
index 5dcc65803..9fff3a2d9 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java
@@ -4,18 +4,18 @@ import android.content.res.ColorStateList;
 import android.view.View;
 import android.widget.Button;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class ButtonHook implements BaseHook {
     @Override
     public void inject(View view, int i, boolean z) {
         if (view instanceof Button) {
             var button = (Button) view;
-            if (button.getBackgroundTintList() != null && Themes.isAccentedColor(button.getBackgroundTintList())) {
-                button.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
+            if (button.getBackgroundTintList() != null && ThemesUtils.isAccentedColor(button.getBackgroundTintList())) {
+                button.setBackgroundTintList(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
             }
             if (TextViewHook.isPositiveButton(button) || TextViewHook.isVkUiButton(view)) {
-                button.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
+                button.setBackgroundTintList(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
             }
         }
     }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java
index 09b6f6402..cde8e57d0 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java
@@ -1,12 +1,11 @@
 package ru.vtosters.lite.themes.hooks;
 
-import android.content.res.ColorStateList;
 import android.view.View;
 import android.widget.ImageView;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class ImageViewHook implements BaseHook {
     @Override
@@ -14,14 +13,14 @@ public class ImageViewHook implements BaseHook {
         if (view instanceof AppCompatImageView) {
             var imageView = (AppCompatImageView) view;
             if (imageView.getImageTintList() != null) {
-                imageView.setImageTintList(Themes.themeCSL(imageView.getImageTintList()));
+                imageView.setImageTintList(ThemesUtils.themeCSL(imageView.getImageTintList()));
             }
         }
 
         if (view instanceof ImageView) {
             var imageView = (ImageView) view;
             if (imageView.getImageTintList() != null) {
-                imageView.setImageTintList(Themes.themeCSL(imageView.getImageTintList()));
+                imageView.setImageTintList(ThemesUtils.themeCSL(imageView.getImageTintList()));
             }
         }
     }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java
index 12b35d1e5..c85402c26 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java
@@ -5,15 +5,16 @@ import android.view.View;
 
 import com.vk.core.view.VKTabLayout;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
+
 
 public class TabLayoutHook implements BaseHook {
     @Override
     public void inject(View view, int i, boolean z) {
         if (view instanceof VKTabLayout) {
             var tabLayout = (VKTabLayout) view;
-            tabLayout.setSelectedTabIndicatorColor(Themes.getAccentColor());
-            tabLayout.setTabRippleColor(ColorStateList.valueOf(Themes.getAccentColor()));
+            tabLayout.setSelectedTabIndicatorColor(ThemesUtils.getAccentColor());
+            tabLayout.setTabRippleColor(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
         }
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java
index e9878063e..77eaa0027 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java
@@ -12,7 +12,7 @@ import com.vtosters.lite.R;
 
 import ru.vtosters.lite.themes.ThemesHacks;
 import ru.vtosters.lite.themes.utils.VkUiThemer;
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class TextViewHook implements BaseHook {
 
@@ -24,31 +24,31 @@ public class TextViewHook implements BaseHook {
         if (view instanceof TextView) {
             var textView = (TextView) view;
 
-            if (Themes.isAccentedColor(textView.getCurrentTextColor())) {
-                textView.setTextColor(Themes.getAccentColor());
+            if (ThemesUtils.isAccentedColor(textView.getCurrentTextColor())) {
+                textView.setTextColor(ThemesUtils.getAccentColor());
             }
 
-            if (textView.getLinkTextColors() != null && Themes.isAccentedColor(textView.getLinkTextColors())) {
-                textView.setLinkTextColor(Themes.getAccentColor());
+            if (textView.getLinkTextColors() != null && ThemesUtils.isAccentedColor(textView.getLinkTextColors())) {
+                textView.setLinkTextColor(ThemesUtils.getAccentColor());
             }
 
 
             if (isPositiveButton(textView) || isVkUiButton(textView)) {
-                view.setBackgroundTintList(ColorStateList.valueOf(Themes.getAccentColor()));
+                view.setBackgroundTintList(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
             }
 
             if (view instanceof TintTextView) {
                 if (eligibleForStartTinting(view.getId())) {
-                    ((TintTextView) view).setDrawableStartTint(Themes.getAccentColor());
+                    ((TintTextView) view).setDrawableStartTint(ThemesUtils.getAccentColor());
                 } else if (eligibleForTinting(view.getId())) {
-                    ((TintTextView) view).setDrawableTint(Themes.getAccentColor());
+                    ((TintTextView) view).setDrawableTint(ThemesUtils.getAccentColor());
                 }
             }
 
             if (view instanceof AppCompatCheckedTextView) {
                 var check = (AppCompatCheckedTextView) view;
-                if (Themes.isAccentedColor(check.getCheckMarkTintList())) {
-                    check.setCheckMarkTintList(ColorStateList.valueOf(Themes.getAccentColor()));
+                if (ThemesUtils.isAccentedColor(check.getCheckMarkTintList())) {
+                    check.setCheckMarkTintList(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
                 }
             }
 
@@ -59,19 +59,19 @@ public class TextViewHook implements BaseHook {
     }
 
     public static boolean eligibleForStartTinting(int id) {
-        return !Themes.isDarkTheme() && id == com.vtosters.lite.R.id.post_retweet_name;
+        return !ThemesUtils.isDarkTheme() && id == com.vtosters.lite.R.id.post_retweet_name;
     }
 
     public static boolean eligibleForTinting(int id) {
-        return !Themes.isDarkTheme() && (id == com.vtosters.lite.R.id.attach_title);
+        return !ThemesUtils.isDarkTheme() && (id == com.vtosters.lite.R.id.attach_title);
     }
 
     public static boolean isPositiveButton(View view) {
-        return !Themes.isDarkTheme() && (view.getId() == R.id.positive || view.getId() == R.id.positive_button);
+        return !ThemesUtils.isDarkTheme() && (view.getId() == R.id.positive || view.getId() == R.id.positive_button);
     }
 
     public static boolean isVkUiButton(View view) {
-        return !Themes.isDarkTheme() && (
+        return !ThemesUtils.isDarkTheme() && (
                 view.getId() == R.id.empty_button
         );
     }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java
index 0539373fa..b4275e0de 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java
@@ -1,11 +1,8 @@
 package ru.vtosters.lite.themes.hooks;
 
-import android.content.res.ColorStateList;
 import android.view.View;
 import android.widget.Toolbar;
 
-import ru.vtosters.lite.utils.Themes;
-
 public class ToolbarHook implements BaseHook {
     @Override
     public void inject(View view, int i, boolean z) {
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java
index ec9a1d91d..22c8f2cdc 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java
@@ -4,7 +4,7 @@ import android.view.View;
 
 import com.vk.imageloader.view.VKImageView;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class VKImageViewHook implements BaseHook {
     @Override
@@ -12,7 +12,7 @@ public class VKImageViewHook implements BaseHook {
         if (view instanceof VKImageView) {
             var imageView = (VKImageView) view;
             if (imageView.getImageTintList() != null) {
-                imageView.setImageTintList(Themes.themeCSL(imageView.getImageTintList()));
+                imageView.setImageTintList(ThemesUtils.themeCSL(imageView.getImageTintList()));
             }
         }
     }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/WaveformViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/WaveformViewHook.java
index 79b691cca..50d554859 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/hooks/WaveformViewHook.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/WaveformViewHook.java
@@ -2,17 +2,14 @@ package ru.vtosters.lite.themes.hooks;
 
 import android.view.View;
 
-
 import com.vtosters.lite.ui.widget.WaveformView;
 
-import ru.vtosters.lite.utils.Themes;
-
 public class WaveformViewHook implements BaseHook {
     @Override
     public void inject(View view, int i, boolean z) {
         if (view instanceof WaveformView) {
             var waveformView = (WaveformView) view;
-            //waveformView.set(Themes.getAccentColor());
+            //waveformView.set(ThemesUtils.getAccentColor());
         }
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java b/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java
index 446cf8837..e62e5efab 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java
@@ -12,12 +12,12 @@ import android.widget.TextView;
 
 import com.vk.core.ui.themes.VKTheme;
 
-import ru.vtosters.lite.utils.Themes;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class VkUiThemer {
     public static void autoThemeVkuiButtons(TextView view) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
-        if (Themes.isDarkTheme())
+        if (ThemesUtils.isDarkTheme())
             return; // no need to theme b/w buttons, well it should skip, but I do it for extra performance
 
         try {
@@ -48,12 +48,12 @@ public class VkUiThemer {
 
                         ColorStateList csl = spd.getColor();
                         if (csl != null) {
-                            Log.d("TSCore", "[tsh] csl2 <def: " + csl.getDefaultColor() + " = " + Themes.hex(csl.getDefaultColor()) + "> | " + csl);
+                            Log.d("TSCore", "[tsh] csl2 <def: " + csl.getDefaultColor() + " = " + ThemesUtils.hex(csl.getDefaultColor()) + "> | " + csl);
                         }
 
-                    if (Themes.isAccentedColor(spd.getColor())) {
+                    if (ThemesUtils.isAccentedColor(spd.getColor())) {
                         Log.d("TSCore", "[tsh] theming CSL");
-                        spd.setTint(Themes.getAccentColor());
+                        spd.setTint(ThemesUtils.getAccentColor());
                     }
                 }
 
@@ -66,12 +66,12 @@ public class VkUiThemer {
 
                     ColorStateList csl = spd.getColor();
                     if (csl != null) {
-                        Log.d("TSCore", "[tsh:disabled] csl2 <def: " + csl.getDefaultColor() + " = " + Themes.hex(csl.getDefaultColor()) + "> | " + csl);
+                        Log.d("TSCore", "[tsh:disabled] csl2 <def: " + csl.getDefaultColor() + " = " + ThemesUtils.hex(csl.getDefaultColor()) + "> | " + csl);
                     }
 
-                if (Themes.isAccentedColor(spd.getColor())) {
+                if (ThemesUtils.isAccentedColor(spd.getColor())) {
                     Log.d("TSCore", "[tsh:disabled] theming CSL");
-                    spd.setTint(Themes.getAccentColor());
+                    spd.setTint(ThemesUtils.getAccentColor());
                 }
             }
         } catch (Exception e) {
@@ -81,10 +81,10 @@ public class VkUiThemer {
     }
 
     public static void fixDropdown(Drawable drawable) {
-        if (Themes.getCurrentTheme() == VKTheme.VKAPP_MILK_LIGHT) {
+        if (ThemesUtils.getCurrentTheme() == VKTheme.VKAPP_MILK_LIGHT) {
             var stateListDrawable = (StateListDrawable) drawable;
-            ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[0].setTint(Themes.getAccentColor());
-            ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[1].setTint(Themes.halfAlpha(Themes.getAccentColor()));
+            ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[0].setTint(ThemesUtils.getAccentColor());
+            ((DrawableContainer.DrawableContainerState) stateListDrawable.getConstantState()).getChildren()[1].setTint(ThemesUtils.halfAlpha(ThemesUtils.getAccentColor()));
         }
     }
 }
diff --git a/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali b/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali
index b63f6b986..16c3d2a3a 100644
--- a/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali
+++ b/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali
@@ -268,7 +268,7 @@
 
     move-result-object p0
 
-    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+    invoke-static {p0}, Lru/vtosters/lite/utils/ThemesUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
     move-result-object p0
 
diff --git a/smali/smali/androidx/core/content/ContextCompat.smali b/smali/smali/androidx/core/content/ContextCompat.smali
index f0ed745fb..8c0eed41a 100644
--- a/smali/smali/androidx/core/content/ContextCompat.smali
+++ b/smali/smali/androidx/core/content/ContextCompat.smali
@@ -267,7 +267,7 @@
 #
     #invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getColor(I)I
 
-    invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->getColor(Landroid/content/Context;I)I
+    invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(Landroid/content/Context;I)I
 
     move-result p0
 
@@ -313,7 +313,7 @@
 #
 #    return-object p0
 
-    invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+    invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->themeCSL(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
 
     move-result-object p0
 
diff --git a/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali b/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali
index e2209329a..e1e058630 100644
--- a/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali
+++ b/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali
@@ -647,7 +647,7 @@
 
     .line 1
 
-    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+    invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
     move-result-object p1
 
diff --git a/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali b/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali
index 0f2da0ed5..2616fdc55 100644
--- a/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali
+++ b/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali
@@ -87,7 +87,7 @@
 
     invoke-virtual {p1, p0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
-    invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+    invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
     move-result-object p2
 
diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali
index a6e168771..a22af7fca 100644
--- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali
+++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali
@@ -170,7 +170,7 @@
     :cond_7
     new-instance v0, Lru/vtosters/lite/themes/VTLResources;
 
-    invoke-static {}, Lru/vtosters/lite/utils/Globals;->getResources()Landroid/content/res/Resources;
+    invoke-static {}, Lru/vtosters/lite/utils/AndroidUtils;->getResources()Landroid/content/res/Resources;
 
     move-result-object v1