Update README.md

.gitignore

@@ -21,6 +21,13 @@ local.properties
 /smali/VTLite.apk.idsig
 .idea/gradle.xml
 .idea/compiler.xml
+apksigner.jar
+apktool_2.6.0.jar
+debug.jks
+smali/VTLite_signed.apk.idsig
+local.properties
+gradle.properties
+smali/lib/armeabi-v7a/liblite.so
 smali/assets/version.properties
 app/src/main/assets/version.properties
 smali/build/resources.zip

README.md

@@ -1,30 +1,9 @@
 # VTosters Lite
 О багах сообщать в issues, **просьба не создавать дубликаты и воспользоваться поиском**
-
-### Пул Реквесты
-
-Скрипты и код далеки от **идеала** и поэтому мы всегда готовы к новым предложениям в **Pull Requests**
-
 ### Компиляция
-
 Требуется установленная **Java** >11 версии
+Скрипты для сборки лежат в папке **scripts**
 
-Требуется установленная **Android Studio**
+Linux/Unix: ```./build.sh```
 
-Весь декомпилированный код клиента находится в ```/smali``` 
-
-Весь исходный код написанный на Java находится в ```/app```
-
-Все необходимые скрипты для компиляции APK, его подписывании и не только находятся в ```/scripts```
-
-Скрипт для Linux/Mac: ```./build.sh```
-
-Скрипт для Windows: ```./build.bat```
-
-![](https://media.discordapp.net/attachments/762063967979175946/956927341450391562/unknown.png)
-
-### Проверка версии коммита
-
-С версии v0.0.4 доступна прямая проверка версии коммита внутри приложения
-
-![](https://media.discordapp.net/attachments/762063967979175946/957344234640408606/Screenshot_20220326-212257_VTLite__01.png)
+Windows: ```./build.bat```

app/src/main/java/com/aefyr/tsg/g2/sql/TelegramStickersDbHelper.java

@@ -94,6 +94,7 @@ public class TelegramStickersDbHelper extends SQLiteOpenHelper {
             e.printStackTrace();
             max = 0;
         }
+        Log.d("sova", "Found last index: " + max);
         return max + 1;
     }
 

app/src/main/java/ru/vtosters/lite/dnr/DNRPrefs.java

@@ -2,6 +2,7 @@ package ru.vtosters.lite.dnr;
 
 import ru.vtosters.lite.utils.Prefs;
 
+// Настройки Донецкой Народной Республики
 public class DNRPrefs {
     public static boolean getStoriesRead() {
         return Prefs.BooleanFalse("read_s");

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -1,7 +1,5 @@
 package ru.vtosters.lite.foaf;
 
-import static ru.vtosters.lite.utils.Proxy.getApiCom;
-
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -53,7 +51,7 @@ public class FoafBase {
         StringBuilder sb;
         if (Prefs.proxy()) {
             sb = new StringBuilder();
-            str = "https://" + getApiCom() + "/_/vk.com/foaf.php?id=";
+            str = "https://vk-api-proxy.xtrafrancyz.net/_/vk.com/foaf.php?id=";
         } else {
             sb = new StringBuilder();
             str = "https://vk.com/foaf.php?id=";

app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java

@@ -1,73 +0,0 @@
-package ru.vtosters.lite.ui.fragments;
-
-import static android.content.Context.MODE_PRIVATE;
-import static ru.vtosters.lite.utils.Helper.GetContext;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import com.vk.audio.AudioMessageUtils;
-import com.vk.auth.api.VKAccount;
-import com.vk.core.f.FileUtils;
-import com.vk.core.util.AppContextHolder;
-import com.vk.core.util.ToastUtils;
-import com.vk.imageloader.VKImageLoader;
-import com.vk.pushes.PushSubscriber;
-import com.vtosters.lite.auth.VKAccountManager;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
-import com.vtosters.lite.im.ImEngineProvider;
-
-import ru.vtosters.lite.ui.PreferencesUtil;
-import ru.vtosters.lite.utils.AccountManager;
-import ru.vtosters.lite.utils.Helper;
-
-public class AccountsFragment extends MaterialPreferenceToolbarFragment {
-
-    @Override
-    public void b(Bundle bundle) {
-        super.b(bundle);
-
-        int vtosterXml = Helper.GetContext().getResources().getIdentifier("empty", "xml", Helper.GetContext().getPackageName());
-        this.a(vtosterXml);
-
-        PreferencesUtil.addPreferenceCategory(this, Helper.getString("accounts"));
-
-        PreferencesUtil.addListPreference(this, "account", "", Helper.getString("selectacc"), AccountManager.getAccAmountNames(), AccountManager.getAccAmount());
-
-        a("account").b(AccountManager.getCurrentAccountName());
-
-        a("account").a((preference, o) -> {
-            VKImageLoader.b();
-            ImEngineProvider.a().h();
-            AudioMessageUtils.j();
-            FileUtils.l();
-            VKAccount b = VKAccountManager.b();
-            PushSubscriber.a.a(b.b(), b.c());
-            AppContextHolder.a.getSharedPreferences("gcm", 0).edit().clear().apply();
-            ToastUtils.a("Перезапустите приложение");
-            return true;
-        });
-
-        PreferencesUtil.addPreference(this, "newacc", Helper.getString("newacc"), "", null, preference -> {
-            SharedPreferences sharedPrefs = GetContext().getSharedPreferences("com.vtosters.lite_preferences", MODE_PRIVATE);
-            SharedPreferences.Editor editor = sharedPrefs.edit();
-            editor.putString("account", Integer.toString(AccountManager.getAvalibleAcc()));
-            editor.commit();
-
-            VKImageLoader.b();
-            ImEngineProvider.a().h();
-            AudioMessageUtils.j();
-            FileUtils.l();
-            VKAccount b = VKAccountManager.b();
-            PushSubscriber.a.a(b.b(), b.c());
-            AppContextHolder.a.getSharedPreferences("gcm", 0).edit().clear().apply();
-            ToastUtils.a("Перезапустите приложение");
-            return false;
-        });
-    }
-
-    @Override
-    public int aq() {
-        return Helper.GetContext().getResources().getIdentifier("accounts", "string", Helper.GetContext().getPackageName());
-    }
-}

app/src/main/java/ru/vtosters/lite/utils/AccountManager.java

@@ -1,88 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import static android.content.Context.MODE_PRIVATE;
-import static ru.vtosters.lite.utils.Helper.GetContext;
-
-import android.content.SharedPreferences;
-
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class AccountManager {
-    public static SharedPreferences getCurrentAccount() {
-        String Value = ru.vtosters.lite.utils.Helper.GetPreferences().getString("account", "");
-        return Helper.GetContext().getSharedPreferences("pref_account_manager" + Value, MODE_PRIVATE);
-    }
-
-    public static void MigrateToNewType() {
-        SharedPreferences OldPrefs = Helper.GetContext().getSharedPreferences("pref_account_manager", MODE_PRIVATE);
-        String OldPrefsValue = OldPrefs.getString("key_vk_account", "");
-        SharedPreferences NewPrefs = GetContext().getSharedPreferences("pref_account_manager0", MODE_PRIVATE);
-        SharedPreferences.Editor editor = NewPrefs.edit();
-        editor.putString("key_vk_account", OldPrefsValue);
-        editor.commit();
-    }
-
-    public static String getCurrentAccountName() {
-        String Value = ru.vtosters.lite.utils.Helper.GetPreferences().getString("account", "");
-        return getName(Value);
-    }
-
-    public static SharedPreferences getNeededAccount(String str) {
-        return Helper.GetContext().getSharedPreferences("pref_account_manager" + str, MODE_PRIVATE);
-    }
-
-    public static String getName(String str) {
-        Pattern pattern = Pattern.compile(".*\"name\":\\{.*?:\"(.*?)\"\\}.*");
-        Matcher matcher = pattern.matcher(getNeededAccount(str).getString("key_vk_account", ""));
-        if (matcher.find()) {
-            String group = matcher.group(1);
-            return group;
-        }
-        return "err";
-    }
-
-    public static int getAvalibleAcc() {
-        int intg = 0;
-        while (true) {
-            if (getName(Integer.toString(intg)) != "err") {
-                intg++;
-            } else {
-                break;
-            }
-        }
-        ;
-        return intg;
-    }
-
-    public static CharSequence[] getAccAmountNames() {
-        int intg = 0;
-        ArrayList<String> list = new ArrayList<String>();
-        while (true) {
-            if (getName(Integer.toString(intg)) != "err") {
-                list.add(getName(Integer.toString(intg)));
-                intg++;
-            } else {
-                break;
-            }
-        };
-        final CharSequence[] charSequenceItems = list.toArray(new CharSequence[list.size()]);
-        return charSequenceItems;
-    }
-
-    public static CharSequence[] getAccAmount() {
-        int intg = 0;
-        ArrayList<String> list = new ArrayList<String>();
-        while (true) {
-            if (getName(Integer.toString(intg)) != "err") {
-                list.add(Integer.toString(intg));
-                intg++;
-            } else {
-                break;
-            }
-        };
-        final CharSequence[] charSequenceItems = list.toArray(new CharSequence[list.size()]);
-        return charSequenceItems;
-    }
-}

app/src/main/java/ru/vtosters/lite/utils/Helper.java

@@ -1,11 +1,16 @@
 package ru.vtosters.lite.utils;
 
+import static android.content.Context.ACTIVITY_SERVICE;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -17,6 +22,7 @@ import com.vtosters.lite.auth.VKAccountManager;
 import com.vtosters.lite.im.ImEngineProvider;
 
 import java.lang.reflect.Method;
+import java.util.List;
 
 public class Helper {
     public static int GetUserId() {
@@ -63,12 +69,8 @@ public class Helper {
         return extendedUserProfile.a;
     }
 
-    public static void restarting(){
-        Context ctx = GetContext();
-        PackageManager pm = ctx.getPackageManager();
-        Intent intent = pm.getLaunchIntentForPackage(ctx.getPackageName());
-        Intent mainIntent = Intent.makeRestartActivityTask(intent.getComponent());
-        ctx.startActivity(mainIntent);
+    public static void restarting() {
+        GetContext().startActivity(Intent.makeRestartActivityTask(GetContext().getPackageManager().getLaunchIntentForPackage(GetContext().getPackageName()).getComponent()));
         Runtime.getRuntime().exit(0);
     }
 

app/src/main/java/ru/vtosters/lite/utils/Prefs.java

@@ -166,10 +166,6 @@ public class Prefs {
         return BooleanFalse("default_ad_list");
     }
 
-    public static boolean shitposting() {
-        return BooleanFalse("shitposting");
-    }
-
     public static boolean dev() {
         return BooleanFalse("dev");
     }
@@ -186,10 +182,6 @@ public class Prefs {
         return BooleanTrue("dns");
     }
 
-    public static boolean libverify() {
-        return BooleanFalse("libverify");
-    }
-
     public static boolean dnt() {
         return BooleanTrue("dnt");
     }
@@ -238,14 +230,10 @@ public class Prefs {
     }
 
     public static String getBuildNumber() {
-        return Prefs.getBuild(Helper.GetContext(), "version.properties");
+        return Prefs.loadAssetTextAsString(Helper.GetContext(), "version.properties");
     }
 
-    public static String getCommitLink() {
-        return "https://github.com/vtosters/lite/commit/" + Prefs.getBuild(Helper.GetContext(), "version.properties");
-    }
-
-    public static String getBuild(Context context, String name) {
+    public static String loadAssetTextAsString(Context context, String name) {
         try {
             Scanner scanner = new Scanner(context.getAssets().open(name));
             while (scanner.hasNextLine()) {
@@ -334,7 +322,7 @@ public class Prefs {
     }
 
     public static boolean newfeed() {
-        return BooleanTrue("newfeed");
+        return BooleanFalse("newfeed");
     }
 
     public static boolean offline() {
@@ -459,10 +447,6 @@ public class Prefs {
         return BooleanTrue("voice");
     }
 
-    public static boolean newvideo() {
-        return BooleanFalse("newvideo");
-    }
-
     public static String widgetads() {
         return ads() ? "null" : "app_widget";
     }
@@ -512,7 +496,6 @@ public class Prefs {
         ReferalsPut();
         StandardFilterPut();
         ShortLinkPut();
-        IDontWantToReadIt();
         String string = Helper.GetPreferences().getString("spamfilters", "");
         if (!string.isEmpty()) {
             mFilters.addAll(Arrays.asList(string.split(", ")));
@@ -576,31 +559,12 @@ public class Prefs {
         }
     }
 
-    public static void IDontWantToReadIt() {
-        if (BooleanTrue("shitposting")) {
-            try {
-                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(Helper.GetContext().getAssets().open("IDontWantToReadIt.txt")));
-                while (true) {
-                    String readLine = bufferedReader.readLine();
-                    if (readLine != null) {
-                        mFilters.add(readLine);
-                    } else {
-                        bufferedReader.close();
-                        return;
-                    }
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     public static String SSFSDomain() {
         String string = Helper.GetPreferences().getString("ssfscustom", "");
         if (!string.isEmpty()) {
             return string;
         }
-        return "https://vtsf.vknext.net";
+        return "https://sf.vknext.ru";
     }
 
     public static String VKVersion() {
@@ -624,7 +588,6 @@ public class Prefs {
         list.clear();
         list.add(new Items1());
         if (!oldabout()) {
-            list.add(new Items(21, R.string.opencommit));
             list.add(new Items(8, R.string.tgchannel));
             list.add(new Items(9, R.string.tgchat));
             list.add(new Items(16, R.string.vtfaq));
@@ -660,7 +623,7 @@ public class Prefs {
     }
 
     public static boolean proxy() {
-        return ru.vtosters.lite.utils.Helper.GetPreferences().getString("proxy", "").equals("apiproxy");
+        return ru.vtosters.lite.utils.Helper.GetPreferences().getString("proxy", "").equals("xtrafrancyz");
     }
 
     public static boolean authors_rec(String str) {
@@ -707,7 +670,7 @@ public class Prefs {
         setupFilters();
         fixGapps();
         setProxy();
-        AccountManager.MigrateToNewType();
+
         registerActivities(application);
     }
 

app/src/main/java/ru/vtosters/lite/utils/Proxy.java

@@ -43,45 +43,64 @@ public class Proxy {
     }
 
     public static String getApiCom() {
-        String string = Helper.GetPreferences().getString("proxyapi", "");
-        if (!Prefs.proxy() & string.isEmpty()) {
+        if (!Prefs.proxy()) {
             return "api.vk.com";
         }
-        return string;
+        String string = Helper.GetPreferences().getString("proxyapi", "");
+        if (!string.isEmpty()) {
+            return string;
+        }
+        return "vk-api-proxy.xtrafrancyz.net";
     }
 
     public static String getAwayPhpCom() {
-        String string = Helper.GetPreferences().getString("proxyapi", "");
-        if (!Prefs.proxy() & string.isEmpty()) {
+        if (!Prefs.proxy()) {
             return "m.vk.com";
         }
-        return string;
+        String string = Helper.GetPreferences().getString("proxyapi", "");
+        if (!string.isEmpty()) {
+            return string;
+        }
+        return "vk-api-proxy.xtrafrancyz.net";
     }
 
     public static String getOauthCom() {
-        String string = Helper.GetPreferences().getString("proxyoauth", "");
-        if (!Prefs.proxy() & string.isEmpty()) {
+        if (!Prefs.proxy()) {
             return "oauth.vk.com";
         }
-        return string;
+        String string = Helper.GetPreferences().getString("proxyoauth", "");
+        if (!string.isEmpty()) {
+            return string;
+        }
+        return "vk-oauth-proxy.xtrafrancyz.net";
     }
 
     public static String getStaticCom() {
-        String string = Helper.GetPreferences().getString("proxystatic", "");
-        if (!Prefs.proxy() & string.isEmpty()) {
+        if (!ru.vtosters.lite.utils.Prefs.proxy()) {
             return "static.vk.com";
         }
-        return string;
+        String string = Helper.GetPreferences().getString("proxystatic", "");
+        if (!string.isEmpty()) {
+            return string;
+        }
+        return "vk-static-proxy.xtrafrancyz.net";
     }
 
     public static String staticFix(String str) {
         String str2;
-        String string = Helper.GetPreferences().getString("proxystatic", "");
-        if (!Prefs.proxy() & string.isEmpty()) {
+        String str3;
+        if (!Prefs.proxy()) {
             return str;
         }
-        str2 = string;
-        return str.replace(str2, "static.vk.com");
+        String string = Helper.GetPreferences().getString("proxystatic", "");
+        if (string.isEmpty()) {
+            str3 = "static.vk.com";
+            str2 = "vk-static-proxy.xtrafrancyz.net";
+        } else {
+            str3 = "static.vk.com";
+            str2 = string;
+        }
+        return str.replace(str2, str3);
     }
 
     public static String GetConnector(String str) {

gradle.properties

@@ -1,3 +0,0 @@
-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

scripts/build.bat

@@ -15,8 +15,6 @@ echo.
 echo %ESC%[1;4mBuild dex...%ESC%[0m
 echo.
 call gradlew clean
-del app\src\main\assets\version.properties
-del smali\assets\version.properties
 call gradlew versionFile
 call gradlew assembleDebug
 if "%ERRORLEVEL%" == "0" (
@@ -75,7 +73,7 @@ echo.
 echo %ESC%[1;4mBuild apk...%ESC%[0m
 echo.
 cd smali\
-call java -jar ../scripts/apktool.jar b . -o ../smali/VTLite.apk --use-aapt2 -p ../scripts/framework/
+call java -jar ../scripts/apktool.jar b . -o VTLite.apk --use-aapt2 -p ../scripts/framework/
 if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
@@ -89,7 +87,8 @@ del assets\version.properties
 echo.
 echo %ESC%[1;4mSign apk...%ESC%[0m
 echo.
-call java -jar ../scripts/apksigner.jar sign --ks ../scripts/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android VTLite.apk
+call java -jar ../apksigner.jar sign --ks debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android VTLite.apk
+del VTLite.apk
 if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
@@ -121,7 +120,7 @@ GOTO startinstall
 echo.
 echo %ESC%[1;4mInstall apk...%ESC%[0m
 echo.
-call adb install VTLite.apk
+call adb install VTLite_signed.apk
 if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (

scripts/build.sh

@@ -7,8 +7,6 @@ UNDERLINE='\033[4m'
 
 echo -e "${BOLD}${UNDERLINE}Сборка dex..${NC}\n"
 cd ../
-rm ../smali/assets/version.properties
-rm ../lite/app/src/main/assets/version.properties
 ./gradlew versionFile
 ./gradlew assembleDebug
 if [ $? -eq 0 ]; then

scripts/framework/1.apk.REMOVED.git-id

@@ -1 +0,0 @@
-0840244ca18d071426e1a4cf350bdb0d446ca68f

smali/assets/IDontWantToReadIt.txt

@@ -1,193 +0,0 @@
-Путин
-Путин
-Путину
-Путину
-Путина
-Путина
-Путинская
-путинская
-Байден
-байден
-Байдену
-байдену
-Обама
-обама
-Обаме
-обаме
-Обаму
-обаму
-Трамп
-трамп
-Трампу
-трампу
-Санкции
-санкции
-Санкций
-санкций
-Россия
-россия
-россии
-России
-МИДУ РФ
-миду рф
-МИД РФ
-мид рф
-Мид РФ
-Мид рф
-Российской
-российской
-Украина
-украина
-Украине
-украине
-Украины
-украины
-военные
-Военные 
-Специальная операция
-Специальная Операция
-специальная операция
-специальная Операция
-Спец. Операция
-Спец. операция
-спец. Операция
-Спец Операция
-спец операция
-Спец операция 
-Военная операция
-Военная Операция
-военная Операция
-военная операция
-спецоперация
-Спецоперация
-спецоперации
-Спецоперации
-спецоперацию
-Спецоперацию
-вторжение
-Вторжение
-ЛНР
-лнр
-ДНР
-днр
-Донбасс
-донбасс
-Луганск
-луганск
-Луганская
-луганская
-Донецк
-донецк
-Донецкая
-донецкая
-Навальным
-навальным
-Навальный
-навальный
-Навального
-навального
-ВСУ
-всу
-ВС РФ
-вс рф
-Шойгу
-шойгу
-Зеленский
-зеленский
-Зеленским
-зеленским
-Зеленскому
-зеленскому
-Зеленского
-зеленского
-евросоюз
-Евросоюз
-евросоюзу
-Евросоюзу
-ес
-ЕС
-Войск
-войск
-армия
-Армия
-Войне
-войне
-войны
-Войны
-войн
-Войн
-солдат
-Солдат
-солдаты
-Солдаты
-Вооруженные
-вооруженные
-нато
-НАТО
-Нато
-Песков
-песков
-Пескову
-Пескова
-пескова
-пескову
-Кремль
-кремль
-Кремлю
-кремлю
-денацификация
-Денацификация
-денацификацию
-Денацификацию
-нацис
-Нацис
-нациз
-Нациз
-Медведев
-медведев
-денацифицировать
-Денацифицировать
-фашис
-Фашис
-фашиз
-Фашиз
-США
-сша
-Киев
-киев
-Харьков
-харьков
-Харьковская
-харьковская
-"Z"
-"V"
-«Z»
-«V»
-"з"
-"в"
-«з»
-«в»
-"z"
-"v"
-«z»
-«v»
-"З"
-"В"
-«З»
-«В»
-русня
-Русня
-хохол
-Хохол
-Хохлы
-хохлы
-ЛДНР
-лднр
-наказать Россию
-наказать россию
-наказать Русских
-наказать русских
-вооружение
-Вооружение
-пво
-ПВО

smali/assets/StandartFilter.txt

@@ -36,16 +36,4 @@ cпocоб зaрaбoтать
 смотри в Источнике
 Смотри в Источнике
 в источнике👇
-в источнике😳👇
-в Источник
-в источник
-В источник
-в источнике
-в Источнике
-В источнике
-в закрепленном комментарии
-в Закрепленном комментарии
-в закрепленном Комментарии
-В закрепленном комментарии
-В Закрепленном комментарии
-В закрепленном Комментарии
+в источнике😳👇

smali/res/drawable/mtrl_dlg_bg.xml

@@ -2,7 +2,7 @@
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
     android:inset="16dp">
     <shape>
-        <solid android:color="?dialogBg" />
+        <solid android:color="?attr/dialogBg" />
         <corners android:radius="8dp" />
     </shape>
 </inset>

smali/res/layout-sw600dp/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout-sw600dp/music_playlist.xml

@@ -5,9 +5,9 @@
         <include layout="@layout/music_page" />
     </ViewAnimator>
     <LinearLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" android:layout_marginStart="4.0dip" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_back_24" android:layout_marginStart="4.0dip" style="@style/ActionButton.White" />
         <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/toolbar_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="1" android:layout_weight="1.0" android:fontFamily="@string/font_family_medium" android:layout_marginStart="16.0dip" />
-        <ImageView android:layout_gravity="end|center" android:id="@id/edit_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:tint="?accent" app:srcCompat="@drawable/ic_mode_edit_24" style="@style/ActionButton.White" />
-        <ImageView android:layout_gravity="end|center" android:id="@id/more_btn" android:layout_width="36.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_more_vertical_24" android:tint="?accent" android:layout_marginEnd="4.0dip" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="end|center" android:id="@id/edit_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" app:srcCompat="@drawable/ic_mode_edit_24" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="end|center" android:id="@id/more_btn" android:tint="?accent" android:layout_width="36.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_more_vertical_24" android:layout_marginEnd="4.0dip" style="@style/ActionButton.White" />
     </LinearLayout>
 </merge>

smali/res/layout-sw600dp/music_playlists.xml

@@ -5,7 +5,7 @@
         <include layout="@layout/music_page" />
     </ViewAnimator>
     <FrameLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" style="@style/ActionButton.White" />
-        <Spinner android:layout_gravity="start|center" android:id="@id/spinner_nav" android:background="?android:selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="?accent" android:minHeight="?actionBarSize" android:popupBackground="@color/white" android:layout_marginStart="16.0dip" style="@style/Widget.AppCompat.Spinner.DropDown.ActionBar" />
+        <ImageView android:layout_gravity="center_vertical" android:tint="?accent" android:id="@id/back_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" style="@style/ActionButton.White" />
+        <Spinner android:layout_gravity="start|center" android:tint="?accent" android:id="@id/spinner_nav" android:background="?android:selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="?actionBarSize" android:popupBackground="@color/white" android:layout_marginStart="16.0dip" style="@style/Widget.AppCompat.Spinner.DropDown.ActionBar" />
     </FrameLayout>
 </merge>

smali/res/layout-sw600dp/music_user_music2.xml

@@ -2,8 +2,8 @@
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android">
     <FrameLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
-        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" android:tint="?accent" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" style="@style/ActionButton.White" />
         <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_header" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="48.0dip">
             <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:fontFamily="@string/font_family_medium" />
             <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:fontFamily="@string/font_family_medium" />

smali/res/layout-sw600dp/store_item.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/photo" android:layout_width="fill_parent" android:layout_height="188.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/sticker_placeholder" />
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="7.5dip" android:singleLine="true" android:layout_toLeftOf="@id/sticker_btn_wrap" android:layout_below="@id/photo" android:layout_alignParentLeft="true" app:typeface="Regular" />
-    <TextView android:textSize="12.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="-1.0dip" android:layout_marginBottom="9.5dip" android:singleLine="true" android:drawablePadding="10.0dip" android:layout_below="@id/title" android:layout_alignRight="@id/title" android:layout_alignParentLeft="true" app:typeface="Regular" />
+    <TextView android:textSize="12.0sp" android:textColor="#ffa6a6a6" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="-1.0dip" android:layout_marginBottom="9.5dip" android:singleLine="true" android:drawablePadding="10.0dip" android:layout_below="@id/title" android:layout_alignRight="@id/title" android:layout_alignParentLeft="true" app:typeface="Regular" />
     <FrameLayout android:id="@id/sticker_btn_wrap" android:background="@android:color/transparent" android:paddingLeft="12.0dip" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/sticker_gift" android:layout_below="@id/photo">
         <com.vtosters.lite.ui.BadooTextView android:id="@id/sticker_button" android:background="?tabbar_background" android:paddingTop="4.5dip" android:paddingBottom="8.5dip" android:layout_height="30.0dip" app:typeface="Medium" style="@style/VKUIButton.Green" />
         <ProgressBar android:layout_gravity="center" android:id="@id/sticker_progress" android:layout_width="20.0dip" android:layout_height="20.0dip" android:max="100" android:indeterminate="false" android:indeterminateOnly="false" />

smali/res/layout-v21/activity_story_settings.xml

@@ -8,7 +8,7 @@
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Сохранение" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_stories" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -20,7 +20,7 @@
                 <LinearLayout android:orientation="vertical" android:id="@id/ll_stories_privacy_holder" android:layout_width="fill_parent" android:layout_height="wrap_content" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_broadcast_group_cancomment" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_broadcast_group_cancomment_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -29,36 +29,36 @@
             <LinearLayout android:orientation="vertical" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:elevation="1.5dip">
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Общие" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_hidden_from_stories" android:background="@drawable/bg_settings_separator" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="?selectableItemBackground" android:layout_weight="1.0">
-                    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
                     <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories_desc" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_broadcast_post" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_broadcast_post_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_story_live" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_story_live_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_animation_overlay" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_animations" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_hd_quality" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save_hd_quality" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
-                <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
+                <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout-v21/dialog_bottom_sheet.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:id="@id/touch_outside" android:layout_width="fill_parent" android:layout_height="fill_parent" android:soundEffectsEnabled="false" android:importantForAccessibility="no" />
     <RelativeLayout android:layout_gravity="center|top" android:id="@id/design_bottom_sheet" android:background="@android:color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" style="?bottomSheetStyle">
-        <View android:id="@id/header_background" android:background="?header_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
+        <View android:id="@id/header_background" android:background="?tabbar_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
         <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?header_background" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:elevation="3.0dip" android:outlineProvider="bounds" app:popupTheme="?actionBarPopupTheme" app:theme="?actionBarTheme" app:titleTextAppearance="@style/ToolbarTitle" style="?actionBarTheme"
           xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <View android:id="@id/header_shadow" android:background="@drawable/picker_bg_attach_bottom_toolbar_shadow" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginTop="54.0dip" android:rotation="180.0" />

smali/res/layout-xlarge/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout/activity_story_settings.xml

@@ -8,7 +8,7 @@
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Сохранение" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_stories" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -20,7 +20,7 @@
                 <LinearLayout android:orientation="vertical" android:id="@id/ll_stories_privacy_holder" android:layout_width="fill_parent" android:layout_height="wrap_content" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_broadcast_group_cancomment" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_broadcast_group_cancomment_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -29,36 +29,36 @@
             <LinearLayout android:orientation="vertical" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip">
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Общие" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_hidden_from_stories" android:background="@drawable/bg_settings_separator" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="?selectableItemBackground" android:layout_weight="1.0">
-                    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
                     <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories_desc" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_broadcast_post" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_broadcast_post_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_story_live" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_story_live_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_animation_overlay" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_animations" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_hd_quality" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save_hd_quality" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
-                <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
+                <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout/apps_info_item.xml

@@ -9,7 +9,7 @@
         <com.vk.imageloader.view.VKCircleImageView android:id="@id/image0" android:paddingRight="4.0dip" android:layout_width="28.0dip" android:layout_height="28.0dip" app:placeholderImage="@drawable/placeholder_user_28" />
     </LinearLayout>
     <View android:id="@id/divider" android:background="@drawable/apps_info_playing_friends" android:layout_width="fill_parent" android:layout_height="0.5dip" />
-    <TextView android:textSize="15.0sp" android:textColor="?text_primary" android:id="@id/description" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="7.0sp" android:fontFamily="@string/font_family_regular" />
+    <TextView android:textSize="15.0sp" android:textColor="#ff212121" android:id="@id/description" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="7.0sp" android:fontFamily="@string/font_family_regular" />
     <TextView android:textSize="15.0sp" android:textColor="@color/text_blue" android:id="@id/text_expand" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/post_show_full" android:fontFamily="@string/font_family_regular" />
     <com.vtosters.lite.ui.widget.GameScreenshotsRecyclerView android:id="@id/recycle" android:layout_width="fill_parent" android:layout_height="256.0dip" android:layout_marginTop="12.0dip" />
 </LinearLayout>

smali/res/layout/board_topic_row.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:paddingTop="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/board_topic_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
+    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/board_topic_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
     <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
     <RelativeLayout android:id="@id/last_comment" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="21.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_below="@id/board_topic_info" android:layout_alignLeft="@id/board_topic_info" android:layout_alignRight="@id/board_topic_info">
         <View android:id="@id/board_topic_divider" android:background="#26000000" android:layout_width="wrap_content" android:layout_height="0.5dip" android:layout_marginLeft="-16.0dip" android:layout_marginRight="-16.0dip" android:layout_marginBottom="12.0dip" />

smali/res/layout/discover_info_holder.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.vk.common.view.FrameLayoutMinRatio android:orientation="vertical" android:id="@id/ratio_container" android:background="@drawable/bg_discover_card_rounded" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="?tabbar_background"
+<com.vk.common.view.FrameLayoutMinRatio android:orientation="vertical" android:id="@id/ratio_container" android:background="@drawable/bg_discover_card_rounded" android:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="centerCrop" app:placeholderImage="@color/image_placeholder_discover" app:roundedCornerRadius="4.0dip" />
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:padding="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">

smali/res/layout/discover_live_holder.xml

@@ -6,5 +6,5 @@
         <TextView android:textSize="16.0dip" android:textColor="@color/white" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxLines="1" />
         <TextView android:textSize="12.0dip" android:textColor="@color/gray" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:maxLines="1" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
     </LinearLayout>
-    <View android:background="@drawable/bg_discover_card_rounded" android:layout_width="fill_parent" android:layout_height="fill_parent" android:backgroundTint="?tabbar_background" />
+    <View android:background="@drawable/bg_discover_card_rounded" android:backgroundTint="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent" />
 </FrameLayout>

smali/res/layout/discover_longread_holder.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.vk.common.view.FrameLayoutMinRatio android:orientation="vertical" android:id="@id/ratio_container" android:background="@drawable/bg_discover_card_rounded" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="?tabbar_background"
+<com.vk.common.view.FrameLayoutMinRatio android:orientation="vertical" android:id="@id/ratio_container" android:background="@drawable/bg_discover_card_rounded" android:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="centerCrop" app:roundedCornerRadius="4.0dip" />
     <com.vk.common.view.SolidColorView android:id="@id/color_overlay" android:layout_width="fill_parent" android:layout_height="fill_parent" />

smali/res/layout/discover_media_holder.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:orientation="vertical" android:background="@drawable/bg_discover_card_rounded" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="?tabbar_background"
+<FrameLayout android:orientation="vertical" android:background="@drawable/bg_discover_card_rounded" android:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="fill_parent" android:layout_height="wrap_content" app:actualImageScaleType="centerCrop" app:placeholderImage="@color/image_placeholder_discover" app:roundedCornerRadius="4.0dip" />
     <View android:layout_gravity="start|bottom|center" android:id="@id/likes_bg" android:background="@drawable/discover_likes_background" android:layout_width="88.0dip" android:layout_height="88.0dip" />

smali/res/layout/feed_likes_filter_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <android.support.design.widget.TabLayout android:id="@id/feed_likes_tablayout" android:layout_width="fill_parent" android:layout_height="@dimen/feed_likes_filter_height" android:layout_weight="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tabBackground="?background_content" app:tabGravity="fill" app:tabIndicatorColor="?accent" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="?accent" app:tabTextAppearance="@style/FeedLikesTabStyle" app:tabTextColor="?text_primary" />
+    <android.support.design.widget.TabLayout android:id="@id/feed_likes_tablayout" android:layout_width="fill_parent" app:tabBackground="?background_content" android:layout_height="@dimen/feed_likes_filter_height" android:layout_weight="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tabGravity="fill" app:tabIndicatorColor="?accent" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="?accent" app:tabTextAppearance="@style/FeedLikesTabStyle" app:tabTextColor="?text_primary" />
 </merge>

smali/res/layout/fragment_home_tabs.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <android.support.design.widget.AppBarLayout android:background="?header_background" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/VKAppBar">
         <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="?actionBarSize">
-            <ImageButton android:id="@id/story" android:background="@drawable/highlight_icon_white_unbounded" android:layout_width="?actionBarSize" android:layout_height="?actionBarSize" android:src="@drawable/ic_story_28" android:tint="?header_text" android:contentDescription="@string/accessibility_open_stories_camera" android:layout_marginStart="0.0dip" android:layout_marginEnd="4.0dip" />
+            <ImageButton android:id="@id/story" android:background="@drawable/highlight_icon_white_unbounded" android:layout_width="?actionBarSize" android:layout_height="?actionBarSize" android:tint="?header_text" android:src="@drawable/ic_story_28" android:contentDescription="@string/accessibility_open_stories_camera" android:layout_marginStart="0.0dip" android:layout_marginEnd="4.0dip" />
             <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
                 <com.vtosters.lite.ui.widget.VKTabLayout android:id="@id/tabs" android:background="@android:color/transparent" android:layout_width="fill_parent" android:layout_height="fill_parent" app:tabBackground="@drawable/highlight_toolbar" app:tabIndicatorColor="?header_tab_active_indicator" app:tabIndicatorHeight="2.5dip" app:tabSelectedTextColor="?header_tab_active_text" app:tabTextColor="?header_tab_inactive_text" />
                 <FrameLayout android:layout_gravity="end" android:id="@id/settings_button_container" android:layout_width="52.0dip" android:layout_height="fill_parent">

smali/res/layout/fragment_photo_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:navigationIcon="@drawable/ic_cancel_black" app:title="@string/avp_pick_photo_title" app:titleTextColor="@color/black" />
-    <com.vk.photogallery.PhotoGalleryView android:id="@id/gallery_view" android:background="#ffffffff" android:padding="3.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="?actionBarSize" app:itemPadding="3.0dip" app:mediaType="photo" />
+    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:navigationIcon="@drawable/ic_cancel_black" app:title="@string/avp_pick_photo_title" app:titleTextColor="@color/black" />
+    <com.vk.photogallery.PhotoGalleryView android:id="@id/gallery_view" android:background="?tabbar_background" android:padding="3.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="?actionBarSize" app:itemPadding="3.0dip" app:mediaType="photo" />
 </FrameLayout>

smali/res/layout/gift_send_checkbox.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Switch android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/privacy" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/gift_send_privacy_label"
+<Switch android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/gift_send_privacy_label"
   xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/group_admin_info.xml

@@ -34,19 +34,19 @@
             <com.vtosters.lite.ui.CompoundRadioGroup android:orientation="vertical" android:id="@id/group_access_radiogroup" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_open" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_open" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_open" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_open_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_open" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_closed" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_closed" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_closed" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_closed_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_closed" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_private" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_private" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_private" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_private_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
             </com.vtosters.lite.ui.CompoundRadioGroup>

smali/res/layout/group_admin_item.xml

@@ -2,5 +2,5 @@
 <LinearLayout android:orientation="horizontal" android:paddingLeft="@dimen/post_side_padding" android:paddingRight="@dimen/post_side_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_gravity="center_vertical" android:id="@id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="32.0dip" android:tint="@color/light_gray" />
-    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="56.0dip" android:text="@string/group_info" />
+    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="56.0dip" android:text="@string/group_info" />
 </LinearLayout>

smali/res/layout/group_admin_services_public.xml

@@ -3,15 +3,15 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip">
         <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip">
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_wall" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_enable_comments" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_links" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_links" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_photos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_service_photoalbums" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_videos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/videos" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_audios" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/audios" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_board" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/board" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_events" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/public_events" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_places" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/places" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center|left" android:id="@id/group_service_contacts" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="8.0dip" android:text="@string/group_contacts" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_wall" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_enable_comments" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_links" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_links" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_photos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_service_photoalbums" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_videos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/videos" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_audios" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/audios" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_board" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/board" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_events" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/public_events" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_places" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/places" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_contacts" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="8.0dip" android:text="@string/group_contacts" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
         </LinearLayout>
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

smali/res/layout/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout/group_edit_manager.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>
@@ -14,19 +14,19 @@
             <com.vtosters.lite.ui.CompoundRadioGroup android:orientation="vertical" android:id="@id/group_access_radiogroup" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/moder" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_moderator" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_moderator" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_moder_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_moder" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/editor" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_editor" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_editor" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_editor_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_editor" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/admin" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_admin" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_admin" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_admin_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_admin" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
             </com.vtosters.lite.ui.CompoundRadioGroup>

smali/res/layout/layout_story_editor.xml

@@ -42,7 +42,7 @@
             <ImageView android:layout_gravity="start|center|top" android:id="@id/iv_drawing_width" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/picker_ic_stroke_width_shadow_48" android:scaleType="centerInside" android:tint="?header_text" />
             <FrameLayout android:layout_gravity="bottom" android:id="@id/fl_draw_nav_panel" android:background="#f2ffffff" android:layout_width="fill_parent" android:layout_height="48.0dip">
                 <ImageView android:id="@id/iv_cancel" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_not_close_24" android:scaleType="centerInside" android:tint="@color/picker_dark_icon" />
-                <ImageView android:layout_gravity="end|bottom|center" android:id="@id/iv_apply" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_done_24" android:scaleType="centerInside" android:tint="@color/accent_blue" />
+                <ImageView android:layout_gravity="end|bottom|center" android:id="@id/iv_apply" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_done_24" android:scaleType="centerInside" android:tint="?header_text" />
                 <LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="fill_parent">
                     <com.vk.stories.view.BrushSelectorView android:id="@id/bsv_pen" android:layout_width="48.0dip" android:layout_height="48.0dip" app:brush_bottomDrawable="@drawable/pen_round_chrome_48" app:brush_topDrawable="@drawable/pen_round_color_48" app:brush_topWhiteDrawable="@drawable/pen_round_color_white_48" />
                     <com.vk.stories.view.BrushSelectorView android:id="@id/bsv_marker" android:layout_width="48.0dip" android:layout_height="48.0dip" app:brush_bottomDrawable="@drawable/pen_marker_chrome_48" app:brush_topDrawable="@drawable/pen_marker_color_48" app:brush_topWhiteDrawable="@drawable/pen_marker_color_white_48" />

smali/res/layout/list_item_gift.xml

@@ -6,6 +6,6 @@
     <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@id/date" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_toLeftOf="@id/actions" android:layout_below="@id/username" android:layout_alignLeft="@id/username" />
     <ImageView android:id="@id/actions" android:layout_marginLeft="@dimen/post_side_padding_menu" android:layout_marginTop="4.0dip" android:layout_marginRight="@dimen/post_side_padding_btn" android:src="@drawable/ic_card_actions" android:layout_alignParentTop="true" style="@style/UserMediumAction" />
     <com.vk.imageloader.view.VKImageView android:id="@id/gift" android:layout_width="176.0dip" android:layout_height="176.0dip" android:layout_marginBottom="4.0dip" android:layout_below="@id/photo" android:layout_centerHorizontal="true" />
-    <TextView android:textSize="15.0dip" android:textColor="?text_primary" android:gravity="center" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="6.0dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:layout_below="@id/gift" android:lineSpacingExtra="4.299988dip" />
+    <TextView android:textSize="15.0dip" android:textColor="#ff212121" android:gravity="center" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="6.0dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:layout_below="@id/gift" android:lineSpacingExtra="4.299988dip" />
     <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:gravity="center" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="-2.3299866dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:text="@string/gifts_owner_privacy" android:layout_below="@id/title" />
 </RelativeLayout>

smali/res/layout/lives_dropdown_view.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip"
+<CheckedTextView android:textSize="16.0dip" android:textColor="@color/news_spinner_text" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/modal_bottom_sheet.xml

@@ -5,7 +5,7 @@
         <ImageView android:id="@id/icon" android:layout_width="56.0dip" android:layout_height="56.0dip" />
         <com.vk.imageloader.view.VKImageView android:id="@id/app_icon" android:layout_width="72.0dip" android:layout_height="72.0dip" app:roundedCornerRadius="14.0dip" />
         <TextView android:textColor="@color/black" android:gravity="center" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:maxLines="3" android:lineSpacingExtra="0.0sp" style="@style/VKUIText.Title1" />
-        <TextView android:gravity="center_horizontal" android:id="@id/message" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" />
+        <TextView android:gravity="center_horizontal" android:id="@id/message" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip"  />
         <TextView android:id="@id/more" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="4.0dip" style="@style/tertiary_button" />
         <android.support.v7.widget.RecyclerView android:id="@id/recycler" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>

smali/res/layout/music_playlist.xml

@@ -5,9 +5,9 @@
         <include layout="@layout/music_page" />
     </ViewAnimator>
     <LinearLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" style="@style/ActionButton.White" />
         <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/toolbar_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:maxLines="1" android:layout_weight="1.0" android:fontFamily="@string/font_family_medium" />
-        <ImageView android:layout_gravity="center|right" android:id="@id/edit_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:tint="?accent" app:srcCompat="@drawable/ic_mode_edit_24" style="@style/ActionButton.White" />
-        <ImageView android:layout_gravity="center|right" android:id="@id/more_btn" android:layout_width="36.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_more_vertical_24" android:tint="?accent" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center|right" android:id="@id/edit_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" app:srcCompat="@drawable/ic_mode_edit_24" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center|right" android:id="@id/more_btn" android:tint="?accent" android:layout_width="36.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_more_vertical_24" style="@style/ActionButton.White" />
     </LinearLayout>
 </merge>

smali/res/layout/music_playlists.xml

@@ -5,7 +5,7 @@
         <include layout="@layout/music_page" />
     </ViewAnimator>
     <FrameLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
-        <Spinner android:layout_gravity="start|center" android:id="@id/spinner_nav" android:background="?android:selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="?accent" android:minHeight="?actionBarSize" android:popupBackground="@color/white" android:layout_marginStart="64.0dip" style="@style/Widget.AppCompat.Spinner.DropDown.ActionBar" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
+        <Spinner android:layout_gravity="start|center" android:id="@id/spinner_nav" android:tint="?accent" android:background="?android:selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="?actionBarSize" android:popupBackground="@color/white" android:layout_marginStart="64.0dip" style="@style/Widget.AppCompat.Spinner.DropDown.ActionBar" />
     </FrameLayout>
 </merge>

smali/res/layout/music_user_music2.xml

@@ -2,8 +2,8 @@
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android">
     <FrameLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
-        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" android:tint="?accent" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" style="@style/ActionButton.White" />
         <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_header" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="64.0dip" android:layout_marginRight="48.0dip">
             <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:fontFamily="@string/font_family_medium" />
             <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:fontFamily="@string/font_family_medium" />

smali/res/layout/music_user_music2_icon.xml

@@ -2,8 +2,8 @@
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:orientation="horizontal" android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
-        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:tint="?accent" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
-        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" android:tint="?accent" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center_vertical" android:id="@id/back_btn" android:tint="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="4.0dip" android:src="@drawable/ic_back_24" android:contentDescription="@string/music_talkback_go_back" style="@style/ActionButton.White" />
+        <ImageView android:layout_gravity="center|right" android:id="@id/search_btn" android:tint="?accent" android:visibility="gone" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:src="@drawable/ic_menu_search" style="@style/ActionButton.White" />
         <com.vk.imageloader.view.VKCircleImageView android:layout_gravity="center_vertical" android:id="@android:id/icon" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="64.0dip" app:backgroundImage="@color/music_placeholder_bg" app:placeholderImage="@drawable/placeholder_user_40" />
         <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_header" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="116.0dip" android:layout_marginRight="48.0dip">
             <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:fontFamily="@string/font_family_medium" />

smali/res/layout/news_dropdown_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical" android:background="@drawable/bottom_divider_bg" android:padding="0.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckedTextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip" android:drawablePadding="12.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
+    <CheckedTextView android:textSize="16.0dip" android:textColor="@color/news_spinner_text" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip" android:drawablePadding="12.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
     <FrameLayout android:id="@id/wrapper" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="52.0dip" android:paddingEnd="16.0dip">
         <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text2" android:focusable="false" android:clickable="false" android:layout_width="wrap_content" android:layout_height="48.0dip" android:layout_marginEnd="56.0dip" />
         <android.support.v7.widget.SwitchCompat android:gravity="center_vertical" android:layout_gravity="end" android:id="@android:id/checkbox" android:focusable="false" android:clickable="false" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="48.0dip" />

smali/res/layout/notifications_item_comment.xml

@@ -5,5 +5,5 @@
     <com.vk.imageloader.view.VKImageView android:id="@id/post_photo" android:layout_width="47.0dip" android:layout_height="47.0dip" android:layout_marginBottom="12.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/photo_placeholder" app:roundedCornerRadius="2.0dip" />
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0dip" android:textColor="?accent" android:ellipsize="middle" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="12.0dip" android:maxLines="@integer/replies_max_lines" android:singleLine="false" android:layout_toLeftOf="@id/post_photo" android:layout_toRightOf="@id/photo" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" app:typeface="Medium" />
     <com.vtosters.lite.ui.LinkedTextView android:textSize="14.0dip" android:textColor="#ff000000" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_toLeftOf="@id/post_photo" android:layout_below="@id/title" android:layout_alignLeft="@id/title" android:lineSpacingExtra="4.0dip" />
-    <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="?text_secondary" android:textColorLink="?accent" android:ellipsize="marquee" android:id="@id/info" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_below="@id/subtitle" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
+    <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="#8a000000" android:textColorLink="?accent" android:ellipsize="marquee" android:id="@id/info" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_below="@id/subtitle" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
 </RelativeLayout>

smali/res/layout/notifications_item_users.xml

@@ -5,6 +5,6 @@
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0dip" android:textColor="#ff737373" android:textColorLink="?accent" android:ellipsize="end" android:id="@id/title" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="12.0dip" android:maxLines="2" android:singleLine="false" android:layout_toLeftOf="@id/post_photo" android:layout_toRightOf="@id/photo" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:lineSpacingExtra="3.0dip" app:typeface="Regular" />
     <com.vk.imageloader.view.VKImageView android:id="@id/post_photo" android:layout_width="47.0dip" android:layout_height="47.0dip" android:layout_marginTop="2.0dip" android:layout_marginBottom="12.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/photo_placeholder" app:roundedCornerRadius="2.0dip" />
     <com.vk.core.view.PhotoStripView android:id="@id/users" android:layout_width="fill_parent" android:layout_height="40.0dip" android:layout_marginTop="7.0dip" android:layout_marginBottom="7.0dip" android:src="@drawable/user_placeholder" android:layout_below="@id/title" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
-    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:ellipsize="marquee" android:id="@id/subtitle" android:paddingBottom="11.5dip" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_below="@id/users" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
+    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:ellipsize="marquee" android:id="@id/subtitle" android:paddingBottom="11.5dip" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_below="@id/users" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
     <ImageView android:id="@id/action" android:layout_width="20.0dip" android:layout_height="20.0dip" android:layout_marginRight="-4.5dip" android:layout_marginBottom="-4.5dip" android:src="@drawable/ic_not_like_16" android:layout_alignRight="@id/photo" android:layout_alignBottom="@id/photo" />
 </RelativeLayout>

smali/res/layout/picker_activity_attach.xml

@@ -5,15 +5,15 @@
       xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
         <View android:id="@id/click_handler" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <com.vk.attachpicker.widget.ContentViewPager android:id="@id/pager" android:fitsSystemWindows="@bool/picker_transparent_status_bar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" />
-        <FrameLayout android:id="@id/fl_tabs_container" android:background="#ffffffff" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="@dimen/picker_tab_panel_height">
+        <FrameLayout android:id="@id/fl_tabs_container" android:background="?tabbar_background" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="@dimen/picker_tab_panel_height">
             <android.support.v7.widget.RecyclerView android:layout_gravity="center_horizontal" android:id="@id/rv_tabs" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="fill_parent" />
-            <View android:id="@id/tabs_overlay" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+            <View android:id="@id/tabs_overlay" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent" />
             <com.vk.attachpicker.widget.ToolbarContainer android:layout_gravity="bottom" android:id="@id/tc_toolbar_container" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         </FrameLayout>
         <FrameLayout android:layout_gravity="bottom" android:id="@id/fl_bottom_button" android:layout_width="fill_parent" android:layout_height="56.0dip">
             <View android:background="@drawable/picker_bg_attach_bottom_toolbar_shadow" android:layout_width="fill_parent" android:layout_height="8.0dip" />
             <com.vk.attachpicker.widget.AttachCounterView android:layout_gravity="bottom" android:id="@id/acv_bottom_panel_counter" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" />
-            <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:layout_gravity="bottom" android:id="@id/tv_bottom_panel_cancel" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" android:text="@string/picker_cancel" android:singleLine="true" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
+            <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:layout_gravity="bottom" android:id="@id/tv_bottom_panel_cancel" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" android:text="@string/picker_cancel" android:singleLine="true" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
         </FrameLayout>
     </android.support.design.widget.CoordinatorLayout>
 </com.vk.core.view.FitSystemWindowsFrameLayout>

smali/res/layout/picker_activity_graffiti.xml

@@ -4,7 +4,7 @@
     <FrameLayout android:id="@id/fl_user_container" android:layout_width="fill_parent" android:layout_height="48.0dip">
         <LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:id="@id/ll_user_container_inner" android:layout_width="wrap_content" android:layout_height="fill_parent">
             <ImageView android:layout_gravity="center_vertical" android:id="@id/iv_avatar" android:layout_width="32.0dip" android:layout_height="32.0dip" />
-            <TextView android:textSize="14.0sp" android:textColor="#8a000000" android:layout_gravity="center_vertical" android:id="@id/tv_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:singleLine="true" />
+            <TextView android:textSize="14.0sp" android:textColor="?text_primary" android:layout_gravity="center_vertical" android:id="@id/tv_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:singleLine="true" />
         </LinearLayout>
         <View android:layout_gravity="bottom" android:background="#1e000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
     </FrameLayout>

smali/res/layout/picker_attach_gallery_header.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="horizontal" android:id="@id/picker_attach_gallery_camera_layout" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="56.0dip"
+<LinearLayout android:orientation="horizontal" android:id="@id/picker_attach_gallery_camera_layout" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="56.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:id="@id/picker_attach_gallery_photo_view" android:layout_width="0.0dip" android:layout_height="fill_parent" android:foreground="@drawable/picker_white_ripple_bounded" android:layout_weight="1.0">
-        <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_photo_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_photo" android:drawableLeft="@drawable/ic_camera_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_camera_24" android:fontFamily="@string/font_family_medium" app:drawableTint="@color/accent_blue" style="@style/AttachPicker.Header.TextView" />
+        <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_photo_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_photo" android:drawableLeft="@drawable/ic_camera_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_camera_24" android:fontFamily="@string/font_family_medium" app:drawableTint="?accent" style="@style/AttachPicker.Header.TextView" />
     </FrameLayout>
     <View android:id="@id/picker_attach_gallery_separator_view" android:background="@color/picker_grey_divider" android:layout_width="0.5dip" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" />
     <FrameLayout android:id="@id/picker_attach_gallery_video_view" android:layout_width="0.0dip" android:layout_height="fill_parent" android:foreground="@drawable/picker_white_ripple_bounded" android:layout_weight="1.0">
-        <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_video_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_video" android:drawableLeft="@drawable/ic_video_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_video_24" android:fontFamily="@string/font_family_medium" app:drawableTint="@color/accent_blue" style="@style/AttachPicker.Header.TextView" />
+        <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_video_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_video" android:drawableLeft="@drawable/ic_video_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_video_24" android:fontFamily="@string/font_family_medium" app:drawableTint="?accent" style="@style/AttachPicker.Header.TextView" />
     </FrameLayout>
 </LinearLayout>

smali/res/layout/picker_layout_editor_bottom_panel.xml

@@ -5,6 +5,6 @@
         <TextView android:textSize="15.0sp" android:textColor="@color/picker_dark_icon" android:gravity="center" android:layout_gravity="center" android:id="@id/tv_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@string/font_family_medium" />
     </FrameLayout>
     <ImageView android:layout_gravity="start|bottom|center" android:id="@id/iv_cancel" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="@dimen/picker_bottom_button_height" android:layout_height="@dimen/picker_bottom_button_height" android:src="@drawable/picker_ic_close_24" android:scaleType="centerInside" android:tint="@color/picker_dark_icon" />
-    <ImageView android:layout_gravity="end|bottom|center" android:id="@id/iv_apply" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="@dimen/picker_bottom_button_height" android:layout_height="@dimen/picker_bottom_button_height" android:src="@drawable/ic_done_24" android:scaleType="centerInside" android:tint="@color/accent_blue" />
+    <ImageView android:layout_gravity="end|bottom|center" android:id="@id/iv_apply" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="@dimen/picker_bottom_button_height" android:layout_height="@dimen/picker_bottom_button_height" android:src="@drawable/ic_done_24" android:scaleType="centerInside" android:tint="?accent" />
     <View android:id="@id/divider" android:background="@color/picker_grey_divider" android:layout_width="fill_parent" android:layout_height="0.5dip" />
 </merge>

smali/res/layout/picker_screen_image_editor.xml

@@ -23,7 +23,7 @@
             <com.vk.attachpicker.widget.EditorActionView android:id="@id/eav_crop" android:layout_width="0.0px" android:layout_height="fill_parent" android:layout_weight="1.0" app:eav_icon="@drawable/picker_ic_crop_rotate_24" app:eav_title="@string/picker_crop" />
             <com.vk.attachpicker.widget.EditorActionView android:id="@id/eav_auto" android:layout_width="0.0px" android:layout_height="fill_parent" android:layout_weight="1.0" app:eav_icon="@drawable/picker_ic_magic_24" app:eav_title="@string/picker_auto" />
         </LinearLayout>
-        <com.vk.attachpicker.widget.AnimatableTextView android:textSize="16.0sp" android:textColor="@color/accent_blue" android:gravity="center" android:id="@id/tv_attach" android:background="@drawable/picker_btn_white" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" android:layout_marginTop="@dimen/picker_image_editor_actions_height" android:text="@string/picker_done" android:textAllCaps="true" />
+        <com.vk.attachpicker.widget.AnimatableTextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:id="@id/tv_attach" android:background="@drawable/picker_btn_white" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" android:layout_marginTop="@dimen/picker_image_editor_actions_height" android:text="@string/picker_done" android:textAllCaps="true" />
         <View android:background="#ffe0e0e0" android:layout_width="fill_parent" android:layout_height="0.5dip" android:layout_marginTop="@dimen/picker_image_editor_actions_height" />
         <FrameLayout android:id="@id/fl_delete_area" android:background="#ddffffff" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginBottom="@dimen/picker_bottom_button_height">
             <ImageView android:layout_gravity="center" android:id="@id/iv_delete_icon" android:layout_width="96.0dip" android:layout_height="48.0dip" android:src="@drawable/picker_ic_delete_zone" />
@@ -31,7 +31,7 @@
         </FrameLayout>
     </FrameLayout>
     <FrameLayout android:layout_gravity="bottom" android:id="@id/fl_auto_panel" android:background="#ffffffff" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/picker_image_editor_bottom_panel">
-        <TextView android:textSize="16.0sp" android:textColor="@color/accent_blue" android:gravity="bottom|center" android:layout_gravity="center_horizontal" android:id="@id/tv_auto_value" android:layout_width="100.0dip" android:layout_height="32.0dip" android:includeFontPadding="false" />
+        <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="bottom|center" android:layout_gravity="center_horizontal" android:id="@id/tv_auto_value" android:layout_width="100.0dip" android:layout_height="32.0dip" android:includeFontPadding="false" />
         <com.vk.attachpicker.widget.VkSeekBar android:layout_gravity="center_horizontal" android:id="@id/vsb_auto_value" android:paddingLeft="24.0dip" android:paddingRight="24.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginTop="24.0dip" />
         <com.vk.attachpicker.widget.EditorBottomPanel android:layout_gravity="bottom" android:id="@id/ebp_auto" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" app:ebp_title="@string/picker_auto_full" />
     </FrameLayout>

smali/res/layout/poll_edit.xml

@@ -13,7 +13,7 @@
             </LinearLayout>
             <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@id/poll_anonym_wrap" android:paddingLeft="@dimen/poll_edit_padding" android:paddingRight="@dimen/poll_edit_padding" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="6.0dip">
                 <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="?accent" android:id="@id/poll_anonym_header" android:paddingLeft="16.0dip" android:paddingTop="13.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/poll_settings" app:typeface="Medium" />
-                <Switch android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/poll_anonym_switch" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/poll_anonym" />
+                <Switch android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/poll_anonym_switch" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/poll_anonym" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout/poll_view.xml

@@ -5,7 +5,7 @@
     <android.support.v7.widget.AppCompatImageView android:layout_gravity="end|center|top" android:id="@id/poll_actions" android:background="@drawable/highlight_unlimited" android:layout_width="36.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_more_vertical_24" android:scaleType="center" />
     <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="160.0dip">
-            <com.vk.core.widget.AdaptiveSizeTextView android:textSize="20.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/poll_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-8.0dip" android:maxLines="3" android:textAlignment="center" android:layout_marginStart="28.0dip" android:layout_marginEnd="28.0dip" app:fontFamily="@font/roboto_bold" />
+            <com.vk.core.widget.AdaptiveSizeTextView android:textSize="20.0sp" android:ellipsize="end" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/poll_title" android:textColor="?text_primary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-8.0dip" android:maxLines="3" android:textAlignment="center" android:layout_marginStart="28.0dip" android:layout_marginEnd="28.0dip" app:fontFamily="@font/roboto_bold" />
             <TextView android:textSize="14.0sp" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/poll_author_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:singleLine="true" android:textAlignment="center" android:paddingStart="2.0dip" android:paddingEnd="2.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
             <TextView android:textSize="14.0sp" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/poll_info" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:singleLine="true" android:textAlignment="center" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
         </LinearLayout>

smali/res/layout/profile_edit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView android:background="?background_content" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:vk="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/scrollable_content" android:background="?background_content" android:paddingBottom="5.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip">
+    <LinearLayout android:gravity="center_horizontal" android:background="?background_content" android:orientation="vertical" android:id="@id/scrollable_content" android:paddingBottom="5.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip">
         <include android:id="@id/edit_info_box" android:layout_width="fill_parent" android:layout_height="wrap_content" layout="@layout/profile_edit_info" />
         <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
             <LinearLayout android:orientation="vertical" android:paddingTop="24.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">

smali/res/layout/profile_edit_info.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:orientation="vertical" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="24.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/info_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="6.0dip" android:text="@string/edit_name_req_processing" />
-        <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/info_new_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="TextView" />
+        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/info_new_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="TextView" />
         <TextView android:id="@id/info_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel_request" android:fontFamily="@string/font_family_medium" style="@style/secondary_button" />
     </LinearLayout>
 </LinearLayout>

smali/res/layout/radio_button_list_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckedTextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/standard_list_item_padding" android:layout_marginRight="@dimen/standard_list_item_padding" android:minHeight="56.0dip" android:drawableLeft="@drawable/radio_button" android:drawablePadding="16.0dip" />
+    <CheckedTextView android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/standard_list_item_padding" android:layout_marginRight="@dimen/standard_list_item_padding" android:minHeight="56.0dip" android:drawableLeft="@drawable/radio_button" android:drawablePadding="16.0dip" />
 </FrameLayout>

smali/res/layout/removable_chat_user.xml

@@ -4,7 +4,7 @@
     <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_marginRight="0.0dip" android:layout_centerVertical="false" app:placeholderImage="@drawable/placeholder_user_72" style="@style/UserSmallPhoto" />
     <ImageView android:id="@id/flist_item_btn" android:background="@drawable/highlight" android:focusable="false" android:focusableInTouchMode="false" android:duplicateParentState="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_list_remove" android:scaleType="center" android:layout_alignParentRight="true" />
     <LinearLayout android:orientation="vertical" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/flist_item_btn" android:layout_toRightOf="@id/photo" android:layout_centerVertical="true">
-        <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="marquee" android:id="@android:id/text1" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
+        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="marquee" android:id="@android:id/text1" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
         <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@android:id/text2" android:paddingTop="1.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
     <ImageView style="@style/Online.Small" />

smali/res/layout/sticker_details.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content">
+    <RelativeLayout android:layout_width="fill_parent" android:background="?tabbar_background" android:layout_height="wrap_content">
         <com.vk.imageloader.view.VKHorizontalParallaxImageView android:id="@id/iv_parallax_bg" android:background="#ffe9ecf0" android:layout_width="fill_parent" android:layout_height="202.0dip" />
         <com.vtosters.lite.ui.widget.ViewPagerInfinite android:id="@id/pager" android:paddingTop="2.0dip" android:paddingBottom="25.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="202.0dip" app:nextPeriodSec="3" />
         <view android:gravity="center|top" android:id="@id/pager_dots_wrap" android:layout_width="fill_parent" android:layout_height="12.0dip" android:layout_marginBottom="4.0dip" android:layout_alignBottom="@id/pager" class="com.vtosters.lite.fragments.stickers.StickersDetailsFragment$PagerDotsView" />

smali/res/layout/sticker_settings_switch_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:background="@drawable/highlight" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="14.0dip" android:paddingRight="13.0dip" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/sticker_settings_autosuggest_title" android:layout_toLeftOf="@id/checkbox" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" />
-    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:text="@string/sticker_settings_autosuggest_subtitle" android:layout_toLeftOf="@id/checkbox" android:layout_below="@id/title" android:layout_alignParentLeft="true" android:lineSpacingExtra="3.0dip" />
+    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/sticker_settings_autosuggest_title" android:layout_toLeftOf="@id/checkbox" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" />
+    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:text="@string/sticker_settings_autosuggest_subtitle" android:layout_toLeftOf="@id/checkbox" android:layout_below="@id/title" android:layout_alignParentLeft="true" android:lineSpacingExtra="3.0dip" />
     <android.support.v7.widget.SwitchCompat android:id="@id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" />
 </RelativeLayout>

smali/res/layout/tgs_entry.xml

@@ -1,15 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@id/linearLayout5" android:padding="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="10.0dip" android:layout_marginRight="5.0dip"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="top" android:id="@id/photo" android:layout_width="fill_parent" android:layout_height="wrap_content" />
-    <LinearLayout android:layout_gravity="center_horizontal" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0">
-        <TextView android:textSize="18.0sp" android:textStyle="bold" android:textColor="?android:textColorPrimary" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/vkim_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" />
-        <TextView android:textColor="?android:textColorSecondary" android:layout_gravity="center_horizontal" android:id="@id/vkim_cancel_label_text" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-    </LinearLayout>
-    <LinearLayout android:gravity="fill_horizontal" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1.0">
-        <ImageView android:id="@id/action_delete" android:layout_width="wrap_content" android:layout_height="fill_parent" />
-        <ImageView android:id="@id/button_update" android:layout_width="wrap_content" android:layout_height="fill_parent" />
-        <Space android:layout_width="0.0dip" android:layout_height="fill_parent" android:layout_weight="1.0" />
-        <android.support.v7.widget.SwitchCompat android:id="@id/choose_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-    </LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="12.0dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginLeft="5dp"
+    android:layout_marginRight="5dp"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:id="@id/linearLayout5">
+            <ImageView
+                android:id="@id/photo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1.0"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@id/vkim_cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorPrimary"
+                    android:textSize="18.0sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@id/vkim_cancel_label_text"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:textColorSecondary" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                android:gravity="fill_horizontal"
+                android:orientation="horizontal"
+                >
+
+                <ImageView
+                    android:id="@id/action_delete"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent" />
+
+                <ImageView
+                    android:id="@id/button_update"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent" />
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"/>
+
+                <android.support.v7.widget.SwitchCompat
+                    android:id="@id/choose_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    />
+            </LinearLayout>
 </LinearLayout>

smali/res/layout/video_album_edit.xml

@@ -8,8 +8,8 @@
                 <EditText android:textSize="16.0dip" android:textColor="?text_primary" android:textColorHint="#ff909499" android:gravity="center_vertical" android:id="@id/title" android:background="@android:color/transparent" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="48.0dip" android:hint="@string/create_album_title" android:inputType="textCapSentences|textMultiLine" />
                 <View android:id="@id/divider" android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/create_album_privacy" />
-                    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/create_album_privacy" />
+                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>

smali/res/layout/video_edit.xml

@@ -10,13 +10,13 @@
                 <EditText android:textSize="16.0dip" android:textColor="?text_primary" android:textColorHint="#ff909499" android:gravity="center_vertical" android:id="@id/subtitle" android:background="@android:color/transparent" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="48.0dip" android:hint="@string/create_album_description" android:inputType="textCapSentences|textMultiLine" />
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy" />
-                    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy" />
+                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
                 </RelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy_comment" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/privacy_title_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy_comments" />
-                    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/privacy_subtitle_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title_comment" />
+                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy_comments" />
+                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title_comment" />
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>

smali/res/layout/view_poll_option.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="15.0dip" android:textColor="?text_primary" android:layout_gravity="start|center" android:id="@id/option_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="9.0dip" android:layout_marginBottom="9.0dip" android:fontFamily="@string/font_family_regular" android:layout_marginStart="12.0dip" android:layout_marginEnd="76.0dip" />
+    <TextView android:textSize="15.0dip" android:layout_gravity="start|center" android:id="@id/option_name" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="9.0dip" android:layout_marginBottom="9.0dip" android:fontFamily="@string/font_family_regular" android:layout_marginStart="12.0dip" android:layout_marginEnd="76.0dip" />
     <android.support.v7.widget.AppCompatCheckBox android:layout_gravity="end|center" android:id="@id/multiple_choice_checkbox" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="7.0dip" />
-    <TextView android:textSize="14.0dip" android:textColor="?text_primary" android:layout_gravity="end|center" android:id="@id/results" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="9.0dip" android:layout_marginBottom="9.0dip" android:drawablePadding="4.0dip" android:fontFamily="@string/font_family_medium" android:layout_marginEnd="12.0dip" />
+    <TextView android:textSize="14.0dip" android:layout_gravity="end|center" android:id="@id/results" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="9.0dip" android:layout_marginBottom="9.0dip" android:drawablePadding="4.0dip" android:fontFamily="@string/font_family_medium" android:layout_marginEnd="12.0dip" />
     <ProgressBar android:layout_gravity="end|center" android:id="@id/progress" android:visibility="invisible" android:layout_width="20.0dip" android:layout_height="20.0dip" android:layout_marginEnd="12.0dip" />
 </merge>

smali/res/layout/view_story_blacklist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:orientation="horizontal" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:gravity="center_vertical" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:text="@string/hidden_from_stories" />
+    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center_vertical" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:text="@string/hidden_from_stories" />
 </FrameLayout>

smali/res/layout/view_story_setting.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:orientation="horizontal" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="90.0dip" android:layout_weight="1.0">
-        <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
         <TextView android:textSize="14.0sp" android:textColor="#89000000" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
     </LinearLayout>
     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />

smali/res/layout/vkim_alert_item_simple.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textAppearance="@style/VkIm.Dialog.List.Item" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text1" android:paddingLeft="24.0dip" android:paddingRight="24.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:minHeight="?android:listPreferredItemHeightSmall"
+<TextView android:textAppearance="@style/VkIm.Dialog.List.Item" android:gravity="center_vertical" android:id="@android:id/text1" android:textColor="?text_primary" android:paddingLeft="24.0dip" android:paddingRight="24.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:minHeight="?android:listPreferredItemHeightSmall"
   xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/vkim_dialog_actions_vc_by_popup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@id/dialog_actions_list_container" android:background="@drawable/vkim_bg_overlay" android:padding="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:backgroundTint="?tabbar_background"
+<LinearLayout android:id="@id/dialog_actions_list_container" android:background="@drawable/vkim_bg_overlay" android:backgroundTint="?tabbar_background" android:padding="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.im.ui.views.dialog_actions.DialogActionsListView android:id="@id/dialog_actions_list_content" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:fadingEdge="none" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" app:vklib_alv_dividerColor="#1e000000" app:vklib_alv_dividerHeight="16.0dip" app:vklib_alv_dividerSize="0.5dip" app:vklib_alv_optionBackground="@drawable/vkim_ripple_dark" app:vklib_alv_optionIconLabelSpace="20.0dip" app:vklib_alv_optionIconTint="#ffaaaeb3" app:vklib_alv_optionLabelTextColor="#ff000000" app:vklib_alv_optionLabelTextSize="16.0sp" app:vklib_alv_optionPaddingEnd="20.0dip" app:vklib_alv_optionPaddingStart="20.0dip" />
 </LinearLayout>

smali/res/layout/vkim_dialog_actions_vc_by_view.xml

@@ -2,7 +2,7 @@
 <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:id="@id/dialog_actions_dim" android:background="?header_background" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <LinearLayout android:id="@id/dialog_actions_list_container" android:background="@drawable/vkim_bg_overlay" android:padding="16.0dip" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-8.0dip" android:layout_marginStart="-8.0dip" android:layout_marginEnd="-8.0dip" android:backgroundTint="?tabbar_background">
+    <LinearLayout android:id="@id/dialog_actions_list_container" android:background="@drawable/vkim_bg_overlay" android:backgroundTint="?tabbar_background" android:padding="16.0dip" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-8.0dip" android:layout_marginStart="-8.0dip" android:layout_marginEnd="-8.0dip">
         <com.vk.im.ui.views.dialog_actions.DialogActionsListView android:id="@id/dialog_actions_list_content" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:fadingEdge="none" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" app:vklib_alv_dividerColor="#1e000000" app:vklib_alv_dividerHeight="16.0dip" app:vklib_alv_dividerSize="0.5dip" app:vklib_alv_optionBackground="@drawable/vkim_ripple_dark" app:vklib_alv_optionIconLabelSpace="20.0dip" app:vklib_alv_optionIconTint="#ffaaaeb3" app:vklib_alv_optionLabelTextColor="?text_primary" app:vklib_alv_optionLabelTextSize="16.0sp" app:vklib_alv_optionPaddingEnd="20.0dip" app:vklib_alv_optionPaddingStart="20.0dip" />
     </LinearLayout>
 </FrameLayout>

smali/res/layout/vkim_msg_list.xml

@@ -2,7 +2,7 @@
 <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <android.support.v7.widget.RecyclerView android:scrollbarStyle="outsideOverlay" android:id="@id/list" android:visibility="invisible" android:scrollbars="vertical" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:fadeScrollbars="true" android:overScrollMode="never" />
-    <com.vk.im.ui.views.msg.MsgStickyDateView android:textSize="13.0sp" android:textColor="?text_primary" android:layout_gravity="center|top" android:id="@id/msg_list_sticky_date" android:background="@drawable/vkim_bg_date_badge" android:paddingTop="9.0dip" android:paddingBottom="11.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:maxLines="1" android:singleLine="true" android:fontFamily="@string/fontRobotoMedium" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:backgroundTint="?tabbar_background" />
+    <com.vk.im.ui.views.msg.MsgStickyDateView android:textSize="13.0sp" android:textColor="?text_primary" android:layout_gravity="center|top" android:id="@id/msg_list_sticky_date" android:background="@drawable/vkim_bg_date_badge" android:backgroundTint="?tabbar_background" android:paddingTop="9.0dip" android:paddingBottom="11.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:maxLines="1" android:singleLine="true" android:fontFamily="@string/fontRobotoMedium" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
     <com.pnikosis.materialishprogress.ProgressWheel android:layout_gravity="center" android:id="@id/progress" android:visibility="invisible" android:layout_width="48.0dip" android:layout_height="48.0dip" app:matProg_barColor="?accent" app:matProg_progressIndeterminate="true" />
     <com.vk.im.ui.views.EmptyViewForList android:layout_gravity="center" android:orientation="vertical" android:id="@id/empty" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" app:icon_size="@dimen/vkim_list_empty_icon_size" app:text_color="@color/subhead_gray" app:text_size="16.0sp" />
     <FrameLayout android:layout_gravity="bottom|center|right" android:id="@id/stb_holder" android:layout_width="64.0dip" android:layout_height="64.0dip">

smali/res/layout/vkim_new_chat_user_vh.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.im.ui.views.avatars.AvatarView android:id="@id/vkim_avatar" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_centerVertical="false" />
     <LinearLayout android:orientation="vertical" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/vkim_avatar" android:layout_centerVertical="true">
-        <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="marquee" android:id="@id/vkim_username" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
+        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="marquee" android:id="@id/vkim_username" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
         <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@id/vkim_subtitle" android:paddingTop="1.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
     <ImageView android:id="@id/online" android:layout_width="12.0dip" android:layout_height="16.0dip" android:layout_alignRight="@id/vkim_avatar" android:layout_alignBottom="@id/vkim_avatar" android:contentDescription="@null" />

smali/res/menu/communities_add.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/action_create_group" android:showAsAction="always" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/action_create_group" android:showAsAction="always"  app:showAsAction="always" />
 </menu>

smali/res/menu/create_new_chat.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_done_theme_tinted" android:id="@id/create_new_chat" android:title="@string/vkim_accessibility_done" android:showAsAction="always" app:iconTint="?header_text" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_done_theme_tinted" android:id="@id/create_new_chat" android:title="@string/vkim_accessibility_done" app:iconTint="?header_text" android:showAsAction="always" app:showAsAction="always" />
 </menu>

smali/res/menu/live_tabs_menu.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_add_24" android:id="@id/tags" android:title="@string/camera_ui_live_start" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_add_24" android:id="@id/tags" android:title="@string/camera_ui_live_start"  app:showAsAction="always" />
 </menu>

smali/res/menu/poll_results.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_params_24" android:id="@id/filters" android:title="@string/poll_filter_icon_title" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_params_24" android:id="@id/filters" android:title="@string/poll_filter_icon_title"  app:showAsAction="always" />
 </menu>

smali/res/menu/profile.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@id/invite" android:title="@string/invite_friends" />
-    <item android:icon="@drawable/vkui_ic_voip_call_24" android:id="@id/call" android:visible="false" android:title="@string/voip_call_user" app:showAsAction="always" />
-    <item android:icon="@drawable/vkui_ic_voip_call_video_24" android:id="@id/call_video" android:visible="false" android:title="@string/voip_call_user" app:showAsAction="always" />
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/edit_group" android:title="@string/edit_group" android:showAsAction="always" app:showAsAction="always" />
-    <item android:id="@id/messages" android:title="@string/allow_messages" />
-    <item android:id="@id/subscribe" android:title="@string/subscribe_to_posts" />
-    <item android:id="@id/subscribe_podcasts" android:title="@string/subscribe_to_podcasts" />
-    <item android:id="@id/subscribe_live" android:title="@string/group_video_live_notify_on" />
-    <item android:id="@id/favorites_add" android:title="@string/fave_add_title" />
-    <item android:id="@id/copy_link" android:title="@string/copy_link" />
-    <item android:id="@id/open_in_browser" android:title="@string/open_in_browser" />
-    <item android:id="@id/report" android:title="@string/report_content" />
-    <item android:id="@id/block" android:title="@string/block_user" />
-    <item android:id="@id/favorites_remove" android:title="@string/favorites_remove" />
-    <item android:id="@id/stats" android:title="@string/view_stats" />
-    <item android:id="@id/edit_community_avatar" android:visible="false" android:title="@string/edit_community_avatar" />
-    <item android:id="@id/btnfoaf" android:title="@string/addinf" />
-    <item android:id="@id/btncopyid" android:title="@string/copyid" />
+    <item android:id="@id/invite" android:title="@string/invite_friends"  />
+    <item android:icon="@drawable/vkui_ic_voip_call_24" android:id="@id/call" android:visible="false" android:title="@string/voip_call_user"  app:showAsAction="always" />
+    <item android:icon="@drawable/vkui_ic_voip_call_video_24" android:id="@id/call_video" android:visible="false" android:title="@string/voip_call_user"  app:showAsAction="always" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/edit_group" android:title="@string/edit_group" android:showAsAction="always"  app:showAsAction="always" />
+    <item android:id="@id/messages" android:title="@string/allow_messages"  />
+    <item android:id="@id/subscribe" android:title="@string/subscribe_to_posts"  />
+    <item android:id="@id/subscribe_podcasts" android:title="@string/subscribe_to_podcasts"  />
+    <item android:id="@id/subscribe_live" android:title="@string/group_video_live_notify_on"  />
+    <item android:id="@id/favorites_add" android:title="@string/fave_add_title"  />
+    <item android:id="@id/copy_link" android:title="@string/copy_link"  />
+    <item android:id="@id/open_in_browser" android:title="@string/open_in_browser"  />
+    <item android:id="@id/report" android:title="@string/report_content"  />
+    <item android:id="@id/block" android:title="@string/block_user"  />
+    <item android:id="@id/favorites_remove" android:title="@string/favorites_remove"  />
+    <item android:id="@id/stats" android:title="@string/view_stats"  />
+    <item android:id="@id/edit_community_avatar" android:visible="false" android:title="@string/edit_community_avatar"  />
+    <item android:id="@id/btnfoaf" android:title="@string/addinf"  />
+    <item android:id="@id/btncopyid" android:title="@string/copyid"  />
 </menu>

smali/res/menu/profile_edit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_check_24" android:id="@id/save" android:title="@string/save" android:showAsAction="always" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_check_24" android:id="@id/save" android:title="@string/save" android:showAsAction="always"  app:showAsAction="always" />
 </menu>

smali/res/menu/videos.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always" app:showAsAction="always">
+    <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always"  app:showAsAction="always">
         <menu>
             <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="@color/leftmenu_icon" />
             <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="@color/leftmenu_icon" />

smali/res/menu/vkim_dialogs.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_camera_switch_48" android:id="@id/msgupdate" android:title="@string/vtlupdmsg" android:showAsAction="always" app:iconTint="?header_text" app:showAsAction="always" />
-    <item android:icon="@drawable/ic_favorite_outline_24" android:id="@id/savedmsg" android:title="@string/savedmsg" android:showAsAction="always" app:iconTint="?header_text" app:showAsAction="always" />
-    <item android:icon="@drawable/ic_add_24" android:id="@id/dialogs_add" android:title="@string/write_a_message" android:showAsAction="always" app:iconTint="?header_text" app:showAsAction="always" />
-    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:iconTint="?header_text" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_camera_switch_48" android:id="@id/msgupdate" android:title="@string/vtlupdmsg" app:iconTint="?header_text" android:showAsAction="always" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_favorite_outline_24" android:id="@id/savedmsg" android:title="@string/savedmsg" app:iconTint="?header_text" android:showAsAction="always" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_add_24" android:id="@id/dialogs_add" android:title="@string/write_a_message" app:iconTint="?header_text" android:showAsAction="always" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:iconTint="?header_text" android:showAsAction="always" app:showAsAction="always" />
 </menu>

smali/res/values-ru/arrays.xml

@@ -467,8 +467,8 @@
     </string-array>
     <string-array name="proxy">
         <item>Без прокси</item>
+        <item>xtrafrancyz</item>
         <item>zaborona.help</item>
-        <item>Сторонний прокси для API</item>
         <item>Сторонний HTTP</item>
         <item>Сторонний HTTPS</item>
         <item>Сторонний SOCKS</item>

smali/res/values-ru/strings.xml

@@ -265,9 +265,6 @@
     <string name="captcha_hint">Введите код с картинки</string>
     <string name="caption">Подпись</string>
     <string name="career">Карьера</string>
-    <string name="catalog_button_show_all">Показать все</string>
-    <string name="catalog_search_parameters">Параметры</string>
-    <string name="catalog_talkback_empty">Кнопка управления</string>
     <string name="category">Категория: %s</string>
     <string name="change_password">Изменить пароль</string>
     <string name="change_status">Изменить статус</string>
@@ -413,17 +410,6 @@
     <string name="community_profile_photos">Фотографии со страницы сообщества</string>
     <string name="community_subscribers_formatted">%s подписчиков</string>
     <string name="completing_purchase">Завершение покупки...</string>
-    <string name="components_base">Основные</string>
-    <string name="components_bottom_confirm_btn">Нижняя кнопка</string>
-    <string name="components_buttons">Кнопки</string>
-    <string name="components_dialogs">Диалоги</string>
-    <string name="components_input_fields">Поля ввода</string>
-    <string name="components_intro_promo">Интро/Промо</string>
-    <string name="components_loaders">Лоадеры</string>
-    <string name="components_snackbar">Снекбар</string>
-    <string name="components_text">Текст</string>
-    <string name="components_title">VK UI компоненты</string>
-    <string name="components_tooltips">Тултипы</string>
     <string name="confirm">Подтверждение</string>
     <string name="confirm_action_title">Подтверждение действия</string>
     <string name="confirm_block_user">Вы действительно хотите заблокировать %s?</string>
@@ -1920,7 +1906,6 @@
     <string name="newsfeed_new_photos_you_have">У Вас %d новых фото</string>
     <string name="newsfeed_newpost_attach_documents_from_device">С устройства</string>
     <string name="newsfeed_newpost_attach_documents_from_gallery">Из галереи</string>
-    <string name="newsfeed_newpost_attachment_adding_forbidden">Прикрепление вложений не доступно</string>
     <string name="newsfeed_newpost_author">Автор публикации</string>
     <string name="newsfeed_newpost_for_all">Видно всем</string>
     <string name="newsfeed_newpost_for_friends">Видно друзьям</string>
@@ -3212,14 +3197,6 @@
     <string name="video_albums">Альбомы</string>
     <string name="video_already_added">Эта видеозапись уже добавлена на Вашу страницу</string>
     <string name="video_author">Отправитель:</string>
-    <string name="video_catalog_filters">Фильтры</string>
-    <string name="video_catalog_filters_date">Дата загрузки</string>
-    <string name="video_catalog_filters_high_quality">Только высокого качества</string>
-    <string name="video_catalog_filters_length">Длительность</string>
-    <string name="video_catalog_filters_safe">Безопасный поиск</string>
-    <string name="video_catalog_filters_show_results">Показать результаты</string>
-    <string name="video_catalog_filters_sort">Сортировка</string>
-    <string name="video_catalog_profile_page_title">Видео</string>
     <string name="video_confirm_remove">Подтвердите удаление видео</string>
     <string name="video_empty_title">Без названия</string>
     <string name="video_err_decode">Ваше устройство не может воспроизвести это видео. Попробуйте выбрать более низкое качество.</string>
@@ -3227,11 +3204,9 @@
     <string name="video_err_network">Произошла ошибка, связанная с подключением к серверу. Проверьте соединение и повторите попытку.</string>
     <string name="video_fast_seek_tooltip">Коснитесь дважды в этой области для перемотки</string>
     <string name="video_hd_only">Высокое качество</string>
-    <string name="video_high_quality">Высокое качество</string>
     <string name="video_live_subscribed">Уведомления о трансляциях включены</string>
     <string name="video_live_unsubscribed">Уведомления о трансляциях выключены</string>
     <string name="video_live_upcoming">Скоро</string>
-    <string name="video_long">Длинные</string>
     <string name="video_more_videos_title">Смотрите также</string>
     <string name="video_next">Следующее видео</string>
     <string name="video_not_supported_flv">Данный тип видео больше не поддерживается. Попробуйте посмотреть в полной версии сайта</string>
@@ -3254,10 +3229,8 @@
     <string name="video_saving">Сохранение видео</string>
     <string name="video_search_date">По дате</string>
     <string name="video_search_duration">По длительности</string>
-    <string name="video_search_hint">Поиск по видео…</string>
     <string name="video_search_sort">Сортировка</string>
     <string name="video_select_quality">Выберите качество</string>
-    <string name="video_short">Короткие</string>
     <string name="video_title">Видео</string>
     <string name="video_upload_ok">Видеозапись загружена</string>
     <string name="video_upload_ok_long">Видеозапись успешно загружена</string>
@@ -4025,6 +3998,35 @@
     <string name="yesterday_at">вчера в</string>
     <string name="your_balance">Ваш баланс: </string>
     <string name="your_gender">Ваш пол:</string>
+
+    <string name="video_high_quality">Высокое качество</string>
+    <string name="video_long">Длинные</string>
+    <string name="video_catalog_filters">Фильтры</string>
+    <string name="video_catalog_filters_date">Дата загрузки</string>
+    <string name="video_catalog_filters_high_quality">Только высокого качества</string>
+    <string name="video_catalog_filters_length">Длительность</string>
+    <string name="video_catalog_filters_safe">Безопасный поиск</string>
+    <string name="video_catalog_filters_show_results">Показать результаты</string>
+    <string name="video_catalog_filters_sort">Сортировка</string>
+    <string name="video_catalog_profile_page_title">Видео</string>
+    <string name="components_base">Основные</string>
+    <string name="components_bottom_confirm_btn">Нижняя кнопка</string>
+    <string name="components_buttons">Кнопки</string>
+    <string name="components_dialogs">Диалоги</string>
+    <string name="components_input_fields">Поля ввода</string>
+    <string name="components_intro_promo">Интро/Промо</string>
+    <string name="components_loaders">Лоадеры</string>
+    <string name="components_snackbar">Снекбар</string>
+    <string name="components_text">Текст</string>
+    <string name="components_title">VK UI компоненты</string>
+    <string name="components_tooltips">Тултипы</string>
+    <string name="catalog_button_show_all">Показать все</string>
+    <string name="catalog_search_parameters">Параметры</string>
+    <string name="catalog_talkback_empty">Кнопка управления</string>
+    <string name="newsfeed_newpost_attachment_adding_forbidden">Прикрепление вложений не доступно</string>
+    <string name="video_search_hint">Поиск по видео…</string>
+    <string name="video_short">Короткие</string>
+
     <string name="vtlfeed">Лента</string>
     <string name="vtlinterface">Интерфейс</string>
     <string name="vtlmusic">Музыка</string>
@@ -4073,7 +4075,6 @@
     <string name="vtlrecommendfriend">Рекомендации друзей</string>
     <string name="vtlrecommendauthor">Рекомендации авторов</string>
     <string name="vtlrecommendfriendpost">Рекомендации постов друзей</string>
-    <string name="BGStickers">Обводка стикеров</string>
     <string name="vtlrecommendmarksummary">Посты по типу Вам может быть интересно и тд</string>
     <string name="vtlfeedwork">Прочее</string>
     <string name="vtlfeedreload">Автоматическое обновление ленты</string>
@@ -4082,7 +4083,6 @@
     <string name="vtlmsgtails">Хвосты сообщений</string>
     <string name="vtlmsgflat">Плоские сообщения</string>
     <string name="vtlupdmsg">Обновить</string>
-    <string name="BGStickerssum">Для включения/отключения вам необходимо очистить кэш приложения</string>
     <string name="app_name_orig">ВКонтакте</string>
     <string name="addinf">Дополнительная информация</string>
     <string name="copyid">Скопировать айди</string>
@@ -4093,134 +4093,98 @@
     <string name="copytokenbtn">Скопировать ваш access token</string>
     <string name="killappbtn">Остановить процесс приложения</string>
     <string name="experts">Эксперты</string>
-    <string name="DNT_OFF">Отключить неписалку</string>
-    <string name="DNT_ON">Включить неписалку</string>
-    <string name="accounts">Аккаунты</string>
-    <string name="act_bot">Для ботов/групп</string>
-    <string name="act_cnv">Для бесед</string>
-    <string name="act_pm">Для личных сообщений</string>
-    <string name="alteremoji">Альтернативный дизайн меню с эмодзи</string>
-    <string name="alteremojisum">Альтернативный вид выбора эмодзи и стикеров в миниатюрном меню</string>
+    <string name="vtlota">Обновления</string>
     <string name="altnewsfeed">Альтернативный дизайн ленты</string>
-    <string name="altnewsfeedsum">Дизайн с новыми вкладками в ленте, а также замена поиска по умолчанию на улучшенный (в нижнем меню)</string>
-    <string name="applicationrestart">Перезапустить приложение</string>
-    <string name="benchapi">Бенчмарк апи</string>
-    <string name="benchapisummary">Тестирование скорости отправки запросов. Бесполезная функция для всех, кроме разработчиков ВКонтакте</string>
-    <string name="cachecleaned">Кэш очищен</string>
-    <string name="clearcache">Очистить весь кэш</string>
-    <string name="clearcachesum">Чистка всего кэша приложения (кроме кэша ленты)</string>
-    <string name="convUsersOnline">Фикс показа онлайна в беседах</string>
-    <string name="convUsersOnlinesum">"Фикс показа онлайна других пользователей в беседах (нужно только если Вы скрыли свой онлайн)
-
-ВНИМАНИЕ! Может вызывать долгие прогрузки списков юзеров, если в беседе много пользователей"</string>
-    <string name="copybtn">Скопировано!</string>
-    <string name="ctypedirect">Прямое</string>
-    <string name="ctypedisabled">Не установлено</string>
-    <string name="ctypesocks">Socks</string>
-    <string name="dnr">Нечиталка</string>
-    <string name="dns">Отправка статуса просмотра истории</string>
-    <string name="dnw">Неписалка</string>
-    <string name="docknumbers">Счётчики в докбаре</string>
-    <string name="docknumberssum">Отключение не работает в интерфейсе для планшетов</string>
-    <string name="fcmtokenfixed">Уведомления были восстановлены!</string>
-    <string name="fcmtokenget">FCM токен получен</string>
-    <string name="fcmtokenrem">FCM токен удален</string>
+    <string name="empty_text" />
+    <string name="showstories">Показывать истории</string>
     <string name="firebasefix">Обновить регистрацию Firebase</string>
-    <string name="firebasefixsum">Исправление получения уведомлений после установки GMS или после восстановления бэкапа приложения</string>
-    <string name="foafdate">"
-Дней с даты регистрации:"</string>
-    <string name="foaferr">Проблемы при загрузке данных!</string>
-    <string name="foafid">Профиль ID:</string>
-    <string name="foafregdate">"
-Дата регистрации:"</string>
+    <string name="clearcache">Очистить весь кэш</string>
+    <string name="applicationrestart">Перезапустить приложение</string>
+    <string name="vtverify">Верификации VTosters</string>
+    <string name="showvtverify">Показывать верификации</string>
+    <string name="showvtfire">Показывать специальные верификации</string>
+    <string name="vtverifyinfo">Что такое верификация VTosters?</string>
     <string name="getvtverify">Получить верификацию на свою страницу</string>
-    <string name="iconapplying">Применение изменений</string>
-    <string name="interfaceemoji">Эмодзи и стикеры</string>
-    <string name="interfaceglobal">Глобальные функции</string>
-    <string name="interfaceglobaldates">Округление дат</string>
-    <string name="interfaceglobaldatessum">"Округление дат постов и пользователей
-
-01 Января 1970 00:00:00 -> 1 Января 00:00"</string>
-    <string name="interfaceglobalnum">Округление чисел</string>
-    <string name="interfaceglobalnumsum">"Округление чисел просмотров, комментариев, лайков и репостов
-
-10000 -> 10k"</string>
-    <string name="interfaceglobalpost">Сокращение постов</string>
-    <string name="interfaceglobalpostsum">"Сокращать текст в постах
-
-Показать полностью..."</string>
+    <string name="vtverifyinfosum">Это наша благодарность за поддержку проекта</string>
+    <string name="firebasefixsum">Исправление получения уведомлений после установки GMS или после восстановления бэкапа приложения</string>
+    <string name="clearcachesum">Чистка всего кэша приложения (кроме кэша ленты)</string>
+    <string name="vtsystem">Системное</string>
+    <string name="BGStickers">Обводка стикеров</string>
+    <string name="BGStickerssum">Для включения/отключения вам необходимо очистить кэш приложения</string>
+    <string name="vkuiinj">Покраска VKUI</string>
+    <string name="proxyimpinfo">Внимание!</string>
+    <string name="proxyadvsettings">Расширенные настройки прокси</string>
+    <string name="useproxy">Вариант прокси</string>
+    <string name="useproxysum">Выберите вариант прокси</string>
+    <string name="proxyapi">API Домен</string>
+    <string name="proxyoauth">OAuth Домен</string>
+    <string name="proxystatic">Static Домен</string>
+    <string name="proxydomain">Домен</string>
+    <string name="proxyport">Порт</string>
+    <string name="proxyhttp">HTTP Прокси</string>
+    <string name="proxyhttps">HTTPS Прокси</string>
+    <string name="proxysocks">Socks Прокси</string>
+    <string name="proxydonate">Донат</string>
+    <string name="proxyowners">Владельцы прокси</string>
+    <string name="proxyownerszbr">Сайт zaborona</string>
+    <string name="proxyownersxtr">Сайт xtrafrancyz</string>
+    <string name="proxyownersxtrsources">Исходный код прокси сервера</string>
+    <string name="proxyimpinfosum">Не используйте прокси если ВК не заблокирован в вашей стране\n\nДля применения изменений необходимо перезапустить приложение</string>
+    <string name="useproxyinfo">Информация об использовании прокси</string>
+    <string name="useproxyinfosum">По умолчанию используется прокси-сервер от xtrafrancyz, но вы можете использовать сторонние прокси-серверы\n\nВводите домены без http/https\n\nЕсли ссылок нет, по умолчанию используется прокси-сервер от xtrafrancyz</string>
     <string name="interfacenewsfeed">Лента</string>
-    <string name="interfacenewsfeedswipe">Боковая камера в новостях</string>
-    <string name="interfacenewsfeedswipesum">Работает только со стандартным дизайном новостей</string>
+    <string name="interfaceemoji">Эмодзи и стикеры</string>
     <string name="interfacestartfr">Стандартный стартовый фрагмент</string>
     <string name="interfacestartfrsum">Выберите стартовый фрагмент</string>
+    <string name="interfaceglobal">Глобальные функции</string>
     <string name="interfacevideo">Видео</string>
     <string name="interfacevideoext">Использовать внешний видеоплеер</string>
     <string name="interfacevideoextsum">Использовать внешний видеоплеер для воспроизведения видео</string>
     <string name="interfacevideorec">Отключение рекомендаций видео</string>
     <string name="interfacevideorecsum">Отключение рекомендаций видео внизу видеоплеера с рекомендациями видео</string>
+    <string name="interfaceglobaldates">Округление дат</string>
+    <string name="interfaceglobaldatessum">Округление дат постов и пользователей\n\n01 Января 1970 00:00:00 -> 1 Января 00:00</string>
+    <string name="interfaceglobalnum">Округление чисел</string>
+    <string name="interfaceglobalnumsum">Округление чисел просмотров, комментариев, лайков и репостов\n\n10000 -> 10k</string>
+    <string name="interfaceglobalpost">Сокращение постов</string>
+    <string name="interfaceglobalpostsum">Сокращать текст в постах\n\nПоказать полностью...</string>
+    <string name="interfacenewsfeedswipe">Боковая камера в новостях</string>
+    <string name="interfacenewsfeedswipesum">Работает только со стандартным дизайном новостей</string>
+    <string name="showstoriessum">Показывать истории в верхней части ленты</string>
+    <string name="altnewsfeedsum">Дизайн с новыми вкладками в ленте, а также замена поиска по умолчанию на улучшенный (в нижнем меню)</string>
     <string name="menucutter">Отключение сокращения меню</string>
     <string name="menucuttersum">Убирает сокращение пунктов в меню разделов приложения</string>
-    <string name="newacc">Добавить аккаунт</string>
-    <string name="newvideo">Новый видео каталог</string>
-    <string name="offline_vtl">Офлайн</string>
-    <string name="online_vtl">Онлайн</string>
-    <string name="opencommit">Открыть коммит</string>
-    <string name="otabranch">Выбрать ветку обновлений</string>
+    <string name="docknumbers">Счётчики в докбаре</string>
+    <string name="docknumberssum">Отключение не работает в интерфейсе для планшетов</string>
+    <string name="systememoji">Использовать системные эмодзи</string>
+    <string name="systememojisum">Ваши системные эмодзи - 😀😁🤑🥵👍</string>
+    <string name="alteremoji">Альтернативный дизайн меню с эмодзи</string>
+    <string name="alteremojisum">Альтернативный вид выбора эмодзи и стикеров в миниатюрном меню</string>
+    <string name="convUsersOnline">Фикс показа онлайна в беседах</string>
+    <string name="convUsersOnlinesum">Фикс показа онлайна других пользователей в беседах (нужно только если Вы скрыли свой онлайн)\n\nВНИМАНИЕ! Может вызывать долгие прогрузки списков юзеров, если в беседе много пользователей</string>
+    <string name="otawarning">Внимание!</string>
+    <string name="otaok">OK</string>
     <string name="otacheckonstart">Проверять обновления на старте</string>
+    <string name="otabranch">Выбрать ветку обновлений</string>
     <string name="otacheckupd">Проверить обновления</string>
     <string name="otaerr">Проверьте ваше интернет соединение и попробуйте ещё раз</string>
-    <string name="otanoupd">Обновлений не найдено</string>
-    <string name="otaok">OK</string>
     <string name="otaretry">Пробовать снова</string>
+    <string name="otanoupd">Обновлений не найдено</string>
     <string name="otaupd">Обновить</string>
     <string name="otaupdavalible">Доступно обновление!</string>
     <string name="otaupdchanges">Список изменений</string>
-    <string name="otawarning">Внимание!</string>
     <string name="otawarnwait">Пожалуйста, не закрывайте приложение до окончания загрузки обновления</string>
-    <string name="privacy_vtl">Приватность</string>
-    <string name="proxyadvsettings">Расширенные настройки прокси</string>
-    <string name="proxyapi">API Домен</string>
-    <string name="proxydomain">Домен</string>
-    <string name="proxydonate">Донат</string>
-    <string name="proxyhttp">HTTP Прокси</string>
-    <string name="proxyhttps">HTTPS Прокси</string>
-    <string name="proxyimpinfo">Внимание!</string>
-    <string name="proxyimpinfosum">"Не используйте прокси если ВК не заблокирован в вашей стране
-
-Для применения изменений необходимо перезапустить приложение"</string>
-    <string name="proxyoauth">OAuth Домен</string>
-    <string name="proxyowners">Владельцы прокси</string>
-    <string name="proxyownersxtr">Сайт xtrafrancyz</string>
-    <string name="proxyownersxtrsources">Исходный код прокси сервера</string>
-    <string name="proxyownerszbr">Сайт zaborona</string>
-    <string name="proxyport">Порт</string>
-    <string name="proxysocks">Socks Прокси</string>
-    <string name="proxystatic">Static Домен</string>
-    <string name="reportbug">Сообщить о баге</string>
-    <string name="restartapp">Перезапустите приложение</string>
-    <string name="savedmsg">Сохраненные сообщения</string>
-    <string name="selectacc">Выберите аккаунт</string>
-    <string name="shitposting">Однотипные новости</string>
-    <string name="shitpostingsummary">Фильтр очистки постов с РФ и действиями связанными на Украине</string>
-    <string name="showstories">Показывать истории</string>
-    <string name="showstoriessum">Показывать истории в верхней части ленты</string>
-    <string name="showvtfire">Показывать специальные верификации</string>
-    <string name="showvtverify">Показывать верификации</string>
-    <string name="sprefsctype">Тип подключения</string>
-    <string name="sprefsdelkey">Удалить ключ бота Telegram</string>
-    <string name="sprefsdelkey2">Ключ был успешно удален</string>
-    <string name="sprefsnetwork">Сеть</string>
-    <string name="sprefsstickers">Стикеры</string>
-    <string name="ssocks">Настройки Socks</string>
-    <string name="ssocksauth">Авторизация</string>
-    <string name="ssockshost">Хост</string>
-    <string name="ssockslogin">Логин</string>
-    <string name="ssockspass">Пароль</string>
-    <string name="ssocksport">Порт</string>
-    <string name="ssockswport">Недопустимый порт</string>
+    <string name="iconapplying">Применение изменений</string>
+    <string name="copybtn">Скопировано!</string>
+    <string name="tokenwarning">Никому не передавайте этот токен, если вы не знаете что делать!</string>
+    <string name="cachecleaned">Кэш очищен</string>
+    <string name="fcmtokenrem">FCM токен удален</string>
+    <string name="fcmtokenget">FCM токен получен</string>
+    <string name="fcmtokenfixed">Уведомления были восстановлены!</string>
+    <string name="stickerscount">стикеров</string>
+    <string name="stickersconnection">Выберите способ подключения!</string>
+    <string name="stickersproxy1">Настройте IP-прокси!</string>
     <string name="stickersapi1">Проверка ключа API</string>
-    <string name="stickersapi10">2. Скопируйте токен бота, который вам отправит бот и вставьте его в приложение</string>
     <string name="stickersapi2">Неверный ключ API бота</string>
     <string name="stickersapi3">Ошибка при проверке ключа!</string>
     <string name="stickersapi4">Пробовать снова</string>
@@ -4228,35 +4192,43 @@
     <string name="stickersapi6">Получите его с помощью бота @BotFather</string>
     <string name="stickersapi7">Подробнее</string>
     <string name="stickersapi8">Инструкции по получению ключа</string>
-    <string name="stickersapi9">"1. Создайте бота у @BotFather (Telegram)
-"</string>
-    <string name="stickersconnection">Выберите способ подключения!</string>
-    <string name="stickerscount">стикеров</string>
+    <string name="stickersapi9">1. Создайте бота у @BotFather (Telegram)\n</string>
+    <string name="stickersapi10">2. Скопируйте токен бота, который вам отправит бот и вставьте его в приложение</string>
     <string name="stickershelp1">Введите URL или ID стикерпака</string>
     <string name="stickershelp2">Ссылка должна быть в формате https://t.me/addstickers/\"ID\"</string>
-    <string name="stickersproxy1">Настройте IP-прокси!</string>
-    <string name="stories_vtl">Истории</string>
-    <string name="systememoji">Использовать системные эмодзи</string>
-    <string name="systememojisum">Ваши системные эмодзи - 😀😁🤑🥵👍</string>
-    <string name="tokenwarning">Никому не передавайте этот токен, если вы не знаете что делать!</string>
-    <string name="useproxy">Вариант прокси</string>
-    <string name="useproxyinfo">Информация об использовании прокси</string>
-    <string name="useproxysum">Выберите вариант прокси</string>
-    <string name="vkuiinj">Покраска VKUI</string>
-    <string name="vtlawayphpsummary">Слежка за пользователем для персонализации рекламы. Также проверка ссылок на блэклист от ВКонтакте и антивирус</string>
-    <string name="vtloffline">Отправка статуса онлайн</string>
-    <string name="vtloffline2">Принудительно отправлять офлайн запросы</string>
-    <string name="vtloffline2summary">"Работает только при отключении отправки статуса онлайн
-Отправляет мгновенно в офлайн после отправки сообщений и прочих методов апи которые отправляют в онлайн
+    <string name="sprefsstickers">Стикеры</string>
+    <string name="sprefsdelkey">Удалить ключ бота Telegram</string>
+    <string name="sprefsdelkey2">Ключ был успешно удален</string>
+    <string name="sprefsctype">Тип подключения</string>
+    <string name="ctypedirect">Прямое</string>
+    <string name="ctypesocks">Socks</string>
+    <string name="ctypedisabled">Не установлено</string>
+    <string name="sprefsnetwork">Сеть</string>
+    <string name="ssocks">Настройки Socks</string>
+    <string name="ssockshost">Хост</string>
+    <string name="ssocksport">Порт</string>
+    <string name="ssockswport">Недопустимый порт</string>
+    <string name="ssocksauth">Авторизация</string>
+    <string name="ssockslogin">Логин</string>
+    <string name="ssockspass">Пароль</string>
+    <string name="foafid">Профиль ID:</string>
+    <string name="foafregdate">\nДата регистрации:</string>
+    <string name="foafdate">\nДней с даты регистрации:</string>
+    <string name="foaferr">Проблемы при загрузке данных!</string>
+    <string name="savedmsg">Сохраненные сообщения</string>
 
-Может выглядеть как ненастоящий уход из сети"</string>
-    <string name="vtlofflinesummary">Отключение онлайна позволит вам оставаться в офлайне</string>
-    <string name="vtsystem">Системное</string>
-    <string name="vtverify">Верификации VTosters</string>
-    <string name="vtverifyinfo">Что такое верификация VTosters?</string>
-    <string name="vtverifyinfosum">Это наша благодарность за поддержку проекта</string>
-    <string name="vtlota">Обновления</string>
     <string name="DNR_ON">Включить нечиталку</string>
     <string name="DNR_OFF">Отключить нечиталку</string>
-    <string name="empty_text" />
+    <string name="DNT_ON">Включить неписалку</string>
+    <string name="DNT_OFF">Отключить неписалку</string>
+    <string name="online_vtl">Онлайн</string>
+    <string name="offline_vtl">Офлайн</string>
+    <string name="dnr">Нечиталка</string>
+    <string name="dnw">Неписалка</string>
+    <string name="dns">Отправка статуса просмотра истории</string>
+    <string name="privacy_vtl">Приватность</string>
+    <string name="stories_vtl">Истории</string>
+    <string name="act_pm">Для личных сообщений</string>
+    <string name="act_cnv">Для бесед</string>
+    <string name="act_bot">Для ботов/групп</string>
 </resources>

smali/res/values-v21/styles.xml

@@ -857,13 +857,6 @@
         <item name="android:textSize">20.0sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
-    <style name="MD.Button.Borderless" parent="@android:style/Widget.Material.Button.Borderless.Colored">
-        <item name="android:textAllCaps">false</item>
-    </style>
-    <style name="MD.Button.Borderless.Dialog" parent="@style/MD.Button.Borderless">
-        <item name="android:minWidth">64.0dip</item>
-        <item name="android:minHeight">48.0dip</item>
-    </style>
     <style name="MaterialDialogTheme.Dark" parent="@android:style/Theme.Material.Dialog.Alert">
         <item name="android:windowBackground">@drawable/mtrl_dlg_bg</item>
         <item name="android:colorAccent">?accent</item>
@@ -872,4 +865,11 @@
         <item name="android:buttonBarNegativeButtonStyle">@style/MD.Button.Borderless.Dialog</item>
         <item name="dialogBg">?tabbar_background</item>
     </style>
+    <style name="MD.Button.Borderless" parent="@android:style/Widget.Material.Button.Borderless.Colored">
+        <item name="android:textAllCaps">false</item>
+    </style>
+    <style name="MD.Button.Borderless.Dialog" parent="@style/MD.Button.Borderless">
+        <item name="android:minWidth">64.0dp</item>
+        <item name="android:minHeight">48.0dp</item>
+    </style>
 </resources>

smali/res/values-v31/styles.xml

@@ -204,6 +204,7 @@
         <item name="text_secondary">@android:color/system_accent2_700</item>
         <item name="background_content">@android:color/system_neutral1_10</item>
         <item name="background_page">@android:color/system_neutral1_50</item>
+
         <item name="android:windowLightStatusBar">true</item>
         <item name="action_sheet_action_foreground">@android:color/system_accent1_900</item>
         <item name="action_sheet_separator">@color/black_alpha12</item>
@@ -396,8 +397,9 @@
         <item name="accent">@android:color/system_accent1_500</item>
         <item name="text_primary">@android:color/system_accent1_900</item>
         <item name="text_secondary">@android:color/system_accent2_700</item>
-        <item name="background_content">@*android:color/system_neutral1_10</item>
+        <item name="background_content">@android:color/system_neutral1_10</item>
         <item name="background_page">@android:color/system_neutral1_50</item>
+
         <item name="android:windowLightStatusBar">true</item>
         <item name="action_sheet_action_foreground">?accent</item>
         <item name="action_sheet_separator">@color/black_alpha12</item>

smali/res/values/arrays.xml

@@ -628,16 +628,16 @@
     </string-array>
     <string-array name="proxy">
         <item>No Proxy</item>
+        <item>xtrafrancyz</item>
         <item>zaborona.help</item>
-        <item>Custom API proxy</item>
         <item>Custom HTTP</item>
         <item>Custom HTTPS</item>
         <item>Custom SOCKS</item>
     </string-array>
     <string-array name="proxy_value">
         <item>noproxy</item>
+        <item>xtrafrancyz</item>
         <item>zaborona</item>
-        <item>apiproxy</item>
         <item>http</item>
         <item>https</item>
         <item>socks</item>

smali/res/values/attrs.xml

@@ -2146,5 +2146,6 @@
     <attr name="yesNoPreferenceStyle" format="reference" />
     <attr name="zOrderOnTop" format="boolean" />
     <attr name="tabbar_fix" format="reference|color" />
-    <attr name="dialogBg" format="reference|color" />
+    <attr name="dialogBg" format="reference" />
+
 </resources>

smali/res/values/public.xml

@@ -1709,7 +1709,6 @@
     <public type="attr" name="yesNoPreferenceStyle" id="0x7f040610" />
     <public type="attr" name="zOrderOnTop" id="0x7f040611" />
     <public type="attr" name="tabbar_fix" id="0x7f040612" />
-    <public type="attr" name="dialogBg" id="0x7f040613" />
     <public type="bool" name="abc_action_bar_embed_tabs" id="0x7f050000" />
     <public type="bool" name="abc_allow_stacked_button_bar" id="0x7f050001" />
     <public type="bool" name="abc_config_actionMenuItemAllCaps" id="0x7f050002" />
@@ -3743,7 +3742,6 @@
     <public type="drawable" name="vkim_msg_out_def_top_tail_sel_t" id="0x7f0808e9" />
     <public type="drawable" name="vkim_msg_out_gift_full_t" id="0x7f0808ea" />
     <public type="drawable" name="vkim_msg_out_gift_full_tail_t" id="0x7f0808eb" />
-    <public type="drawable" name="mtrl_dlg_bg" id="0x7f0808ec" />
     <public type="drawable" name="$avd_hide_password__0" id="0x7f080000" />
     <public type="drawable" name="$avd_hide_password__1" id="0x7f080001" />
     <public type="drawable" name="$avd_hide_password__2" id="0x7f080002" />
@@ -8596,6 +8594,7 @@
     <public type="id" name="youtube" id="0x7f0a0cdd" />
     <public type="id" name="zhukov" id="0x7f0a0cde" />
     <public type="id" name="zoom" id="0x7f0a0cdf" />
+    <public type="id" name="download_video" id="0x7f0a0ce8" />
     <public type="id" name="choose_btn" id="0x7f0a0ce0" />
     <public type="id" name="remove_btn" id="0x7f0a0ce1" />
     <public type="id" name="author" id="0x7f0a0ce2" />
@@ -8604,8 +8603,6 @@
     <public type="id" name="msgupdate" id="0x7f0a0ce5" />
     <public type="id" name="btnfoaf" id="0x7f0a0ce6" />
     <public type="id" name="btncopyid" id="0x7f0a0ce7" />
-    <public type="id" name="download_video" id="0x7f0a0ce8" />
-    <public type="id" name="savedmsg" id="0x7f0a0ce9" />
     <public type="integer" name="abc_config_activityDefaultDur" id="0x7f0b0000" />
     <public type="integer" name="abc_config_activityShortDur" id="0x7f0b0001" />
     <public type="integer" name="angle_rtl_180" id="0x7f0b0002" />
@@ -12598,8 +12595,6 @@
     <public type="string" name="poll_result_country_title" id="0x7f110914" />
     <public type="string" name="poll_result_filer_country_and_city" id="0x7f110915" />
     <public type="string" name="poll_result_filter_age" id="0x7f110916" />
-    <public type="string" name="poll_result_filter_age_18_plus" id="0x7f110917" />
-    <public type="string" name="poll_result_filter_age_36_plus" id="0x7f110918" />
     <public type="string" name="poll_result_filter_age_any" id="0x7f110919" />
     <public type="string" name="poll_result_filter_gender_any" id="0x7f11091a" />
     <public type="string" name="poll_result_filter_gender_female" id="0x7f11091b" />
@@ -14390,7 +14385,6 @@
     <public type="string" name="vtlrecommendfriend" id="0x7f111015" />
     <public type="string" name="vtlrecommendauthor" id="0x7f111016" />
     <public type="string" name="vtlrecommendfriendpost" id="0x7f111017" />
-    <public type="string" name="BGStickers" id="0x7f111018" />
     <public type="string" name="vtlrecommendmarksummary" id="0x7f111019" />
     <public type="string" name="vtlfeedwork" id="0x7f11101a" />
     <public type="string" name="vtlfeedreload" id="0x7f11101b" />
@@ -14399,7 +14393,6 @@
     <public type="string" name="vtlmsgtails" id="0x7f11101e" />
     <public type="string" name="vtlmsgflat" id="0x7f11101f" />
     <public type="string" name="vtlupdmsg" id="0x7f111020" />
-    <public type="string" name="BGStickerssum" id="0x7f111021" />
     <public type="string" name="app_name_orig" id="0x7f111022" />
     <public type="string" name="addinf" id="0x7f111023" />
     <public type="string" name="copyid" id="0x7f111024" />
@@ -14410,530 +14403,13 @@
     <public type="string" name="copytokenbtn" id="0x7f111029" />
     <public type="string" name="killappbtn" id="0x7f11102a" />
     <public type="string" name="experts" id="0x7f11102b" />
-    <public type="string" name="DNT_OFF" id="0x7f11102c" />
-    <public type="string" name="DNT_ON" id="0x7f11102d" />
-    <public type="string" name="accounts" id="0x7f11102e" />
-    <public type="string" name="act_bot" id="0x7f11102f" />
-    <public type="string" name="act_cnv" id="0x7f111030" />
-    <public type="string" name="act_pm" id="0x7f111031" />
-    <public type="string" name="alteremoji" id="0x7f111032" />
-    <public type="string" name="alteremojisum" id="0x7f111033" />
-    <public type="string" name="altnewsfeed" id="0x7f111034" />
-    <public type="string" name="altnewsfeedsum" id="0x7f111035" />
-    <public type="string" name="applicationrestart" id="0x7f111036" />
-    <public type="string" name="benchapi" id="0x7f111037" />
-    <public type="string" name="benchapisummary" id="0x7f111038" />
-    <public type="string" name="cachecleaned" id="0x7f111039" />
-    <public type="string" name="clearcache" id="0x7f11103a" />
-    <public type="string" name="clearcachesum" id="0x7f11103b" />
-    <public type="string" name="convUsersOnline" id="0x7f11103c" />
-    <public type="string" name="convUsersOnlinesum" id="0x7f11103d" />
-    <public type="string" name="copybtn" id="0x7f11103e" />
-    <public type="string" name="ctypedirect" id="0x7f11103f" />
-    <public type="string" name="ctypedisabled" id="0x7f111040" />
-    <public type="string" name="ctypesocks" id="0x7f111041" />
-    <public type="string" name="dnr" id="0x7f111042" />
-    <public type="string" name="dns" id="0x7f111043" />
-    <public type="string" name="dnw" id="0x7f111044" />
-    <public type="string" name="docknumbers" id="0x7f111045" />
-    <public type="string" name="docknumberssum" id="0x7f111046" />
-    <public type="string" name="fcmtokenfixed" id="0x7f111047" />
-    <public type="string" name="fcmtokenget" id="0x7f111048" />
-    <public type="string" name="fcmtokenrem" id="0x7f111049" />
-    <public type="string" name="firebasefix" id="0x7f11104a" />
-    <public type="string" name="firebasefixsum" id="0x7f11104b" />
-    <public type="string" name="foafdate" id="0x7f11104c" />
-    <public type="string" name="foaferr" id="0x7f11104d" />
-    <public type="string" name="foafid" id="0x7f11104e" />
-    <public type="string" name="foafregdate" id="0x7f11104f" />
-    <public type="string" name="getvtverify" id="0x7f111050" />
-    <public type="string" name="iconapplying" id="0x7f111051" />
-    <public type="string" name="interfaceemoji" id="0x7f111052" />
-    <public type="string" name="interfaceglobal" id="0x7f111053" />
-    <public type="string" name="interfaceglobaldates" id="0x7f111054" />
-    <public type="string" name="interfaceglobaldatessum" id="0x7f111055" />
-    <public type="string" name="interfaceglobalnum" id="0x7f111056" />
-    <public type="string" name="interfaceglobalnumsum" id="0x7f111057" />
-    <public type="string" name="interfaceglobalpost" id="0x7f111058" />
-    <public type="string" name="interfaceglobalpostsum" id="0x7f111059" />
-    <public type="string" name="interfacenewsfeed" id="0x7f11105a" />
-    <public type="string" name="interfacenewsfeedswipe" id="0x7f11105b" />
-    <public type="string" name="interfacenewsfeedswipesum" id="0x7f11105c" />
-    <public type="string" name="interfacestartfr" id="0x7f11105d" />
-    <public type="string" name="interfacestartfrsum" id="0x7f11105e" />
-    <public type="string" name="interfacevideo" id="0x7f11105f" />
-    <public type="string" name="interfacevideoext" id="0x7f111060" />
-    <public type="string" name="interfacevideoextsum" id="0x7f111061" />
-    <public type="string" name="interfacevideorec" id="0x7f111062" />
-    <public type="string" name="interfacevideorecsum" id="0x7f111063" />
-    <public type="string" name="menucutter" id="0x7f111064" />
-    <public type="string" name="menucuttersum" id="0x7f111065" />
-    <public type="string" name="newacc" id="0x7f111066" />
-    <public type="string" name="newvideo" id="0x7f111067" />
-    <public type="string" name="offline_vtl" id="0x7f111068" />
-    <public type="string" name="online_vtl" id="0x7f111069" />
-    <public type="string" name="opencommit" id="0x7f11106a" />
-    <public type="string" name="otabranch" id="0x7f11106b" />
-    <public type="string" name="otacheckonstart" id="0x7f11106c" />
-    <public type="string" name="otacheckupd" id="0x7f11106d" />
-    <public type="string" name="otaerr" id="0x7f11106e" />
-    <public type="string" name="otanoupd" id="0x7f11106f" />
-    <public type="string" name="otaok" id="0x7f111070" />
-    <public type="string" name="otaretry" id="0x7f111071" />
-    <public type="string" name="otaupd" id="0x7f111072" />
-    <public type="string" name="otaupdavalible" id="0x7f111073" />
-    <public type="string" name="otaupdchanges" id="0x7f111074" />
-    <public type="string" name="otawarning" id="0x7f111075" />
-    <public type="string" name="otawarnwait" id="0x7f111076" />
-    <public type="string" name="privacy_vtl" id="0x7f111077" />
-    <public type="string" name="proxyadvsettings" id="0x7f111078" />
-    <public type="string" name="proxyapi" id="0x7f111079" />
-    <public type="string" name="proxydomain" id="0x7f11107a" />
-    <public type="string" name="proxydonate" id="0x7f11107b" />
-    <public type="string" name="proxyhttp" id="0x7f11107c" />
-    <public type="string" name="proxyhttps" id="0x7f11107d" />
-    <public type="string" name="proxyimpinfo" id="0x7f11107e" />
-    <public type="string" name="proxyimpinfosum" id="0x7f11107f" />
-    <public type="string" name="proxyoauth" id="0x7f111080" />
-    <public type="string" name="proxyowners" id="0x7f111081" />
-    <public type="string" name="proxyownersxtr" id="0x7f111082" />
-    <public type="string" name="proxyownersxtrsources" id="0x7f111083" />
-    <public type="string" name="proxyownerszbr" id="0x7f111084" />
-    <public type="string" name="proxyport" id="0x7f111085" />
-    <public type="string" name="proxysocks" id="0x7f111086" />
-    <public type="string" name="proxystatic" id="0x7f111087" />
-    <public type="string" name="reportbug" id="0x7f111088" />
-    <public type="string" name="restartapp" id="0x7f111089" />
-    <public type="string" name="savedmsg" id="0x7f11108a" />
-    <public type="string" name="selectacc" id="0x7f11108b" />
-    <public type="string" name="shitposting" id="0x7f11108c" />
-    <public type="string" name="shitpostingsummary" id="0x7f11108d" />
-    <public type="string" name="showstories" id="0x7f11108e" />
-    <public type="string" name="showstoriessum" id="0x7f11108f" />
-    <public type="string" name="showvtfire" id="0x7f111090" />
-    <public type="string" name="showvtverify" id="0x7f111091" />
-    <public type="string" name="sprefsctype" id="0x7f111092" />
-    <public type="string" name="sprefsdelkey" id="0x7f111093" />
-    <public type="string" name="sprefsdelkey2" id="0x7f111094" />
-    <public type="string" name="sprefsnetwork" id="0x7f111095" />
-    <public type="string" name="sprefsstickers" id="0x7f111096" />
-    <public type="string" name="ssocks" id="0x7f111097" />
-    <public type="string" name="ssocksauth" id="0x7f111098" />
-    <public type="string" name="ssockshost" id="0x7f111099" />
-    <public type="string" name="ssockslogin" id="0x7f11109a" />
-    <public type="string" name="ssockspass" id="0x7f11109b" />
-    <public type="string" name="ssocksport" id="0x7f11109c" />
-    <public type="string" name="ssockswport" id="0x7f11109d" />
-    <public type="string" name="stickersapi1" id="0x7f11109e" />
-    <public type="string" name="stickersapi10" id="0x7f11109f" />
-    <public type="string" name="stickersapi2" id="0x7f1110a0" />
-    <public type="string" name="stickersapi3" id="0x7f1110a1" />
-    <public type="string" name="stickersapi4" id="0x7f1110a2" />
-    <public type="string" name="stickersapi5" id="0x7f1110a3" />
-    <public type="string" name="stickersapi6" id="0x7f1110a4" />
-    <public type="string" name="stickersapi7" id="0x7f1110a5" />
-    <public type="string" name="stickersapi8" id="0x7f1110a6" />
-    <public type="string" name="stickersapi9" id="0x7f1110a7" />
-    <public type="string" name="stickersconnection" id="0x7f1110a8" />
-    <public type="string" name="stickerscount" id="0x7f1110a9" />
-    <public type="string" name="stickershelp1" id="0x7f1110aa" />
-    <public type="string" name="stickershelp2" id="0x7f1110ab" />
-    <public type="string" name="stickersproxy1" id="0x7f1110ac" />
-    <public type="string" name="stories_vtl" id="0x7f1110ad" />
-    <public type="string" name="systememoji" id="0x7f1110ae" />
-    <public type="string" name="systememojisum" id="0x7f1110af" />
-    <public type="string" name="tokenwarning" id="0x7f1110b0" />
-    <public type="string" name="useproxy" id="0x7f1110b1" />
-    <public type="string" name="useproxyinfo" id="0x7f1110b2" />
-    <public type="string" name="useproxysum" id="0x7f1110b3" />
-    <public type="string" name="vkuiinj" id="0x7f1110b4" />
-    <public type="string" name="vtlawayphpsummary" id="0x7f1110b5" />
-    <public type="string" name="vtloffline" id="0x7f1110b6" />
-    <public type="string" name="vtloffline2" id="0x7f1110b7" />
-    <public type="string" name="vtloffline2summary" id="0x7f1110b8" />
-    <public type="string" name="vtlofflinesummary" id="0x7f1110b9" />
-    <public type="string" name="vtsystem" id="0x7f1110ba" />
-    <public type="string" name="vtverify" id="0x7f1110bb" />
-    <public type="string" name="vtverifyinfo" id="0x7f1110bc" />
-    <public type="string" name="vtverifyinfosum" id="0x7f1110bd" />
+    <public type="string" name="scree_nsize" id="0x7f110a34" />
+    <public type="string" name="empty_text" id="0x7f11027f" />
+    <public type="string" name="poll_result_filter_age_18_plus" id="0x7f110917" />
+    <public type="string" name="poll_result_filter_age_36_plus" id="0x7f110918" />
     <public type="string" name="vtlota" id="0x7f111233" />
     <public type="string" name="DNR_ON" id="0x7f111234" />
     <public type="string" name="DNR_OFF" id="0x7f111235" />
-    <public type="string" name="APKTOOL_DUMMY_10be" id="0x7f1110be" />
-    <public type="string" name="APKTOOL_DUMMY_10bf" id="0x7f1110bf" />
-    <public type="string" name="APKTOOL_DUMMY_10c0" id="0x7f1110c0" />
-    <public type="string" name="APKTOOL_DUMMY_10c1" id="0x7f1110c1" />
-    <public type="string" name="APKTOOL_DUMMY_10c2" id="0x7f1110c2" />
-    <public type="string" name="APKTOOL_DUMMY_10c3" id="0x7f1110c3" />
-    <public type="string" name="APKTOOL_DUMMY_10c4" id="0x7f1110c4" />
-    <public type="string" name="APKTOOL_DUMMY_10c5" id="0x7f1110c5" />
-    <public type="string" name="APKTOOL_DUMMY_10c6" id="0x7f1110c6" />
-    <public type="string" name="APKTOOL_DUMMY_10c7" id="0x7f1110c7" />
-    <public type="string" name="APKTOOL_DUMMY_10c8" id="0x7f1110c8" />
-    <public type="string" name="APKTOOL_DUMMY_10c9" id="0x7f1110c9" />
-    <public type="string" name="APKTOOL_DUMMY_10ca" id="0x7f1110ca" />
-    <public type="string" name="APKTOOL_DUMMY_10cb" id="0x7f1110cb" />
-    <public type="string" name="APKTOOL_DUMMY_10cc" id="0x7f1110cc" />
-    <public type="string" name="APKTOOL_DUMMY_10cd" id="0x7f1110cd" />
-    <public type="string" name="APKTOOL_DUMMY_10ce" id="0x7f1110ce" />
-    <public type="string" name="APKTOOL_DUMMY_10cf" id="0x7f1110cf" />
-    <public type="string" name="APKTOOL_DUMMY_10d0" id="0x7f1110d0" />
-    <public type="string" name="APKTOOL_DUMMY_10d1" id="0x7f1110d1" />
-    <public type="string" name="APKTOOL_DUMMY_10d2" id="0x7f1110d2" />
-    <public type="string" name="APKTOOL_DUMMY_10d3" id="0x7f1110d3" />
-    <public type="string" name="APKTOOL_DUMMY_10d4" id="0x7f1110d4" />
-    <public type="string" name="APKTOOL_DUMMY_10d5" id="0x7f1110d5" />
-    <public type="string" name="APKTOOL_DUMMY_10d6" id="0x7f1110d6" />
-    <public type="string" name="APKTOOL_DUMMY_10d7" id="0x7f1110d7" />
-    <public type="string" name="APKTOOL_DUMMY_10d8" id="0x7f1110d8" />
-    <public type="string" name="APKTOOL_DUMMY_10d9" id="0x7f1110d9" />
-    <public type="string" name="APKTOOL_DUMMY_10da" id="0x7f1110da" />
-    <public type="string" name="APKTOOL_DUMMY_10db" id="0x7f1110db" />
-    <public type="string" name="APKTOOL_DUMMY_10dc" id="0x7f1110dc" />
-    <public type="string" name="APKTOOL_DUMMY_10dd" id="0x7f1110dd" />
-    <public type="string" name="APKTOOL_DUMMY_10de" id="0x7f1110de" />
-    <public type="string" name="APKTOOL_DUMMY_10df" id="0x7f1110df" />
-    <public type="string" name="APKTOOL_DUMMY_10e0" id="0x7f1110e0" />
-    <public type="string" name="APKTOOL_DUMMY_10e1" id="0x7f1110e1" />
-    <public type="string" name="APKTOOL_DUMMY_10e2" id="0x7f1110e2" />
-    <public type="string" name="APKTOOL_DUMMY_10e3" id="0x7f1110e3" />
-    <public type="string" name="APKTOOL_DUMMY_10e4" id="0x7f1110e4" />
-    <public type="string" name="APKTOOL_DUMMY_10e5" id="0x7f1110e5" />
-    <public type="string" name="APKTOOL_DUMMY_10e6" id="0x7f1110e6" />
-    <public type="string" name="APKTOOL_DUMMY_10e7" id="0x7f1110e7" />
-    <public type="string" name="APKTOOL_DUMMY_10e8" id="0x7f1110e8" />
-    <public type="string" name="APKTOOL_DUMMY_10e9" id="0x7f1110e9" />
-    <public type="string" name="APKTOOL_DUMMY_10ea" id="0x7f1110ea" />
-    <public type="string" name="APKTOOL_DUMMY_10eb" id="0x7f1110eb" />
-    <public type="string" name="APKTOOL_DUMMY_10ec" id="0x7f1110ec" />
-    <public type="string" name="APKTOOL_DUMMY_10ed" id="0x7f1110ed" />
-    <public type="string" name="APKTOOL_DUMMY_10ee" id="0x7f1110ee" />
-    <public type="string" name="APKTOOL_DUMMY_10ef" id="0x7f1110ef" />
-    <public type="string" name="APKTOOL_DUMMY_10f0" id="0x7f1110f0" />
-    <public type="string" name="APKTOOL_DUMMY_10f1" id="0x7f1110f1" />
-    <public type="string" name="APKTOOL_DUMMY_10f2" id="0x7f1110f2" />
-    <public type="string" name="APKTOOL_DUMMY_10f3" id="0x7f1110f3" />
-    <public type="string" name="APKTOOL_DUMMY_10f4" id="0x7f1110f4" />
-    <public type="string" name="APKTOOL_DUMMY_10f5" id="0x7f1110f5" />
-    <public type="string" name="APKTOOL_DUMMY_10f6" id="0x7f1110f6" />
-    <public type="string" name="APKTOOL_DUMMY_10f7" id="0x7f1110f7" />
-    <public type="string" name="APKTOOL_DUMMY_10f8" id="0x7f1110f8" />
-    <public type="string" name="APKTOOL_DUMMY_10f9" id="0x7f1110f9" />
-    <public type="string" name="APKTOOL_DUMMY_10fa" id="0x7f1110fa" />
-    <public type="string" name="APKTOOL_DUMMY_10fb" id="0x7f1110fb" />
-    <public type="string" name="APKTOOL_DUMMY_10fc" id="0x7f1110fc" />
-    <public type="string" name="APKTOOL_DUMMY_10fd" id="0x7f1110fd" />
-    <public type="string" name="APKTOOL_DUMMY_10fe" id="0x7f1110fe" />
-    <public type="string" name="APKTOOL_DUMMY_10ff" id="0x7f1110ff" />
-    <public type="string" name="APKTOOL_DUMMY_1100" id="0x7f111100" />
-    <public type="string" name="APKTOOL_DUMMY_1101" id="0x7f111101" />
-    <public type="string" name="APKTOOL_DUMMY_1102" id="0x7f111102" />
-    <public type="string" name="APKTOOL_DUMMY_1103" id="0x7f111103" />
-    <public type="string" name="APKTOOL_DUMMY_1104" id="0x7f111104" />
-    <public type="string" name="APKTOOL_DUMMY_1105" id="0x7f111105" />
-    <public type="string" name="APKTOOL_DUMMY_1106" id="0x7f111106" />
-    <public type="string" name="APKTOOL_DUMMY_1107" id="0x7f111107" />
-    <public type="string" name="APKTOOL_DUMMY_1108" id="0x7f111108" />
-    <public type="string" name="APKTOOL_DUMMY_1109" id="0x7f111109" />
-    <public type="string" name="APKTOOL_DUMMY_110a" id="0x7f11110a" />
-    <public type="string" name="APKTOOL_DUMMY_110b" id="0x7f11110b" />
-    <public type="string" name="APKTOOL_DUMMY_110c" id="0x7f11110c" />
-    <public type="string" name="APKTOOL_DUMMY_110d" id="0x7f11110d" />
-    <public type="string" name="APKTOOL_DUMMY_110e" id="0x7f11110e" />
-    <public type="string" name="APKTOOL_DUMMY_110f" id="0x7f11110f" />
-    <public type="string" name="APKTOOL_DUMMY_1110" id="0x7f111110" />
-    <public type="string" name="APKTOOL_DUMMY_1111" id="0x7f111111" />
-    <public type="string" name="APKTOOL_DUMMY_1112" id="0x7f111112" />
-    <public type="string" name="APKTOOL_DUMMY_1113" id="0x7f111113" />
-    <public type="string" name="APKTOOL_DUMMY_1114" id="0x7f111114" />
-    <public type="string" name="APKTOOL_DUMMY_1115" id="0x7f111115" />
-    <public type="string" name="APKTOOL_DUMMY_1116" id="0x7f111116" />
-    <public type="string" name="APKTOOL_DUMMY_1117" id="0x7f111117" />
-    <public type="string" name="APKTOOL_DUMMY_1118" id="0x7f111118" />
-    <public type="string" name="APKTOOL_DUMMY_1119" id="0x7f111119" />
-    <public type="string" name="APKTOOL_DUMMY_111a" id="0x7f11111a" />
-    <public type="string" name="APKTOOL_DUMMY_111b" id="0x7f11111b" />
-    <public type="string" name="APKTOOL_DUMMY_111c" id="0x7f11111c" />
-    <public type="string" name="APKTOOL_DUMMY_111d" id="0x7f11111d" />
-    <public type="string" name="APKTOOL_DUMMY_111e" id="0x7f11111e" />
-    <public type="string" name="APKTOOL_DUMMY_111f" id="0x7f11111f" />
-    <public type="string" name="APKTOOL_DUMMY_1120" id="0x7f111120" />
-    <public type="string" name="APKTOOL_DUMMY_1121" id="0x7f111121" />
-    <public type="string" name="APKTOOL_DUMMY_1122" id="0x7f111122" />
-    <public type="string" name="APKTOOL_DUMMY_1123" id="0x7f111123" />
-    <public type="string" name="APKTOOL_DUMMY_1124" id="0x7f111124" />
-    <public type="string" name="APKTOOL_DUMMY_1125" id="0x7f111125" />
-    <public type="string" name="APKTOOL_DUMMY_1126" id="0x7f111126" />
-    <public type="string" name="APKTOOL_DUMMY_1127" id="0x7f111127" />
-    <public type="string" name="APKTOOL_DUMMY_1128" id="0x7f111128" />
-    <public type="string" name="APKTOOL_DUMMY_1129" id="0x7f111129" />
-    <public type="string" name="APKTOOL_DUMMY_112a" id="0x7f11112a" />
-    <public type="string" name="APKTOOL_DUMMY_112b" id="0x7f11112b" />
-    <public type="string" name="APKTOOL_DUMMY_112c" id="0x7f11112c" />
-    <public type="string" name="APKTOOL_DUMMY_112d" id="0x7f11112d" />
-    <public type="string" name="APKTOOL_DUMMY_112e" id="0x7f11112e" />
-    <public type="string" name="APKTOOL_DUMMY_112f" id="0x7f11112f" />
-    <public type="string" name="APKTOOL_DUMMY_1130" id="0x7f111130" />
-    <public type="string" name="APKTOOL_DUMMY_1131" id="0x7f111131" />
-    <public type="string" name="APKTOOL_DUMMY_1132" id="0x7f111132" />
-    <public type="string" name="APKTOOL_DUMMY_1133" id="0x7f111133" />
-    <public type="string" name="APKTOOL_DUMMY_1134" id="0x7f111134" />
-    <public type="string" name="APKTOOL_DUMMY_1135" id="0x7f111135" />
-    <public type="string" name="APKTOOL_DUMMY_1136" id="0x7f111136" />
-    <public type="string" name="APKTOOL_DUMMY_1137" id="0x7f111137" />
-    <public type="string" name="APKTOOL_DUMMY_1138" id="0x7f111138" />
-    <public type="string" name="APKTOOL_DUMMY_1139" id="0x7f111139" />
-    <public type="string" name="APKTOOL_DUMMY_113a" id="0x7f11113a" />
-    <public type="string" name="APKTOOL_DUMMY_113b" id="0x7f11113b" />
-    <public type="string" name="APKTOOL_DUMMY_113c" id="0x7f11113c" />
-    <public type="string" name="APKTOOL_DUMMY_113d" id="0x7f11113d" />
-    <public type="string" name="APKTOOL_DUMMY_113e" id="0x7f11113e" />
-    <public type="string" name="APKTOOL_DUMMY_113f" id="0x7f11113f" />
-    <public type="string" name="APKTOOL_DUMMY_1140" id="0x7f111140" />
-    <public type="string" name="APKTOOL_DUMMY_1141" id="0x7f111141" />
-    <public type="string" name="APKTOOL_DUMMY_1142" id="0x7f111142" />
-    <public type="string" name="APKTOOL_DUMMY_1143" id="0x7f111143" />
-    <public type="string" name="APKTOOL_DUMMY_1144" id="0x7f111144" />
-    <public type="string" name="APKTOOL_DUMMY_1145" id="0x7f111145" />
-    <public type="string" name="APKTOOL_DUMMY_1146" id="0x7f111146" />
-    <public type="string" name="APKTOOL_DUMMY_1147" id="0x7f111147" />
-    <public type="string" name="APKTOOL_DUMMY_1148" id="0x7f111148" />
-    <public type="string" name="APKTOOL_DUMMY_1149" id="0x7f111149" />
-    <public type="string" name="APKTOOL_DUMMY_114a" id="0x7f11114a" />
-    <public type="string" name="APKTOOL_DUMMY_114b" id="0x7f11114b" />
-    <public type="string" name="APKTOOL_DUMMY_114c" id="0x7f11114c" />
-    <public type="string" name="APKTOOL_DUMMY_114d" id="0x7f11114d" />
-    <public type="string" name="APKTOOL_DUMMY_114e" id="0x7f11114e" />
-    <public type="string" name="APKTOOL_DUMMY_114f" id="0x7f11114f" />
-    <public type="string" name="APKTOOL_DUMMY_1150" id="0x7f111150" />
-    <public type="string" name="APKTOOL_DUMMY_1151" id="0x7f111151" />
-    <public type="string" name="APKTOOL_DUMMY_1152" id="0x7f111152" />
-    <public type="string" name="APKTOOL_DUMMY_1153" id="0x7f111153" />
-    <public type="string" name="APKTOOL_DUMMY_1154" id="0x7f111154" />
-    <public type="string" name="APKTOOL_DUMMY_1155" id="0x7f111155" />
-    <public type="string" name="APKTOOL_DUMMY_1156" id="0x7f111156" />
-    <public type="string" name="APKTOOL_DUMMY_1157" id="0x7f111157" />
-    <public type="string" name="APKTOOL_DUMMY_1158" id="0x7f111158" />
-    <public type="string" name="APKTOOL_DUMMY_1159" id="0x7f111159" />
-    <public type="string" name="APKTOOL_DUMMY_115a" id="0x7f11115a" />
-    <public type="string" name="APKTOOL_DUMMY_115b" id="0x7f11115b" />
-    <public type="string" name="APKTOOL_DUMMY_115c" id="0x7f11115c" />
-    <public type="string" name="APKTOOL_DUMMY_115d" id="0x7f11115d" />
-    <public type="string" name="APKTOOL_DUMMY_115e" id="0x7f11115e" />
-    <public type="string" name="APKTOOL_DUMMY_115f" id="0x7f11115f" />
-    <public type="string" name="APKTOOL_DUMMY_1160" id="0x7f111160" />
-    <public type="string" name="APKTOOL_DUMMY_1161" id="0x7f111161" />
-    <public type="string" name="APKTOOL_DUMMY_1162" id="0x7f111162" />
-    <public type="string" name="APKTOOL_DUMMY_1163" id="0x7f111163" />
-    <public type="string" name="APKTOOL_DUMMY_1164" id="0x7f111164" />
-    <public type="string" name="APKTOOL_DUMMY_1165" id="0x7f111165" />
-    <public type="string" name="APKTOOL_DUMMY_1166" id="0x7f111166" />
-    <public type="string" name="APKTOOL_DUMMY_1167" id="0x7f111167" />
-    <public type="string" name="APKTOOL_DUMMY_1168" id="0x7f111168" />
-    <public type="string" name="APKTOOL_DUMMY_1169" id="0x7f111169" />
-    <public type="string" name="APKTOOL_DUMMY_116a" id="0x7f11116a" />
-    <public type="string" name="APKTOOL_DUMMY_116b" id="0x7f11116b" />
-    <public type="string" name="APKTOOL_DUMMY_116c" id="0x7f11116c" />
-    <public type="string" name="APKTOOL_DUMMY_116d" id="0x7f11116d" />
-    <public type="string" name="APKTOOL_DUMMY_116e" id="0x7f11116e" />
-    <public type="string" name="APKTOOL_DUMMY_116f" id="0x7f11116f" />
-    <public type="string" name="APKTOOL_DUMMY_1170" id="0x7f111170" />
-    <public type="string" name="APKTOOL_DUMMY_1171" id="0x7f111171" />
-    <public type="string" name="APKTOOL_DUMMY_1172" id="0x7f111172" />
-    <public type="string" name="APKTOOL_DUMMY_1173" id="0x7f111173" />
-    <public type="string" name="APKTOOL_DUMMY_1174" id="0x7f111174" />
-    <public type="string" name="APKTOOL_DUMMY_1175" id="0x7f111175" />
-    <public type="string" name="APKTOOL_DUMMY_1176" id="0x7f111176" />
-    <public type="string" name="APKTOOL_DUMMY_1177" id="0x7f111177" />
-    <public type="string" name="APKTOOL_DUMMY_1178" id="0x7f111178" />
-    <public type="string" name="APKTOOL_DUMMY_1179" id="0x7f111179" />
-    <public type="string" name="APKTOOL_DUMMY_117a" id="0x7f11117a" />
-    <public type="string" name="APKTOOL_DUMMY_117b" id="0x7f11117b" />
-    <public type="string" name="APKTOOL_DUMMY_117c" id="0x7f11117c" />
-    <public type="string" name="APKTOOL_DUMMY_117d" id="0x7f11117d" />
-    <public type="string" name="APKTOOL_DUMMY_117e" id="0x7f11117e" />
-    <public type="string" name="APKTOOL_DUMMY_117f" id="0x7f11117f" />
-    <public type="string" name="APKTOOL_DUMMY_1180" id="0x7f111180" />
-    <public type="string" name="APKTOOL_DUMMY_1181" id="0x7f111181" />
-    <public type="string" name="APKTOOL_DUMMY_1182" id="0x7f111182" />
-    <public type="string" name="APKTOOL_DUMMY_1183" id="0x7f111183" />
-    <public type="string" name="APKTOOL_DUMMY_1184" id="0x7f111184" />
-    <public type="string" name="APKTOOL_DUMMY_1185" id="0x7f111185" />
-    <public type="string" name="APKTOOL_DUMMY_1186" id="0x7f111186" />
-    <public type="string" name="APKTOOL_DUMMY_1187" id="0x7f111187" />
-    <public type="string" name="APKTOOL_DUMMY_1188" id="0x7f111188" />
-    <public type="string" name="APKTOOL_DUMMY_1189" id="0x7f111189" />
-    <public type="string" name="APKTOOL_DUMMY_118a" id="0x7f11118a" />
-    <public type="string" name="APKTOOL_DUMMY_118b" id="0x7f11118b" />
-    <public type="string" name="APKTOOL_DUMMY_118c" id="0x7f11118c" />
-    <public type="string" name="APKTOOL_DUMMY_118d" id="0x7f11118d" />
-    <public type="string" name="APKTOOL_DUMMY_118e" id="0x7f11118e" />
-    <public type="string" name="APKTOOL_DUMMY_118f" id="0x7f11118f" />
-    <public type="string" name="APKTOOL_DUMMY_1190" id="0x7f111190" />
-    <public type="string" name="APKTOOL_DUMMY_1191" id="0x7f111191" />
-    <public type="string" name="APKTOOL_DUMMY_1192" id="0x7f111192" />
-    <public type="string" name="APKTOOL_DUMMY_1193" id="0x7f111193" />
-    <public type="string" name="APKTOOL_DUMMY_1194" id="0x7f111194" />
-    <public type="string" name="APKTOOL_DUMMY_1195" id="0x7f111195" />
-    <public type="string" name="APKTOOL_DUMMY_1196" id="0x7f111196" />
-    <public type="string" name="APKTOOL_DUMMY_1197" id="0x7f111197" />
-    <public type="string" name="APKTOOL_DUMMY_1198" id="0x7f111198" />
-    <public type="string" name="APKTOOL_DUMMY_1199" id="0x7f111199" />
-    <public type="string" name="APKTOOL_DUMMY_119a" id="0x7f11119a" />
-    <public type="string" name="APKTOOL_DUMMY_119b" id="0x7f11119b" />
-    <public type="string" name="APKTOOL_DUMMY_119c" id="0x7f11119c" />
-    <public type="string" name="APKTOOL_DUMMY_119d" id="0x7f11119d" />
-    <public type="string" name="APKTOOL_DUMMY_119e" id="0x7f11119e" />
-    <public type="string" name="APKTOOL_DUMMY_119f" id="0x7f11119f" />
-    <public type="string" name="APKTOOL_DUMMY_11a0" id="0x7f1111a0" />
-    <public type="string" name="APKTOOL_DUMMY_11a1" id="0x7f1111a1" />
-    <public type="string" name="APKTOOL_DUMMY_11a2" id="0x7f1111a2" />
-    <public type="string" name="APKTOOL_DUMMY_11a3" id="0x7f1111a3" />
-    <public type="string" name="APKTOOL_DUMMY_11a4" id="0x7f1111a4" />
-    <public type="string" name="APKTOOL_DUMMY_11a5" id="0x7f1111a5" />
-    <public type="string" name="APKTOOL_DUMMY_11a6" id="0x7f1111a6" />
-    <public type="string" name="APKTOOL_DUMMY_11a7" id="0x7f1111a7" />
-    <public type="string" name="APKTOOL_DUMMY_11a8" id="0x7f1111a8" />
-    <public type="string" name="APKTOOL_DUMMY_11a9" id="0x7f1111a9" />
-    <public type="string" name="APKTOOL_DUMMY_11aa" id="0x7f1111aa" />
-    <public type="string" name="APKTOOL_DUMMY_11ab" id="0x7f1111ab" />
-    <public type="string" name="APKTOOL_DUMMY_11ac" id="0x7f1111ac" />
-    <public type="string" name="APKTOOL_DUMMY_11ad" id="0x7f1111ad" />
-    <public type="string" name="APKTOOL_DUMMY_11ae" id="0x7f1111ae" />
-    <public type="string" name="APKTOOL_DUMMY_11af" id="0x7f1111af" />
-    <public type="string" name="APKTOOL_DUMMY_11b0" id="0x7f1111b0" />
-    <public type="string" name="APKTOOL_DUMMY_11b1" id="0x7f1111b1" />
-    <public type="string" name="APKTOOL_DUMMY_11b2" id="0x7f1111b2" />
-    <public type="string" name="APKTOOL_DUMMY_11b3" id="0x7f1111b3" />
-    <public type="string" name="APKTOOL_DUMMY_11b4" id="0x7f1111b4" />
-    <public type="string" name="APKTOOL_DUMMY_11b5" id="0x7f1111b5" />
-    <public type="string" name="APKTOOL_DUMMY_11b6" id="0x7f1111b6" />
-    <public type="string" name="APKTOOL_DUMMY_11b7" id="0x7f1111b7" />
-    <public type="string" name="APKTOOL_DUMMY_11b8" id="0x7f1111b8" />
-    <public type="string" name="APKTOOL_DUMMY_11b9" id="0x7f1111b9" />
-    <public type="string" name="APKTOOL_DUMMY_11ba" id="0x7f1111ba" />
-    <public type="string" name="APKTOOL_DUMMY_11bb" id="0x7f1111bb" />
-    <public type="string" name="APKTOOL_DUMMY_11bc" id="0x7f1111bc" />
-    <public type="string" name="APKTOOL_DUMMY_11bd" id="0x7f1111bd" />
-    <public type="string" name="APKTOOL_DUMMY_11be" id="0x7f1111be" />
-    <public type="string" name="APKTOOL_DUMMY_11bf" id="0x7f1111bf" />
-    <public type="string" name="APKTOOL_DUMMY_11c0" id="0x7f1111c0" />
-    <public type="string" name="APKTOOL_DUMMY_11c1" id="0x7f1111c1" />
-    <public type="string" name="APKTOOL_DUMMY_11c2" id="0x7f1111c2" />
-    <public type="string" name="APKTOOL_DUMMY_11c3" id="0x7f1111c3" />
-    <public type="string" name="APKTOOL_DUMMY_11c4" id="0x7f1111c4" />
-    <public type="string" name="APKTOOL_DUMMY_11c5" id="0x7f1111c5" />
-    <public type="string" name="APKTOOL_DUMMY_11c6" id="0x7f1111c6" />
-    <public type="string" name="APKTOOL_DUMMY_11c7" id="0x7f1111c7" />
-    <public type="string" name="APKTOOL_DUMMY_11c8" id="0x7f1111c8" />
-    <public type="string" name="APKTOOL_DUMMY_11c9" id="0x7f1111c9" />
-    <public type="string" name="APKTOOL_DUMMY_11ca" id="0x7f1111ca" />
-    <public type="string" name="APKTOOL_DUMMY_11cb" id="0x7f1111cb" />
-    <public type="string" name="APKTOOL_DUMMY_11cc" id="0x7f1111cc" />
-    <public type="string" name="APKTOOL_DUMMY_11cd" id="0x7f1111cd" />
-    <public type="string" name="APKTOOL_DUMMY_11ce" id="0x7f1111ce" />
-    <public type="string" name="APKTOOL_DUMMY_11cf" id="0x7f1111cf" />
-    <public type="string" name="APKTOOL_DUMMY_11d0" id="0x7f1111d0" />
-    <public type="string" name="APKTOOL_DUMMY_11d1" id="0x7f1111d1" />
-    <public type="string" name="APKTOOL_DUMMY_11d2" id="0x7f1111d2" />
-    <public type="string" name="APKTOOL_DUMMY_11d3" id="0x7f1111d3" />
-    <public type="string" name="APKTOOL_DUMMY_11d4" id="0x7f1111d4" />
-    <public type="string" name="APKTOOL_DUMMY_11d5" id="0x7f1111d5" />
-    <public type="string" name="APKTOOL_DUMMY_11d6" id="0x7f1111d6" />
-    <public type="string" name="APKTOOL_DUMMY_11d7" id="0x7f1111d7" />
-    <public type="string" name="APKTOOL_DUMMY_11d8" id="0x7f1111d8" />
-    <public type="string" name="APKTOOL_DUMMY_11d9" id="0x7f1111d9" />
-    <public type="string" name="APKTOOL_DUMMY_11da" id="0x7f1111da" />
-    <public type="string" name="APKTOOL_DUMMY_11db" id="0x7f1111db" />
-    <public type="string" name="APKTOOL_DUMMY_11dc" id="0x7f1111dc" />
-    <public type="string" name="APKTOOL_DUMMY_11dd" id="0x7f1111dd" />
-    <public type="string" name="APKTOOL_DUMMY_11de" id="0x7f1111de" />
-    <public type="string" name="APKTOOL_DUMMY_11df" id="0x7f1111df" />
-    <public type="string" name="APKTOOL_DUMMY_11e0" id="0x7f1111e0" />
-    <public type="string" name="APKTOOL_DUMMY_11e1" id="0x7f1111e1" />
-    <public type="string" name="APKTOOL_DUMMY_11e2" id="0x7f1111e2" />
-    <public type="string" name="APKTOOL_DUMMY_11e3" id="0x7f1111e3" />
-    <public type="string" name="APKTOOL_DUMMY_11e4" id="0x7f1111e4" />
-    <public type="string" name="APKTOOL_DUMMY_11e5" id="0x7f1111e5" />
-    <public type="string" name="APKTOOL_DUMMY_11e6" id="0x7f1111e6" />
-    <public type="string" name="APKTOOL_DUMMY_11e7" id="0x7f1111e7" />
-    <public type="string" name="APKTOOL_DUMMY_11e8" id="0x7f1111e8" />
-    <public type="string" name="APKTOOL_DUMMY_11e9" id="0x7f1111e9" />
-    <public type="string" name="APKTOOL_DUMMY_11ea" id="0x7f1111ea" />
-    <public type="string" name="APKTOOL_DUMMY_11eb" id="0x7f1111eb" />
-    <public type="string" name="APKTOOL_DUMMY_11ec" id="0x7f1111ec" />
-    <public type="string" name="APKTOOL_DUMMY_11ed" id="0x7f1111ed" />
-    <public type="string" name="APKTOOL_DUMMY_11ee" id="0x7f1111ee" />
-    <public type="string" name="APKTOOL_DUMMY_11ef" id="0x7f1111ef" />
-    <public type="string" name="APKTOOL_DUMMY_11f0" id="0x7f1111f0" />
-    <public type="string" name="APKTOOL_DUMMY_11f1" id="0x7f1111f1" />
-    <public type="string" name="APKTOOL_DUMMY_11f2" id="0x7f1111f2" />
-    <public type="string" name="APKTOOL_DUMMY_11f3" id="0x7f1111f3" />
-    <public type="string" name="APKTOOL_DUMMY_11f4" id="0x7f1111f4" />
-    <public type="string" name="APKTOOL_DUMMY_11f5" id="0x7f1111f5" />
-    <public type="string" name="APKTOOL_DUMMY_11f6" id="0x7f1111f6" />
-    <public type="string" name="APKTOOL_DUMMY_11f7" id="0x7f1111f7" />
-    <public type="string" name="APKTOOL_DUMMY_11f8" id="0x7f1111f8" />
-    <public type="string" name="APKTOOL_DUMMY_11f9" id="0x7f1111f9" />
-    <public type="string" name="APKTOOL_DUMMY_11fa" id="0x7f1111fa" />
-    <public type="string" name="APKTOOL_DUMMY_11fb" id="0x7f1111fb" />
-    <public type="string" name="APKTOOL_DUMMY_11fc" id="0x7f1111fc" />
-    <public type="string" name="APKTOOL_DUMMY_11fd" id="0x7f1111fd" />
-    <public type="string" name="APKTOOL_DUMMY_11fe" id="0x7f1111fe" />
-    <public type="string" name="APKTOOL_DUMMY_11ff" id="0x7f1111ff" />
-    <public type="string" name="APKTOOL_DUMMY_1200" id="0x7f111200" />
-    <public type="string" name="APKTOOL_DUMMY_1201" id="0x7f111201" />
-    <public type="string" name="APKTOOL_DUMMY_1202" id="0x7f111202" />
-    <public type="string" name="APKTOOL_DUMMY_1203" id="0x7f111203" />
-    <public type="string" name="APKTOOL_DUMMY_1204" id="0x7f111204" />
-    <public type="string" name="APKTOOL_DUMMY_1205" id="0x7f111205" />
-    <public type="string" name="APKTOOL_DUMMY_1206" id="0x7f111206" />
-    <public type="string" name="APKTOOL_DUMMY_1207" id="0x7f111207" />
-    <public type="string" name="APKTOOL_DUMMY_1208" id="0x7f111208" />
-    <public type="string" name="APKTOOL_DUMMY_1209" id="0x7f111209" />
-    <public type="string" name="APKTOOL_DUMMY_120a" id="0x7f11120a" />
-    <public type="string" name="APKTOOL_DUMMY_120b" id="0x7f11120b" />
-    <public type="string" name="APKTOOL_DUMMY_120c" id="0x7f11120c" />
-    <public type="string" name="APKTOOL_DUMMY_120d" id="0x7f11120d" />
-    <public type="string" name="APKTOOL_DUMMY_120e" id="0x7f11120e" />
-    <public type="string" name="APKTOOL_DUMMY_120f" id="0x7f11120f" />
-    <public type="string" name="APKTOOL_DUMMY_1210" id="0x7f111210" />
-    <public type="string" name="APKTOOL_DUMMY_1211" id="0x7f111211" />
-    <public type="string" name="APKTOOL_DUMMY_1212" id="0x7f111212" />
-    <public type="string" name="APKTOOL_DUMMY_1213" id="0x7f111213" />
-    <public type="string" name="APKTOOL_DUMMY_1214" id="0x7f111214" />
-    <public type="string" name="APKTOOL_DUMMY_1215" id="0x7f111215" />
-    <public type="string" name="APKTOOL_DUMMY_1216" id="0x7f111216" />
-    <public type="string" name="APKTOOL_DUMMY_1217" id="0x7f111217" />
-    <public type="string" name="APKTOOL_DUMMY_1218" id="0x7f111218" />
-    <public type="string" name="APKTOOL_DUMMY_1219" id="0x7f111219" />
-    <public type="string" name="APKTOOL_DUMMY_121a" id="0x7f11121a" />
-    <public type="string" name="APKTOOL_DUMMY_121b" id="0x7f11121b" />
-    <public type="string" name="APKTOOL_DUMMY_121c" id="0x7f11121c" />
-    <public type="string" name="APKTOOL_DUMMY_121d" id="0x7f11121d" />
-    <public type="string" name="APKTOOL_DUMMY_121e" id="0x7f11121e" />
-    <public type="string" name="APKTOOL_DUMMY_121f" id="0x7f11121f" />
-    <public type="string" name="APKTOOL_DUMMY_1220" id="0x7f111220" />
-    <public type="string" name="APKTOOL_DUMMY_1221" id="0x7f111221" />
-    <public type="string" name="APKTOOL_DUMMY_1222" id="0x7f111222" />
-    <public type="string" name="APKTOOL_DUMMY_1223" id="0x7f111223" />
-    <public type="string" name="APKTOOL_DUMMY_1224" id="0x7f111224" />
-    <public type="string" name="APKTOOL_DUMMY_1225" id="0x7f111225" />
-    <public type="string" name="APKTOOL_DUMMY_1226" id="0x7f111226" />
-    <public type="string" name="APKTOOL_DUMMY_1227" id="0x7f111227" />
-    <public type="string" name="APKTOOL_DUMMY_1228" id="0x7f111228" />
-    <public type="string" name="APKTOOL_DUMMY_1229" id="0x7f111229" />
-    <public type="string" name="APKTOOL_DUMMY_122a" id="0x7f11122a" />
-    <public type="string" name="APKTOOL_DUMMY_122b" id="0x7f11122b" />
-    <public type="string" name="APKTOOL_DUMMY_122c" id="0x7f11122c" />
-    <public type="string" name="APKTOOL_DUMMY_122d" id="0x7f11122d" />
-    <public type="string" name="APKTOOL_DUMMY_122e" id="0x7f11122e" />
-    <public type="string" name="APKTOOL_DUMMY_122f" id="0x7f11122f" />
-    <public type="string" name="APKTOOL_DUMMY_1230" id="0x7f111230" />
-    <public type="string" name="APKTOOL_DUMMY_1231" id="0x7f111231" />
-    <public type="string" name="APKTOOL_DUMMY_1232" id="0x7f111232" />
-    <public type="string" name="scree_nsize" id="0x7f110a34" />
-    <public type="string" name="empty_text" id="0x7f11027f" />
     <public type="style" name="ActionBarGrayTheme" id="0x7f120000" />
     <public type="style" name="ActionBarProgress" id="0x7f120001" />
     <public type="style" name="ActionBarSpinner" id="0x7f120002" />
@@ -15859,9 +15335,6 @@
     <public type="style" name="SolidSeekBar" id="0x7f1201bf" />
     <public type="style" name="TextStickerDialogForLolipop" id="0x7f120214" />
     <public type="style" name="VkIm.Toolbar.TitleText.Large" id="0x7f120323" />
-    <public type="style" name="MD.Button.Borderless" id="0x7f1203a7" />
-    <public type="style" name="MD.Button.Borderless.Dialog" id="0x7f1203a8" />
-    <public type="style" name="MaterialDialogTheme.Dark" id="0x7f1203a9" />
     <public type="style" name="Base.V22.Theme.AppCompat" id="0x7f12007a" />
     <public type="style" name="Base.V22.Theme.AppCompat.Light" id="0x7f12007b" />
     <public type="style" name="Base.V23.Theme.AppCompat" id="0x7f12007c" />
@@ -15898,6 +15371,4 @@
     <public type="xml" name="preferences_proxy" id="0x7f140018" />
     <public type="xml" name="preferences_gms" id="0x7f14001a" />
     <public type="xml" name="empty" id="0x7f14001b" />
-    <public type="xml" name="APKTOOL_DUMMY_f" id="0x7f14000f" />
-    <public type="xml" name="APKTOOL_DUMMY_19" id="0x7f140019" />
 </resources>

smali/res/values/strings.xml

@@ -216,7 +216,6 @@
     <string name="auth_2fa_sms">Enter the code sent via SMS to&lt;br>the phone number &lt;b>%s&lt;/b>.</string>
     <string name="auth_alt">Any trouble receiving codes?</string>
     <string name="auth_code_hint">Enter code</string>
-    <string name="auth_error">An error occurred while logging in. Check your credentials and try again.</string>
     <string name="auth_error_network">Unable to log in due to problems with a network. Please check your connection and try again.</string>
     <string name="auth_error_title">Authorization error</string>
     <string name="auth_out_of_tries">Too many login attempts. Please try again later.</string>
@@ -282,9 +281,6 @@ You can block user from his profile page."</string>
     <string name="captcha_hint">Please enter the code from the picture</string>
     <string name="caption">Caption</string>
     <string name="career">Career</string>
-    <string name="catalog_button_show_all">Show all</string>
-    <string name="catalog_search_parameters">Parameters</string>
-    <string name="catalog_talkback_empty">Control button</string>
     <string name="category">Category: %s</string>
     <string name="cd_share_action_icon">Sharing Action icon</string>
     <string name="change_password">Change password</string>
@@ -435,18 +431,6 @@ You can block user from his profile page."</string>
     <string name="community_profile_photos">Logo pictures</string>
     <string name="community_subscribers_formatted">%s followers</string>
     <string name="completing_purchase">Completing purchase...</string>
-    <string name="components_actions_popup">Context menu</string>
-    <string name="components_base">Base</string>
-    <string name="components_bottom_confirm_btn">Lower button</string>
-    <string name="components_buttons">Buttons</string>
-    <string name="components_dialogs">Dialogs</string>
-    <string name="components_input_fields">Input fields</string>
-    <string name="components_intro_promo">Intro/Promo</string>
-    <string name="components_loaders">Loaders</string>
-    <string name="components_snackbar">Snackbar</string>
-    <string name="components_text">Text</string>
-    <string name="components_title">VK UI components</string>
-    <string name="components_tooltips">Tooltips</string>
     <string name="confirm">Please confirm</string>
     <string name="confirm_action_title">Confirm action</string>
     <string name="confirm_block_user">Are you sure you want to block %s?</string>
@@ -1990,7 +1974,6 @@ Please try again later"</string>
     <string name="newsfeed_new_photos_you_have">You have %d new photos</string>
     <string name="newsfeed_newpost_attach_documents_from_device">From device</string>
     <string name="newsfeed_newpost_attach_documents_from_gallery">From gallery</string>
-    <string name="newsfeed_newpost_attachment_adding_forbidden">Adding attachments is forbidden</string>
     <string name="newsfeed_newpost_author">"Post's author"</string>
     <string name="newsfeed_newpost_for_all">Everyone</string>
     <string name="newsfeed_newpost_for_friends">Friends only</string>
@@ -2385,8 +2368,6 @@ in group chats"</string>
     <string name="poll_result_country_title">Country</string>
     <string name="poll_result_filer_country_and_city">Country and city</string>
     <string name="poll_result_filter_age">Age</string>
-    <string name="poll_result_filter_age_18_plus">18+</string>
-    <string name="poll_result_filter_age_36_plus">36+</string>
     <string name="poll_result_filter_age_any">Any</string>
     <string name="poll_result_filter_gender_any">Any</string>
     <string name="poll_result_filter_gender_female">Female</string>
@@ -3317,14 +3298,6 @@ photo"</string>
     <string name="video_albums">Albums</string>
     <string name="video_already_added">This video has already been added to your page</string>
     <string name="video_author">Added by:</string>
-    <string name="video_catalog_filters">Filters</string>
-    <string name="video_catalog_filters_date">Upload date</string>
-    <string name="video_catalog_filters_high_quality">High quality only</string>
-    <string name="video_catalog_filters_length">Length</string>
-    <string name="video_catalog_filters_safe">Safe search</string>
-    <string name="video_catalog_filters_show_results">Show results</string>
-    <string name="video_catalog_filters_sort">Sort</string>
-    <string name="video_catalog_profile_page_title">Video</string>
     <string name="video_confirm_remove">Confirm video removal</string>
     <string name="video_empty_title">Untitled</string>
     <string name="video_err_decode">Your device can not play this video. Try selecting lower quality.</string>
@@ -3332,12 +3305,10 @@ photo"</string>
     <string name="video_err_network">There are some problems with your network connection.</string>
     <string name="video_fast_seek_tooltip">Tap here twice to rewind</string>
     <string name="video_hd_only">High quality</string>
-    <string name="video_high_quality">High quality</string>
     <string name="video_live">Live</string>
     <string name="video_live_subscribed">Stream notifications enabled</string>
     <string name="video_live_unsubscribed">Stream notifications disabled</string>
     <string name="video_live_upcoming">Soon</string>
-    <string name="video_long">Long</string>
     <string name="video_more_videos_title">See also</string>
     <string name="video_next">Next video</string>
     <string name="video_not_supported_flv">This video format is no longer supported. Please try watching it in the full website version</string>
@@ -3373,10 +3344,8 @@ photo"</string>
     <string name="video_saving">Saving video</string>
     <string name="video_search_date">By date</string>
     <string name="video_search_duration">By duration</string>
-    <string name="video_search_hint">Search videos…</string>
     <string name="video_search_sort">Sort</string>
     <string name="video_select_quality">Select quality</string>
-    <string name="video_short">Short</string>
     <string name="video_title">Video</string>
     <string name="video_upload_ok">Uploaded a video</string>
     <string name="video_upload_ok_long">Video uploaded successfully</string>
@@ -4148,6 +4117,37 @@ with video"</string>
     <string name="yesterday_at">yesterday at</string>
     <string name="your_balance">Your balance: </string>
     <string name="your_gender">Your gender:</string>
+
+    <string name="video_high_quality">High quality</string>
+    <string name="video_long">Long</string>
+    <string name="video_catalog_filters">Filters</string>
+    <string name="video_catalog_filters_date">Upload date</string>
+    <string name="video_catalog_filters_high_quality">High quality only</string>
+    <string name="video_catalog_filters_length">Length</string>
+    <string name="video_catalog_filters_safe">Safe search</string>
+    <string name="video_catalog_filters_show_results">Show results</string>
+    <string name="video_catalog_filters_sort">Sort</string>
+    <string name="video_catalog_profile_page_title">Video</string>
+    <string name="auth_error">An error occurred while logging in. Check your credentials and try again.</string>
+    <string name="components_actions_popup">Context menu</string>
+    <string name="components_base">Base</string>
+    <string name="components_bottom_confirm_btn">Lower button</string>
+    <string name="components_buttons">Buttons</string>
+    <string name="components_dialogs">Dialogs</string>
+    <string name="components_input_fields">Input fields</string>
+    <string name="components_intro_promo">Intro/Promo</string>
+    <string name="components_loaders">Loaders</string>
+    <string name="components_snackbar">Snackbar</string>
+    <string name="components_text">Text</string>
+    <string name="components_title">VK UI components</string>
+    <string name="components_tooltips">Tooltips</string>
+    <string name="catalog_button_show_all">Show all</string>
+    <string name="catalog_search_parameters">Parameters</string>
+    <string name="catalog_talkback_empty">Control button</string>
+    <string name="newsfeed_newpost_attachment_adding_forbidden">Adding attachments is forbidden</string>
+    <string name="video_search_hint">Search videos…</string>
+    <string name="video_short">Short</string>
+
     <string name="vtlfeed">Feed</string>
     <string name="vtlinterface">Interface</string>
     <string name="vtlmusic">Music</string>
@@ -4157,6 +4157,7 @@ with video"</string>
     <string name="vtltgs">Telegram Stickers</string>
     <string name="vtlthemes">Appearance</string>
     <string name="vtlmessages">Messages</string>
+    <string name="vtlota">Updates</string>
     <string name="vkconnect">VK ID</string>
     <string name="bugs">Bugtracker</string>
     <string name="promocode">Activate promocode</string>
@@ -4179,7 +4180,7 @@ Example: #sponsored, Free gift cards, #PROMO
 Filters are case-sensitive!"</string>
     <string name="vtlownfilter">Custom filter</string>
     <string name="vtlsfilter">Standard adblock filter</string>
-    <string name="vtlsfiltersummary">Blocks posts with common tags, such as #ad, #pr and so on</string>
+	<string name="vtlsfiltersummary">Blocks posts with common tags, such as #ad, #pr and so on</string>
     <string name="vtlusevkui">Use VKUI</string>
     <string name="vtlawayphp">Disable away.php redirect</string>
     <string name="vtlinterfacemsg">Interface</string>
@@ -4197,9 +4198,8 @@ Does not affect vk.cc links"</string>
     <string name="vtlrecommend">Recommendations</string>
     <string name="vtlrecommendfriend">Friends recommendations</string>
     <string name="vtlrecommendauthor">Authors recommendations</string>
-    <string name="vtlrecommendfriendpost">"Recommended friends' posts"</string>
-    <string name="BGStickers">Sticker outlines</string>
-    <string name="vtlrecommendmarksummary">Posts like You may be interested</string>
+    <string name="vtlrecommendfriendpost">Recommended friends\' posts</string>
+    <string name="vtlrecommendmarksummary">Posts like &quot;You may be interested&quot;</string>
     <string name="vtlfeedwork">Other</string>
     <string name="vtlfeedreload">Automatic feed update</string>
     <string name="vtlfeedcache">Cache feed posts</string>
@@ -4207,7 +4207,6 @@ Does not affect vk.cc links"</string>
     <string name="vtlmsgtails">Message tails</string>
     <string name="vtlmsgflat">Flat Messages</string>
     <string name="vtlupdmsg">Update</string>
-    <string name="BGStickerssum">You need to clear the application cache after toggling this option</string>
     <string name="app_name_orig">VK</string>
     <string name="addinf">Additional information</string>
     <string name="copyid">Copy ID</string>
@@ -4217,135 +4216,99 @@ Does not affect vk.cc links"</string>
     <string name="vticonsummary">The original name and icon of VK</string>
     <string name="copytokenbtn">Copy your access token</string>
     <string name="killappbtn">Kill the app process</string>
-    <string name="experts">Experts</string>
-    <string name="DNT_OFF">Disable Do Not Type</string>
-    <string name="DNT_ON">Enable Do Not Type</string>
-    <string name="accounts">Accounts</string>
-    <string name="act_bot">For Bots/Groups</string>
-    <string name="act_cnv">For Conversations</string>
-    <string name="act_pm">For Private messages</string>
-    <string name="alteremoji">Alternative type of emoji menu</string>
-    <string name="alteremojisum">Alrernative selection of emojis and stickers in the miniature menu</string>
     <string name="altnewsfeed">Alternative design of newsfeed</string>
-    <string name="altnewsfeedsum">Design with new tabs in the feed, as well as replacing default search with an improved one (in the bottom menu)</string>
-    <string name="applicationrestart">Restart application</string>
-    <string name="benchapi">Benchmark api</string>
-    <string name="benchapisummary">Testing the speed of sending requests. Useless function for everyone except VKontakte developers</string>
-    <string name="cachecleaned">Cache cleared</string>
-    <string name="clearcache">Clear all cache</string>
-    <string name="clearcachesum">Clears app cache (except for feed cache)</string>
-    <string name="convUsersOnline">Fix showing online in conversations</string>
-    <string name="convUsersOnlinesum">"Fix showing other users online in conversations (only needed if you have hidden your online one)
-
-Warning! It can cause long downloads of user lists if there are a lot of users in the conversation"</string>
-    <string name="copybtn">Copied!</string>
-    <string name="ctypedirect">Direct</string>
-    <string name="ctypedisabled">Not set</string>
-    <string name="ctypesocks">Socks</string>
-    <string name="dnr">Do not read</string>
-    <string name="dns">Send status of viewing stories</string>
-    <string name="dnw">Do not write</string>
-    <string name="docknumbers">Counters in dockbar</string>
-    <string name="docknumberssum">"Disabling doesn't work in the tablet interface"</string>
-    <string name="fcmtokenfixed">Notifications have been restored!</string>
-    <string name="fcmtokenget">FCM token received</string>
-    <string name="fcmtokenrem">FCM token deleted</string>
+    <string name="experts">Experts</string>
+    <string name="poll_result_filter_age_18_plus">18+</string>
+    <string name="poll_result_filter_age_36_plus">36+</string>
+    <string name="showstories">Show stories</string>
     <string name="firebasefix">Update Firebase registration</string>
-    <string name="firebasefixsum">Correction of receiving notifications after installing GMS or after restoring the backup of the application</string>
-    <string name="foafdate">"
-Days from the date of registration:"</string>
-    <string name="foaferr">Issues when loading data!</string>
-    <string name="foafid">Profile ID:</string>
-    <string name="foafregdate">"
-Registration date:"</string>
+    <string name="clearcache">Clear all cache</string>
+    <string name="applicationrestart">Restart application</string>
+    <string name="vtverify">VTosters verifications</string>
+    <string name="showvtverify">Show verifications</string>
+    <string name="showvtfire">Show special verifications</string>
+    <string name="vtverifyinfo">What are VTosters verifications?</string>
     <string name="getvtverify">Get verification on your profile</string>
-    <string name="iconapplying">Applying changes</string>
-    <string name="interfaceemoji">Emoji and stickers</string>
-    <string name="interfaceglobal">Global features</string>
-    <string name="interfaceglobaldates">Date rounding</string>
-    <string name="interfaceglobaldatessum">"Date rounding of posts and users
-
-01 Jan 1970 00:00:00 -> 1 Jan 00:00"</string>
-    <string name="interfaceglobalnum">Round up numbers</string>
-    <string name="interfaceglobalnumsum">"Round up the numbers of views, comments, likes and reposts
-
-10000 -> 10k"</string>
-    <string name="interfaceglobalpost">Shorten posts</string>
-    <string name="interfaceglobalpostsum">"Shorten the text in posts
-
-Expand text..."</string>
+    <string name="vtverifyinfosum">This is our gratitude for the support of the project</string>
+    <string name="firebasefixsum">Correction of receiving notifications after installing GMS or after restoring the backup of the application</string>
+    <string name="clearcachesum">Clears app cache (except for feed cache)</string>
+    <string name="vtsystem">Internal settings</string>
+    <string name="BGStickers">Sticker outlines</string>
+    <string name="BGStickerssum">You need to clear the application cache after toggling this option</string>
+    <string name="vkuiinj">VKUI theming</string>
+    <string name="proxyimpinfo">Warning!</string>
+    <string name="proxyadvsettings">Advanced proxy settings</string>
+    <string name="useproxy">Proxy variant</string>
+    <string name="useproxysum">Select the proxy variant</string>
+    <string name="proxyapi">API Domain</string>
+    <string name="proxyoauth">OAuth Domain</string>
+    <string name="proxystatic">Static Domain</string>
+    <string name="proxydomain">Domain</string>
+    <string name="proxyport">Port</string>
+    <string name="proxyhttp">HTTP Proxy</string>
+    <string name="proxyhttps">HTTPS Proxy</string>
+    <string name="proxysocks">Socks Proxy</string>
+    <string name="proxydonate">Donate</string>
+    <string name="proxyowners">Proxy owners</string>
+    <string name="proxyownerszbr">zaborona site</string>
+    <string name="proxyownersxtr">xtrafrancyz site</string>
+    <string name="proxyownersxtrsources">Proxy server sources</string>
+    <string name="proxyimpinfosum">Don\'t use proxy if VK is available in your country\n\nYou need to restart the application to apply proxy settings</string>
+    <string name="useproxyinfo">Information about using a proxy</string>
+    <string name="useproxyinfosum">By default a proxy from xtrafrancyz is used, but you can use third-party proxies\n\nEnter domains without http/https\n\nIf there are no links, the proxy from xtrafrancyz is used by default</string>
     <string name="interfacenewsfeed">Feed</string>
-    <string name="interfacenewsfeedswipe">Side camera in the news</string>
-    <string name="interfacenewsfeedswipesum">Works only with the default newsfeed design</string>
+    <string name="interfaceemoji">Emoji and stickers</string>
     <string name="interfacestartfr">Default start fragment</string>
     <string name="interfacestartfrsum">Select start fragment</string>
+    <string name="interfaceglobal">Global features</string>
     <string name="interfacevideo">Video</string>
     <string name="interfacevideoext">Use external video player</string>
     <string name="interfacevideoextsum">Use an external video player to play videos</string>
     <string name="interfacevideorec">Disable recommended videos</string>
     <string name="interfacevideorecsum">Disable video recommendations at the bottom of the video player with video recommendations</string>
+    <string name="interfaceglobaldates">Date rounding</string>
+    <string name="interfaceglobaldatessum">Date rounding of posts and users\n\n01 Jan 1970 00:00:00 -> 1 Jan 00:00</string>
+    <string name="interfaceglobalnum">Round up numbers</string>
+    <string name="interfaceglobalnumsum">Round up the numbers of views, comments, likes and reposts\n\n10000 -> 10k</string>
+    <string name="interfaceglobalpost">Shorten posts</string>
+    <string name="interfaceglobalpostsum">Shorten the text in posts\n\nExpand text...</string>
+    <string name="interfacenewsfeedswipe">Side camera in the news</string>
+    <string name="interfacenewsfeedswipesum">Works only with the default newsfeed design</string>
+    <string name="showstoriessum">Show stories at the top of the feed</string>
+    <string name="altnewsfeedsum">Design with new tabs in the feed, as well as replacing default search with an improved one (in the bottom menu)</string>
     <string name="menucutter">Disable menu shortening</string>
     <string name="menucuttersum">Removes the shortening of items in the application section menu</string>
-    <string name="newacc">Add new account</string>
-    <string name="newvideo">New video catalog</string>
-    <string name="offline_vtl">Offline</string>
-    <string name="online_vtl">Online</string>
-    <string name="opencommit">Open commit</string>
-    <string name="otabranch">Select update branch</string>
+    <string name="docknumbers">Counters in dockbar</string>
+    <string name="docknumberssum">Disabling doesn\'t work in the tablet interface</string>
+    <string name="systememoji">Use system emojis</string>
+    <string name="systememojisum">Your system emojis - 😀😁🤑🥵👍</string>
+    <string name="alteremoji">Alternative type of emoji menu</string>
+    <string name="alteremojisum">Alrernative selection of emojis and stickers in the miniature menu</string>
+    <string name="convUsersOnline">Fix showing online in conversations</string>
+    <string name="convUsersOnlinesum">Fix showing other users online in conversations (only needed if you have hidden your online one)\n\nWarning! It can cause long downloads of user lists if there are a lot of users in the conversation</string>
+    <string name="otawarning">Warning!</string>
+    <string name="otaok">OK</string>
     <string name="otacheckonstart">Enable updates at start</string>
+    <string name="otabranch">Select update branch</string>
     <string name="otacheckupd">Check for updates</string>
     <string name="otaerr">Check your internet connection and try again</string>
-    <string name="otanoupd">No updates found</string>
-    <string name="otaok">OK</string>
     <string name="otaretry">Try again</string>
+    <string name="otanoupd">No updates found</string>
     <string name="otaupd">Update</string>
     <string name="otaupdavalible">Update available!</string>
     <string name="otaupdchanges">Changelog</string>
-    <string name="otawarning">Warning!</string>
-    <string name="otawarnwait">"Please don't close the app until the end of the update download"</string>
-    <string name="privacy_vtl">Privacy</string>
-    <string name="proxyadvsettings">Advanced proxy settings</string>
-    <string name="proxyapi">API Domain</string>
-    <string name="proxydomain">Domain</string>
-    <string name="proxydonate">Donate</string>
-    <string name="proxyhttp">HTTP Proxy</string>
-    <string name="proxyhttps">HTTPS Proxy</string>
-    <string name="proxyimpinfo">Warning!</string>
-    <string name="proxyimpinfosum">"Don't use proxy if VK is available in your country
-
-You need to restart the application to apply proxy settings"</string>
-    <string name="proxyoauth">OAuth Domain</string>
-    <string name="proxyowners">Proxy owners</string>
-    <string name="proxyownersxtr">xtrafrancyz site</string>
-    <string name="proxyownersxtrsources">Proxy server sources</string>
-    <string name="proxyownerszbr">zaborona site</string>
-    <string name="proxyport">Port</string>
-    <string name="proxysocks">Socks Proxy</string>
-    <string name="proxystatic">Static Domain</string>
-    <string name="reportbug">Report a bug</string>
-    <string name="restartapp">Please, restart app</string>
-    <string name="savedmsg">Saved messages</string>
-    <string name="selectacc">Select account</string>
-    <string name="shitposting">The same type of news</string>
-    <string name="shitpostingsummary">Filter for cleaning posts with the Russian Federation and actions related in Ukraine</string>
-    <string name="showstories">Show stories</string>
-    <string name="showstoriessum">Show stories at the top of the feed</string>
-    <string name="showvtfire">Show special verifications</string>
-    <string name="showvtverify">Show verifications</string>
-    <string name="sprefsctype">Connection type</string>
-    <string name="sprefsdelkey">Delete the Telegram bot key</string>
-    <string name="sprefsdelkey2">The key was deleted successfully</string>
-    <string name="sprefsnetwork">Network</string>
-    <string name="sprefsstickers">Stickers</string>
-    <string name="ssocks">Socks Settings</string>
-    <string name="ssocksauth">Authorization</string>
-    <string name="ssockshost">Host</string>
-    <string name="ssockslogin">Login</string>
-    <string name="ssockspass">Password</string>
-    <string name="ssocksport">Port</string>
-    <string name="ssockswport">Invalid port</string>
+    <string name="otawarnwait">Please don\'t close the app until the end of the update download</string>
+    <string name="iconapplying">Applying changes</string>
+    <string name="copybtn">Copied!</string>
+    <string name="tokenwarning">Don\'t give this token to anyone if you don\'t know what to do!</string>
+    <string name="cachecleaned">Cache cleared</string>
+    <string name="fcmtokenrem">FCM token deleted</string>
+    <string name="fcmtokenget">FCM token received</string>
+    <string name="fcmtokenfixed">Notifications have been restored!</string>
+    <string name="stickerscount">stickers</string>
+    <string name="stickersconnection">Choose the connection method!</string>
+    <string name="stickersproxy1">Configure the IP proxy!</string>
     <string name="stickersapi1">Checking API key</string>
-    <string name="stickersapi10">2. Copy the bot token that the bot will send you and paste it into the application</string>
     <string name="stickersapi2">Invalid Bot API key</string>
     <string name="stickersapi3">Error checking the key!</string>
     <string name="stickersapi4">Try again</string>
@@ -4353,406 +4316,43 @@ You need to restart the application to apply proxy settings"</string>
     <string name="stickersapi6">Get it using the bot @BotFather</string>
     <string name="stickersapi7">More details</string>
     <string name="stickersapi8">Instructions for obtaining a key</string>
-    <string name="stickersapi9">"1. Create a bot at @BotFather (Telegram)
-"</string>
-    <string name="stickersconnection">Choose the connection method!</string>
-    <string name="stickerscount">stickers</string>
+    <string name="stickersapi9">1. Create a bot at @BotFather (Telegram)\n</string>
+    <string name="stickersapi10">2. Copy the bot token that the bot will send you and paste it into the application</string>
     <string name="stickershelp1">Enter the URL or the sticker pack ID</string>
     <string name="stickershelp2">The link must be in the format https://t.me/addstickers/\"ID\"</string>
-    <string name="stickersproxy1">Configure the IP proxy!</string>
-    <string name="stories_vtl">Stories</string>
-    <string name="systememoji">Use system emojis</string>
-    <string name="systememojisum">Your system emojis - 😀😁🤑🥵👍</string>
-    <string name="tokenwarning">"Don't give this token to anyone if you don't know what to do!"</string>
-    <string name="useproxy">Proxy variant</string>
-    <string name="useproxyinfo">Information about using a proxy</string>
-    <string name="useproxysum">Select the proxy variant</string>
-    <string name="vkuiinj">VKUI theming</string>
-    <string name="vtlawayphpsummary">Tracking the user to personalize ads. Also checking links to the blacklist from VKontakte and antivirus</string>
-    <string name="vtloffline">Send online status</string>
-    <string name="vtloffline2">Force offline requests</string>
-    <string name="vtloffline2summary">"Works only when online status sending is disabledsends instantly offline after sending messages and other api methods that are sent online
+    <string name="sprefsstickers">Stickers</string>
+    <string name="sprefsdelkey">Delete the Telegram bot key</string>
+    <string name="sprefsdelkey2">The key was deleted successfully</string>
+    <string name="sprefsctype">Connection type</string>
+    <string name="ctypedirect">Direct</string>
+    <string name="ctypesocks">Socks</string>
+    <string name="ctypedisabled">Not set</string>
+    <string name="sprefsnetwork">Network</string>
+    <string name="ssocks">Socks Settings</string>
+    <string name="ssockshost">Host</string>
+    <string name="ssocksport">Port</string>
+    <string name="ssockswport">Invalid port</string>
+    <string name="ssocksauth">Authorization</string>
+    <string name="ssockslogin">Login</string>
+    <string name="ssockspass">Password</string>
+    <string name="foafid">Profile ID:</string>
+    <string name="foafregdate">\nRegistration date:</string>
+    <string name="foafdate">\nDays from the date of registration:</string>
+    <string name="foaferr">Issues when loading data!</string>
+    <string name="savedmsg">Saved messages</string>
 
-May look like a fake leaving the online"</string>
-    <string name="vtlofflinesummary">Disabling online will allow you to stay offline</string>
-    <string name="vtsystem">Internal settings</string>
-    <string name="vtverify">VTosters verifications</string>
-    <string name="vtverifyinfo">What are VTosters verifications?</string>
-    <string name="vtverifyinfosum">This is our gratitude for the support of the project</string>
-    <string name="vtlota">Updates</string>
     <string name="DNR_ON">Enable Do Not Read</string>
     <string name="DNR_OFF">Disable Do Not Read</string>
-    <item type="string" name="APKTOOL_DUMMY_10be" />
-    <item type="string" name="APKTOOL_DUMMY_10bf" />
-    <item type="string" name="APKTOOL_DUMMY_10c0" />
-    <item type="string" name="APKTOOL_DUMMY_10c1" />
-    <item type="string" name="APKTOOL_DUMMY_10c2" />
-    <item type="string" name="APKTOOL_DUMMY_10c3" />
-    <item type="string" name="APKTOOL_DUMMY_10c4" />
-    <item type="string" name="APKTOOL_DUMMY_10c5" />
-    <item type="string" name="APKTOOL_DUMMY_10c6" />
-    <item type="string" name="APKTOOL_DUMMY_10c7" />
-    <item type="string" name="APKTOOL_DUMMY_10c8" />
-    <item type="string" name="APKTOOL_DUMMY_10c9" />
-    <item type="string" name="APKTOOL_DUMMY_10ca" />
-    <item type="string" name="APKTOOL_DUMMY_10cb" />
-    <item type="string" name="APKTOOL_DUMMY_10cc" />
-    <item type="string" name="APKTOOL_DUMMY_10cd" />
-    <item type="string" name="APKTOOL_DUMMY_10ce" />
-    <item type="string" name="APKTOOL_DUMMY_10cf" />
-    <item type="string" name="APKTOOL_DUMMY_10d0" />
-    <item type="string" name="APKTOOL_DUMMY_10d1" />
-    <item type="string" name="APKTOOL_DUMMY_10d2" />
-    <item type="string" name="APKTOOL_DUMMY_10d3" />
-    <item type="string" name="APKTOOL_DUMMY_10d4" />
-    <item type="string" name="APKTOOL_DUMMY_10d5" />
-    <item type="string" name="APKTOOL_DUMMY_10d6" />
-    <item type="string" name="APKTOOL_DUMMY_10d7" />
-    <item type="string" name="APKTOOL_DUMMY_10d8" />
-    <item type="string" name="APKTOOL_DUMMY_10d9" />
-    <item type="string" name="APKTOOL_DUMMY_10da" />
-    <item type="string" name="APKTOOL_DUMMY_10db" />
-    <item type="string" name="APKTOOL_DUMMY_10dc" />
-    <item type="string" name="APKTOOL_DUMMY_10dd" />
-    <item type="string" name="APKTOOL_DUMMY_10de" />
-    <item type="string" name="APKTOOL_DUMMY_10df" />
-    <item type="string" name="APKTOOL_DUMMY_10e0" />
-    <item type="string" name="APKTOOL_DUMMY_10e1" />
-    <item type="string" name="APKTOOL_DUMMY_10e2" />
-    <item type="string" name="APKTOOL_DUMMY_10e3" />
-    <item type="string" name="APKTOOL_DUMMY_10e4" />
-    <item type="string" name="APKTOOL_DUMMY_10e5" />
-    <item type="string" name="APKTOOL_DUMMY_10e6" />
-    <item type="string" name="APKTOOL_DUMMY_10e7" />
-    <item type="string" name="APKTOOL_DUMMY_10e8" />
-    <item type="string" name="APKTOOL_DUMMY_10e9" />
-    <item type="string" name="APKTOOL_DUMMY_10ea" />
-    <item type="string" name="APKTOOL_DUMMY_10eb" />
-    <item type="string" name="APKTOOL_DUMMY_10ec" />
-    <item type="string" name="APKTOOL_DUMMY_10ed" />
-    <item type="string" name="APKTOOL_DUMMY_10ee" />
-    <item type="string" name="APKTOOL_DUMMY_10ef" />
-    <item type="string" name="APKTOOL_DUMMY_10f0" />
-    <item type="string" name="APKTOOL_DUMMY_10f1" />
-    <item type="string" name="APKTOOL_DUMMY_10f2" />
-    <item type="string" name="APKTOOL_DUMMY_10f3" />
-    <item type="string" name="APKTOOL_DUMMY_10f4" />
-    <item type="string" name="APKTOOL_DUMMY_10f5" />
-    <item type="string" name="APKTOOL_DUMMY_10f6" />
-    <item type="string" name="APKTOOL_DUMMY_10f7" />
-    <item type="string" name="APKTOOL_DUMMY_10f8" />
-    <item type="string" name="APKTOOL_DUMMY_10f9" />
-    <item type="string" name="APKTOOL_DUMMY_10fa" />
-    <item type="string" name="APKTOOL_DUMMY_10fb" />
-    <item type="string" name="APKTOOL_DUMMY_10fc" />
-    <item type="string" name="APKTOOL_DUMMY_10fd" />
-    <item type="string" name="APKTOOL_DUMMY_10fe" />
-    <item type="string" name="APKTOOL_DUMMY_10ff" />
-    <item type="string" name="APKTOOL_DUMMY_1100" />
-    <item type="string" name="APKTOOL_DUMMY_1101" />
-    <item type="string" name="APKTOOL_DUMMY_1102" />
-    <item type="string" name="APKTOOL_DUMMY_1103" />
-    <item type="string" name="APKTOOL_DUMMY_1104" />
-    <item type="string" name="APKTOOL_DUMMY_1105" />
-    <item type="string" name="APKTOOL_DUMMY_1106" />
-    <item type="string" name="APKTOOL_DUMMY_1107" />
-    <item type="string" name="APKTOOL_DUMMY_1108" />
-    <item type="string" name="APKTOOL_DUMMY_1109" />
-    <item type="string" name="APKTOOL_DUMMY_110a" />
-    <item type="string" name="APKTOOL_DUMMY_110b" />
-    <item type="string" name="APKTOOL_DUMMY_110c" />
-    <item type="string" name="APKTOOL_DUMMY_110d" />
-    <item type="string" name="APKTOOL_DUMMY_110e" />
-    <item type="string" name="APKTOOL_DUMMY_110f" />
-    <item type="string" name="APKTOOL_DUMMY_1110" />
-    <item type="string" name="APKTOOL_DUMMY_1111" />
-    <item type="string" name="APKTOOL_DUMMY_1112" />
-    <item type="string" name="APKTOOL_DUMMY_1113" />
-    <item type="string" name="APKTOOL_DUMMY_1114" />
-    <item type="string" name="APKTOOL_DUMMY_1115" />
-    <item type="string" name="APKTOOL_DUMMY_1116" />
-    <item type="string" name="APKTOOL_DUMMY_1117" />
-    <item type="string" name="APKTOOL_DUMMY_1118" />
-    <item type="string" name="APKTOOL_DUMMY_1119" />
-    <item type="string" name="APKTOOL_DUMMY_111a" />
-    <item type="string" name="APKTOOL_DUMMY_111b" />
-    <item type="string" name="APKTOOL_DUMMY_111c" />
-    <item type="string" name="APKTOOL_DUMMY_111d" />
-    <item type="string" name="APKTOOL_DUMMY_111e" />
-    <item type="string" name="APKTOOL_DUMMY_111f" />
-    <item type="string" name="APKTOOL_DUMMY_1120" />
-    <item type="string" name="APKTOOL_DUMMY_1121" />
-    <item type="string" name="APKTOOL_DUMMY_1122" />
-    <item type="string" name="APKTOOL_DUMMY_1123" />
-    <item type="string" name="APKTOOL_DUMMY_1124" />
-    <item type="string" name="APKTOOL_DUMMY_1125" />
-    <item type="string" name="APKTOOL_DUMMY_1126" />
-    <item type="string" name="APKTOOL_DUMMY_1127" />
-    <item type="string" name="APKTOOL_DUMMY_1128" />
-    <item type="string" name="APKTOOL_DUMMY_1129" />
-    <item type="string" name="APKTOOL_DUMMY_112a" />
-    <item type="string" name="APKTOOL_DUMMY_112b" />
-    <item type="string" name="APKTOOL_DUMMY_112c" />
-    <item type="string" name="APKTOOL_DUMMY_112d" />
-    <item type="string" name="APKTOOL_DUMMY_112e" />
-    <item type="string" name="APKTOOL_DUMMY_112f" />
-    <item type="string" name="APKTOOL_DUMMY_1130" />
-    <item type="string" name="APKTOOL_DUMMY_1131" />
-    <item type="string" name="APKTOOL_DUMMY_1132" />
-    <item type="string" name="APKTOOL_DUMMY_1133" />
-    <item type="string" name="APKTOOL_DUMMY_1134" />
-    <item type="string" name="APKTOOL_DUMMY_1135" />
-    <item type="string" name="APKTOOL_DUMMY_1136" />
-    <item type="string" name="APKTOOL_DUMMY_1137" />
-    <item type="string" name="APKTOOL_DUMMY_1138" />
-    <item type="string" name="APKTOOL_DUMMY_1139" />
-    <item type="string" name="APKTOOL_DUMMY_113a" />
-    <item type="string" name="APKTOOL_DUMMY_113b" />
-    <item type="string" name="APKTOOL_DUMMY_113c" />
-    <item type="string" name="APKTOOL_DUMMY_113d" />
-    <item type="string" name="APKTOOL_DUMMY_113e" />
-    <item type="string" name="APKTOOL_DUMMY_113f" />
-    <item type="string" name="APKTOOL_DUMMY_1140" />
-    <item type="string" name="APKTOOL_DUMMY_1141" />
-    <item type="string" name="APKTOOL_DUMMY_1142" />
-    <item type="string" name="APKTOOL_DUMMY_1143" />
-    <item type="string" name="APKTOOL_DUMMY_1144" />
-    <item type="string" name="APKTOOL_DUMMY_1145" />
-    <item type="string" name="APKTOOL_DUMMY_1146" />
-    <item type="string" name="APKTOOL_DUMMY_1147" />
-    <item type="string" name="APKTOOL_DUMMY_1148" />
-    <item type="string" name="APKTOOL_DUMMY_1149" />
-    <item type="string" name="APKTOOL_DUMMY_114a" />
-    <item type="string" name="APKTOOL_DUMMY_114b" />
-    <item type="string" name="APKTOOL_DUMMY_114c" />
-    <item type="string" name="APKTOOL_DUMMY_114d" />
-    <item type="string" name="APKTOOL_DUMMY_114e" />
-    <item type="string" name="APKTOOL_DUMMY_114f" />
-    <item type="string" name="APKTOOL_DUMMY_1150" />
-    <item type="string" name="APKTOOL_DUMMY_1151" />
-    <item type="string" name="APKTOOL_DUMMY_1152" />
-    <item type="string" name="APKTOOL_DUMMY_1153" />
-    <item type="string" name="APKTOOL_DUMMY_1154" />
-    <item type="string" name="APKTOOL_DUMMY_1155" />
-    <item type="string" name="APKTOOL_DUMMY_1156" />
-    <item type="string" name="APKTOOL_DUMMY_1157" />
-    <item type="string" name="APKTOOL_DUMMY_1158" />
-    <item type="string" name="APKTOOL_DUMMY_1159" />
-    <item type="string" name="APKTOOL_DUMMY_115a" />
-    <item type="string" name="APKTOOL_DUMMY_115b" />
-    <item type="string" name="APKTOOL_DUMMY_115c" />
-    <item type="string" name="APKTOOL_DUMMY_115d" />
-    <item type="string" name="APKTOOL_DUMMY_115e" />
-    <item type="string" name="APKTOOL_DUMMY_115f" />
-    <item type="string" name="APKTOOL_DUMMY_1160" />
-    <item type="string" name="APKTOOL_DUMMY_1161" />
-    <item type="string" name="APKTOOL_DUMMY_1162" />
-    <item type="string" name="APKTOOL_DUMMY_1163" />
-    <item type="string" name="APKTOOL_DUMMY_1164" />
-    <item type="string" name="APKTOOL_DUMMY_1165" />
-    <item type="string" name="APKTOOL_DUMMY_1166" />
-    <item type="string" name="APKTOOL_DUMMY_1167" />
-    <item type="string" name="APKTOOL_DUMMY_1168" />
-    <item type="string" name="APKTOOL_DUMMY_1169" />
-    <item type="string" name="APKTOOL_DUMMY_116a" />
-    <item type="string" name="APKTOOL_DUMMY_116b" />
-    <item type="string" name="APKTOOL_DUMMY_116c" />
-    <item type="string" name="APKTOOL_DUMMY_116d" />
-    <item type="string" name="APKTOOL_DUMMY_116e" />
-    <item type="string" name="APKTOOL_DUMMY_116f" />
-    <item type="string" name="APKTOOL_DUMMY_1170" />
-    <item type="string" name="APKTOOL_DUMMY_1171" />
-    <item type="string" name="APKTOOL_DUMMY_1172" />
-    <item type="string" name="APKTOOL_DUMMY_1173" />
-    <item type="string" name="APKTOOL_DUMMY_1174" />
-    <item type="string" name="APKTOOL_DUMMY_1175" />
-    <item type="string" name="APKTOOL_DUMMY_1176" />
-    <item type="string" name="APKTOOL_DUMMY_1177" />
-    <item type="string" name="APKTOOL_DUMMY_1178" />
-    <item type="string" name="APKTOOL_DUMMY_1179" />
-    <item type="string" name="APKTOOL_DUMMY_117a" />
-    <item type="string" name="APKTOOL_DUMMY_117b" />
-    <item type="string" name="APKTOOL_DUMMY_117c" />
-    <item type="string" name="APKTOOL_DUMMY_117d" />
-    <item type="string" name="APKTOOL_DUMMY_117e" />
-    <item type="string" name="APKTOOL_DUMMY_117f" />
-    <item type="string" name="APKTOOL_DUMMY_1180" />
-    <item type="string" name="APKTOOL_DUMMY_1181" />
-    <item type="string" name="APKTOOL_DUMMY_1182" />
-    <item type="string" name="APKTOOL_DUMMY_1183" />
-    <item type="string" name="APKTOOL_DUMMY_1184" />
-    <item type="string" name="APKTOOL_DUMMY_1185" />
-    <item type="string" name="APKTOOL_DUMMY_1186" />
-    <item type="string" name="APKTOOL_DUMMY_1187" />
-    <item type="string" name="APKTOOL_DUMMY_1188" />
-    <item type="string" name="APKTOOL_DUMMY_1189" />
-    <item type="string" name="APKTOOL_DUMMY_118a" />
-    <item type="string" name="APKTOOL_DUMMY_118b" />
-    <item type="string" name="APKTOOL_DUMMY_118c" />
-    <item type="string" name="APKTOOL_DUMMY_118d" />
-    <item type="string" name="APKTOOL_DUMMY_118e" />
-    <item type="string" name="APKTOOL_DUMMY_118f" />
-    <item type="string" name="APKTOOL_DUMMY_1190" />
-    <item type="string" name="APKTOOL_DUMMY_1191" />
-    <item type="string" name="APKTOOL_DUMMY_1192" />
-    <item type="string" name="APKTOOL_DUMMY_1193" />
-    <item type="string" name="APKTOOL_DUMMY_1194" />
-    <item type="string" name="APKTOOL_DUMMY_1195" />
-    <item type="string" name="APKTOOL_DUMMY_1196" />
-    <item type="string" name="APKTOOL_DUMMY_1197" />
-    <item type="string" name="APKTOOL_DUMMY_1198" />
-    <item type="string" name="APKTOOL_DUMMY_1199" />
-    <item type="string" name="APKTOOL_DUMMY_119a" />
-    <item type="string" name="APKTOOL_DUMMY_119b" />
-    <item type="string" name="APKTOOL_DUMMY_119c" />
-    <item type="string" name="APKTOOL_DUMMY_119d" />
-    <item type="string" name="APKTOOL_DUMMY_119e" />
-    <item type="string" name="APKTOOL_DUMMY_119f" />
-    <item type="string" name="APKTOOL_DUMMY_11a0" />
-    <item type="string" name="APKTOOL_DUMMY_11a1" />
-    <item type="string" name="APKTOOL_DUMMY_11a2" />
-    <item type="string" name="APKTOOL_DUMMY_11a3" />
-    <item type="string" name="APKTOOL_DUMMY_11a4" />
-    <item type="string" name="APKTOOL_DUMMY_11a5" />
-    <item type="string" name="APKTOOL_DUMMY_11a6" />
-    <item type="string" name="APKTOOL_DUMMY_11a7" />
-    <item type="string" name="APKTOOL_DUMMY_11a8" />
-    <item type="string" name="APKTOOL_DUMMY_11a9" />
-    <item type="string" name="APKTOOL_DUMMY_11aa" />
-    <item type="string" name="APKTOOL_DUMMY_11ab" />
-    <item type="string" name="APKTOOL_DUMMY_11ac" />
-    <item type="string" name="APKTOOL_DUMMY_11ad" />
-    <item type="string" name="APKTOOL_DUMMY_11ae" />
-    <item type="string" name="APKTOOL_DUMMY_11af" />
-    <item type="string" name="APKTOOL_DUMMY_11b0" />
-    <item type="string" name="APKTOOL_DUMMY_11b1" />
-    <item type="string" name="APKTOOL_DUMMY_11b2" />
-    <item type="string" name="APKTOOL_DUMMY_11b3" />
-    <item type="string" name="APKTOOL_DUMMY_11b4" />
-    <item type="string" name="APKTOOL_DUMMY_11b5" />
-    <item type="string" name="APKTOOL_DUMMY_11b6" />
-    <item type="string" name="APKTOOL_DUMMY_11b7" />
-    <item type="string" name="APKTOOL_DUMMY_11b8" />
-    <item type="string" name="APKTOOL_DUMMY_11b9" />
-    <item type="string" name="APKTOOL_DUMMY_11ba" />
-    <item type="string" name="APKTOOL_DUMMY_11bb" />
-    <item type="string" name="APKTOOL_DUMMY_11bc" />
-    <item type="string" name="APKTOOL_DUMMY_11bd" />
-    <item type="string" name="APKTOOL_DUMMY_11be" />
-    <item type="string" name="APKTOOL_DUMMY_11bf" />
-    <item type="string" name="APKTOOL_DUMMY_11c0" />
-    <item type="string" name="APKTOOL_DUMMY_11c1" />
-    <item type="string" name="APKTOOL_DUMMY_11c2" />
-    <item type="string" name="APKTOOL_DUMMY_11c3" />
-    <item type="string" name="APKTOOL_DUMMY_11c4" />
-    <item type="string" name="APKTOOL_DUMMY_11c5" />
-    <item type="string" name="APKTOOL_DUMMY_11c6" />
-    <item type="string" name="APKTOOL_DUMMY_11c7" />
-    <item type="string" name="APKTOOL_DUMMY_11c8" />
-    <item type="string" name="APKTOOL_DUMMY_11c9" />
-    <item type="string" name="APKTOOL_DUMMY_11ca" />
-    <item type="string" name="APKTOOL_DUMMY_11cb" />
-    <item type="string" name="APKTOOL_DUMMY_11cc" />
-    <item type="string" name="APKTOOL_DUMMY_11cd" />
-    <item type="string" name="APKTOOL_DUMMY_11ce" />
-    <item type="string" name="APKTOOL_DUMMY_11cf" />
-    <item type="string" name="APKTOOL_DUMMY_11d0" />
-    <item type="string" name="APKTOOL_DUMMY_11d1" />
-    <item type="string" name="APKTOOL_DUMMY_11d2" />
-    <item type="string" name="APKTOOL_DUMMY_11d3" />
-    <item type="string" name="APKTOOL_DUMMY_11d4" />
-    <item type="string" name="APKTOOL_DUMMY_11d5" />
-    <item type="string" name="APKTOOL_DUMMY_11d6" />
-    <item type="string" name="APKTOOL_DUMMY_11d7" />
-    <item type="string" name="APKTOOL_DUMMY_11d8" />
-    <item type="string" name="APKTOOL_DUMMY_11d9" />
-    <item type="string" name="APKTOOL_DUMMY_11da" />
-    <item type="string" name="APKTOOL_DUMMY_11db" />
-    <item type="string" name="APKTOOL_DUMMY_11dc" />
-    <item type="string" name="APKTOOL_DUMMY_11dd" />
-    <item type="string" name="APKTOOL_DUMMY_11de" />
-    <item type="string" name="APKTOOL_DUMMY_11df" />
-    <item type="string" name="APKTOOL_DUMMY_11e0" />
-    <item type="string" name="APKTOOL_DUMMY_11e1" />
-    <item type="string" name="APKTOOL_DUMMY_11e2" />
-    <item type="string" name="APKTOOL_DUMMY_11e3" />
-    <item type="string" name="APKTOOL_DUMMY_11e4" />
-    <item type="string" name="APKTOOL_DUMMY_11e5" />
-    <item type="string" name="APKTOOL_DUMMY_11e6" />
-    <item type="string" name="APKTOOL_DUMMY_11e7" />
-    <item type="string" name="APKTOOL_DUMMY_11e8" />
-    <item type="string" name="APKTOOL_DUMMY_11e9" />
-    <item type="string" name="APKTOOL_DUMMY_11ea" />
-    <item type="string" name="APKTOOL_DUMMY_11eb" />
-    <item type="string" name="APKTOOL_DUMMY_11ec" />
-    <item type="string" name="APKTOOL_DUMMY_11ed" />
-    <item type="string" name="APKTOOL_DUMMY_11ee" />
-    <item type="string" name="APKTOOL_DUMMY_11ef" />
-    <item type="string" name="APKTOOL_DUMMY_11f0" />
-    <item type="string" name="APKTOOL_DUMMY_11f1" />
-    <item type="string" name="APKTOOL_DUMMY_11f2" />
-    <item type="string" name="APKTOOL_DUMMY_11f3" />
-    <item type="string" name="APKTOOL_DUMMY_11f4" />
-    <item type="string" name="APKTOOL_DUMMY_11f5" />
-    <item type="string" name="APKTOOL_DUMMY_11f6" />
-    <item type="string" name="APKTOOL_DUMMY_11f7" />
-    <item type="string" name="APKTOOL_DUMMY_11f8" />
-    <item type="string" name="APKTOOL_DUMMY_11f9" />
-    <item type="string" name="APKTOOL_DUMMY_11fa" />
-    <item type="string" name="APKTOOL_DUMMY_11fb" />
-    <item type="string" name="APKTOOL_DUMMY_11fc" />
-    <item type="string" name="APKTOOL_DUMMY_11fd" />
-    <item type="string" name="APKTOOL_DUMMY_11fe" />
-    <item type="string" name="APKTOOL_DUMMY_11ff" />
-    <item type="string" name="APKTOOL_DUMMY_1200" />
-    <item type="string" name="APKTOOL_DUMMY_1201" />
-    <item type="string" name="APKTOOL_DUMMY_1202" />
-    <item type="string" name="APKTOOL_DUMMY_1203" />
-    <item type="string" name="APKTOOL_DUMMY_1204" />
-    <item type="string" name="APKTOOL_DUMMY_1205" />
-    <item type="string" name="APKTOOL_DUMMY_1206" />
-    <item type="string" name="APKTOOL_DUMMY_1207" />
-    <item type="string" name="APKTOOL_DUMMY_1208" />
-    <item type="string" name="APKTOOL_DUMMY_1209" />
-    <item type="string" name="APKTOOL_DUMMY_120a" />
-    <item type="string" name="APKTOOL_DUMMY_120b" />
-    <item type="string" name="APKTOOL_DUMMY_120c" />
-    <item type="string" name="APKTOOL_DUMMY_120d" />
-    <item type="string" name="APKTOOL_DUMMY_120e" />
-    <item type="string" name="APKTOOL_DUMMY_120f" />
-    <item type="string" name="APKTOOL_DUMMY_1210" />
-    <item type="string" name="APKTOOL_DUMMY_1211" />
-    <item type="string" name="APKTOOL_DUMMY_1212" />
-    <item type="string" name="APKTOOL_DUMMY_1213" />
-    <item type="string" name="APKTOOL_DUMMY_1214" />
-    <item type="string" name="APKTOOL_DUMMY_1215" />
-    <item type="string" name="APKTOOL_DUMMY_1216" />
-    <item type="string" name="APKTOOL_DUMMY_1217" />
-    <item type="string" name="APKTOOL_DUMMY_1218" />
-    <item type="string" name="APKTOOL_DUMMY_1219" />
-    <item type="string" name="APKTOOL_DUMMY_121a" />
-    <item type="string" name="APKTOOL_DUMMY_121b" />
-    <item type="string" name="APKTOOL_DUMMY_121c" />
-    <item type="string" name="APKTOOL_DUMMY_121d" />
-    <item type="string" name="APKTOOL_DUMMY_121e" />
-    <item type="string" name="APKTOOL_DUMMY_121f" />
-    <item type="string" name="APKTOOL_DUMMY_1220" />
-    <item type="string" name="APKTOOL_DUMMY_1221" />
-    <item type="string" name="APKTOOL_DUMMY_1222" />
-    <item type="string" name="APKTOOL_DUMMY_1223" />
-    <item type="string" name="APKTOOL_DUMMY_1224" />
-    <item type="string" name="APKTOOL_DUMMY_1225" />
-    <item type="string" name="APKTOOL_DUMMY_1226" />
-    <item type="string" name="APKTOOL_DUMMY_1227" />
-    <item type="string" name="APKTOOL_DUMMY_1228" />
-    <item type="string" name="APKTOOL_DUMMY_1229" />
-    <item type="string" name="APKTOOL_DUMMY_122a" />
-    <item type="string" name="APKTOOL_DUMMY_122b" />
-    <item type="string" name="APKTOOL_DUMMY_122c" />
-    <item type="string" name="APKTOOL_DUMMY_122d" />
-    <item type="string" name="APKTOOL_DUMMY_122e" />
-    <item type="string" name="APKTOOL_DUMMY_122f" />
-    <item type="string" name="APKTOOL_DUMMY_1230" />
-    <item type="string" name="APKTOOL_DUMMY_1231" />
-    <item type="string" name="APKTOOL_DUMMY_1232" />
+    <string name="DNT_ON">Enable Do Not Type</string>
+    <string name="DNT_OFF">Disable Do Not Type</string>
+    <string name="online_vtl">Online</string>
+    <string name="offline_vtl">Offline</string>
+    <string name="dnr">Do not read</string>
+    <string name="dnw">Do not write</string>
+    <string name="dns">Send status of viewing stories</string>
+    <string name="privacy_vtl">Privacy</string>
+    <string name="stories_vtl">Stories</string>
+    <string name="act_pm">For Private messages</string>
+    <string name="act_cnv">For Conversations</string>
+    <string name="act_bot">For Bots/Groups</string>
 </resources>

smali/res/values/styles.xml

@@ -126,7 +126,7 @@
     <style name="AttachPicker.Header" parent="@style/AttachPicker" />
     <style name="AttachPicker.Header.TextView" parent="@style/AttachPicker.Header">
         <item name="android:textSize">14.0sp</item>
-        <item name="android:textColor">@color/accent_blue</item>
+        <item name="android:textColor">?accent</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>
@@ -906,7 +906,7 @@
         <item name="android:minWidth">88.0dip</item>
         <item name="android:minHeight">48.0dip</item>
     </style>
-    <style name="Base.Widget.AppCompat.Button.Borderless" parent="@style/Base.Widget.AppCompat.Button">
+    <style name=" Base.Widget.AppCompat.Button.Borderless" parent="@style/Base.Widget.AppCompat.Button">
         <item name="android:background">@drawable/abc_btn_borderless_material</item>
     </style>
     <style name="Base.Widget.AppCompat.Button.Borderless.Colored" parent="@style/Base.Widget.AppCompat.Button.Borderless">

smali/res/values/xmls.xml

@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="xml" name="APKTOOL_DUMMY_f" />
-    <item type="xml" name="APKTOOL_DUMMY_19" />
 </resources>

smali/res/xml/preferences_activity.xml

@@ -14,11 +14,11 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/online_vtl">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtloffline" android:key="offline" android:summary="@string/vtlofflinesummary" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Отправка статуса онлайн" android:key="offline" android:summary="Отключение онлайна позволит вам оставаться в офлайне" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/offline_vtl">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtloffline2" android:key="setoffline" android:summary="@string/vtloffline2summary" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Принудительный офлайн" android:key="setoffline" android:summary="Работает только при отключении отправки статуса онлайн\nОтправляет мгновенно в офлайн после отправки сообщений и прочих методов апи которые отправляют в онлайн\n\nМожет выглядеть как ненастоящий уход из сети" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/stories_vtl">
@@ -26,7 +26,7 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/privacy_vtl">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlawayphp" android:key="awayphp" android:summary="@string/vtlawayphpsummary" android:defaultValue="true" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/benchapi" android:key="benchmark" android:summary="@string/benchapisummary" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlawayphp" android:key="awayphp" android:summary="Слежка за пользователем для персонализации рекламы. Также проверка ссылок на блэклист от ВКонтакте и антивирус" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Бенчмарк апи" android:key="benchmark" android:summary="Тестирование скорости отправки запросов. Бесполезная функция для всех, кроме разработчиков ВКонтакте" android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_debug.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference android:enabled="false" android:title="Внимание!" android:summary="Данное меню предназначено только для тестирования работоспособности приложения. Если вы являетесь рядовым юзером, то вам не следует ничего не трогать в данных настройках, что бы не было проблем с работой приложения!" />
     <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Показывать пункт дебага в настройках" android:key="devmenu" android:defaultValue="false" />
-    <PreferenceCategory android:title="Experimental">
+      <PreferenceCategory android:title="Experimental">
         <EditTextPreference android:title="Изменение версии вк" android:key="vkversion" android:summary="Требуется перезапуск" android:defaultValue="" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlusevkui" android:key="usevkui" android:summary="Редактирование страницы?" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Статистика страницы" android:key="unlockstats" android:summary="Вкшники вроде перестали отдавать инфу" android:defaultValue="false" />
@@ -20,7 +20,7 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="isMusicRestricted" android:key="isMusicRestricted" android:summary="Вкшные ограничения на музыку. Фактически ничего не ограничивает, ибо всё вырезано" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="hasMusicSubscription" android:key="hasMusicSubscription" android:summary="Подписка на музыку" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Вернуть старые пункты в about" android:key="oldabout" android:defaultValue="false" />
-        <EditTextPreference android:title="SSFS Domain" android:key="ssfscustom" android:defaultValue="https://vtsf.vknext.net" />
+        <EditTextPreference android:title="SSFS Domain" android:key="ssfscustom" android:defaultValue="https://sf.vknext.ru" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="Домены" android:key="domains">

smali/res/xml/preferences_feed.xml

@@ -14,7 +14,6 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfilter" android:key="default_ad_list" android:summary="@string/vtlsfiltersummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfiltershort" android:key="shortlinkfilter" android:summary="@string/vtlsfiltershortsummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfilterrefs" android:key="refsfilter" android:summary="@string/vtlsfilterrefssummary" android:defaultValue="false" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/shitposting" android:key="shitposting" android:summary="@string/shitpostingsummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlrecommend">

smali/res/xml/preferences_interface.xml

@@ -2,7 +2,7 @@
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/interfacenewsfeed">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/altnewsfeed" android:key="newfeed" android:summary="@string/altnewsfeedsum" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/altnewsfeed" android:key="newfeed" android:summary="@string/altnewsfeedsum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/showstories" android:key="stories" android:summary="@string/showstoriessum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacenewsfeedswipe" android:key="swipe" android:summary="@string/interfacenewsfeedswipesum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
@@ -17,12 +17,9 @@
     <PreferenceCategory android:title="@string/interfacevideo">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacevideoext" android:key="isEnableExternalOpening" android:summary="@string/interfacevideoextsum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacevideorec" android:key="__dbg_disable_video_feed" android:summary="@string/interfacevideorecsum" android:defaultValue="false" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/newvideo" android:key="newvideo" android:defaultValue="false" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/menucutter" android:key="showmenu" android:summary="@string/menucuttersum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/docknumbers" android:key="dockcounter" android:summary="@string/docknumberssum" android:defaultValue="true" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_messages.xml

@@ -11,7 +11,7 @@
     <PreferenceCategory android:title="@string/interfaceemoji">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/alteremoji" android:key="alteremoji" android:summary="@string/alteremojisum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/systememoji" android:key="systememoji" android:summary="@string/systememojisum" android:defaultValue="false" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/BGStickers" android:key="isBGStickersEnabled" android:summary="@string/BGStickerssum" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/BGStickers" android:summary="@string/BGStickerssum" android:key="isBGStickersEnabled" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">