diff --git a/app/build.gradle b/app/build.gradle
index 6dcad8153..a77881c97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,6 +87,7 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
     namespace 'ru.vtosters.lite'
+    ndkVersion '24.0.8215888'
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index fb8fcb7e1..7e71b03ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,17 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Fri Jun 03 17:38:03 MSK 2022
+org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.ignorelist=classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar
\ No newline at end of file
+android.jetifier.ignorelist=classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar
diff --git a/smali/res/layout/fave_small_holder.xml b/smali/res/layout/fave_small_holder.xml
index e517102fa..c8d88330c 100644
--- a/smali/res/layout/fave_small_holder.xml
+++ b/smali/res/layout/fave_small_holder.xml
@@ -59,7 +59,7 @@
         android:layout_marginTop="4.0dip"
         android:src="@drawable/ic_more_vertical_24"
         android:scaleType="center"
-        android:tint="@color/fave_action_gray"
+        android:tint="?text_primary"
         android:layout_marginEnd="4.0dip"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -115,7 +115,7 @@
 
         <TextView
             android:textSize="13.0sp"
-            android:textColor="@color/gray_400"
+            android:textColor="?text_primary"
             android:ellipsize="end"
             android:gravity="start|center"
             android:id="@id/tv_subtitle"
@@ -136,12 +136,12 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/iv_fave_image"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle_container"
-        app:separatorTextColor="@color/gray_400"
+        app:separatorTextColor="?text_primary"
         app:singleLineMode="true"
         app:tagFontFamily="@string/font_family_regular"
         app:tagHorizontalPadding="2.0dip"
         app:tagLineSpacingExtra="5.0sp"
-        app:tagTextColor="@color/gray_400"
+        app:tagTextColor="?text_primary"
         app:tagTextSize="13.0sp"
         app:tagVerticalPadding="1.0dip"
         app:verticalSpacing="0.0dip" />
@@ -151,7 +151,7 @@
         android:layout_width="12.0dip"
         android:layout_height="12.0dip"
         android:src="@drawable/ic_tag_12"
-        android:tint="@color/gray_300"
+        android:tint="?text_primary"
         app:layout_constraintBottom_toBottomOf="@id/ft_tag_group"
         app:layout_constraintStart_toStartOf="@id/tv_title"
         app:layout_constraintTop_toTopOf="@id/ft_tag_group" />
diff --git a/smali/res/layout/music_fragment_playlist.xml b/smali/res/layout/music_fragment_playlist.xml
index 1c5fbd1b6..4216cc513 100644
--- a/smali/res/layout/music_fragment_playlist.xml
+++ b/smali/res/layout/music_fragment_playlist.xml
@@ -55,7 +55,7 @@
 
                     <TextView
                         android:textSize="17.0dip"
-                        android:textColor="?header_text"
+                        android:textColor="@color/white"
                         android:ellipsize="end"
                         android:gravity="center_horizontal"
                         android:id="@id/playlist_title"
diff --git a/smali/res/layout/tags_holder_layout.xml b/smali/res/layout/tags_holder_layout.xml
index a7d3309b3..9fd5f2a94 100644
--- a/smali/res/layout/tags_holder_layout.xml
+++ b/smali/res/layout/tags_holder_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="@color/gray_A40"
+<FrameLayout android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="48.0dip"
@@ -18,7 +18,7 @@
         android:layout_height="24.0dip"
         android:layout_marginTop="12.0dip"
         android:src="@drawable/ic_tag_24"
-        android:tint="?accent"
+        android:tint="?text_primary"
         android:layout_marginStart="16.0dip" />
 
     <com.vk.fave.views.FaveTagViewGroup
@@ -30,7 +30,7 @@
         android:layout_marginBottom="8.0dip"
         android:layout_marginStart="52.0dip"
         android:layout_marginEnd="8.0dip"
-        app:separatorTextColor="@color/gray_300"
+        app:separatorTextColor="?text_primary"
         app:separatorWidth="6.0dip"
         app:tagBackground="@drawable/highlight_radius_4"
         app:tagFontFamily="@string/font_family_regular"