Fixed bugs

https://github.com/vtosters/lite/issues/103

README.md

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

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

@@ -1,7 +1,5 @@
 package ru.vtosters.lite.dnr;
 
-import android.util.Log;
-
 import com.vk.im.engine.models.dialogs.Dialog;
 import com.vk.im.ui.components.common.DialogAction;
 

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

@@ -1,7 +1,5 @@
 package ru.vtosters.lite.dnr;
 
-import android.util.Log;
-
 import com.vk.core.util.ToastUtils;
 import com.vk.im.engine.commands.messages.SetUserActivityCmd;
 import com.vk.im.engine.models.dialogs.Dialog;

app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java

@@ -13,8 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import ru.vtosters.lite.R;
-
 public class VideoDownloader {
     public static void downloadVideo(VideoFile videoFile, Context context) {
         final List<String> list = new ArrayList<>();

app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java

@@ -16,8 +16,8 @@ import com.vtosters.lite.R;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.badmanners.DeviceInfoCollector;
+import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Prefs;
 
 public class Crashreporter {

app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java

@@ -9,14 +9,14 @@ import android.widget.Toast;
 import com.vk.dto.common.VerifyInfo;
 import com.vk.navigation.NavigatorKeys;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.MediaType;

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

@@ -11,6 +11,7 @@ import android.widget.Toast;
 import androidx.exifinterface.media.ExifInterface;
 
 import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vtosters.lite.R;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -24,9 +25,6 @@ import java.util.regex.Pattern;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import ru.f0x1d.net.F0x1dRequest;
-
-import com.vtosters.lite.R;
-
 import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Prefs;
 

app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java

@@ -2,7 +2,6 @@ package ru.vtosters.lite.tgs;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.util.Log;
 
 import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;

app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java

@@ -8,9 +8,9 @@ import android.content.Intent;
 
 import com.vk.navigation.Navigator;
 
+import ru.vtosters.lite.ui.fragments.InstallGMSFragment;
 import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Prefs;
-import ru.vtosters.lite.ui.fragments.InstallGMSFragment;
 
 public class InstallGMS {
     public static void alert(final Activity activity) {

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

@@ -2,9 +2,8 @@ package ru.vtosters.lite.ui.fragments;
 
 import android.os.Bundle;
 
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
-
 import com.vtosters.lite.R;
+import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class ActivityFragment extends MaterialPreferenceToolbarFragment {
     @Override

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

@@ -7,6 +7,8 @@ import com.vk.core.util.ToastUtils;
 import com.vtosters.lite.R;
 import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
+import ru.vtosters.lite.utils.Helper;
+
 /* renamed from: ru.vtosters.lite.utils.lite.ui.activities.interface  reason: invalid class name */
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -34,7 +36,7 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     }
 
     public /* synthetic */ boolean restart(Preference preference, Object obj) {
-        ToastUtils.a("Пожалуйста перезапустите приложение");
+        ToastUtils.a(Helper.getString("restartapp"));
         return true;
     }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java

@@ -0,0 +1,188 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import android.content.res.ColorStateList;
+import android.graphics.Typeface;
+import android.support.v7.widget.RecyclerView;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.List;
+
+import ru.vtosters.lite.utils.Helper;
+import ru.vtosters.lite.utils.Themes;
+
+public class DockBarAdapter extends RecyclerView.a
+        implements IItemTouchHelper {
+
+    public static final int SELECTED_TAB_TYPE = 1;
+    public static final int DISABLED_TAB_TYPE = 2;
+    public static final int GROUP_TITLE_TYPE = 3;
+
+    
+    private final DockBarManager mDockBarManager = DockBarManager.getInstance();
+
+    @Override
+    public RecyclerView.x b(ViewGroup parent, int viewType) {
+        if (viewType == GROUP_TITLE_TYPE) {
+            return new GroupViewHolder(createGroupTitle());
+        } else {
+            return new DockBarEditViewHolder(createTabItem());
+        }
+    }
+
+    @Override
+    public int b(int i) {
+        return getItemType(i);
+    }
+
+    private View createTabItem() {
+        LinearLayout container = new LinearLayout(Helper.GetContext());
+        container.setTag("tab_item_container");
+        container.setGravity(Gravity.CENTER_VERTICAL);
+        container.setOrientation(LinearLayout.HORIZONTAL);
+        container.setPadding(
+                Helper.convertDpToPixel(12),
+                Helper.convertDpToPixel(12),
+                Helper.convertDpToPixel(12),
+                Helper.convertDpToPixel(12)
+        );
+        container.setLayoutParams(new LinearLayout.LayoutParams(-1, Helper.convertDpToPixel(48)));
+
+        ImageView icon = new ImageView(Helper.GetContext());
+        icon.setTag("icon");
+        icon.setImageTintList(ColorStateList.valueOf(Themes.getAccentColor()));
+        icon.setLayoutParams(new LinearLayout.LayoutParams(
+                Helper.convertDpToPixel(24),
+                Helper.convertDpToPixel(24)));
+        container.addView(icon);
+
+        TextView title = new TextView(Helper.GetContext());
+        title.setTag("title");
+        title.setTextSize(16.0f);
+        title.setTypeface(Typeface.DEFAULT_BOLD);
+        title.setTextColor(Themes.getTextAttr());
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(-1, -2);
+        params.weight = 1;
+        params.leftMargin = Helper.convertDpToPixel(16);
+        container.addView(title, params);
+
+        return container;
+    }
+
+    private View createGroupTitle() {
+        LinearLayout layout = new LinearLayout(Helper.GetContext());
+        layout.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
+
+        TextView title = new TextView(Helper.GetContext());
+        title.setTag("group_title");
+        title.setTextSize(13.0f);
+        title.setPadding(
+                Helper.convertDpToPixel(16),
+                Helper.convertDpToPixel(13),
+                Helper.convertDpToPixel(16),
+                Helper.convertDpToPixel(13)
+        );
+        title.setAllCaps(true);
+        title.setTextColor(Themes.getTextAttr());
+        layout.addView(title, new LinearLayout.LayoutParams(-2, -2));
+
+        return layout;
+    }
+
+    @Override
+    public void a(RecyclerView.x holder, int position) {
+        if (holder instanceof GroupViewHolder) {
+            ((GroupViewHolder) holder).bind(mDockBarManager.getGroupTitle(position));
+        } else {
+            int viewType = getItemType(position);
+            if (viewType == SELECTED_TAB_TYPE) {
+                ((DockBarEditViewHolder) holder).bind(mDockBarManager.getSelectedTab(position));
+            } else if (viewType == DISABLED_TAB_TYPE) {
+                ((DockBarEditViewHolder) holder).bind(mDockBarManager.getDisabledTab(position));
+            }
+        }
+    }
+
+    @Override
+    public int au_() {
+        return mDockBarManager.getItemCount();
+    }
+
+    @Override
+    public void onItemDismiss(int index) {
+        mDockBarManager.move(this, index);
+    }
+
+    @Override
+    public boolean onItemMove(int fromPosition, int toPosition) {
+        int fromViewType = getItemType(fromPosition);
+        int toViewType = getItemType(toPosition);
+
+        if (fromPosition < toPosition) {
+
+            if (fromViewType != toViewType) {
+                mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
+            } else {
+                List<DockBarTab> list = fromViewType == SELECTED_TAB_TYPE ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
+                mDockBarManager.swap(this, list, fromViewType, fromPosition, toPosition);
+            }
+
+        } else if (toPosition != 0) {
+
+            if (fromViewType != toViewType) {
+                mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
+            } else {
+                List<DockBarTab> list = fromViewType == SELECTED_TAB_TYPE ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
+                mDockBarManager.swap(this, list, fromViewType, fromPosition, toPosition);
+            }
+
+        }
+
+        return true;
+    }
+
+    public int getIndexByViewType(int position, int viewType) {
+        return mDockBarManager.getIndexByViewType(position, viewType);
+    }
+
+    public int getItemType(int position) {
+        return mDockBarManager.getItemType(position);
+    }
+
+    static class DockBarEditViewHolder extends RecyclerView.x {
+
+        private ImageView mIcon;
+        private TextView mTitle;
+
+        public DockBarEditViewHolder(View itemView) {
+            super(itemView);
+
+            mIcon = itemView.findViewWithTag("icon");
+            mTitle = itemView.findViewWithTag("title");
+        }
+
+        public void bind(DockBarTab tab) {
+            mIcon.setImageResource(tab.iconID);
+            mTitle.setText(tab.titleID);
+        }
+    }
+
+    static class GroupViewHolder extends RecyclerView.x {
+
+        private TextView mGroupTitle;
+
+        public GroupViewHolder(View view) {
+            super(view);
+
+            mGroupTitle = view.findViewWithTag("group_title");
+        }
+
+        public void bind(String groupTitle) {
+            mGroupTitle.setText(groupTitle);
+        }
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarDragItem.java

@@ -0,0 +1,14 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+public class DockBarDragItem {
+
+    public boolean active;
+    public int index;
+    public DockBarTab dockBarTab;
+
+    public DockBarDragItem(boolean active, int index, DockBarTab dockBarTab) {
+        this.active = active;
+        this.index = index;
+        this.dockBarTab = dockBarTab;
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java

@@ -0,0 +1,86 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.a.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import me.grishka.appkit.fragments.ToolbarFragment;
+import ru.vtosters.lite.utils.Helper;
+
+public class DockBarFragment extends ToolbarFragment {
+
+    private RecyclerView mRecyclerView;
+    private DockBarAdapter mAdapter;
+    private ItemTouchHelper mItemTouchHelper;
+
+    @Override
+    public View d(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
+        super.b(bundle);
+
+        LinearLayout container = new LinearLayout(n());
+        container.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
+        container.setOrientation(LinearLayout.VERTICAL);
+
+        LinearLayout buttonsContainer = new LinearLayout(n());
+        buttonsContainer.setPadding(
+                Helper.convertDpToPixel(13),
+                Helper.convertDpToPixel(10),
+                Helper.convertDpToPixel(13),
+                Helper.convertDpToPixel(10)
+        );
+        container.addView(buttonsContainer, new LinearLayout.LayoutParams(-1, -2));
+        
+        Button save = new Button(n());
+        save.setText("Сохранить");
+        save.setOnClickListener(v -> {
+            DockBarManager.getInstance().save();
+            Helper.restarting();
+        });
+
+        LinearLayout.LayoutParams saveParams = new LinearLayout.LayoutParams(0, -2);
+        saveParams.weight = 1.0f;
+        buttonsContainer.addView(save, saveParams);
+
+        View divider = new View(n());
+        buttonsContainer.addView(divider, new LinearLayout.LayoutParams(Helper.convertDpToPixel(10), 0));
+
+        Button reset = new Button(n());
+        reset.setText("Сбросить");
+        reset.setOnClickListener(v -> {
+            DockBarManager.getInstance().delete();
+            Helper.restarting();
+        });
+
+        LinearLayout.LayoutParams resetParams = new LinearLayout.LayoutParams(0, -2);
+        resetParams.weight = 1.0f;
+        buttonsContainer.addView(reset, resetParams);
+
+        mRecyclerView = new RecyclerView(n());
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(n()));
+        mAdapter = new DockBarAdapter();
+        mRecyclerView.setAdapter(mAdapter);
+        container.addView(mRecyclerView, new LinearLayout.LayoutParams(-1, -1));
+
+        mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelperCallback(mAdapter));
+        mItemTouchHelper.a(mRecyclerView);
+
+        return container;
+    }
+
+    @Override
+    public void a(View arg0, Bundle arg1) {
+        o_(true);
+
+        super.a(arg0, arg1);
+
+        a("Редактор докбара");
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java

@@ -0,0 +1,202 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.vk.apps.AppsFragment;
+import com.vk.core.d.RecoloredDrawable;
+import com.vk.core.fragments.FragmentImpl;
+import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView;
+import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import ru.vtosters.lite.utils.Helper;
+
+public class DockBarInjector {
+    private static final DockBarManager sManager = DockBarManager.getInstance();
+
+    public static Map<Class<? extends FragmentImpl>, Integer> injectMap() {
+        LinkedHashMap<Class<? extends FragmentImpl>, Integer> map = new LinkedHashMap<>();
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            map.put(tab.fragmentClass, tab.id);
+        }
+        return map;
+    }
+
+    public static void inject(BottomNavigationView navigationView) {
+        Menu menu = navigationView.getMenu();
+        menu.clear();
+        try {
+            Field field = BottomNavigationMenuView.class.getDeclaredField("h");
+            field.setAccessible(true);
+
+            Object synchronizedPool = field.get(null);
+
+            Class<?> synchronisedPoolCls = Class.forName("android.support.v4.f.Pools$a");
+
+            Method acquire = synchronisedPoolCls.getDeclaredMethod("a");
+
+            if (synchronizedPool != null) {
+                do {
+                } while (acquire.invoke(synchronizedPool) != null);
+            }
+
+        } catch (NoSuchFieldException | IllegalAccessException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            MenuItem add = menu.add(0, tab.id, 0, tab.titleID);
+            Drawable drawable = Helper.GetContext().getResources().getDrawable(tab.iconID);
+            ColorStateList colorStateList = Helper.GetContext().getResources().getColorStateList(com.vtosters.lite.R.color.bottom_navigation_item);
+//            if (isAndroidMonet()) {
+//                colorStateList = ColorStateList.valueOf(Themes.getAccentColor());
+//            }
+            add.setIcon((Drawable) new RecoloredDrawable(drawable, colorStateList));
+            add.setShowAsAction(1);
+            add.setCheckable(true);
+        }
+    }
+
+    public static int injectId(String tag) {
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            if (tag.equals(tab.tag))
+                return tab.id;
+        }
+        return 0;
+    }
+
+    public static void injectMenuFragment(Menu menu) {
+        List<MenuItem> menuItems = new ArrayList<>();
+        for (int i = 0; i < menu.size(); i++) {
+            menuItems.add(menu.getItem(i));
+        }
+        menu.clear();
+
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            if (tab.id != com.vtosters.lite.R.id.tab_menu) {
+                int itemId = tab.id;
+                if (tab.id == com.vtosters.lite.R.id.tab_news) {
+                    itemId = com.vtosters.lite.R.id.menu_newsfeed;
+                } else if (tab.id == com.vtosters.lite.R.id.tab_discover) {
+                    itemId = com.vtosters.lite.R.id.menu_search;
+                } else if (tab.id == com.vtosters.lite.R.id.tab_feedback) {
+                    itemId = com.vtosters.lite.R.id.menu_feedback;
+                } else if (tab.id == com.vtosters.lite.R.id.tab_messages) {
+                    itemId = com.vtosters.lite.R.id.menu_messages;
+                }
+
+                MenuItem add = menu.add(0, itemId, 0, tab.titleID);
+                add.setIcon(tab.iconID);
+                add.setVisible(true);
+            }
+        }
+
+        for (MenuItem menuItem : menuItems) {
+            MenuItem item = menu.add(menuItem.getGroupId(), menuItem.getItemId(), menuItem.getOrder(), menuItem.getTitle());
+            item.setIcon(menuItem.getIcon());
+        }
+        menuItems.clear();
+
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem menuItem = menu.getItem(i);
+            for (DockBarTab tab : sManager.getSelectedTabs()) {
+                int itemId = menuItem.getItemId();
+                if (itemId == com.vtosters.lite.R.id.menu_newsfeed) {
+                    itemId = com.vtosters.lite.R.id.tab_news;
+                } else if (itemId == com.vtosters.lite.R.id.menu_search) {
+                    itemId = com.vtosters.lite.R.id.tab_discover;
+                } else if (itemId == com.vtosters.lite.R.id.menu_feedback) {
+                    itemId = com.vtosters.lite.R.id.tab_feedback;
+                } else if (itemId == com.vtosters.lite.R.id.menu_messages) {
+                    itemId = com.vtosters.lite.R.id.tab_messages;
+                }
+                if (itemId == tab.id && tab.id != com.vtosters.lite.R.id.menu_vk_pay) {
+                    menuItems.add(menuItem);
+                    break;
+                }
+            }
+        }
+
+        for (MenuItem menuItem : menuItems) {
+            menu.removeItem(menuItem.getItemId());
+        }
+    }
+
+    public static JSONArray injectMenuJSON(JSONArray arr) {
+        List<String> arrayList = new ArrayList(Arrays.asList(
+                "news",
+                "messages",
+                "feedback",
+                "discover"
+        ));
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            if (tab.id == com.vtosters.lite.R.id.tab_discover) {
+                arrayList.remove("discover");
+            } else if (tab.id == com.vtosters.lite.R.id.tab_feedback) {
+                arrayList.remove("feedback");
+            } else if (tab.id == com.vtosters.lite.R.id.tab_messages) {
+                arrayList.remove("messages");
+            } else if (tab.id == com.vtosters.lite.R.id.tab_news) {
+                arrayList.remove("news");
+            }
+        }
+        try {
+            JSONArray jSONArray = new JSONArray();
+            for (int i = 0; i < arrayList.size(); i++) {
+                jSONArray.put(new JSONObject().put("name", arrayList.get(i)));
+            }
+            for (int i2 = 0; i2 < arr.length(); i2++) {
+                jSONArray.put(arr.getJSONObject(i2));
+            }
+            return jSONArray;
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return arr;
+        }
+    }
+
+    public static int getItemCount() {
+        return sManager.getSelectedTabs().size();
+    }
+
+    public static boolean isDockOpenAllowed(FragmentImpl fragment) {
+        return isDockOpenAllowed(fragment.getClass());
+    }
+
+    public static boolean isDockOpenAllowed(Class<?> cls) {
+        for (DockBarTab tab : sManager.getSelectedTabs())
+            if (tab.fragmentClass == cls)
+                return true;
+        for (DockBarTab tab : sManager.getDisabledTabs())
+            if (tab.fragmentClass == cls)
+                return true;
+        return false;
+    }
+
+    public static Class<?> interceptClick(int id) {
+        for (DockBarTab tab : sManager.getSelectedTabs()) {
+            if (id == tab.id)
+                return tab.fragmentClass;
+        }
+        for (DockBarTab tab : sManager.getDisabledTabs()) {
+            if (id == tab.id)
+                return tab.fragmentClass;
+        }
+        return AppsFragment.class;
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java

@@ -0,0 +1,312 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import com.vk.apps.AppsFragment;
+import com.vk.discover.DiscoverFeedFragment;
+import com.vk.discover.DiscoverFragment;
+import com.vk.fave.fragments.FaveTabFragment;
+import com.vk.menu.MenuFragment;
+import com.vk.music.fragment.MusicFragment;
+import com.vk.newsfeed.Feed2049;
+import com.vk.newsfeed.NewsfeedFragment;
+import com.vk.notifications.NotificationsContainerFragment;
+import com.vtosters.lite.R;
+import com.vtosters.lite.fragments.GamesFragment;
+import com.vtosters.lite.fragments.PhotosFragment;
+import com.vtosters.lite.fragments.ProfileFragment;
+import com.vtosters.lite.fragments.SettingsListFragment;
+import com.vtosters.lite.fragments.d.DocumentsViewFragment;
+import com.vtosters.lite.fragments.f.FriendsFragment;
+import com.vtosters.lite.fragments.g.BirthdaysFragment;
+import com.vtosters.lite.fragments.h.GroupsFragment;
+import com.vtosters.lite.fragments.lives.LivesPostListFragment;
+import com.vtosters.lite.fragments.m.VideosFragment;
+import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment;
+import com.vtosters.lite.fragments.money.MoneyTransfersFragment;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import ru.vtosters.lite.utils.Helper;
+import ru.vtosters.lite.utils.Prefs;
+
+public class DockBarManager {
+    public static final int MIN_SELECTED_TABS_LIMIT = 3;
+    public static final int MAX_SELECTED_TABS_LIMIT = 8;
+
+    private static DockBarManager sInstance = new DockBarManager();
+
+    public static DockBarManager getInstance() {
+        if (sInstance == null)
+            sInstance = new DockBarManager();
+        return sInstance;
+    }
+
+    private List<DockBarTab> mSelectedTabs = new ArrayList<>();
+    private List<DockBarTab> mDisabledTabs = new ArrayList<>();
+    private List<String> mGroups = Arrays.asList(
+            "Выбранные элементы докбара",
+            "Невыбранные элементы"
+    );
+
+    public DockBarManager() {
+        load();
+    }
+
+    private void load() {
+        File dockbar = new File(Helper.GetContext().getFilesDir(), "dockbar.json");
+
+        if (!dockbar.exists()) {
+            mSelectedTabs.add(new DockBarTab("tab_news", Prefs.olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, Prefs.isUseAlternativeFragments() ? Feed2049.b.c() : NewsfeedFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_discover", Prefs.olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, Prefs.isUseAlternativeFragments() ? DiscoverFragment.class : DiscoverFeedFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_messages", Prefs.olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_feedback", Prefs.olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_menu", Prefs.olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
+
+            mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_photos", R.drawable.ic_camera_24, R.string.photos, R.id.menu_photos, PhotosFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_audios", R.drawable.ic_music_24, R.string.music, R.id.menu_audios, MusicFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_videos", R.drawable.ic_video_24, R.string.videos, R.id.menu_videos, VideosFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_lives", R.drawable.ic_live_filter_24dp, R.string.sett_live, R.id.menu_lives, LivesPostListFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_games", R.drawable.ic_games_24, R.string.games, R.id.menu_games, GamesFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.exo_track_selection_title_video_res_0x7f11031e, R.id.menu_fave, FaveTabFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_documents", R.drawable.ic_document_24, R.string.docs, R.id.menu_documents, DocumentsViewFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_payments", R.drawable.ic_money_transfer_24, R.string.money_transfer_money_transfers, R.id.menu_payments, MoneyTransfersFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_vk_apps", R.drawable.ic_services_24, R.string.menu_apps, R.id.menu_vk_apps, AppsFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_profile", R.drawable.libverify_ic_account_circle_white, R.string.profile, R.id.profile, ProfileFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_settings", R.drawable.ic_settings_24, R.string.menu_settings, R.id.menu_settings, SettingsListFragment.class));
+            mDisabledTabs.add(new DockBarTab("tab_brtd", R.drawable.ic_menu_birthdays, R.string.birthdays_title, R.id.menu_birthdays, BirthdaysFragment.class));
+
+        } else {
+            try {
+                JSONObject json = new JSONObject(readFully(new FileInputStream(dockbar)));
+
+                JSONArray selected = json.getJSONArray("selected");
+                for (int i = 0; i < selected.length(); i++) {
+                    JSONObject item = selected.getJSONObject(i);
+                    DockBarTab tab = new DockBarTab(
+                            item.getString("tag"),
+                            item.getInt("iconID"),
+                            item.getInt("titleID"),
+                            item.getInt("id"),
+                            Class.forName(item.getString("fragmentClass"))
+                    );
+                    if (Prefs.isUseAlternativeFragments()) {
+                        if (tab.fragmentClass == NewsfeedFragment.class) {
+                            tab.fragmentClass = Feed2049.b.c();
+                        } else if (tab.fragmentClass == DiscoverFeedFragment.class) {
+                            tab.fragmentClass = DiscoverFragment.class;
+                        }
+                    } else {
+                        if (tab.fragmentClass == Feed2049.b.c()) {
+                            tab.fragmentClass = NewsfeedFragment.class;
+                        } else if (tab.fragmentClass == DiscoverFragment.class) {
+                            tab.fragmentClass = DiscoverFeedFragment.class;
+                        }
+                    }
+                    mSelectedTabs.add(tab);
+                }
+
+                JSONArray disabled = json.getJSONArray("disabled");
+                for (int i = 0; i < disabled.length(); i++) {
+                    JSONObject item = disabled.getJSONObject(i);
+                    DockBarTab tab = new DockBarTab(
+                            item.getString("tag"),
+                            item.getInt("iconID"),
+                            item.getInt("titleID"),
+                            item.getInt("id"),
+                            Class.forName(item.getString("fragmentClass"))
+                    );
+                    if (Prefs.isUseAlternativeFragments()) {
+                        if (tab.fragmentClass == NewsfeedFragment.class) {
+                            tab.fragmentClass = Feed2049.b.c();
+                        } else if (tab.fragmentClass == DiscoverFeedFragment.class) {
+                            tab.fragmentClass = DiscoverFragment.class;
+                        }
+                    } else {
+                        if (tab.fragmentClass == Feed2049.b.c()) {
+                            tab.fragmentClass = NewsfeedFragment.class;
+                        } else if (tab.fragmentClass == DiscoverFragment.class) {
+                            tab.fragmentClass = DiscoverFeedFragment.class;
+                        }
+                    }
+                    mDisabledTabs.add(tab);
+                }
+
+            } catch (JSONException | IOException | ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static String readFully(InputStream is) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] buffer = new byte[2048];
+        int len;
+        while ((len = is.read(buffer)) > 0) {
+            bos.write(buffer, 0, len);
+        }
+        return bos.toString();
+    }
+
+    public void delete() {
+        File dockbar = new File(Helper.GetContext().getFilesDir(), "dockbar.json");
+        if (dockbar.exists()) dockbar.delete();
+    }
+
+    public void save() {
+        try {
+            File dockbar = new File(Helper.GetContext().getFilesDir(), "dockbar.json");
+
+            JSONArray selected = new JSONArray();
+            for (DockBarTab tab : mSelectedTabs) {
+
+                JSONObject item = new JSONObject()
+                        .put("tag", tab.tag)
+                        .put("iconID", tab.iconID)
+                        .put("titleID", tab.titleID)
+                        .put("id", tab.id)
+                        .put("fragmentClass", tab.fragmentClass.getName());
+                selected.put(item);
+            }
+
+            JSONArray disabled = new JSONArray();
+            for (DockBarTab tab : mDisabledTabs) {
+                JSONObject item = new JSONObject()
+                        .put("tag", tab.tag)
+                        .put("iconID", tab.iconID)
+                        .put("titleID", tab.titleID)
+                        .put("id", tab.id)
+                        .put("fragmentClass", tab.fragmentClass.getName());
+                disabled.put(item);
+            }
+
+            JSONObject json = new JSONObject();
+            json.put("selected", selected).put("disabled", disabled);
+
+            FileOutputStream fos = new FileOutputStream(dockbar);
+            fos.write(json.toString().getBytes(StandardCharsets.UTF_8));
+        } catch (JSONException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void swap(DockBarAdapter adapter, List<DockBarTab> list, int itemType, int fromPosition, int toPosition) {
+        int curr = adapter.getIndexByViewType(fromPosition, itemType);
+        int target = adapter.getIndexByViewType(toPosition, itemType);
+        if (fromPosition < toPosition) {
+            for (int i = curr; i < target; i++) {
+                Collections.swap(list, i, i + 1);
+            }
+        } else {
+            for (int i = curr; i > target; i--) {
+                Collections.swap(list, i, i - 1);
+            }
+        }
+        adapter.b(fromPosition, toPosition);// notifyItemMoved
+    }
+
+    public void swapAndMigrate(DockBarAdapter adapter, int fromPosition, int toPosition) {
+        int curr = adapter.getIndexByViewType(fromPosition, adapter.getItemType(fromPosition));
+        int target = adapter.getIndexByViewType(toPosition, adapter.getItemType(toPosition));
+        if (fromPosition < toPosition) {
+
+            if (mSelectedTabs.size() <= MIN_SELECTED_TABS_LIMIT || mSelectedTabs.get(curr).tag.equals("tab_menu")) return;
+
+            DockBarTab tab = mSelectedTabs.get(curr);
+            mSelectedTabs.remove(tab);
+            mDisabledTabs.add(tab);
+
+            for (int i = mDisabledTabs.size() - 1; i > target; i--) {
+                Collections.swap(mDisabledTabs, i, i - 1);
+            }
+
+            for (int i = 0; i < target; i++) {
+                Collections.swap(mDisabledTabs, i, i + 1);
+            }
+        } else  {
+
+            if (mSelectedTabs.size() >= MAX_SELECTED_TABS_LIMIT) return;
+
+            DockBarTab tab = mDisabledTabs.get(curr);
+            mDisabledTabs.remove(tab);
+            mSelectedTabs.add(tab);
+        }
+        adapter.b(fromPosition, toPosition);// notifyItemMoved
+    }
+
+    public void move(DockBarAdapter adapter, int index) {
+        if (getItemType(index) == 1) {
+            DockBarTab item = mSelectedTabs.get(getIndexByViewType(index, 1));
+
+            mSelectedTabs.remove(item);
+
+            mDisabledTabs.add(item);
+
+            for (int i = mDisabledTabs.size() - 1; i > 0; i--) {
+                Collections.swap(mDisabledTabs, i, i - 1);
+            }
+
+            adapter.e_(index); // notifyItemRemoved
+            adapter.d_(getItemCount() - mDisabledTabs.size()); // notifyItemInserted
+        }
+    }
+
+    public int getItemCount() {
+        return mSelectedTabs.size() + mDisabledTabs.size() + mGroups.size();
+    }
+
+    public int getIndexByViewType(int position, int viewType) {
+        if (viewType == DockBarAdapter.SELECTED_TAB_TYPE) {
+            return position - 1;
+        } else if (viewType == DockBarAdapter.DISABLED_TAB_TYPE) {
+            return position - mSelectedTabs.size() - mGroups.size();
+        } else {
+            return position != 0 ? 1 : 0;
+        }
+    }
+
+    public int getItemType(int position) {
+        if (position == 0 || position == mSelectedTabs.size() + 1) {
+            return DockBarAdapter.GROUP_TITLE_TYPE;
+        } else if (position - 1 < mSelectedTabs.size()) {
+            return DockBarAdapter.SELECTED_TAB_TYPE;
+        } else if (position - 1 >= mSelectedTabs.size()) {
+            return DockBarAdapter.DISABLED_TAB_TYPE;
+        }
+        return -1;
+    }
+
+    public DockBarTab getSelectedTab(int pos) {
+        return mSelectedTabs.get(getIndexByViewType(pos, 1));
+    }
+
+    public DockBarTab getDisabledTab(int pos) {
+        return mDisabledTabs.get(getIndexByViewType(pos, 2));
+    }
+
+    public String getGroupTitle(int pos) {
+        return mGroups.get(getIndexByViewType(pos, -1));
+    }
+
+    public List<DockBarTab> getSelectedTabs() {
+        return mSelectedTabs;
+    }
+
+    public List<DockBarTab> getDisabledTabs() {
+        return mDisabledTabs;
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarTab.java

@@ -0,0 +1,20 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import com.vk.core.fragments.FragmentImpl;
+
+public class DockBarTab {
+
+    public String tag;
+    public int iconID;
+    public int titleID;
+    public int id;
+    public Class<? extends FragmentImpl> fragmentClass;
+
+    public DockBarTab(String tag, int iconID, int titleID, int resID, Class<?> fragmentClass) {
+        this.tag = tag;
+        this.iconID = iconID;
+        this.titleID = titleID;
+        this.id = resID;
+        this.fragmentClass = (Class<? extends FragmentImpl>) fragmentClass;
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/IItemTouchHelper.java

@@ -0,0 +1,8 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+public interface IItemTouchHelper {
+
+    void onItemDismiss(int index);
+
+    boolean onItemMove(int fromPosition, int toPosition);
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java

@@ -0,0 +1,45 @@
+package ru.vtosters.lite.ui.fragments.dockbar;
+
+import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
+
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.a.ItemTouchHelper;
+
+public class ItemTouchHelperCallback extends ItemTouchHelper.a {
+
+    private DockBarAdapter mAdapter;
+
+    public ItemTouchHelperCallback(DockBarAdapter mAdapter) {
+        this.mAdapter = mAdapter;
+    }
+
+    @Override // isLongPressDragEnabled
+    public boolean a() {
+        return true;
+    }
+
+    @Override // isItemViewSwipeEnabled
+    public boolean b() {
+        return false;
+    }
+
+    @Override
+    public int a(RecyclerView recyclerView, RecyclerView.x viewHolder) {
+        int pos = mAdapter.getItemType(viewHolder.d());
+        int dragFlags = pos != DockBarAdapter.GROUP_TITLE_TYPE ? androidx.recyclerview.widget.ItemTouchHelper.UP | androidx.recyclerview.widget.ItemTouchHelper.DOWN : 0;
+        int swipeFlags = pos == 1 ? androidx.recyclerview.widget.ItemTouchHelper.START | androidx.recyclerview.widget.ItemTouchHelper.END : 0;
+        return makeMovementFlags(dragFlags, swipeFlags);
+    }
+
+    @Override
+    public void a(RecyclerView.x viewHolder, int direction) {
+        mAdapter.onItemDismiss(viewHolder.d());
+    }
+
+    @Override
+    public boolean b(RecyclerView recyclerView, RecyclerView.x viewHolder, RecyclerView.x target) {
+        if (mAdapter.getItemType(viewHolder.d()) == DockBarAdapter.GROUP_TITLE_TYPE)
+            return false;
+        return mAdapter.onItemMove(viewHolder.d(), target.d());
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccontItem.java

@@ -0,0 +1,13 @@
+package ru.vtosters.lite.ui.fragments.multiaccount;
+
+class MultiAccountItem {
+    public String nickname;
+    public String imageUrl;
+    public int index;
+
+    public MultiAccountItem(String name, String imageUrl, int index) {
+        this.nickname = name;
+        this.imageUrl = imageUrl;
+        this.index = index;
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java

@@ -0,0 +1,168 @@
+package ru.vtosters.lite.ui.fragments.multiaccount;
+
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+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.imageloader.VKImageLoader;
+import com.vk.imageloader.view.VKCircleImageView;
+import com.vk.pushes.PushSubscriber;
+import com.vtosters.lite.R;
+import com.vtosters.lite.auth.VKAccountManager;
+import com.vtosters.lite.im.ImEngineProvider;
+
+import java.util.List;
+
+import ru.vtosters.lite.utils.Helper;
+import ru.vtosters.lite.utils.Themes;
+
+public class MultiAccountAdapter extends RecyclerView.a<MultiAccountAdapter.MultiAccountViewHolder> {
+
+    private final List<MultiAccountItem> mAccounts = MultiAccountManager.buildList();
+
+    @Override
+    public MultiAccountViewHolder b(ViewGroup parent, int viewType) {
+        RelativeLayout layout = new RelativeLayout(parent.getContext());
+        layout.setPadding(
+                Helper.convertDpToPixel(12),
+                Helper.convertDpToPixel(6),
+                Helper.convertDpToPixel(6),
+                Helper.convertDpToPixel(6)
+        );
+
+        VKCircleImageView avatar = new VKCircleImageView(parent.getContext());
+        avatar.setId(1);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
+                Helper.convertDpToPixel(48),
+                Helper.convertDpToPixel(48)
+        );
+        params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        params.addRule(RelativeLayout.CENTER_VERTICAL);
+        layout.addView(avatar, params);
+
+        TextView nickname = new TextView(parent.getContext());
+        nickname.setId(2);
+        nickname.setPaddingRelative(
+                Helper.convertDpToPixel(12),
+                0,
+                0,
+                0
+        );
+        nickname.setEllipsize(TextUtils.TruncateAt.END);
+        nickname.setSingleLine(true);
+        nickname.setTextSize(15.0f);
+        nickname.setTextColor(Themes.getTextAttr());
+        nickname.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
+        RelativeLayout.LayoutParams params1 = new RelativeLayout.LayoutParams(-2, -2);
+        params1.addRule(RelativeLayout.CENTER_VERTICAL);
+        params1.addRule(RelativeLayout.RIGHT_OF, 1);
+        layout.addView(nickname, params1);
+
+        ImageButton action = new ImageButton(parent.getContext());
+        action.setId(3);
+        action.setBackgroundResource(com.vtosters.lite.R.drawable.rounded_list_selector);
+        Drawable drawable = Themes.recolorDrawable(Helper.getResources().getDrawable(R.drawable.ic_list_remove));
+        action.setImageDrawable(drawable);
+        RelativeLayout.LayoutParams params2 = new RelativeLayout.LayoutParams(
+                Helper.convertDpToPixel(48),
+                Helper.convertDpToPixel(48)
+        );
+        params2.addRule(RelativeLayout.CENTER_VERTICAL);
+        params2.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layout.addView(action, params2);
+
+        return new MultiAccountViewHolder(layout);
+    }
+    
+    @Override
+    public void a(MultiAccountViewHolder holder, int pos) {
+        holder.bind(pos == 0 ? null : mAccounts.get(pos-1), pos);
+    }
+
+    @Override
+    public int au_() {
+        return mAccounts.size() + 1;
+    }
+
+    static class MultiAccountViewHolder extends RecyclerView.x {
+
+        private final RelativeLayout mContainer;
+        private final VKCircleImageView mAvatar;
+        private final TextView mNickname;
+        private final ImageButton mAction;
+
+        public MultiAccountViewHolder(View view) {
+            super(view);
+
+            mContainer = (RelativeLayout) view;
+            mAvatar = (VKCircleImageView) view.findViewById(1);
+            mNickname = (TextView) view.findViewById(2);
+            mAction = (ImageButton) view.findViewById(3);
+        }
+
+        public void bind(MultiAccountItem item, int pos) {
+            if (pos == 0) {
+                mNickname.setText("Добавить новый аккаунт");
+                mContainer.setOnClickListener(v -> {
+                    MultiAccountManager.addAccount();
+
+                    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();
+                    Helper.restarting();
+                });
+                Drawable drawable = Themes.recolorDrawable(Helper.getResources().getDrawable(R.drawable.ic_list_add));
+                mAction.setImageDrawable(drawable);
+                mAction.setClickable(false);
+            } else {
+                mContainer.setOnClickListener(v -> {
+                    MultiAccountManager.switchAccount(item.index);
+
+                    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();
+                    Helper.restarting();
+
+                });
+
+                if (Helper.isNetworkConnected())
+                    mAvatar.a(item.imageUrl);
+                else
+                    mAvatar.a(R.drawable.vkim_ic_placeholder_user_square_64dp);
+
+                mNickname.setText(item.nickname);
+
+                mAction.setOnClickListener(v -> {
+                    MultiAccountManager.deleteAccount(item.index);
+
+                    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();
+                    Helper.restarting();
+                });
+            }
+        }
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java

@@ -0,0 +1,41 @@
+package ru.vtosters.lite.ui.fragments.multiaccount;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import me.grishka.appkit.fragments.ToolbarFragment;
+import ru.vtosters.lite.utils.Helper;
+
+public class MultiAccountFragment extends ToolbarFragment {
+
+    private RecyclerView mRecyclerView;
+    private MultiAccountAdapter mAdapter;
+
+    @Override
+    public View d(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
+
+        LinearLayout layout = new LinearLayout(n());
+
+        mRecyclerView = new RecyclerView(n());
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(n()));
+        mAdapter = new MultiAccountAdapter();
+        mRecyclerView.setAdapter(mAdapter);
+        layout.addView(mRecyclerView, new LinearLayout.LayoutParams(-1, -1));
+
+        return layout;
+    }
+
+    @Override
+    public void a(View arg0, Bundle arg1) {
+        o_(true);
+
+        super.a(arg0, arg1);
+
+        a(Helper.getString("accounts"));
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java

@@ -0,0 +1,87 @@
+package ru.vtosters.lite.ui.fragments.multiaccount;
+
+import static ru.vtosters.lite.utils.Helper.GetContext;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import ru.vtosters.lite.utils.Helper;
+
+public class MultiAccountManager {
+
+    public static void migrate() {
+        SharedPreferences OldPrefs = Helper.GetContext().getSharedPreferences("pref_account_manager", Context.MODE_PRIVATE);
+        String OldPrefsValue = OldPrefs.getString("key_vk_account", "");
+        SharedPreferences NewPrefs = GetContext().getSharedPreferences("pref_account_manager0", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = NewPrefs.edit();
+        editor.putString("key_vk_account", OldPrefsValue);
+        editor.apply();
+    }
+
+    public static SharedPreferences getCurrentAccount() {
+        int account = Helper.GetPreferences().getInt("account", 0);
+        return Helper.GetContext().getSharedPreferences("pref_account_manager" + (account != 0 ? account : ""), Context.MODE_PRIVATE);
+    }
+
+    private static int getAccountPrefsCount() {
+       File[] prefs = new File(Helper.GetContext().getFilesDir().getParent(), "shared_prefs")
+                .listFiles((dir, name) -> {
+                    return name.matches("pref_account_manager\\d+\\.xml");
+                });
+        return prefs != null ? prefs.length : 0;
+    }
+
+    private static String withRegex(String base, String regex, String def) {
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(base);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return def;
+    }
+
+    public static List<MultiAccountItem> buildList() {
+        List<MultiAccountItem> list = new ArrayList<>();
+        for (int i = 0; i <= getAccountPrefsCount(); i++) {
+            SharedPreferences prefs = Helper.GetContext().getSharedPreferences("pref_account_manager" + i, Context.MODE_PRIVATE);
+            String keyVKAccount = prefs.getString("key_vk_account", "");
+            if (!keyVKAccount.isEmpty()) {
+                String name = withRegex(keyVKAccount, ".*\"name\":\\{.*?:\"(.*?)\"\\}.*", "");
+                String avatarUrl = withRegex(keyVKAccount, ".*\"photo\":\\{.*?:\"(.*?)\"\\}.*", "https://vk.com/images/camera_200.png")
+                        .replace("\\/", "/");
+                list.add(new MultiAccountItem(
+                        name, avatarUrl, i
+                ));
+            }
+        }
+        return list;
+    }
+
+    public static boolean switchAccount(int i) {
+        int account = Helper.GetPreferences().getInt("account", 0);
+        if (account == i) return false;
+
+        Helper.GetPreferences().edit().putInt("account", i).commit();
+        return true;
+    }
+
+    public static void addAccount() {
+        Helper.GetPreferences().edit().putInt("account", getAccountPrefsCount()).commit();
+    }
+
+    public static void deleteAccount(int i) {
+        int account = Helper.GetPreferences().getInt("account", 0);
+        SharedPreferences prefs = Helper.GetContext().getSharedPreferences("pref_account_manager" + i, Context.MODE_PRIVATE);
+        prefs.edit().clear().commit();
+        File file = new File(new File(Helper.GetContext().getFilesDir().getParent(), "shared_prefs"), "pref_account_manager" + i);
+        if (file.exists()) file.delete();
+        if (account == i && getAccountPrefsCount() > 0)
+            switchAccount(buildList().get(0).index);
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java

@@ -42,8 +42,8 @@ import java.io.File;
 
 import me.grishka.appkit.fragments.ToolbarFragment;
 import ru.vtosters.lite.tgs.TGPref;
-import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.ui.PreferencesUtil;
+import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Prefs;
 import ru.vtosters.lite.utils.Themes;
 

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java

@@ -8,8 +8,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.tgs.TGRoot;
-import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.ui.PreferencesUtil;
+import ru.vtosters.lite.utils.Helper;
 
 public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragment {
 

app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetProxy.java

@@ -1,15 +1,10 @@
 package ru.vtosters.lite.ui.vkui;
 
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.view.View;
 
 import com.vk.core.dialogs.bottomsheet.ModalBottomSheet;
 
-import com.vtosters.lite.R;
-
-import ru.vtosters.lite.utils.Helper;
-
 public class ModalBottomSheetProxy {
     public final ModalBottomSheet.a builder;
 

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

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.util.Log;
 
 import com.vk.dto.common.VideoFile;
 
@@ -27,40 +26,31 @@ public class ExternalLinkHandler {
     private static final Map<String, String> qualities = new HashMap<>();
 
     public static boolean parseVideoFile(VideoFile file, Context context) {
-        if (!Prefs.isEnableExternalOpening()) return false;
-
         if (checkYoutubeLink(file)) {
-
             try {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setData(Uri.parse(file.n));
-
                 context.startActivity(intent);
+                return true;
             } catch (Exception e) {
                 e.printStackTrace();
             }
-
-        } else if (checkVkVideo(file)) {
-
-            if (qualities.size() == 1) {
-
-                startExternalVideo((String) qualities.values().toArray()[0]);
-
-            } else {
-
-                String[] titles = qualities.keySet().toArray(new String[0]);
-
-                new AlertDialog.Builder(context)
-                        .setItems(titles, ((dialog, which) -> {
-
-                            startExternalVideo(qualities.get(titles[which]));
-
-                        }))
-                        .show();
-
-            }
         }
 
+        if (!Prefs.isEnableExternalOpening()) return false;
+
+        if (checkVkVideo(file)) {
+            if (qualities.size() == 1) {
+                startExternalVideo((String) qualities.values().toArray()[0]);
+            } else {
+                String[] titles = qualities.keySet().toArray(new String[0]);
+                new AlertDialog.Builder(context)
+                        .setItems(titles, ((dialog, which) -> {
+                            startExternalVideo(qualities.get(titles[which]));
+                        }))
+                        .show();
+            }
+        }
         return true;
     }
 
@@ -71,7 +61,6 @@ public class ExternalLinkHandler {
                     return true;
             }
         }
-
         return false;
     }
 
@@ -119,28 +108,21 @@ public class ExternalLinkHandler {
 
             String packageName = getMXPlayerPackageName();
             if (!Helper.isEmpty(packageName)) {
-
                 intent.setPackage(packageName);
                 intent.setDataAndType(uri, "application/mp4");
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
             } else {
-
                 intent.setAction(Intent.ACTION_VIEW);
                 intent.setDataAndType(uri, "video/mp4");
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                     intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
             }
-
             Helper.GetContext().startActivity(intent);
-
             return true;
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return false;
     }
 

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

@@ -1,16 +1,13 @@
 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.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -22,7 +19,6 @@ 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() {
@@ -69,8 +65,12 @@ public class Helper {
         return extendedUserProfile.a;
     }
 
-    public static void restarting() {
-        GetContext().startActivity(Intent.makeRestartActivityTask(GetContext().getPackageManager().getLaunchIntentForPackage(GetContext().getPackageName()).getComponent()));
+    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);
         Runtime.getRuntime().exit(0);
     }
 
@@ -137,4 +137,10 @@ public class Helper {
     public static boolean isEmpty(String str) {
         return str == null || str.isEmpty();
     }
+
+    public static boolean isNetworkConnected() {
+        ConnectivityManager cm = (ConnectivityManager) GetContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+        return activeNetwork != null ? activeNetwork.isConnectedOrConnecting() :false;
+    }
 }

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.utils;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static ru.vtosters.lite.utils.Proxy.setProxy;
 
 import android.app.Activity;
@@ -11,7 +13,6 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.view.View;
 import android.view.Window;
 
 import com.vk.about.Items;
@@ -20,7 +21,6 @@ import com.vk.about.Items2;
 import com.vk.apps.AppsFragment;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vk.core.util.Screen;
-import com.vk.discover.DiscoverFragment;
 import com.vk.fave.fragments.FaveTabFragment;
 import com.vk.menu.MenuFragment;
 import com.vk.music.fragment.MusicFragment;
@@ -55,7 +55,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Scanner;
 
-import kotlin.jvm.internal.Intrinsics;
+import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager;
+import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager;
 
 public class Prefs {
     public static String VERSIONNAME = "2.0 DEV";
@@ -106,6 +107,10 @@ public class Prefs {
         return BooleanFalse("adsgroup");
     }
 
+    public static boolean olddock() {
+        return BooleanFalse("olddock");
+    }
+
     public static boolean adsslider() {
         return BooleanFalse("__dbg_no_slider_ads");
     }
@@ -166,6 +171,10 @@ public class Prefs {
         return BooleanFalse("default_ad_list");
     }
 
+    public static boolean shitposting() {
+        return BooleanFalse("shitposting");
+    }
+
     public static boolean dev() {
         return BooleanFalse("dev");
     }
@@ -248,6 +257,7 @@ public class Prefs {
                 String line = scanner.findInLine("VERSION_BUILD=.+");
                 if (line != null)
                     return line.replace("VERSION_BUILD=", "");
+                return "0000000";
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -330,7 +340,7 @@ public class Prefs {
     }
 
     public static boolean newfeed() {
-        return BooleanFalse("newfeed");
+        return BooleanTrue("newfeed");
     }
 
     public static boolean offline() {
@@ -456,7 +466,7 @@ public class Prefs {
     }
 
     public static boolean newvideo() {
-        return BooleanFalse("newvideo");
+        return false;
     }
 
     public static String widgetads() {
@@ -464,15 +474,11 @@ public class Prefs {
     }
 
     public static void setNavbarColor(Window window, int i) {
-        if (navbar()) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.setNavigationBarColor(getNavbarColor());
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && VKThemeHelper.d()) {
+            window.getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
         }
-        if (Build.VERSION.SDK_INT >= 31 && VKThemeHelper.d()) {
-            View decorView = window.getDecorView();
-            Intrinsics.a((Object) decorView, "view");
-            decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() | 8192);
+        if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setNavigationBarColor(getNavbarColor());
         }
     }
 
@@ -508,6 +514,7 @@ public class Prefs {
         ReferalsPut();
         StandardFilterPut();
         ShortLinkPut();
+        IDontWantToReadIt();
         String string = Helper.GetPreferences().getString("spamfilters", "");
         if (!string.isEmpty()) {
             mFilters.addAll(Arrays.asList(string.split(", ")));
@@ -571,6 +578,25 @@ 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()) {
@@ -683,7 +709,7 @@ public class Prefs {
         setupFilters();
         fixGapps();
         setProxy();
-
+        MultiAccountManager.migrate();
         registerActivities(application);
     }
 
@@ -723,8 +749,15 @@ public class Prefs {
         });
     }
 
+    public static boolean isUseAlternativeFragments() {
+        return true;
+    }
+
     public static Class getStartFragment() {
-        String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_value", "");
+        String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_values", "");
+        if (string.equals("default")) {
+            return DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
+        }
         if (string.equals("newsfeed")) {
             return Feed2049.b.c();
         }
@@ -740,7 +773,7 @@ public class Prefs {
         if (string.equals("friends")) {
             return FriendsFragment.class;
         }
-        if (string.equals(NavigatorKeys.v)) {
+        if (string.equals("photos")) {
             return PhotosFragment.class;
         }
         if (string.equals("videos")) {
@@ -753,7 +786,7 @@ public class Prefs {
             return AppsFragment.class;
         }
         if (string.equals("discover")) {
-            return DiscoverFragment.class;
+            return Feed2049.b.e();
         }
         if (string.equals("notifications")) {
             return NotificationsContainerFragment.class;
@@ -779,7 +812,7 @@ public class Prefs {
         if (string.equals("docs")) {
             return DocumentsViewFragment.class;
         }
-        return string.equals("brtd") ? BirthdaysFragment.class : Feed2049.b.c();
+        return string.equals("brtd") ? BirthdaysFragment.class : DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
     }
 
     public static Context BaseContextLocale(Context context) {

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

@@ -10,9 +10,6 @@ import android.widget.ImageButton;
 import com.vk.core.d.RecoloredDrawable;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
-import com.vtosters.lite.auth.VKAccountManager;
-
-import ru.vtosters.lite.f0x1d.VTVerifications;
 
 public class Themes {
     public static int getAccentColor() {

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

@@ -4,14 +4,14 @@ import android.util.Base64;
 import android.util.Log;
 import android.webkit.WebView;
 
+import com.vtosters.lite.R;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-import com.vtosters.lite.R;
-
 public class VKUIInjector {
     private static boolean isLoaded = false;
     private static String loadedCSS = "";

scripts/build.bat

@@ -16,6 +16,7 @@ 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" (
@@ -67,14 +68,13 @@ if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
     echo %ESC%[31mFailed%ESC%[0m
-    exit /B 1
 )
 
 echo.
 echo %ESC%[1;4mBuild apk...%ESC%[0m
 echo.
 cd smali\
-call java -jar ../scripts/apktool.jar b . -o VTLite.apk --use-aapt2 -p ../scripts/framework/
+call java -jar ../scripts/apktool.jar b . -o ../scripts/VTLite.apk --use-aapt2 -p ../scripts/framework/
 if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (
@@ -88,8 +88,7 @@ del assets\version.properties
 echo.
 echo %ESC%[1;4mSign apk...%ESC%[0m
 echo.
-call java -jar ../apksigner.jar sign --ks debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android VTLite.apk
-del VTLite.apk
+call java -jar ../scripts/apksigner.jar sign --ks ../scripts/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android ../scripts/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_signed.apk
+call adb install ../scripts/VTLite.apk
 if "%ERRORLEVEL%" == "0" (
     echo %ESC%[92mSuccessful%ESC%[0m
 ) else (

scripts/build.sh

@@ -1,4 +1,4 @@
-œ#!/bin/bash
+#!/bin/bash
 RED='\033[31m'
 GREEN='\033[92m'
 NC='\033[0m'
@@ -51,7 +51,6 @@ if [ $? -eq 0 ]; then
 	echo -e "${GREEN}Успех!${NC}\n"
 else
 	echo -e "${RED}Провал.${NC}\n"
-	exit 1
 fi
 
 echo -e "${BOLD}${UNDERLINE}Сборка apk..${NC}"

smali/AndroidManifest.xml

@@ -66,7 +66,7 @@
     <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ"/>
     <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE"/>
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-    <application android:allowBackup="false" android:debuggable="false" android:hardwareAccelerated="true" android:icon="@mipmap/vt_launcher" android:label="@string/app_name" android:largeHeap="true" android:name="com.vtosters.lite.VKApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="true" android:roundIcon="@mipmap/vt_launcher_round" android:supportsRtl="true" android:theme="@style/BaseStyle">
+    <application android:allowBackup="false" android:debuggable="false" android:hardwareAccelerated="true" android:icon="@mipmap/vt_launcher" android:label="@string/app_name" android:largeHeap="true" android:requestLegacyExternalStorage="true" android:preserveLegacyExternalStorage="true" android:name="com.vtosters.lite.VKApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="true" android:roundIcon="@mipmap/vt_launcher_round" android:supportsRtl="true" android:theme="@style/BaseStyle">
         <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBlTHhNGPj7ktPWrUo_d4YJs_Sn_zsISZg"/>
         <meta-data android:name="com.google.android.geo.API_SECRET" android:value="yu6ZAA0OWO3kmr4es7fGtSmiyfk="/>
         <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/fb_app_id"/>

smali/assets/IDontWantToReadIt.txt

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

smali/assets/StandartFilter.txt

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

smali/res/drawable-v21/vkim_white_btn.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
+            <solid android:color="?background_content" />
             <corners android:radius="4.0dip" />
         </shape>
     </item>

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="?attr/dialogBg" />
+        <solid android:color="?dialogBg" />
         <corners android:radius="8dp" />
     </shape>
 </inset>

smali/res/drawable/music_actions_header_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/music_bottom_menu_header_bg" />
+    <solid android:color="?header_background" />
     <corners android:topLeftRadius="8.0dip" android:topRightRadius="8.0dip" />
 </shape>

smali/res/drawable/vkim_msg_part_btn_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1.0dip" android:color="#ff518bcc" />
+    <stroke android:width="1.0dip" android:color="?accent" />
     <padding android:left="12.0dip" android:top="6.0dip" android:right="12.0dip" android:bottom="7.0dip" />
     <corners android:radius="4.0dip" />
 </shape>

smali/res/drawable/vkim_white_btn.xml

@@ -9,7 +9,7 @@
     </item>
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
+            <solid android:color="?background_content" />
             <corners android:radius="4.0dip" />
         </shape>
     </item>

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="#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="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="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: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" />
+        <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" />
         <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: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" />
+        <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" />
     </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: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" />
+        <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" />
     </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: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" />
+        <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" />
         <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="#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" />
+    <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" />
     <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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <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="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="#ff212121" 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="?text_primary" 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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <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="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="#ff212121" 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="?text_primary" 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="#ff212121" 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="?text_primary" 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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <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" />
                     </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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <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" />
                     </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="#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" />
+                <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" />
             </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="?tabbar_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
+        <View android:id="@id/header_background" android:background="?header_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-v21/game_card_fragment.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical" android:id="@id/appkit_loader_root" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="3.0dip" app:popupTheme="?actionBarPopupTheme" app:theme="?actionBarTheme" style="?actionBarTheme">
+    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?header_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="3.0dip" app:popupTheme="?actionBarPopupTheme" app:theme="?actionBarTheme" style="?actionBarTheme">
         <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@id/apps_header" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:weightSum="1.0" android:minHeight="80.0dip">
             <com.vk.imageloader.view.VKImageView android:id="@android:id/icon" android:layout_width="48.0dip" android:layout_height="48.0dip" app:placeholderImage="@drawable/placeholder_game_dark_48" app:roundedCornerRadius="10.0dip" />
             <LinearLayout android:orientation="vertical" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0">

smali/res/layout-v21/vkim_mentions_container.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout android:id="@id/mentions_cl" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/divider" android:layout_below="@id/dialog_header_container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <FrameLayout android:id="@id/mentions_container" android:background="#ffffffff" android:paddingLeft="0.0dip" android:paddingTop="0.0dip" android:paddingRight="0.0dip" android:paddingBottom="0.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="6.0dip" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" />
+    <FrameLayout android:id="@id/mentions_container" android:background="?tabbar_background" android:paddingLeft="0.0dip" android:paddingTop="0.0dip" android:paddingRight="0.0dip" android:paddingBottom="0.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="6.0dip" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" />
 </android.support.design.widget.CoordinatorLayout>

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="#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="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="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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <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="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="#ff212121" 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="?text_primary" 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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <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="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="#ff212121" 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="?text_primary" 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="#ff212121" 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="?text_primary" 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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <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" />
                     </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="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <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" />
                     </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="#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" />
+                <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" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout/appkit_recycler_fragment.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.vk.core.ui.RecursiveSwipeRefreshLayout android:id="@id/refresh_layout" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <FrameLayout android:id="@id/content_wrap" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent">
+    <FrameLayout android:id="@id/content_wrap" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="fill_parent">
         <me.grishka.appkit.views.UsableRecyclerView android:id="@id/list" android:scrollbars="vertical" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <include android:id="@id/empty" layout="@layout/appkit_empty" />
     </FrameLayout>

smali/res/layout/apps_app_info_item.xml

@@ -2,5 +2,5 @@
 <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" 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.imageloader.view.VKImageView android:id="@id/ivAppIcon" android:layout_width="36.0dip" android:layout_height="36.0dip" android:layout_marginBottom="12.0dip" app:roundedCornerRadius="8.0dip" />
-    <TextView android:textColor="@color/black" android:id="@id/tvAppName" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32.0dip" android:fontFamily="@string/font_family_regular" style="@style/VKUIText.Title2" />
+    <TextView android:textColor="?accent" android:id="@id/tvAppName" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32.0dip" android:fontFamily="@string/font_family_regular" style="@style/VKUIText.Title2" />
 </LinearLayout>

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="#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="?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="@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="#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="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="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/catalog_fragment.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:id="@id/vk_app_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_behavior="com.vk.core.view.FixAppBarLayoutBehavior" style="@style/VKAppBar">
         <include android:id="@id/search" android:layout_width="fill_parent" android:layout_height="52.0dip" layout="@layout/toolbar_modern_search_view" />
-        <android.support.design.widget.TabLayout android:id="@id/tabs" android:layout_width="wrap_content" android:layout_height="48.0dip" app:tabGravity="fill" app:tabIndicatorColor="@color/white" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="@color/white" app:tabTextColor="@color/white_alpha60" style="@style/CatalogTabLayout" />
+        <android.support.design.widget.TabLayout android:id="@id/tabs" android:layout_width="wrap_content" android:layout_height="48.0dip" app:tabGravity="fill" app:tabIndicatorColor="?accent" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="?text_primary" app:tabTextColor="?text_secondary" style="@style/CatalogTabLayout" />
     </android.support.design.widget.AppBarLayout>
     <android.support.v4.view.ViewPager android:id="@id/viewpager" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintTop_toBottomOf="@id/vk_app_bar" />
     <com.vk.catalog.core.ui.view.CatalogLoadingAndErrorView android:layout_gravity="center_vertical" android:id="@id/loading_and_error_view" android:background="?background_content" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintTop_toBottomOf="@id/vk_app_bar" />

smali/res/layout/description_holder.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.vtosters.lite.ui.LinkedTextView android:textSize="15.0dip" android:textColor="@color/main_text" android:textColorHighlight="#802b587a" android:textColorLink="#ff2b587a" android:linksClickable="false" android:id="@id/post_view" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="@dimen/good_description_padding_bottom" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="@dimen/good_description_padding_bottom" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="4.0dip"
+<com.vtosters.lite.ui.LinkedTextView android:textSize="15.0dip" android:textColor="?text_primary" android:textColorHighlight="#802b587a" android:textColorLink="#ff2b587a" android:linksClickable="false" android:id="@id/post_view" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="@dimen/good_description_padding_bottom" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="@dimen/good_description_padding_bottom" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="4.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" />

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:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<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"
   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:backgroundTint="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    <View android:background="@drawable/bg_discover_card_rounded" android:layout_width="fill_parent" android:layout_height="fill_parent" android:backgroundTint="?tabbar_background" />
 </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:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<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"
   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:backgroundTint="?tabbar_background" android:padding="4.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<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"
   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/documents_item.xml

@@ -4,7 +4,7 @@
     <TextView android:textSize="16.0dip" android:textColor="#ff99a2ad" android:ellipsize="marquee" android:gravity="center" android:id="@id/docs_item_type" android:background="@drawable/docs_thumb_bg" android:padding="5.0dip" android:layout_width="64.0dip" android:layout_height="48.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" android:singleLine="true" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:fontFamily="@string/font_family_medium" />
     <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_toRightOf="@id/docs_item_type" android:layout_centerVertical="true">
         <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="marquee" android:id="@id/docs_item_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" />
-        <TextView android:textSize="14.0dip" android:textColor="#85000205" android:ellipsize="marquee" android:id="@id/docs_item_info" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:singleLine="true" android:layout_below="@id/docs_item_title" android:layout_alignLeft="@id/docs_item_title" android:layout_alignParentRight="true" />
+        <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:ellipsize="marquee" android:id="@id/docs_item_info" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:singleLine="true" android:layout_below="@id/docs_item_title" android:layout_alignLeft="@id/docs_item_title" android:layout_alignParentRight="true" />
     </LinearLayout>
     <com.vk.imageloader.view.VKImageView android:id="@id/docs_item_thumb" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignLeft="@id/docs_item_type" android:layout_alignTop="@id/docs_item_type" android:layout_alignRight="@id/docs_item_type" android:layout_alignBottom="@id/docs_item_type" vk:actualImageScaleType="centerCrop" vk:roundedCornerRadius="2.0dip" />
 </RelativeLayout>

smali/res/layout/error.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.vtosters.lite.ui.ErrorView android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<com.vtosters.lite.ui.ErrorView android:gravity="center" android:orientation="vertical" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/error_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_warning_light" />
     <TextView android:textSize="16.0sp" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/error_text" android:paddingLeft="32.0dip" android:paddingRight="32.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/liblists_err_text" android:freezesText="true" style="@style/VKUIText.Subhead" />

smali/res/layout/fave_all_fragment.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout android:orientation="vertical" android:id="@id/appkit_loader_root" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<android.support.design.widget.CoordinatorLayout android:orientation="vertical" android:background="?background_content" android:id="@id/appkit_loader_root" 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">
     <com.vk.fave.views.FaveAllPaginatedView android:id="@id/rpb_list" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/toolbar_behavior_scrolling" />
 </android.support.design.widget.CoordinatorLayout>

smali/res/layout/fave_tab_fragment.xml

@@ -4,11 +4,11 @@
     <android.support.design.widget.AppBarLayout android:id="@id/vk_app_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/VKAppBar">
         <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?header_background" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:navigationContentDescription="@string/accessibility_toolbar_back" app:popupTheme="?actionBarPopupTheme" app:theme="?actionBarTheme" style="?actionBarTheme">
             <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12.0dip">
-                <TextView android:textSize="20.0sp" android:textColor="@color/white" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@string/font_family_medium" />
-                <TextView android:textSize="14.0sp" android:textColor="@color/white_opacity40" android:ellipsize="end" android:id="@id/subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:lines="1" android:maxEms="20" android:fontFamily="@string/font_family_medium" />
+                <TextView android:textSize="20.0sp" android:textColor="?text_primary" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@string/font_family_medium" />
+                <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:lines="1" android:maxEms="20" android:fontFamily="@string/font_family_medium" />
             </LinearLayout>
         </android.support.v7.widget.Toolbar>
-        <android.support.design.widget.TabLayout android:id="@id/tabs" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="48.0dip" app:tabGravity="fill" app:tabIndicatorColor="#ffffffff" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="#ffffffff" app:tabTextColor="#99ffffff" />
+        <android.support.design.widget.TabLayout android:id="@id/tabs" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="48.0dip" app:tabGravity="fill" app:tabIndicatorColor="?accent" app:tabMaxWidth="0.0dip" app:tabMode="scrollable" app:tabSelectedTextColor="?text_primary" app:tabTextColor="?text_secondary" />
     </android.support.design.widget.AppBarLayout>
     <ProgressBar android:layout_gravity="center" android:id="@id/loading" android:layout_width="50.0dip" android:layout_height="50.0dip" android:layout_marginTop="56.0dip" />
     <com.vk.core.view.VKViewPager android:id="@id/viewpager" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1.0" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintTop_toBottomOf="@id/vk_app_bar" />

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" 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" />
+    <android.support.design.widget.TabLayout android:background="?background_content" 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" />
 </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: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" />
+            <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" />
             <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="?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" />
+    <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" />
 </FrameLayout>

smali/res/layout/friends_header_request.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:backgroundTint="?background_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="14.0dip" android:textColor="@color/text_game_gray" android:id="@id/title" android:paddingLeft="@dimen/friends_header_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" />
-    <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:gravity="center" android:id="@id/counter" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="1" android:maxLines="1" android:fontFamily="@string/font_family_medium" />
+    <TextView android:textSize="14.0dip" android:textColor="?text_primary" android:id="@id/title" android:paddingLeft="@dimen/friends_header_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" />
+    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:gravity="center" android:id="@id/counter" android:paddingLeft="8.0dip" android:paddingRight="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="1" android:maxLines="1" android:fontFamily="@string/font_family_medium" />
     <Space android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="1.0" />
     <TextView android:textSize="14.0dip" android:textColor="?accent" android:id="@id/action" android:background="@drawable/highlight" android:paddingLeft="@dimen/friends_header_padding" android:paddingTop="@dimen/friends_header_top_padding" android:paddingRight="@dimen/friends_header_padding" android:paddingBottom="@dimen/friends_header_top_padding" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/show_all" />
 </LinearLayout>

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="#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"
+<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"
   xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/gifts_catalog_content.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.vk.core.ui.RecursiveSwipeRefreshLayout android:id="@id/refresh_layout" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<com.vk.core.ui.RecursiveSwipeRefreshLayout android:background="?background_content" android:id="@id/refresh_layout" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.vtosters.lite.ui.layout.ExpandableBarLayout android:id="@id/expandable" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/toolbar">
-        <FrameLayout android:id="@id/content_wrap" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent">
+        <FrameLayout android:id="@id/content_wrap" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="fill_parent">
             <me.grishka.appkit.views.UsableRecyclerView android:id="@id/list" android:scrollbars="vertical" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" />
             <include android:id="@id/empty" layout="@layout/appkit_empty" />
         </FrameLayout>
-        <TextView android:textSize="16.0dip" android:textColor="#ff6a6f75" android:gravity="center" android:id="@id/balance" android:background="#fff7f7f7" android:layout_width="fill_parent" android:layout_height="40.0dip" />
+        <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center" android:id="@id/balance" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="40.0dip" />
     </com.vtosters.lite.ui.layout.ExpandableBarLayout>
 </com.vk.core.ui.RecursiveSwipeRefreshLayout>

smali/res/layout/good_write_button_holder.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical" android:background="@android:color/white" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="8.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:orientation="vertical" android:background="?background_content" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="8.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@android:id/button1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="36.0dip" android:text="@string/write_to_the_good_owner" style="@style/MaterialBlueButton" />
 </LinearLayout>

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="#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="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="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="#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="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="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="#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="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="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="#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" />
+    <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" />
 </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="#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" />
+            <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" />
         </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="#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="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="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="#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="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="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="#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="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="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="#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="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="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="#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="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="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/identity_desc.xml

@@ -2,7 +2,7 @@
 <FrameLayout android:layout_width="fill_parent" android:layout_height="160.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="20.0dip" android:paddingEnd="20.0dip">
-        <TextView android:textSize="20.0sp" android:textColor="@color/gray_1000" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/identity_title" android:fontFamily="@font/roboto_medium" />
-        <com.vtosters.lite.ui.LinkedTextView android:textSize="15.0sp" android:textColor="@color/gray_400" android:gravity="center_horizontal" android:id="@id/identity_desc_text" android:paddingTop="6.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <TextView android:textSize="20.0sp" android:textColor="?text_primary" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/identity_title" android:fontFamily="@font/roboto_medium" />
+        <com.vtosters.lite.ui.LinkedTextView android:textSize="15.0sp" android:textColor="?text_secondary" android:gravity="center_horizontal" android:id="@id/identity_desc_text" android:paddingTop="6.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
 </FrameLayout>

smali/res/layout/identity_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:background="@drawable/bottom_divider_bg" android:layout_width="fill_parent" android:layout_height="72.0dip" android:paddingStart="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="16.0sp" android:textColor="@color/black" android:layout_gravity="top" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="14.0dip" android:maxLines="1" android:lines="1" android:singleLine="true" android:layout_marginEnd="58.0dip" />
-    <TextView android:textSize="14.0sp" android:textColor="@color/gray_400" android:layout_gravity="bottom" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:maxLines="1" android:lines="1" android:singleLine="true" android:layout_marginEnd="58.0dip" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_gravity="top" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="14.0dip" android:maxLines="1" android:lines="1" android:singleLine="true" android:layout_marginEnd="58.0dip" />
+    <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:layout_gravity="bottom" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:maxLines="1" android:lines="1" android:singleLine="true" android:layout_marginEnd="58.0dip" />
     <ImageView android:layout_gravity="end|center" android:id="@id/check" android:layout_width="48.0dip" android:layout_height="48.0dip" android:scaleType="centerInside" android:layout_marginEnd="4.0dip" />
 </FrameLayout>

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="?header_text" />
+                <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" />
                 <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="#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="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="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="@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"
+<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"
   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/money_transfer_header.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center_horizontal" android:orientation="horizontal" android:padding="16.0dip" android:layout_width="@dimen/money_transfer_btn_width" android:layout_height="wrap_content"
+<LinearLayout android:layout_gravity="center_horizontal" android:background="?background_content" android:orientation="horizontal" android:padding="16.0dip" android:layout_width="@dimen/money_transfer_btn_width" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textSize="16.0sp" android:id="@id/fl_send_money" android:layout_width="0.0dip" android:layout_height="44.0dip" android:text="@string/money_transfer_send" android:layout_weight="0.5" style="@style/primary_button" />
     <View android:id="@id/fl_divider" android:layout_width="12.0dip" android:layout_height="0.0dip" />

smali/res/layout/music_fragment_podcasts_list_screen.xml

@@ -4,7 +4,7 @@
     <ViewAnimator android:id="@id/content_animator" android:paddingTop="?actionBarSize" android:layout_width="fill_parent" android:layout_height="fill_parent">
         <include layout="@layout/music_page" />
     </ViewAnimator>
-    <LinearLayout android:orientation="horizontal" android:background="?accent" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="?actionBarSize" style="@style/Toolbar">
+    <LinearLayout android:orientation="horizontal" 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:src="@drawable/ic_back_24" android:contentDescription="@string/music_talkback_go_back" android:layout_marginStart="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/ActionButton.White" />
         <android.support.constraint.ConstraintLayout android:id="@id/toolbar_header" android:background="@drawable/music_selectable_bg" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginStart="12.0dip" android:layout_marginEnd="40.0dip">
             <com.vk.imageloader.view.VKCircleImageView android:layout_gravity="center_vertical" android:id="@id/user_logo" android:layout_width="40.0dip" android:layout_height="40.0dip" app:backgroundImage="@color/music_placeholder_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/placeholder_user_40" />

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: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" />
+        <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" />
         <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: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" />
+        <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" />
     </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: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" />
+        <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" />
     </FrameLayout>
 </merge>

smali/res/layout/music_podcast_screen_header.xml

@@ -2,16 +2,16 @@
 <android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="160.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.music.view.ThumbsImageView android:id="@id/audio_image" android:layout_width="@dimen/music_playlist_image_big" android:layout_height="@dimen/music_playlist_image_big" android:layout_marginTop="16.0dip" android:layout_marginStart="16.0dip" app:backgroundImage="@color/music_placeholder_bg" app:layout_constraintEnd_toStartOf="@id/audio_title" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:roundedCornerRadius="@dimen/music_image_rounding_corners" app:tiv_placeholder_resource="@drawable/ic_podcast_48" />
-    <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="20.0dip" android:textColor="@color/music_text_primary" android:ellipsize="end" android:id="@id/audio_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20.0dip" android:maxLines="1" android:layout_marginStart="12.0dip" android:layout_marginEnd="16.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/audio_explicit" app:layout_constraintStart_toEndOf="@id/audio_image" app:layout_constraintTop_toTopOf="parent" style="@style/title_text" />
+    <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/audio_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20.0dip" android:maxLines="1" android:layout_marginStart="12.0dip" android:layout_marginEnd="16.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/audio_explicit" app:layout_constraintStart_toEndOf="@id/audio_image" app:layout_constraintTop_toTopOf="parent" style="@style/title_text" />
     <ImageView android:id="@id/audio_explicit" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/audio_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/audio_title" />
-    <TextView android:textStyle="normal" android:textColor="@color/music_link_text" android:id="@id/audio_artist" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:fontFamily="sans-serif" app:layout_constraintEnd_toEndOf="@id/audio_title" app:layout_constraintStart_toStartOf="@id/audio_title" app:layout_constraintTop_toBottomOf="@id/audio_title" style="@style/TextStyle.SingleLine" />
+    <TextView android:textStyle="normal" android:textColor="?text_secondary" android:id="@id/audio_artist" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:layout_width="0.0dip" android:layout_height="wrap_content" android:fontFamily="sans-serif" app:layout_constraintEnd_toEndOf="@id/audio_title" app:layout_constraintStart_toStartOf="@id/audio_title" app:layout_constraintTop_toBottomOf="@id/audio_title" style="@style/TextStyle.SingleLine" />
     <ImageButton android:id="@id/play_pause" android:background="@drawable/podcast_snippet_blue_oval" android:layout_width="36.0dip" android:layout_height="36.0dip" android:src="@drawable/podcast_snippet_play_pause_blue" android:tint="?header_text" android:layout_marginStart="6.0dip" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toEndOf="@id/audio_image" app:layout_constraintTop_toBottomOf="@id/audio_artist" />
     <SeekBar android:id="@id/seekbar" android:background="@null" android:padding="0.0dip" android:clickable="false" android:layout_width="0.0dip" android:layout_height="2.0dip" android:progressDrawable="@drawable/podcast_snippet_seekbar_blue" android:minHeight="2.0dip" android:thumb="@null" android:thumbOffset="0.0dip" app:layout_constraintBottom_toBottomOf="@id/play_pause" app:layout_constraintEnd_toStartOf="@id/time_text" app:layout_constraintStart_toEndOf="@id/play_pause" app:layout_constraintTop_toTopOf="@id/play_pause" />
-    <TextView android:textSize="12.0dip" android:textColor="@color/subhead_gray" android:gravity="center" android:id="@id/time_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="@id/play_pause" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/play_pause" />
-    <TextView android:textSize="14.0dip" android:textColor="@color/medium_blue_gray" android:gravity="center_vertical" android:id="@id/audio_fave_toggle" android:background="@drawable/music_selectable_bg" android:layout_width="wrap_content" android:layout_height="40.0dip" android:text="@string/music_listen_later" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_favorite_outline_24" android:fontFamily="@string/font_family_medium" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" app:layout_constraintBottom_toBottomOf="@id/audio_image" app:layout_constraintStart_toEndOf="@id/audio_image" />
+    <TextView android:textSize="12.0dip" android:textColor="?text_primary" android:gravity="center" android:id="@id/time_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="@id/play_pause" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/play_pause" />
+    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:gravity="center_vertical" android:id="@id/audio_fave_toggle" android:background="@drawable/music_selectable_bg" android:layout_width="wrap_content" android:layout_height="40.0dip" android:text="@string/music_listen_later" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_favorite_outline_24" android:fontFamily="@string/font_family_medium" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" app:layout_constraintBottom_toBottomOf="@id/audio_image" app:layout_constraintStart_toEndOf="@id/audio_image" />
     <View android:id="@id/first_divider" android:background="#ff000000" android:layout_width="0.0dip" android:layout_height="0.5dip" android:layout_marginTop="12.0dip" android:alpha="0.12" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_image" />
-    <TextView android:textSize="15.0dip" android:textColor="@color/subhead_gray" android:gravity="center_vertical" android:id="@id/audio_title_2" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="46.0dip" android:fontFamily="@string/font_family_medium" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" android:layout_toEndOf="@id/playlist_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/first_divider" />
-    <com.vtosters.lite.ui.LinkedTextView android:textSize="15.0dip" android:textStyle="normal" android:textColor="@color/muted_black_old" android:id="@id/audio_description" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:fontFamily="sans-serif" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_title_2" />
+    <TextView android:textSize="15.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@id/audio_title_2" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="46.0dip" android:fontFamily="@string/font_family_medium" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" android:layout_toEndOf="@id/playlist_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/first_divider" />
+    <com.vtosters.lite.ui.LinkedTextView android:textSize="15.0dip" android:textStyle="normal" android:textColor="?text_secondary" android:id="@id/audio_description" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:fontFamily="sans-serif" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_title_2" />
     <TextView android:textSize="13.0dip" android:textStyle="normal" android:textColor="@color/caption_gray" android:gravity="center" android:id="@id/audio_total_info" android:layout_width="fill_parent" android:layout_height="48.0dip" android:fontFamily="sans-serif" android:layout_toEndOf="@id/playlist_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_description" />
     <View android:id="@id/second_divider" android:background="#ff000000" android:layout_width="0.0dip" android:layout_height="0.5dip" android:alpha="0.12" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_total_info" />
 </android.support.constraint.ConstraintLayout>

smali/res/layout/music_small_player.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ProgressBar android:id="@id/player_view_progress" android:layout_width="fill_parent" android:layout_height="2.0dip" android:max="100" android:indeterminate="false" android:progressDrawable="@drawable/drawer_player_progress" android:layout_toRightOf="@id/player_view_albumart" android:layout_alignParentRight="true" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
     <com.vk.music.view.ThumbsImageView android:layout_gravity="center_vertical" android:id="@id/image" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" app:backgroundImage="@color/music_placeholder_bg" app:roundedCornerRadius="@dimen/music_image_rounding_corners" app:tiv_placeholder_resource="@drawable/ic_song_24" />
-    <TextView android:textSize="16.0dip" android:textColor="#ff2c2d2e" android:ellipsize="end" android:gravity="center|left" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="80.0dip" android:layout_marginRight="100.0dip" android:maxLines="1" android:includeFontPadding="false" android:layout_weight="1.0" />
+    <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center|left" android:layout_gravity="center_vertical" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="80.0dip" android:layout_marginRight="100.0dip" android:maxLines="1" android:includeFontPadding="false" android:layout_weight="1.0" />
     <ImageButton android:layout_gravity="center|right" android:id="@id/play_pause" android:background="@drawable/highlight_circle" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="52.0dip" android:contentDescription="@string/music_talkback_play" />
     <ImageButton android:layout_gravity="center|right" android:id="@id/next" android:background="@drawable/highlight_circle" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="4.0dip" android:contentDescription="@string/music_talkback_next" />
 </FrameLayout>

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: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" />
+        <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" />
         <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: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" />
+        <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" />
         <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="@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" />
+    <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" />
     <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="#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" />
+    <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" />
 </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="#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" />
+    <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" />
     <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="?tabbar_background" 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="#ffffffff" 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="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+            <View android:id="@id/tabs_overlay" android:background="#ffffffff" 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="?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" />
+            <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" />
         </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="?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" />
+            <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" />
         </LinearLayout>
         <View android:layout_gravity="bottom" android:background="#1e000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
     </FrameLayout>

smali/res/layout/picker_adapter_album_spinner.xml

@@ -4,7 +4,7 @@
     <com.vk.attachpicker.widget.LocalImageView android:layout_gravity="center_vertical" android:id="@id/tiv_album_image" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginLeft="8.0dip" android:scaleType="centerCrop" />
     <View android:layout_gravity="center_vertical" android:layout_width="1.0px" android:layout_height="48.0dip" />
     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip">
-        <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="bottom|center|left" android:id="@id/tv_title" android:paddingBottom="1.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:singleLine="true" />
+        <TextView android:textSize="16.0dip" android:textColor="#ffb9b9b9" android:gravity="bottom|center|left" android:id="@id/tv_title" android:paddingBottom="1.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:singleLine="true" />
         <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:gravity="center|left|top" android:id="@id/tv_photos_count" android:layout_width="wrap_content" android:layout_height="fill_parent" android:singleLine="true" />
     </LinearLayout>
 </LinearLayout>

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="?tabbar_background" android:layout_width="fill_parent" android:layout_height="56.0dip"
+<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"
   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="?accent" 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="@color/accent_blue" 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="?accent" 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="@color/accent_blue" style="@style/AttachPicker.Header.TextView" />
     </FrameLayout>
 </LinearLayout>