From 18dbc4cf2813c165f501d1082c964c8812265511 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Fri, 3 Jun 2022 18:49:48 +0200
Subject: [PATCH] xml formatted

---
 .../drawable-v24/ic_launcher_foreground.xml   |  50 ++--
 app/src/main/res/drawable/ic_add.xml          |   6 +-
 app/src/main/res/drawable/ic_arrow_down.xml   |   6 +-
 app/src/main/res/drawable/ic_arrow_down2.xml  |  13 +-
 .../main/res/drawable/ic_arrow_up_down.xml    |   8 +-
 app/src/main/res/drawable/ic_aspect_ratio.xml |  13 +-
 app/src/main/res/drawable/ic_bell.xml         |   8 +-
 app/src/main/res/drawable/ic_bell_small.xml   |   8 +-
 app/src/main/res/drawable/ic_block.xml        |   2 +-
 app/src/main/res/drawable/ic_campaign.xml     |   6 +-
 app/src/main/res/drawable/ic_close.xml        |   6 +-
 app/src/main/res/drawable/ic_color.xml        |   6 +-
 app/src/main/res/drawable/ic_delete.xml       |   6 +-
 app/src/main/res/drawable/ic_download.xml     |   6 +-
 app/src/main/res/drawable/ic_filter.xml       |   2 +-
 app/src/main/res/drawable/ic_grid.xml         |   6 +-
 app/src/main/res/drawable/ic_hd.xml           |   6 +-
 app/src/main/res/drawable/ic_hearted.xml      |   6 +-
 app/src/main/res/drawable/ic_home.xml         |   2 +-
 .../main/res/drawable/ic_home_outlined.xml    |   2 +-
 app/src/main/res/drawable/ic_info.xml         |   6 +-
 .../res/drawable/ic_launcher_background.xml   | 232 +++++++++++++-----
 app/src/main/res/drawable/ic_library.xml      |   6 +-
 app/src/main/res/drawable/ic_like.xml         |   6 +-
 app/src/main/res/drawable/ic_list.xml         |   6 +-
 app/src/main/res/drawable/ic_login.xml        |   6 +-
 app/src/main/res/drawable/ic_pause.xml        |   6 +-
 app/src/main/res/drawable/ic_pinned.xml       |   8 +-
 app/src/main/res/drawable/ic_play.xml         |   6 +-
 app/src/main/res/drawable/ic_playlist.xml     |  13 +-
 app/src/main/res/drawable/ic_region.xml       |   6 +-
 app/src/main/res/drawable/ic_save.xml         |   6 +-
 app/src/main/res/drawable/ic_search.xml       |  10 +-
 app/src/main/res/drawable/ic_search2.xml      |   6 +-
 app/src/main/res/drawable/ic_server.xml       |   6 +-
 app/src/main/res/drawable/ic_share.xml        |   6 +-
 app/src/main/res/drawable/ic_sponsorblock.xml |   4 +-
 .../main/res/drawable/ic_subscriptions.xml    |   6 +-
 app/src/main/res/drawable/ic_theme.xml        |   2 +-
 app/src/main/res/drawable/ic_thumb_up.xml     |   6 +-
 app/src/main/res/drawable/ic_translate.xml    |   6 +-
 app/src/main/res/drawable/ic_trash.xml        |   2 +-
 app/src/main/res/drawable/ic_upload.xml       |   6 +-
 app/src/main/res/drawable/ic_verified.xml     |   6 +-
 app/src/main/res/drawable/ic_vlc.xml          |  19 +-
 app/src/main/res/drawable/ic_wifi_off.xml     |   6 +-
 app/src/main/res/layout/activity_main.xml     |  11 +-
 .../main/res/layout/activity_nointernet.xml   |   1 -
 app/src/main/res/layout/activity_player.xml   |   7 +-
 .../main/res/layout/channel_search_row.xml    |   4 +-
 .../res/layout/channel_subscription_row.xml   |   7 +-
 app/src/main/res/layout/comments_row.xml      |   4 +-
 .../main/res/layout/dialog_addtoplaylist.xml  |  24 +-
 .../res/layout/dialog_create_playlist.xml     |  44 ++--
 app/src/main/res/layout/dialog_download.xml   |  38 +--
 app/src/main/res/layout/dialog_login.xml      |  45 ++--
 app/src/main/res/layout/dialog_logout.xml     |  23 +-
 .../layout/exo_styled_player_control_view.xml | 125 ++++++----
 app/src/main/res/layout/fragment_channel.xml  |  26 +-
 app/src/main/res/layout/fragment_home.xml     |  23 +-
 app/src/main/res/layout/fragment_player.xml   |   4 +-
 app/src/main/res/layout/fragment_playlist.xml |  66 ++---
 app/src/main/res/layout/fragment_search.xml   |   5 +-
 .../res/layout/fragment_subscriptions.xml     |   6 +-
 app/src/main/res/layout/playlist_row.xml      |  13 +-
 .../main/res/layout/playlist_search_row.xml   |  21 +-
 app/src/main/res/layout/playlists_row.xml     |  10 +-
 app/src/main/res/layout/searchhistory_row.xml |   4 +-
 app/src/main/res/layout/trending_row.xml      |  12 +-
 app/src/main/res/layout/video_channel_row.xml |   9 +-
 app/src/main/res/layout/video_search_row.xml  |   8 +-
 app/src/main/res/menu/action_bar.xml          |   6 +-
 app/src/main/res/menu/bottom_menu.xml         |  15 +-
 .../main/res/mipmap-anydpi-v26/ic_bird.xml    |   4 +-
 .../res/mipmap-anydpi-v26/ic_bird_round.xml   |   4 +-
 .../main/res/mipmap-anydpi-v26/ic_fire.xml    |   4 +-
 .../res/mipmap-anydpi-v26/ic_fire_round.xml   |   4 +-
 .../main/res/mipmap-anydpi-v26/ic_flame.xml   |   4 +-
 .../res/mipmap-anydpi-v26/ic_flame_round.xml  |   4 +-
 .../res/mipmap-anydpi-v26/ic_gradient.xml     |   4 +-
 .../mipmap-anydpi-v26/ic_gradient_round.xml   |   4 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   4 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   4 +-
 .../main/res/mipmap-anydpi-v26/ic_legacy.xml  |   4 +-
 .../res/mipmap-anydpi-v26/ic_legacy_round.xml |   4 +-
 .../main/res/mipmap-anydpi-v26/ic_shaped.xml  |   4 +-
 .../res/mipmap-anydpi-v26/ic_shaped_round.xml |   4 +-
 .../main/res/mipmap-anydpi-v26/ic_torch.xml   |   4 +-
 .../res/mipmap-anydpi-v26/ic_torch_round.xml  |   4 +-
 app/src/main/res/navigation/nav.xml           |   7 +-
 app/src/main/res/values-night/themes.xml      | 135 ++++++----
 app/src/main/res/values-v23/themes.xml        | 135 ++++++----
 app/src/main/res/values/style.xml             |   1 +
 app/src/main/res/values/themes.xml            | 137 +++++++----
 app/src/main/res/xml/activity_main_scene.xml  |  48 ++--
 app/src/main/res/xml/player_scene.xml         |  46 ++--
 app/src/main/res/xml/settings.xml             | 168 ++++++-------
 .../main/res/xml/sponsorblock_settings.xml    |  52 ++--
 98 files changed, 1093 insertions(+), 827 deletions(-)

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 8bb9833ba..88a84c281 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -4,27 +4,31 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.084375"
-      android:scaleY="0.084375">
-    <path
-        android:pathData="M0,0h1280v1280h-1280z"
-        android:fillColor="#161316"/>
-    <path
-        android:pathData="M880,639.6C880,637.1 878.6,634.7 876.4,633.4L495,410.4C488.4,406.5 480,411.3 480,419V515.2C480,518.8 481.9,522.1 485.1,523.9L675.1,631.2C681.9,635 681.9,644.8 675.1,648.6L485.1,755.9C481.9,757.7 480,761 480,764.6V860.8C480,868.5 488.4,873.3 495.1,869.4L876.4,645.9C878.6,644.6 880,642.2 880,639.6Z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startX="680"
-            android:startY="409"
-            android:endX="680"
-            android:endY="870.8"
-            android:type="linear">
-          <item android:offset="0" android:color="#FFFF5A8B"/>
-          <item android:offset="1" android:color="#FFFFD1A7"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M614.7,631.1C621.4,634.9 621.4,644.7 614.7,648.5L494.9,716.4C488.3,720.2 480,715.3 480,707.7V571.9C480,564.2 488.3,559.4 494.9,563.2L614.7,631.1Z"
-        android:fillColor="#F2EEFF"/>
-  </group>
+    <group
+        android:scaleX="0.084375"
+        android:scaleY="0.084375">
+        <path
+            android:pathData="M0,0h1280v1280h-1280z"
+            android:fillColor="#161316" />
+        <path android:pathData="M880,639.6C880,637.1 878.6,634.7 876.4,633.4L495,410.4C488.4,406.5 480,411.3 480,419V515.2C480,518.8 481.9,522.1 485.1,523.9L675.1,631.2C681.9,635 681.9,644.8 675.1,648.6L485.1,755.9C481.9,757.7 480,761 480,764.6V860.8C480,868.5 488.4,873.3 495.1,869.4L876.4,645.9C878.6,644.6 880,642.2 880,639.6Z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:startX="680"
+                    android:startY="409"
+                    android:endX="680"
+                    android:endY="870.8"
+                    android:type="linear">
+                    <item
+                        android:offset="0"
+                        android:color="#FFFF5A8B" />
+                    <item
+                        android:offset="1"
+                        android:color="#FFFFD1A7" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:pathData="M614.7,631.1C621.4,634.9 621.4,644.7 614.7,648.5L494.9,716.4C488.3,720.2 480,715.3 480,707.7V571.9C480,564.2 488.3,559.4 494.9,563.2L614.7,631.1Z"
+            android:fillColor="#F2EEFF" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 8d87c4a6a..0dbf2e57a 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorSurface">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index 884bee144..10cedc2e3 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down2.xml b/app/src/main/res/drawable/ic_arrow_down2.xml
index 1aeaa9985..e8123164a 100644
--- a/app/src/main/res/drawable/ic_arrow_down2.xml
+++ b/app/src/main/res/drawable/ic_arrow_down2.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrow_up_down.xml
index 61934e3b2..aa33a09e8 100644
--- a/app/src/main/res/drawable/ic_arrow_up_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_up_down.xml
@@ -4,6 +4,10 @@
     android:viewportHeight="160"
     android:viewportWidth="160"
     android:tint="?attr/colorControlNormal">
-    <path android:fillColor="#FF000000" android:pathData="M30.24,64.96C27.52,67.61 23.16,67.55 20.51,64.82 17.86,62.1 17.92,57.74 20.64,55.09L75.43,1.97 80.23,6.9 75.42,1.95c2.74,-2.65 7.1,-2.58 9.76,0.15 0.08,0.08 0.15,0.16 0.23,0.24L139.36,55.1c2.72,2.65 2.78,7.01 0.13,9.73 -2.65,2.72 -7,2.78 -9.73,0.14L80.21,16.5Z"/>
-    <path android:fillColor="#FF000000" android:pathData="M129.76,95.05C132.48,92.4 136.84,92.46 139.49,95.19 142.14,97.91 142.08,102.27 139.36,104.92L84.57,158.04 79.77,153.11 84.58,158.06c-2.74,2.65 -7.1,2.58 -9.76,-0.15 -0.08,-0.08 -0.15,-0.16 -0.23,-0.24L20.64,104.91c-2.72,-2.65 -2.78,-7.01 -0.13,-9.73 2.65,-2.72 7,-2.78 9.73,-0.14L79.79,143.51Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M30.24,64.96C27.52,67.61 23.16,67.55 20.51,64.82 17.86,62.1 17.92,57.74 20.64,55.09L75.43,1.97 80.23,6.9 75.42,1.95c2.74,-2.65 7.1,-2.58 9.76,0.15 0.08,0.08 0.15,0.16 0.23,0.24L139.36,55.1c2.72,2.65 2.78,7.01 0.13,9.73 -2.65,2.72 -7,2.78 -9.73,0.14L80.21,16.5Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M129.76,95.05C132.48,92.4 136.84,92.46 139.49,95.19 142.14,97.91 142.08,102.27 139.36,104.92L84.57,158.04 79.77,153.11 84.58,158.06c-2.74,2.65 -7.1,2.58 -9.76,-0.15 -0.08,-0.08 -0.15,-0.16 -0.23,-0.24L20.64,104.91c-2.72,-2.65 -2.78,-7.01 -0.13,-9.73 2.65,-2.72 7,-2.78 9.73,-0.14L79.79,143.51Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_aspect_ratio.xml b/app/src/main/res/drawable/ic_aspect_ratio.xml
index c7b8b5f55..4f2bff3ea 100644
--- a/app/src/main/res/drawable/ic_aspect_ratio.xml
+++ b/app/src/main/res/drawable/ic_aspect_ratio.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,12h-2v3h-3v2h5v-5zM7,9h3L10,7L5,7v5h2L7,9zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02z"/>
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,12h-2v3h-3v2h5v-5zM7,9h3L10,7L5,7v5h2L7,9zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bell.xml b/app/src/main/res/drawable/ic_bell.xml
index fede204c4..a65a68661 100644
--- a/app/src/main/res/drawable/ic_bell.xml
+++ b/app/src/main/res/drawable/ic_bell.xml
@@ -3,8 +3,8 @@
     android:height="20dp"
     android:viewportWidth="18"
     android:viewportHeight="20">
-  <path
-      android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
-      android:fillColor="#E6E1E5"
-      android:fillType="evenOdd"/>
+    <path
+        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
+        android:fillColor="#E6E1E5"
+        android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bell_small.xml b/app/src/main/res/drawable/ic_bell_small.xml
index ef834c1e1..c9f18e09d 100644
--- a/app/src/main/res/drawable/ic_bell_small.xml
+++ b/app/src/main/res/drawable/ic_bell_small.xml
@@ -3,8 +3,8 @@
     android:height="16dp"
     android:viewportWidth="18"
     android:viewportHeight="20">
-  <path
-      android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
-      android:fillColor="#E6E1E5"
-      android:fillType="evenOdd"/>
+    <path
+        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
+        android:fillColor="#E6E1E5"
+        android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml
index 268f04edb..e594b916e 100644
--- a/app/src/main/res/drawable/ic_block.xml
+++ b/app/src/main/res/drawable/ic_block.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
+    <path
         android:fillColor="#FF000000"
         android:pathData="M7,24Q7,27.05 8.1,29.875Q9.2,32.7 11.05,34.95L34.95,11.05Q32.65,9.1 29.85,8.05Q27.05,7 24,7Q16.9,7 11.95,11.95Q7,16.9 7,24ZM13.05,37Q15.3,38.95 18.125,39.975Q20.95,41 24,41Q31.1,41 36.05,36.05Q41,31.1 41,24Q41,20.95 39.95,18.15Q38.9,15.35 37,13.05ZM4,24Q4,19.85 5.575,16.2Q7.15,12.55 9.85,9.85Q12.55,7.15 16.2,5.575Q19.85,4 24,4Q28.15,4 31.8,5.575Q35.45,7.15 38.15,9.85Q40.85,12.55 42.425,16.2Q44,19.85 44,24Q44,28.15 42.425,31.8Q40.85,35.45 38.15,38.15Q35.45,40.85 31.8,42.425Q28.15,44 24,44Q19.85,44 16.2,42.425Q12.55,40.85 9.85,38.15Q7.15,35.45 5.575,31.8Q4,28.15 4,24Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml
index 09e69863c..9a5eb603d 100644
--- a/app/src/main/res/drawable/ic_campaign.xml
+++ b/app/src/main/res/drawable/ic_campaign.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,11v2h4v-2h-4zM16,17.61c0.96,0.71 2.21,1.65 3.2,2.39 0.4,-0.53 0.8,-1.07 1.2,-1.6 -0.99,-0.74 -2.24,-1.68 -3.2,-2.4 -0.4,0.54 -0.8,1.08 -1.2,1.61zM20.4,5.6c-0.4,-0.53 -0.8,-1.07 -1.2,-1.6 -0.99,0.74 -2.24,1.68 -3.2,2.4 0.4,0.53 0.8,1.07 1.2,1.6 0.96,-0.72 2.21,-1.65 3.2,-2.4zM4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3L13,6L8,9L4,9zM15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69c0.92,-0.81 1.5,-2.01 1.5,-3.34z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,11v2h4v-2h-4zM16,17.61c0.96,0.71 2.21,1.65 3.2,2.39 0.4,-0.53 0.8,-1.07 1.2,-1.6 -0.99,-0.74 -2.24,-1.68 -3.2,-2.4 -0.4,0.54 -0.8,1.08 -1.2,1.61zM20.4,5.6c-0.4,-0.53 -0.8,-1.07 -1.2,-1.6 -0.99,0.74 -2.24,1.68 -3.2,2.4 0.4,0.53 0.8,1.07 1.2,1.6 0.96,-0.72 2.21,-1.65 3.2,-2.4zM4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3L13,6L8,9L4,9zM15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69c0.92,-0.81 1.5,-2.01 1.5,-3.34z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 89466258f..3b3c877a9 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_color.xml b/app/src/main/res/drawable/ic_color.xml
index cd24727ea..c7a650c29 100644
--- a/app/src/main/res/drawable/ic_color.xml
+++ b/app/src/main/res/drawable/ic_color.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 65268d9c8..1726235a5 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6Q4.575,6 4.287,5.713Q4,5.425 4,5Q4,4.575 4.287,4.287Q4.575,4 5,4H9Q9,3.575 9.288,3.287Q9.575,3 10,3H14Q14.425,3 14.713,3.287Q15,3.575 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5Q20,5.425 19.712,5.713Q19.425,6 19,6V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM7,6V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19V6ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19V6ZM12,13.9 L13.9,15.8Q14.2,16.075 14.613,16.075Q15.025,16.075 15.3,15.8Q15.6,15.5 15.6,15.087Q15.6,14.675 15.3,14.4L13.4,12.5L15.3,10.6Q15.6,10.3 15.6,9.887Q15.6,9.475 15.3,9.2Q15.025,8.9 14.613,8.9Q14.2,8.9 13.9,9.2L12,11.1L10.1,9.2Q9.825,8.9 9.413,8.9Q9,8.9 8.7,9.2Q8.425,9.475 8.425,9.887Q8.425,10.3 8.7,10.6L10.6,12.5L8.7,14.4Q8.425,14.675 8.425,15.087Q8.425,15.5 8.7,15.8Q9,16.075 9.413,16.075Q9.825,16.075 10.1,15.8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6Q4.575,6 4.287,5.713Q4,5.425 4,5Q4,4.575 4.287,4.287Q4.575,4 5,4H9Q9,3.575 9.288,3.287Q9.575,3 10,3H14Q14.425,3 14.713,3.287Q15,3.575 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5Q20,5.425 19.712,5.713Q19.425,6 19,6V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM7,6V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19V6ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19V6ZM12,13.9 L13.9,15.8Q14.2,16.075 14.613,16.075Q15.025,16.075 15.3,15.8Q15.6,15.5 15.6,15.087Q15.6,14.675 15.3,14.4L13.4,12.5L15.3,10.6Q15.6,10.3 15.6,9.887Q15.6,9.475 15.3,9.2Q15.025,8.9 14.613,8.9Q14.2,8.9 13.9,9.2L12,11.1L10.1,9.2Q9.825,8.9 9.413,8.9Q9,8.9 8.7,9.2Q8.425,9.475 8.425,9.887Q8.425,10.3 8.7,10.6L10.6,12.5L8.7,14.4Q8.425,14.675 8.425,15.087Q8.425,15.5 8.7,15.8Q9,16.075 9.413,16.075Q9.825,16.075 10.1,15.8Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index 5cf9f5d19..fb059c16b 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index e0b21ad93..0761dca14 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -6,5 +6,5 @@
     android:width="24dp">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_grid.xml b/app/src/main/res/drawable/ic_grid.xml
index 6c7b4d242..da4463144 100644
--- a/app/src/main/res/drawable/ic_grid.xml
+++ b/app/src/main/res/drawable/ic_grid.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M5,11Q4.175,11 3.587,10.412Q3,9.825 3,9V5Q3,4.175 3.587,3.587Q4.175,3 5,3H9Q9.825,3 10.413,3.587Q11,4.175 11,5V9Q11,9.825 10.413,10.412Q9.825,11 9,11ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V15Q3,14.175 3.587,13.587Q4.175,13 5,13H9Q9.825,13 10.413,13.587Q11,14.175 11,15V19Q11,19.825 10.413,20.413Q9.825,21 9,21ZM15,11Q14.175,11 13.588,10.412Q13,9.825 13,9V5Q13,4.175 13.588,3.587Q14.175,3 15,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V9Q21,9.825 20.413,10.412Q19.825,11 19,11ZM15,21Q14.175,21 13.588,20.413Q13,19.825 13,19V15Q13,14.175 13.588,13.587Q14.175,13 15,13H19Q19.825,13 20.413,13.587Q21,14.175 21,15V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,9H9V5H5ZM15,9H19V5H15ZM15,19H19V15H15ZM5,19H9V15H5ZM15,9ZM15,15ZM9,15ZM9,9Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5,11Q4.175,11 3.587,10.412Q3,9.825 3,9V5Q3,4.175 3.587,3.587Q4.175,3 5,3H9Q9.825,3 10.413,3.587Q11,4.175 11,5V9Q11,9.825 10.413,10.412Q9.825,11 9,11ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V15Q3,14.175 3.587,13.587Q4.175,13 5,13H9Q9.825,13 10.413,13.587Q11,14.175 11,15V19Q11,19.825 10.413,20.413Q9.825,21 9,21ZM15,11Q14.175,11 13.588,10.412Q13,9.825 13,9V5Q13,4.175 13.588,3.587Q14.175,3 15,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V9Q21,9.825 20.413,10.412Q19.825,11 19,11ZM15,21Q14.175,21 13.588,20.413Q13,19.825 13,19V15Q13,14.175 13.588,13.587Q14.175,13 15,13H19Q19.825,13 20.413,13.587Q21,14.175 21,15V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,9H9V5H5ZM15,9H19V5H15ZM15,19H19V15H15ZM5,19H9V15H5ZM15,9ZM15,15ZM9,15ZM9,9Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml
index 88f881355..4a7a2058b 100644
--- a/app/src/main/res/drawable/ic_hd.xml
+++ b/app/src/main/res/drawable/ic_hd.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M6.75,15Q7.075,15 7.287,14.787Q7.5,14.575 7.5,14.25V13H9.5V14.25Q9.5,14.575 9.713,14.787Q9.925,15 10.25,15Q10.575,15 10.788,14.787Q11,14.575 11,14.25V9.75Q11,9.425 10.788,9.212Q10.575,9 10.25,9Q9.925,9 9.713,9.212Q9.5,9.425 9.5,9.75V11.5H7.5V9.75Q7.5,9.425 7.287,9.212Q7.075,9 6.75,9Q6.425,9 6.213,9.212Q6,9.425 6,9.75V14.25Q6,14.575 6.213,14.787Q6.425,15 6.75,15ZM13.5,15H17Q17.425,15 17.712,14.712Q18,14.425 18,14V10Q18,9.575 17.712,9.287Q17.425,9 17,9H13.5Q13.3,9 13.15,9.15Q13,9.3 13,9.5V14.5Q13,14.7 13.15,14.85Q13.3,15 13.5,15ZM14.5,13.5V10.5H16.5Q16.5,10.5 16.5,10.5Q16.5,10.5 16.5,10.5V13.5Q16.5,13.5 16.5,13.5Q16.5,13.5 16.5,13.5ZM4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18H20Q20,18 20,18Q20,18 20,18V6Q20,6 20,6Q20,6 20,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.75,15Q7.075,15 7.287,14.787Q7.5,14.575 7.5,14.25V13H9.5V14.25Q9.5,14.575 9.713,14.787Q9.925,15 10.25,15Q10.575,15 10.788,14.787Q11,14.575 11,14.25V9.75Q11,9.425 10.788,9.212Q10.575,9 10.25,9Q9.925,9 9.713,9.212Q9.5,9.425 9.5,9.75V11.5H7.5V9.75Q7.5,9.425 7.287,9.212Q7.075,9 6.75,9Q6.425,9 6.213,9.212Q6,9.425 6,9.75V14.25Q6,14.575 6.213,14.787Q6.425,15 6.75,15ZM13.5,15H17Q17.425,15 17.712,14.712Q18,14.425 18,14V10Q18,9.575 17.712,9.287Q17.425,9 17,9H13.5Q13.3,9 13.15,9.15Q13,9.3 13,9.5V14.5Q13,14.7 13.15,14.85Q13.3,15 13.5,15ZM14.5,13.5V10.5H16.5Q16.5,10.5 16.5,10.5Q16.5,10.5 16.5,10.5V13.5Q16.5,13.5 16.5,13.5Q16.5,13.5 16.5,13.5ZM4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18H20Q20,18 20,18Q20,18 20,18V6Q20,6 20,6Q20,6 20,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_hearted.xml b/app/src/main/res/drawable/ic_hearted.xml
index f690e38fd..026c4821e 100644
--- a/app/src/main/res/drawable/ic_hearted.xml
+++ b/app/src/main/res/drawable/ic_hearted.xml
@@ -3,7 +3,7 @@
     android:height="66.911dp"
     android:viewportWidth="66.911"
     android:viewportHeight="66.911">
-  <path
-      android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z"
-      android:fillColor="#E34326"/>
+    <path
+        android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z"
+        android:fillColor="#E34326" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index b8b77a1be..7eb8f98dd 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
+    <path
         android:fillColor="#FF000000"
         android:pathData="M11,42Q9.75,42 8.875,41.125Q8,40.25 8,39V19.5Q8,18.8 8.325,18.15Q8.65,17.5 9.2,17.1L22.2,7.35Q22.6,7.05 23.05,6.9Q23.5,6.75 24,6.75Q24.5,6.75 24.95,6.9Q25.4,7.05 25.8,7.35L38.8,17.1Q39.35,17.5 39.675,18.15Q40,18.8 40,19.5V39Q40,40.25 39.125,41.125Q38.25,42 37,42H28V28H20V42Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home_outlined.xml b/app/src/main/res/drawable/ic_home_outlined.xml
index 99f7f8218..3825c2fa1 100644
--- a/app/src/main/res/drawable/ic_home_outlined.xml
+++ b/app/src/main/res/drawable/ic_home_outlined.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
+    <path
         android:fillColor="#FF000000"
         android:pathData="M11,39H18.5V26.5H29.5V39H37V19.5L24,9.75L11,19.5ZM11,42Q9.75,42 8.875,41.125Q8,40.25 8,39V19.5Q8,18.8 8.325,18.15Q8.65,17.5 9.2,17.1L22.2,7.35Q22.6,7.05 23.05,6.9Q23.5,6.75 24,6.75Q24.5,6.75 24.95,6.9Q25.4,7.05 25.8,7.35L38.8,17.1Q39.35,17.5 39.675,18.15Q40,18.8 40,19.5V39Q40,40.25 39.125,41.125Q38.25,42 37,42H26.5V29.5H21.5V42ZM24,24.35Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 8f9a9042a..2f9babaa3 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,17Q12.425,17 12.713,16.712Q13,16.425 13,16V11.975Q13,11.55 12.713,11.275Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12V16.025Q11,16.45 11.288,16.725Q11.575,17 12,17ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,17Q12.425,17 12.713,16.712Q13,16.425 13,16V11.975Q13,11.55 12.713,11.275Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12V16.025Q11,16.45 11.288,16.725Q11.575,17 12,17ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index ca3826a46..5cc10bf6c 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,74 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
+<vector android:height="108dp"
     android:width="108dp"
     android:viewportHeight="108"
     android:viewportWidth="108"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index d4cfbb741..f49974c03 100644
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M23.5,27.85 L32.25,22.25Q32.95,21.8 32.95,21Q32.95,20.2 32.25,19.75L23.5,14.15Q22.75,13.65 21.975,14.075Q21.2,14.5 21.2,15.4V26.6Q21.2,27.5 21.975,27.925Q22.75,28.35 23.5,27.85ZM13,38Q11.8,38 10.9,37.1Q10,36.2 10,35V7Q10,5.8 10.9,4.9Q11.8,4 13,4H41Q42.2,4 43.1,4.9Q44,5.8 44,7V35Q44,36.2 43.1,37.1Q42.2,38 41,38ZM7,44Q5.8,44 4.9,43.1Q4,42.2 4,41V11.5Q4,10.85 4.425,10.425Q4.85,10 5.5,10Q6.15,10 6.575,10.425Q7,10.85 7,11.5V41Q7,41 7,41Q7,41 7,41H36.5Q37.15,41 37.575,41.425Q38,41.85 38,42.5Q38,43.15 37.575,43.575Q37.15,44 36.5,44Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23.5,27.85 L32.25,22.25Q32.95,21.8 32.95,21Q32.95,20.2 32.25,19.75L23.5,14.15Q22.75,13.65 21.975,14.075Q21.2,14.5 21.2,15.4V26.6Q21.2,27.5 21.975,27.925Q22.75,28.35 23.5,27.85ZM13,38Q11.8,38 10.9,37.1Q10,36.2 10,35V7Q10,5.8 10.9,4.9Q11.8,4 13,4H41Q42.2,4 43.1,4.9Q44,5.8 44,7V35Q44,36.2 43.1,37.1Q42.2,38 41,38ZM7,44Q5.8,44 4.9,43.1Q4,42.2 4,41V11.5Q4,10.85 4.425,10.425Q4.85,10 5.5,10Q6.15,10 6.575,10.425Q7,10.85 7,11.5V41Q7,41 7,41Q7,41 7,41H36.5Q37.15,41 37.575,41.425Q38,41.85 38,42.5Q38,43.15 37.575,43.575Q37.15,44 36.5,44Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
index 6a39a3934..f55183f28 100644
--- a/app/src/main/res/drawable/ic_like.xml
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml
index 9884aeb83..f5811370e 100644
--- a/app/src/main/res/drawable/ic_list.xml
+++ b/app/src/main/res/drawable/ic_list.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index ce29cf2d2..8b9ac53cf 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M9.325,16.275Q9.05,15.95 9.05,15.537Q9.05,15.125 9.325,14.85L11.175,13H4Q3.575,13 3.288,12.712Q3,12.425 3,12Q3,11.575 3.288,11.287Q3.575,11 4,11H11.175L9.325,9.15Q9.025,8.85 9.025,8.438Q9.025,8.025 9.325,7.725Q9.6,7.425 10.013,7.425Q10.425,7.425 10.7,7.7L14.3,11.3Q14.45,11.45 14.513,11.625Q14.575,11.8 14.575,12Q14.575,12.2 14.513,12.375Q14.45,12.55 14.3,12.7L10.7,16.3Q10.4,16.6 10,16.575Q9.6,16.55 9.325,16.275ZM13,21Q12.575,21 12.288,20.712Q12,20.425 12,20Q12,19.575 12.288,19.288Q12.575,19 13,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H13Q12.575,5 12.288,4.712Q12,4.425 12,4Q12,3.575 12.288,3.287Q12.575,3 13,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.325,16.275Q9.05,15.95 9.05,15.537Q9.05,15.125 9.325,14.85L11.175,13H4Q3.575,13 3.288,12.712Q3,12.425 3,12Q3,11.575 3.288,11.287Q3.575,11 4,11H11.175L9.325,9.15Q9.025,8.85 9.025,8.438Q9.025,8.025 9.325,7.725Q9.6,7.425 10.013,7.425Q10.425,7.425 10.7,7.7L14.3,11.3Q14.45,11.45 14.513,11.625Q14.575,11.8 14.575,12Q14.575,12.2 14.513,12.375Q14.45,12.55 14.3,12.7L10.7,16.3Q10.4,16.6 10,16.575Q9.6,16.55 9.325,16.275ZM13,21Q12.575,21 12.288,20.712Q12,20.425 12,20Q12,19.575 12.288,19.288Q12.575,19 13,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H13Q12.575,5 12.288,4.712Q12,4.425 12,4Q12,3.575 12.288,3.287Q12.575,3 13,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 13d6d2ec0..7e8a3e2ad 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pinned.xml b/app/src/main/res/drawable/ic_pinned.xml
index f1e14a868..e08649fa0 100644
--- a/app/src/main/res/drawable/ic_pinned.xml
+++ b/app/src/main/res/drawable/ic_pinned.xml
@@ -4,8 +4,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"
+        android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 163461d92..803ba506b 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M8,5v14l11,-7z"/>
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_playlist.xml b/app/src/main/res/drawable/ic_playlist.xml
index 84a357ccf..24d17c426 100644
--- a/app/src/main/res/drawable/ic_playlist.xml
+++ b/app/src/main/res/drawable/ic_playlist.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M4,10h12v2L4,12zM4,6h12v2L4,8zM4,14h8v2L4,16zM14,14v6l5,-3z"/>
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,10h12v2L4,12zM4,6h12v2L4,8zM4,14h8v2L4,16zM14,14v6l5,-3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_region.xml b/app/src/main/res/drawable/ic_region.xml
index 5f87c0736..c311f9af4 100644
--- a/app/src/main/res/drawable/ic_region.xml
+++ b/app/src/main/res/drawable/ic_region.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index 249474523..602bb91b5 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 1c62ad710..451a03301 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,8 +1,12 @@
 <vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
     android:tint="?attr/colorControlNormal"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 
 
 </vector>
diff --git a/app/src/main/res/drawable/ic_search2.xml b/app/src/main/res/drawable/ic_search2.xml
index d401039d2..5188b2a93 100644
--- a/app/src/main/res/drawable/ic_search2.xml
+++ b/app/src/main/res/drawable/ic_search2.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml
index 67222c8b7..e9b4dcdfb 100644
--- a/app/src/main/res/drawable/ic_server.xml
+++ b/app/src/main/res/drawable/ic_server.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-    android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 2f13bb3e2..5002dcc14 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sponsorblock.xml b/app/src/main/res/drawable/ic_sponsorblock.xml
index ffdc099ab..c16db6ea8 100644
--- a/app/src/main/res/drawable/ic_sponsorblock.xml
+++ b/app/src/main/res/drawable/ic_sponsorblock.xml
@@ -6,8 +6,8 @@
     android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z"/>
+        android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z"/>
+        android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_subscriptions.xml b/app/src/main/res/drawable/ic_subscriptions.xml
index dd4b93c0b..f877314b4 100644
--- a/app/src/main/res/drawable/ic_subscriptions.xml
+++ b/app/src/main/res/drawable/ic_subscriptions.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M15.5,7Q14.85,7 14.425,6.575Q14,6.15 14,5.5Q14,4.85 14.425,4.425Q14.85,4 15.5,4H32.5Q33.15,4 33.575,4.425Q34,4.85 34,5.5Q34,6.15 33.575,6.575Q33.15,7 32.5,7ZM8.95,13Q8.3,13 7.875,12.575Q7.45,12.15 7.45,11.5Q7.45,10.85 7.875,10.425Q8.3,10 8.95,10H39.05Q39.7,10 40.125,10.425Q40.55,10.85 40.55,11.5Q40.55,12.15 40.125,12.575Q39.7,13 39.05,13ZM7,44Q5.8,44 4.9,43.1Q4,42.2 4,41V19Q4,17.8 4.9,16.9Q5.8,16 7,16H41Q42.2,16 43.1,16.9Q44,17.8 44,19V41Q44,42.2 43.1,43.1Q42.2,44 41,44ZM22.7,35.85 L29.55,31.25Q30.25,30.8 30.25,30Q30.25,29.2 29.55,28.75L22.7,24.15Q21.95,23.65 21.15,24.075Q20.35,24.5 20.35,25.4V34.65Q20.35,35.55 21.15,35.975Q21.95,36.4 22.7,35.85Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,7Q14.85,7 14.425,6.575Q14,6.15 14,5.5Q14,4.85 14.425,4.425Q14.85,4 15.5,4H32.5Q33.15,4 33.575,4.425Q34,4.85 34,5.5Q34,6.15 33.575,6.575Q33.15,7 32.5,7ZM8.95,13Q8.3,13 7.875,12.575Q7.45,12.15 7.45,11.5Q7.45,10.85 7.875,10.425Q8.3,10 8.95,10H39.05Q39.7,10 40.125,10.425Q40.55,10.85 40.55,11.5Q40.55,12.15 40.125,12.575Q39.7,13 39.05,13ZM7,44Q5.8,44 4.9,43.1Q4,42.2 4,41V19Q4,17.8 4.9,16.9Q5.8,16 7,16H41Q42.2,16 43.1,16.9Q44,17.8 44,19V41Q44,42.2 43.1,43.1Q42.2,44 41,44ZM22.7,35.85 L29.55,31.25Q30.25,30.8 30.25,30Q30.25,29.2 29.55,28.75L22.7,24.15Q21.95,23.65 21.15,24.075Q20.35,24.5 20.35,25.4V34.65Q20.35,35.55 21.15,35.975Q21.95,36.4 22.7,35.85Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_theme.xml b/app/src/main/res/drawable/ic_theme.xml
index bba2398d3..6dedd26ca 100644
--- a/app/src/main/res/drawable/ic_theme.xml
+++ b/app/src/main/res/drawable/ic_theme.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="48"
     android:tint="?attr/colorControlNormal">
 
-<path
+    <path
         android:fillColor="#FF000000"
         android:pathData="M24,42Q16.5,42 11.25,36.75Q6,31.5 6,24Q6,17.25 9.975,12.55Q13.95,7.85 20.4,6.5Q22.45,6.1 23.2,7.2Q23.95,8.3 23.15,10.2Q22.7,11.35 22.45,12.55Q22.2,13.75 22.2,15Q22.2,19.5 25.35,22.65Q28.5,25.8 33,25.8Q34.25,25.8 35.425,25.575Q36.6,25.35 37.7,24.95Q39.85,24.15 40.9,25.025Q41.95,25.9 41.45,28Q40.1,34.05 35.4,38.025Q30.7,42 24,42ZM24,39Q29.45,39 33.5,35.625Q37.55,32.25 38.55,27.7Q37.3,28.25 35.875,28.525Q34.45,28.8 33,28.8Q27.25,28.8 23.225,24.775Q19.2,20.75 19.2,15Q19.2,13.8 19.45,12.425Q19.7,11.05 20.35,9.3Q15.45,10.65 12.225,14.775Q9,18.9 9,24Q9,30.25 13.375,34.625Q17.75,39 24,39ZM23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Q23.8,24.15 23.8,24.15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml
index 6a39a3934..f55183f28 100644
--- a/app/src/main/res/drawable/ic_thumb_up.xml
+++ b/app/src/main/res/drawable/ic_thumb_up.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_translate.xml b/app/src/main/res/drawable/ic_translate.xml
index 94e6d4d98..92291014a 100644
--- a/app/src/main/res/drawable/ic_translate.xml
+++ b/app/src/main/res/drawable/ic_translate.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M13.35,22Q12.75,22 12.488,21.613Q12.225,21.225 12.425,20.65L16.075,10.975Q16.225,10.575 16.638,10.287Q17.05,10 17.5,10Q17.925,10 18.35,10.287Q18.775,10.575 18.925,10.975L22.575,20.65Q22.775,21.225 22.513,21.613Q22.25,22 21.625,22Q21.35,22 21.125,21.825Q20.9,21.65 20.8,21.4L19.95,18.95H15.1L14.225,21.4Q14.125,21.65 13.875,21.825Q13.625,22 13.35,22ZM15.7,17.2H19.3L17.55,12.25H17.45ZM7.15,8.55Q7.55,9.275 8,9.887Q8.45,10.5 9.05,11.15Q10.15,9.95 10.875,8.688Q11.6,7.425 12.1,6H2Q1.575,6 1.288,5.713Q1,5.425 1,5Q1,4.575 1.288,4.287Q1.575,4 2,4H8V3Q8,2.575 8.288,2.287Q8.575,2 9,2Q9.425,2 9.713,2.287Q10,2.575 10,3V4H16Q16.425,4 16.712,4.287Q17,4.575 17,5Q17,5.425 16.712,5.713Q16.425,6 16,6H14.1Q13.575,7.775 12.675,9.45Q11.775,11.125 10.45,12.6L12.85,15.05L12.1,17.1L9,14L4.7,18.3Q4.425,18.575 4,18.575Q3.575,18.575 3.3,18.3Q3.025,18.025 3.025,17.6Q3.025,17.175 3.3,16.9L7.65,12.55Q6.975,11.775 6.4,10.987Q5.825,10.2 5.375,9.325Q5.1,8.8 5.35,8.4Q5.6,8 6.225,8Q6.475,8 6.75,8.162Q7.025,8.325 7.15,8.55Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.35,22Q12.75,22 12.488,21.613Q12.225,21.225 12.425,20.65L16.075,10.975Q16.225,10.575 16.638,10.287Q17.05,10 17.5,10Q17.925,10 18.35,10.287Q18.775,10.575 18.925,10.975L22.575,20.65Q22.775,21.225 22.513,21.613Q22.25,22 21.625,22Q21.35,22 21.125,21.825Q20.9,21.65 20.8,21.4L19.95,18.95H15.1L14.225,21.4Q14.125,21.65 13.875,21.825Q13.625,22 13.35,22ZM15.7,17.2H19.3L17.55,12.25H17.45ZM7.15,8.55Q7.55,9.275 8,9.887Q8.45,10.5 9.05,11.15Q10.15,9.95 10.875,8.688Q11.6,7.425 12.1,6H2Q1.575,6 1.288,5.713Q1,5.425 1,5Q1,4.575 1.288,4.287Q1.575,4 2,4H8V3Q8,2.575 8.288,2.287Q8.575,2 9,2Q9.425,2 9.713,2.287Q10,2.575 10,3V4H16Q16.425,4 16.712,4.287Q17,4.575 17,5Q17,5.425 16.712,5.713Q16.425,6 16,6H14.1Q13.575,7.775 12.675,9.45Q11.775,11.125 10.45,12.6L12.85,15.05L12.1,17.1L9,14L4.7,18.3Q4.425,18.575 4,18.575Q3.575,18.575 3.3,18.3Q3.025,18.025 3.025,17.6Q3.025,17.175 3.3,16.9L7.65,12.55Q6.975,11.775 6.4,10.987Q5.825,10.2 5.375,9.325Q5.1,8.8 5.35,8.4Q5.6,8 6.225,8Q6.475,8 6.75,8.162Q7.025,8.325 7.15,8.55Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_trash.xml b/app/src/main/res/drawable/ic_trash.xml
index d52cfe83e..a0969185a 100644
--- a/app/src/main/res/drawable/ic_trash.xml
+++ b/app/src/main/res/drawable/ic_trash.xml
@@ -6,5 +6,5 @@
     android:width="24dp">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
index ac84d528c..c9d009473 100644
--- a/app/src/main/res/drawable/ic_upload.xml
+++ b/app/src/main/res/drawable/ic_upload.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
 
-<path
-      android:fillColor="#FF000000"
-      android:pathData="M12,16Q11.575,16 11.288,15.712Q11,15.425 11,15V7.85L9.125,9.725Q8.825,10.025 8.425,10.025Q8.025,10.025 7.7,9.7Q7.4,9.4 7.413,8.987Q7.425,8.575 7.7,8.3L11.3,4.7Q11.45,4.55 11.625,4.487Q11.8,4.425 12,4.425Q12.2,4.425 12.375,4.487Q12.55,4.55 12.7,4.7L16.3,8.3Q16.6,8.6 16.587,9.012Q16.575,9.425 16.3,9.7Q16,10 15.588,10.012Q15.175,10.025 14.875,9.725L13,7.85V15Q13,15.425 12.713,15.712Q12.425,16 12,16ZM6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V16Q4,15.575 4.287,15.287Q4.575,15 5,15Q5.425,15 5.713,15.287Q6,15.575 6,16V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V16Q18,15.575 18.288,15.287Q18.575,15 19,15Q19.425,15 19.712,15.287Q20,15.575 20,16V18Q20,18.825 19.413,19.413Q18.825,20 18,20Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,16Q11.575,16 11.288,15.712Q11,15.425 11,15V7.85L9.125,9.725Q8.825,10.025 8.425,10.025Q8.025,10.025 7.7,9.7Q7.4,9.4 7.413,8.987Q7.425,8.575 7.7,8.3L11.3,4.7Q11.45,4.55 11.625,4.487Q11.8,4.425 12,4.425Q12.2,4.425 12.375,4.487Q12.55,4.55 12.7,4.7L16.3,8.3Q16.6,8.6 16.587,9.012Q16.575,9.425 16.3,9.7Q16,10 15.588,10.012Q15.175,10.025 14.875,9.725L13,7.85V15Q13,15.425 12.713,15.712Q12.425,16 12,16ZM6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V16Q4,15.575 4.287,15.287Q4.575,15 5,15Q5.425,15 5.713,15.287Q6,15.575 6,16V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V16Q18,15.575 18.288,15.287Q18.575,15 19,15Q19.425,15 19.712,15.287Q20,15.575 20,16V18Q20,18.825 19.413,19.413Q18.825,20 18,20Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
index 259f68822..d7bd40fba 100644
--- a/app/src/main/res/drawable/ic_verified.xml
+++ b/app/src/main/res/drawable/ic_verified.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M23,12l-2.44,-2.79l0.34,-3.69l-3.61,-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7l3.61,0.82L8.6,22.5l3.4,-1.47l3.4,1.46l1.89,-3.19l3.61,-0.82l-0.34,-3.69L23,12zM10.09,16.72l-3.8,-3.81l1.48,-1.48l2.32,2.33l5.85,-5.87l1.48,1.48L10.09,16.72z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M23,12l-2.44,-2.79l0.34,-3.69l-3.61,-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7l3.61,0.82L8.6,22.5l3.4,-1.47l3.4,1.46l1.89,-3.19l3.61,-0.82l-0.34,-3.69L23,12zM10.09,16.72l-3.8,-3.81l1.48,-1.48l2.32,2.33l5.85,-5.87l1.48,1.48L10.09,16.72z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_vlc.xml b/app/src/main/res/drawable/ic_vlc.xml
index 09154ca7e..db03e26e9 100644
--- a/app/src/main/res/drawable/ic_vlc.xml
+++ b/app/src/main/res/drawable/ic_vlc.xml
@@ -1,7 +1,16 @@
-<vector android:height="24dp" android:viewportHeight="1000"
-    android:viewportWidth="1000" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+<vector android:height="24dp"
+    android:viewportHeight="1000"
+    android:viewportWidth="1000"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="?attr/colorControlNormal">
-    <path android:fillColor="@android:color/white" android:pathData="M469.81,12.11c-5.14,0.79 -12.65,6.33 -17,11.86c-6.33,8.3 -23.33,56.15 -37.96,109.13c-5.14,17 77.1,28.47 134.84,18.98c42.31,-7.12 41.12,-4.75 25.7,-56.54c-19.38,-66.03 -25.7,-77.5 -43.1,-82.24C518.05,9.34 486.81,8.95 469.81,12.11z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M356.72,328.83c-1.19,1.58 -13.05,40.73 -26.89,87.39l-24.91,84.62l16.61,14.63c40.33,35.99 154.6,52.99 253.85,37.56c60.89,-9.09 110.71,-30.45 116.64,-49.82c1.98,-5.93 -42.7,-170.42 -47.85,-177.14c-0.79,-0.79 -3.56,0.4 -6.32,2.77c-3.16,2.37 -18.58,7.91 -34.79,12.65c-62.87,18.19 -178.33,13.84 -228.15,-7.91C365.42,329.62 357.51,327.25 356.72,328.83z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M185.51,628.94c-14.24,2.77 -19.77,12.65 -34.8,60.5C85.87,897.82 72.43,942.89 70.45,958.71c-3.95,34 -39.93,31.23 432.58,31.23c459.46,-0 428.23,1.98 428.23,-24.91c0,-6.72 -4.75,-27.29 -10.28,-45.87c-32.42,-107.95 -85.01,-274.81 -88.57,-280.74c-4.35,-8.31 -22.93,-12.26 -61.29,-12.26l-27.68,-0l1.19,24.12l1.58,24.12l-19.77,18.98c-35.19,33.61 -105.18,54.17 -200.47,58.12c-114.67,4.75 -219.06,-20.56 -257.41,-62.87c-13.44,-15.02 -13.84,-17 -12.65,-39.14l1.19,-23.33l-31.63,0.4C208.05,626.96 189.86,628.15 185.51,628.94z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M469.81,12.11c-5.14,0.79 -12.65,6.33 -17,11.86c-6.33,8.3 -23.33,56.15 -37.96,109.13c-5.14,17 77.1,28.47 134.84,18.98c42.31,-7.12 41.12,-4.75 25.7,-56.54c-19.38,-66.03 -25.7,-77.5 -43.1,-82.24C518.05,9.34 486.81,8.95 469.81,12.11z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M356.72,328.83c-1.19,1.58 -13.05,40.73 -26.89,87.39l-24.91,84.62l16.61,14.63c40.33,35.99 154.6,52.99 253.85,37.56c60.89,-9.09 110.71,-30.45 116.64,-49.82c1.98,-5.93 -42.7,-170.42 -47.85,-177.14c-0.79,-0.79 -3.56,0.4 -6.32,2.77c-3.16,2.37 -18.58,7.91 -34.79,12.65c-62.87,18.19 -178.33,13.84 -228.15,-7.91C365.42,329.62 357.51,327.25 356.72,328.83z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M185.51,628.94c-14.24,2.77 -19.77,12.65 -34.8,60.5C85.87,897.82 72.43,942.89 70.45,958.71c-3.95,34 -39.93,31.23 432.58,31.23c459.46,-0 428.23,1.98 428.23,-24.91c0,-6.72 -4.75,-27.29 -10.28,-45.87c-32.42,-107.95 -85.01,-274.81 -88.57,-280.74c-4.35,-8.31 -22.93,-12.26 -61.29,-12.26l-27.68,-0l1.19,24.12l1.58,24.12l-19.77,18.98c-35.19,33.61 -105.18,54.17 -200.47,58.12c-114.67,4.75 -219.06,-20.56 -257.41,-62.87c-13.44,-15.02 -13.84,-17 -12.65,-39.14l1.19,-23.33l-31.63,0.4C208.05,626.96 189.86,628.15 185.51,628.94z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_wifi_off.xml b/app/src/main/res/drawable/ic_wifi_off.xml
index da8346977..b984b8dbc 100644
--- a/app/src/main/res/drawable/ic_wifi_off.xml
+++ b/app/src/main/res/drawable/ic_wifi_off.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M22.99,9C19.15,5.16 13.8,3.76 8.84,4.78l2.52,2.52c3.47,-0.17 6.99,1.05 9.63,3.7l2,-2zM18.99,13c-1.29,-1.29 -2.84,-2.13 -4.49,-2.56l3.53,3.53 0.96,-0.97zM2,3.05L5.07,6.1C3.6,6.82 2.22,7.78 1,9l1.99,2c1.24,-1.24 2.67,-2.16 4.2,-2.77l2.24,2.24C7.81,10.89 6.27,11.73 5,13v0.01L6.99,15c1.36,-1.36 3.14,-2.04 4.92,-2.06L18.98,20l1.27,-1.26L3.29,1.79 2,3.05zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M22.99,9C19.15,5.16 13.8,3.76 8.84,4.78l2.52,2.52c3.47,-0.17 6.99,1.05 9.63,3.7l2,-2zM18.99,13c-1.29,-1.29 -2.84,-2.13 -4.49,-2.56l3.53,3.53 0.96,-0.97zM2,3.05L5.07,6.1C3.6,6.82 2.22,7.78 1,9l1.99,2c1.24,-1.24 2.67,-2.16 4.2,-2.77l2.24,2.24C7.81,10.89 6.27,11.73 5,13v0.01L6.99,15c1.36,-1.36 3.14,-2.04 4.92,-2.06L18.98,20l1.27,-1.26L3.29,1.79 2,3.05zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4b6b86e7f..b30527a37 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,9 +6,9 @@
     android:layout_height="match_parent"
     app:layoutDescription="@xml/activity_main_scene"
     tools:context=".MainActivity"
-    android:id="@+id/mainMotionLayout"
-    >
-        <com.google.android.material.appbar.MaterialToolbar
+    android:id="@+id/mainMotionLayout">
+
+    <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -16,7 +16,7 @@
         app:titleCentered="true"
         app:subtitleCentered="true"
         app:title="@string/app_name"
-            app:navigationIcon="@drawable/ic_settings"
+        app:navigationIcon="@drawable/ic_settings"
 
         />
 
@@ -48,6 +48,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:background="@android:color/transparent"
-        />
+        android:background="@android:color/transparent" />
 </androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_nointernet.xml b/app/src/main/res/layout/activity_nointernet.xml
index a36cb835d..2efa97b9a 100644
--- a/app/src/main/res/layout/activity_nointernet.xml
+++ b/app/src/main/res/layout/activity_nointernet.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index aeddf4375..de8c91236 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Player"
-    android:background="@color/black"
-    >
+    android:background="@color/black">
 
     <com.github.libretube.util.CustomExoPlayerView
         android:id="@+id/fullscreen_player"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/black"
-        />
+        android:background="@color/black" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_search_row.xml b/app/src/main/res/layout/channel_search_row.xml
index 80b4b8a8f..bd82790a1 100644
--- a/app/src/main/res/layout/channel_search_row.xml
+++ b/app/src/main/res/layout/channel_search_row.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    >
+    android:background="?android:attr/selectableItemBackground">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/search_channel_image"
diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index 97cbf0228..1f2628518 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -5,14 +5,15 @@
     android:orientation="vertical"
     android:layout_margin="8dp"
     android:padding="8dp"
-    android:background="?android:attr/selectableItemBackground"
-    >
+    android:background="?android:attr/selectableItemBackground">
+
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/subscription_channel_image"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_gravity="center"
-        android:layout_marginBottom="4dp"/>
+        android:layout_marginBottom="4dp" />
+
     <TextView
         android:text="kirrrrrrrrrrrrrrrrrrrrrrrrrrfgdfg"
         android:id="@+id/subscription_channel_name"
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 40d3d1e83..2c8f21637 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:background="?android:attr/selectableItemBackground"
     android:layout_height="wrap_content">
@@ -11,8 +10,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        >
+        android:paddingBottom="16dp">
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/commentor_image"
diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml
index 534f719bf..162dc5d5d 100644
--- a/app/src/main/res/layout/dialog_addtoplaylist.xml
+++ b/app/src/main/res/layout/dialog_addtoplaylist.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-
+    android:layout_height="wrap_content">
 
 
     <TextView
@@ -15,20 +12,21 @@
         android:text="@string/app_name"
         android:gravity="center"
         android:layout_margin="10dp"
-        android:textSize="20sp"
-        />
+        android:textSize="20sp" />
+
+    <Spinner
+        android:id="@+id/playlists_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:layout_margin="8dp" />
 
-        <Spinner
-            android:id="@+id/playlists_spinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:layout_margin="8dp"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
+
         <Button
             android:id="@+id/addToPlaylist"
             android:layout_width="wrap_content"
@@ -36,7 +34,7 @@
             android:text="@string/addToPlaylist"
             android:textColor="?attr/colorSurface"
             android:padding="8dp"
-            android:layout_margin="8dp"/>
+            android:layout_margin="8dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index 9f9ebe180..b71793853 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -3,9 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-
+    android:layout_height="wrap_content">
 
 
     <TextView
@@ -15,8 +13,7 @@
         android:text="@string/app_name"
         android:gravity="center"
         android:layout_margin="10dp"
-        android:textSize="20sp"
-        />
+        android:textSize="20sp" />
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -32,16 +29,15 @@
         app:boxCornerRadiusBottomStart="15dp"
         app:boxCornerRadiusBottomEnd="15dp"
         app:boxCornerRadiusTopEnd="15dp"
-        app:boxCornerRadiusTopStart="15dp"
-        >
+        app:boxCornerRadiusTopStart="15dp">
 
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/playlist_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/playlistName"
-        android:inputType="text"
-        android:padding="12dp" />
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/playlist_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/playlistName"
+            android:inputType="text"
+            android:padding="12dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
 
@@ -50,6 +46,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
+
         <Button
             android:id="@+id/cancel_button"
             android:layout_width="wrap_content"
@@ -57,15 +54,16 @@
             android:text="@string/cancel"
             android:textColor="?attr/colorSurface"
             android:padding="8dp"
-            android:layout_margin="8dp"/>
-    <Button
-        android:id="@+id/create_new_playlist"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/createPlaylist"
-        android:textColor="?attr/colorSurface"
-        android:padding="8dp"
-        android:layout_margin="8dp"/>
+            android:layout_margin="8dp" />
+
+        <Button
+            android:id="@+id/create_new_playlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/createPlaylist"
+            android:textColor="?attr/colorSurface"
+            android:padding="8dp"
+            android:layout_margin="8dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index e714c5d2f..db9cea487 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
+    android:layout_height="wrap_content">
 
 
     <TextView
@@ -13,44 +12,47 @@
         android:text="@string/app_name"
         android:gravity="center"
         android:layout_margin="10dp"
-        android:textSize="20sp"
-        />
+        android:textSize="20sp" />
 
     <Spinner
         android:id="@+id/video_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        />
+        android:layout_margin="8dp" />
+
     <Spinner
         android:id="@+id/audio_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"/>
+        android:layout_margin="8dp" />
+
     <RadioGroup
         android:id="@+id/radioGp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp">
+
         <RadioButton
             android:id="@+id/mkv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text=".mkv"
-            android:checked="true"/>
+            android:checked="true" />
+
         <RadioButton
             android:id="@+id/mp4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text=".mp4"/>
+            android:text=".mp4" />
     </RadioGroup>
-        <Button
-            android:id="@+id/download"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/download"
-            android:textColor="?attr/colorSurface"
-            android:padding="8dp"
-            android:layout_margin="8dp"
-            android:layout_gravity="center"/>
+
+    <Button
+        android:id="@+id/download"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/download"
+        android:textColor="?attr/colorSurface"
+        android:padding="8dp"
+        android:layout_margin="8dp"
+        android:layout_gravity="center" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index dc006bf64..433baaa91 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -3,10 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-
-
+    android:layout_height="wrap_content">
 
 
     <TextView
@@ -16,8 +13,7 @@
         android:text="@string/app_name"
         android:gravity="center"
         android:layout_margin="10dp"
-        android:textSize="20sp"
-        />
+        android:textSize="20sp" />
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -32,16 +28,15 @@
         app:boxCornerRadiusBottomStart="15dp"
         app:boxCornerRadiusBottomEnd="15dp"
         app:boxCornerRadiusTopEnd="15dp"
-        app:boxCornerRadiusTopStart="15dp"
-        >
+        app:boxCornerRadiusTopStart="15dp">
 
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/username"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/username"
-        android:inputType="text"
-        android:padding="12dp" />
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/username"
+            android:inputType="text"
+            android:padding="12dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -76,6 +71,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center">
+
         <Button
             android:id="@+id/register"
             android:layout_width="wrap_content"
@@ -83,15 +79,16 @@
             android:text="@string/register"
             android:textColor="?attr/colorSurface"
             android:padding="8dp"
-            android:layout_margin="8dp"/>
-    <Button
-        android:id="@+id/login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/login"
-        android:textColor="?attr/colorSurface"
-        android:padding="8dp"
-        android:layout_margin="8dp"/>
+            android:layout_margin="8dp" />
+
+        <Button
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/login"
+            android:textColor="?attr/colorSurface"
+            android:padding="8dp"
+            android:layout_margin="8dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
index 347ea3a93..04d54ffd2 100644
--- a/app/src/main/res/layout/dialog_logout.xml
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -11,8 +11,7 @@
         android:text="@string/app_name"
         android:gravity="center"
         android:layout_margin="10dp"
-        android:textSize="20sp"
-        />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/user"
@@ -20,16 +19,16 @@
         android:layout_height="wrap_content"
         android:text="@string/already_logged_in"
         android:padding="8dp"
+        android:layout_margin="8dp" />
+
+    <Button
+        android:id="@+id/logout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/logout"
+        android:textColor="?attr/colorSurface"
+        android:padding="8dp"
         android:layout_margin="8dp"
-        />
-        <Button
-            android:id="@+id/logout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/logout"
-            android:textColor="?attr/colorSurface"
-            android:padding="8dp"
-            android:layout_margin="8dp"
-            android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 4a1a1898e..2c534bc78 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright 2020 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -21,11 +20,14 @@
          determined. See: https://github.com/google/ExoPlayer/issues/8726.
     -->
 
-    <View android:id="@id/exo_controls_background"
+    <View
+        android:id="@id/exo_controls_background"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/exo_black_opacity_60"/>
-    <FrameLayout android:id="@+id/top_bar"
+        android:background="@color/exo_black_opacity_60" />
+
+    <FrameLayout
+        android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/exo_styled_bottom_bar_height"
         android:layout_marginBottom="@dimen/exo_styled_bottom_bar_margin_top"
@@ -48,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_close2"
                 android:padding="@dimen/exo_icon_padding"
-                android:background="#00FFFFFF"/>
+                android:background="#00FFFFFF" />
         </LinearLayout>
 
         <LinearLayout
@@ -60,6 +62,7 @@
             android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
             android:layout_gravity="center_vertical|end"
             android:layoutDirection="ltr">
+
             <ImageButton
                 android:id="@+id/aspect_ratio_button"
                 android:layout_width="wrap_content"
@@ -67,7 +70,7 @@
                 android:src="@drawable/ic_aspect_ratio"
                 android:padding="@dimen/exo_icon_padding"
                 android:layout_marginEnd="12dp"
-                android:background="#00FFFFFF"/>
+                android:background="#00FFFFFF" />
 
             <TextView
                 android:id="@+id/quality_text"
@@ -76,18 +79,21 @@
                 android:layout_gravity="center_vertical"
                 android:padding="@dimen/exo_icon_padding"
                 android:text="HLS"
-                android:textColor="#FFFFFF"/>
+                android:textColor="#FFFFFF" />
+
             <ImageButton
                 android:id="@+id/quality_select"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_arrow_down2"
                 android:padding="@dimen/exo_icon_padding"
-                android:background="#00FFFFFF"/>
+                android:background="#00FFFFFF" />
         </LinearLayout>
 
     </FrameLayout>
-    <FrameLayout android:id="@id/exo_bottom_bar"
+
+    <FrameLayout
+        android:id="@id/exo_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/exo_styled_bottom_bar_height"
         android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top"
@@ -95,7 +101,8 @@
         android:background="@color/exo_bottom_bar_background"
         android:layoutDirection="ltr">
 
-        <LinearLayout android:id="@id/exo_time"
+        <LinearLayout
+            android:id="@id/exo_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
@@ -105,62 +112,75 @@
             android:layout_gravity="center_vertical|start"
             android:layoutDirection="ltr">
 
-            <TextView android:id="@id/exo_position"
-                style="@style/ExoStyledControls.TimeText.Position"/>
+            <TextView
+                android:id="@id/exo_position"
+                style="@style/ExoStyledControls.TimeText.Position" />
+
+            <TextView style="@style/ExoStyledControls.TimeText.Separator" />
 
             <TextView
-                style="@style/ExoStyledControls.TimeText.Separator"/>
-
-            <TextView android:id="@id/exo_duration"
-                style="@style/ExoStyledControls.TimeText.Duration"/>
+                android:id="@id/exo_duration"
+                style="@style/ExoStyledControls.TimeText.Duration" />
 
         </LinearLayout>
 
-        <LinearLayout android:id="@id/exo_basic_controls"
+        <LinearLayout
+            android:id="@id/exo_basic_controls"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:layoutDirection="ltr">
 
-            <ImageButton android:id="@id/exo_vr"
-                style="@style/ExoStyledControls.Button.Bottom.VR"/>
+            <ImageButton
+                android:id="@id/exo_vr"
+                style="@style/ExoStyledControls.Button.Bottom.VR" />
 
-            <ImageButton android:id="@id/exo_shuffle"
-                style="@style/ExoStyledControls.Button.Bottom.Shuffle"/>
+            <ImageButton
+                android:id="@id/exo_shuffle"
+                style="@style/ExoStyledControls.Button.Bottom.Shuffle" />
 
-            <ImageButton android:id="@id/exo_repeat_toggle"
-                style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/>
+            <ImageButton
+                android:id="@id/exo_repeat_toggle"
+                style="@style/ExoStyledControls.Button.Bottom.RepeatToggle" />
 
-            <ImageButton android:id="@id/exo_subtitle"
-                style="@style/ExoStyledControls.Button.Bottom.CC"/>
+            <ImageButton
+                android:id="@id/exo_subtitle"
+                style="@style/ExoStyledControls.Button.Bottom.CC" />
 
-            <ImageButton android:id="@id/exo_settings"
-                style="@style/ExoStyledControls.Button.Bottom.Settings"/>
+            <ImageButton
+                android:id="@id/exo_settings"
+                style="@style/ExoStyledControls.Button.Bottom.Settings" />
 
-            <ImageButton android:id="@+id/fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
+            <ImageButton
+                android:id="@+id/fullscreen"
+                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
 
-            <ImageButton android:id="@id/exo_fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
+            <ImageButton
+                android:id="@id/exo_fullscreen"
+                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
 
-            <ImageButton android:id="@id/exo_overflow_show"
-                style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/>
+            <ImageButton
+                android:id="@id/exo_overflow_show"
+                style="@style/ExoStyledControls.Button.Bottom.OverflowShow" />
 
         </LinearLayout>
 
-        <HorizontalScrollView android:id="@id/exo_extra_controls_scroll_view"
+        <HorizontalScrollView
+            android:id="@id/exo_extra_controls_scroll_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:visibility="invisible">
 
-            <LinearLayout android:id="@id/exo_extra_controls"
+            <LinearLayout
+                android:id="@id/exo_extra_controls"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layoutDirection="ltr">
 
-                <ImageButton android:id="@id/exo_overflow_hide"
-                    style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/>
+                <ImageButton
+                    android:id="@id/exo_overflow_hide"
+                    style="@style/ExoStyledControls.Button.Bottom.OverflowHide" />
 
             </LinearLayout>
 
@@ -168,15 +188,16 @@
 
     </FrameLayout>
 
-    <View android:id="@id/exo_progress_placeholder"
+    <View
+        android:id="@id/exo_progress_placeholder"
         android:layout_width="match_parent"
         android:layout_height="15dp"
         android:layout_gravity="bottom"
         android:layout_marginBottom="1dp"
-        android:background="@color/exo_bottom_bar_background"
-        />
+        android:background="@color/exo_bottom_bar_background" />
 
-    <LinearLayout android:id="@id/exo_minimal_controls"
+    <LinearLayout
+        android:id="@id/exo_minimal_controls"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
@@ -185,8 +206,9 @@
         android:gravity="center_vertical"
         android:layoutDirection="ltr">
 
-        <ImageButton android:id="@id/exo_minimal_fullscreen"
-            style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
+        <ImageButton
+            android:id="@id/exo_minimal_fullscreen"
+            style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
 
     </LinearLayout>
 
@@ -200,18 +222,21 @@
         android:padding="@dimen/exo_styled_controls_padding"
         android:clipToPadding="false">
 
-        <ImageButton android:id="@id/exo_prev"
-            style="@style/ExoStyledControls.Button.Center.Previous"/>
+        <ImageButton
+            android:id="@id/exo_prev"
+            style="@style/ExoStyledControls.Button.Center.Previous" />
 
         <include layout="@layout/exo_styled_player_control_rewind_button" />
 
-        <ImageButton android:id="@id/exo_play_pause"
-            style="@style/ExoStyledControls.Button.Center.PlayPause"/>
+        <ImageButton
+            android:id="@id/exo_play_pause"
+            style="@style/ExoStyledControls.Button.Center.PlayPause" />
 
         <include layout="@layout/exo_styled_player_control_ffwd_button" />
 
-        <ImageButton android:id="@id/exo_next"
-            style="@style/ExoStyledControls.Button.Center.Next"/>
+        <ImageButton
+            android:id="@id/exo_next"
+            style="@style/ExoStyledControls.Button.Center.Next" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 74dd14d31..37c2f1246 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -48,18 +48,17 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/channel_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left"
-                        android:text="Channel Name"
-                        android:drawablePadding="3dip"
-                        android:textSize="16sp"
-                        android:textStyle="bold"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        />
+                        <TextView
+                            android:id="@+id/channel_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="left"
+                            android:text="Channel Name"
+                            android:drawablePadding="3dip"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            android:maxLines="1"
+                            android:ellipsize="end" />
 
                     </LinearLayout>
 
@@ -84,8 +83,7 @@
                     android:textColor="?android:attr/textColorPrimary"
                     android:textSize="11sp"
                     android:drawableLeft="@drawable/ic_bell_small"
-                    android:drawableTint="?android:attr/textColorPrimary"
-                    />
+                    android:drawableTint="?android:attr/textColorPrimary" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 1acc6c6dc..09399ae97 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -13,20 +13,21 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+        app:layout_constraintBottom_toBottomOf="parent" />
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/home_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recview"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressBar"
-        app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recview"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/progressBar"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index edebe3eb7..98a36a777 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -148,7 +148,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/download"
-                            android:maxLines="1"/>
+                            android:maxLines="1" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -285,7 +285,7 @@
                             android:src="@drawable/ic_arrow_up_down"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"/>
+                            app:layout_constraintBottom_toBottomOf="parent" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index c46a5178a..9c1e25101 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -5,43 +5,47 @@
     android:layout_height="match_parent"
     tools:context=".fragments.PlaylistFragment"
     android:id="@+id/playlist_scrollview">
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/playlist_name"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text=""
-        android:textSize="24sp"
-        android:textStyle="bold"
-        android:padding="8dp"/>
-    <TextView
-        android:id="@+id/playlist_uploader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textStyle="bold"/>
-    <TextView
-        android:id="@+id/playlist_totVideos"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"/>
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants">
+        android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/playlist_recView"
+        <TextView
+            android:id="@+id/playlist_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:nestedScrollingEnabled="false" />
-    </RelativeLayout>
+            android:text=""
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:padding="8dp" />
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/playlist_uploader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/playlist_totVideos"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:descendantFocusability="blocksDescendants">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/playlist_recView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false" />
+        </RelativeLayout>
+
+    </LinearLayout>
 
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 22d4e1ee9..b7664bd3f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -320,7 +320,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/searchbar_holder"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/search_recycler"
@@ -330,7 +330,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/searchbar_holder"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/searchbar_holder" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 495ba91dd..755be110e 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -64,16 +64,14 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/subscriptions"
-                        />
+                        android:text="@string/subscriptions" />
 
                     <ImageView
                         android:id="@+id/toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
-                        android:src="@drawable/ic_arrow_down"
-                    />
+                        android:src="@drawable/ic_arrow_down" />
 
                 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/playlist_row.xml b/app/src/main/res/layout/playlist_row.xml
index efd6d4a28..b0c4e6095 100644
--- a/app/src/main/res/layout/playlist_row.xml
+++ b/app/src/main/res/layout/playlist_row.xml
@@ -7,15 +7,15 @@
     android:layout_margin="8dp"
     android:layout_marginBottom="16dp"
     android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search"
-    >
+    android:id="@+id/video_search">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent=".45"/>
+        app:layout_constraintGuide_percent=".45" />
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
         app:cardCornerRadius="8dp"
@@ -35,6 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
         <TextView
             android:id="@+id/playlist_duration"
             android:layout_width="wrap_content"
@@ -43,7 +44,7 @@
             android:layout_margin="5dp"
             android:textColor="@color/duration_text_color"
             android:background="@color/duration_background_color"
-            android:padding="0.5dp"/>
+            android:padding="0.5dp" />
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
@@ -65,6 +66,7 @@
         app:layout_constraintEnd_toStartOf="@+id/delete_playlist"
         app:layout_constraintStart_toEndOf="@+id/card_search_thumbnail"
         app:layout_constraintTop_toBottomOf="@+id/playlist_title" />
+
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/delete_playlist"
         android:layout_width="0dp"
@@ -75,6 +77,5 @@
         app:layout_constraintTop_toTopOf="parent"
         android:background="?android:attr/selectableItemBackground"
         android:padding="8dp"
-        android:visibility="gone"
-        />
+        android:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/playlist_search_row.xml b/app/src/main/res/layout/playlist_search_row.xml
index f7acbeeb4..d520aaada 100644
--- a/app/src/main/res/layout/playlist_search_row.xml
+++ b/app/src/main/res/layout/playlist_search_row.xml
@@ -5,15 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    >
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent=".45"/>
+        app:layout_constraintGuide_percent=".45" />
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_playlist"
         app:cardCornerRadius="8dp"
@@ -27,17 +27,18 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
         app:layout_constraintEnd_toStartOf="@+id/guideline">
-    <ImageView
-        android:id="@+id/search_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
+        <ImageView
+            android:id="@+id/search_thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
         <RelativeLayout
             android:layout_width="100dp"
             android:layout_height="match_parent"
             android:layout_gravity="right"
-            android:background="#CC000000"
-            >
+            android:background="#CC000000">
 
             <TextView
                 android:id="@+id/search_playlist_number"
diff --git a/app/src/main/res/layout/playlists_row.xml b/app/src/main/res/layout/playlists_row.xml
index 433d87347..c9cb7ec18 100644
--- a/app/src/main/res/layout/playlists_row.xml
+++ b/app/src/main/res/layout/playlists_row.xml
@@ -7,15 +7,15 @@
     android:layout_margin="8dp"
     android:layout_marginBottom="16dp"
     android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/playlist"
-    >
+    android:id="@+id/playlist">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent=".45"/>
+        app:layout_constraintGuide_percent=".45" />
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_playlist_thumbnail"
         app:cardCornerRadius="8dp"
@@ -55,6 +55,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/card_playlist_thumbnail"
         app:layout_constraintTop_toBottomOf="@+id/playlist_title" />
+
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/delete_playlist"
         android:layout_width="0dp"
@@ -64,6 +65,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:background="?android:attr/selectableItemBackground"
-        android:padding="8dp"
-        />
+        android:padding="8dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/searchhistory_row.xml b/app/src/main/res/layout/searchhistory_row.xml
index e3282ec58..aac477305 100644
--- a/app/src/main/res/layout/searchhistory_row.xml
+++ b/app/src/main/res/layout/searchhistory_row.xml
@@ -15,8 +15,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_margin="5dp"
-        />
+        android:layout_margin="5dp" />
+
     <TextView
         android:id="@+id/history_text"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index 854eb33e8..72260e2ed 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:background="?android:attr/selectableItemBackground"
 
@@ -25,8 +24,8 @@
             android:id="@+id/thumbnail"
             android:src="@mipmap/ic_launcher"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            />
+            android:layout_height="match_parent" />
+
         <TextView
             android:id="@+id/thumbnail_duration"
             android:layout_width="wrap_content"
@@ -35,7 +34,7 @@
             android:layout_margin="5dp"
             android:textColor="@color/duration_text_color"
             android:background="@color/duration_background_color"
-            android:padding="0.5dp"/>
+            android:padding="0.5dp" />
     </androidx.cardview.widget.CardView>
 
 
@@ -53,7 +52,7 @@
         app:layout_constraintStart_toEndOf="@+id/channel_image"
         app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
         android:ellipsize="end"
-        android:maxLines="2"/>
+        android:maxLines="2" />
 
     <TextView
         android:id="@+id/textView_channel"
@@ -63,8 +62,7 @@
         app:layout_constraintEnd_toEndOf="@+id/textView_title"
         app:layout_constraintStart_toStartOf="@+id/textView_title"
         app:layout_constraintTop_toBottomOf="@+id/textView_title"
-        android:paddingBottom="16dp"
-        />
+        android:paddingBottom="16dp" />
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/channel_image"
diff --git a/app/src/main/res/layout/video_channel_row.xml b/app/src/main/res/layout/video_channel_row.xml
index ad74d023b..6536befd9 100644
--- a/app/src/main/res/layout/video_channel_row.xml
+++ b/app/src/main/res/layout/video_channel_row.xml
@@ -6,15 +6,15 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
     android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search"
-    >
+    android:id="@+id/video_search">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent=".45"/>
+        app:layout_constraintGuide_percent=".45" />
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
         app:cardCornerRadius="8dp"
@@ -34,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
         <TextView
             android:id="@+id/channel_duration"
             android:layout_width="wrap_content"
@@ -42,7 +43,7 @@
             android:layout_margin="5dp"
             android:textColor="@color/duration_text_color"
             android:background="@color/duration_background_color"
-            android:padding="0.5dp"/>
+            android:padding="0.5dp" />
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
diff --git a/app/src/main/res/layout/video_search_row.xml b/app/src/main/res/layout/video_search_row.xml
index 1782042c5..84eb2cf8d 100644
--- a/app/src/main/res/layout/video_search_row.xml
+++ b/app/src/main/res/layout/video_search_row.xml
@@ -6,15 +6,15 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
     android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search"
-    >
+    android:id="@+id/video_search">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_percent=".45"/>
+        app:layout_constraintGuide_percent=".45" />
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
         app:cardCornerRadius="8dp"
@@ -45,7 +45,7 @@
             android:textSize="11dp"
             android:textColor="@color/duration_text_color"
             android:background="@color/duration_background_color"
-            android:padding="0.5dp"/>
+            android:padding="0.5dp" />
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
diff --git a/app/src/main/res/menu/action_bar.xml b/app/src/main/res/menu/action_bar.xml
index 22eaaca2e..88b77a9ac 100644
--- a/app/src/main/res/menu/action_bar.xml
+++ b/app/src/main/res/menu/action_bar.xml
@@ -2,10 +2,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="Search"
+    <item
+        android:title="Search"
         android:icon="@drawable/ic_search"
         android:id="@+id/action_search"
-        app:showAsAction="always"
-        />
+        app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
index 459eb0a82..4a47bc113 100644
--- a/app/src/main/res/menu/bottom_menu.xml
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:id="@+id/home2" android:title="@string/startpage" android:icon="@drawable/ic_home"/>
-    <item android:id="@+id/subscriptions" android:title="@string/subscriptions" android:icon="@drawable/ic_subscriptions"/>
-    <item android:id="@+id/library" android:title="@string/library" android:icon="@drawable/ic_library"/>
+    <item
+        android:id="@+id/home2"
+        android:title="@string/startpage"
+        android:icon="@drawable/ic_home" />
+    <item
+        android:id="@+id/subscriptions"
+        android:title="@string/subscriptions"
+        android:icon="@drawable/ic_subscriptions" />
+    <item
+        android:id="@+id/library"
+        android:title="@string/library"
+        android:icon="@drawable/ic_library" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_bird.xml b/app/src/main/res/mipmap-anydpi-v26/ic_bird.xml
index 2294accdd..1a9c2d357 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_bird.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_bird.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_bird_background"/>
-    <foreground android:drawable="@mipmap/ic_bird_foreground"/>
+    <background android:drawable="@color/ic_bird_background" />
+    <foreground android:drawable="@mipmap/ic_bird_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_bird_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_bird_round.xml
index 2294accdd..1a9c2d357 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_bird_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_bird_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_bird_background"/>
-    <foreground android:drawable="@mipmap/ic_bird_foreground"/>
+    <background android:drawable="@color/ic_bird_background" />
+    <foreground android:drawable="@mipmap/ic_bird_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_fire.xml b/app/src/main/res/mipmap-anydpi-v26/ic_fire.xml
index aab91d3e3..7251b72bf 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_fire.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_fire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_fire_background"/>
-    <foreground android:drawable="@mipmap/ic_fire_foreground"/>
+    <background android:drawable="@color/ic_fire_background" />
+    <foreground android:drawable="@mipmap/ic_fire_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_fire_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_fire_round.xml
index aab91d3e3..7251b72bf 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_fire_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_fire_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_fire_background"/>
-    <foreground android:drawable="@mipmap/ic_fire_foreground"/>
+    <background android:drawable="@color/ic_fire_background" />
+    <foreground android:drawable="@mipmap/ic_fire_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_flame.xml b/app/src/main/res/mipmap-anydpi-v26/ic_flame.xml
index 74036edbe..c68f44380 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_flame.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_flame.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_flame_background"/>
-    <foreground android:drawable="@mipmap/ic_flame_foreground"/>
+    <background android:drawable="@color/ic_flame_background" />
+    <foreground android:drawable="@mipmap/ic_flame_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_flame_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_flame_round.xml
index 74036edbe..c68f44380 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_flame_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_flame_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_flame_background"/>
-    <foreground android:drawable="@mipmap/ic_flame_foreground"/>
+    <background android:drawable="@color/ic_flame_background" />
+    <foreground android:drawable="@mipmap/ic_flame_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_gradient.xml b/app/src/main/res/mipmap-anydpi-v26/ic_gradient.xml
index 622bb1fd3..8c2611e4f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_gradient.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_gradient.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_gradient_background"/>
-    <foreground android:drawable="@mipmap/ic_gradient_foreground"/>
+    <background android:drawable="@color/ic_gradient_background" />
+    <foreground android:drawable="@mipmap/ic_gradient_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_gradient_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_gradient_round.xml
index 622bb1fd3..8c2611e4f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_gradient_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_gradient_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_gradient_background"/>
-    <foreground android:drawable="@mipmap/ic_gradient_foreground"/>
+    <background android:drawable="@color/ic_gradient_background" />
+    <foreground android:drawable="@mipmap/ic_gradient_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..ac94b34f5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_legacy.xml b/app/src/main/res/mipmap-anydpi-v26/ic_legacy.xml
index 3f5b47929..45a094316 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_legacy.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_legacy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_legacy_background"/>
-    <foreground android:drawable="@mipmap/ic_legacy_foreground"/>
+    <background android:drawable="@color/ic_legacy_background" />
+    <foreground android:drawable="@mipmap/ic_legacy_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_legacy_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_legacy_round.xml
index 3f5b47929..45a094316 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_legacy_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_legacy_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_legacy_background"/>
-    <foreground android:drawable="@mipmap/ic_legacy_foreground"/>
+    <background android:drawable="@color/ic_legacy_background" />
+    <foreground android:drawable="@mipmap/ic_legacy_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shaped.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shaped.xml
index 81a28a261..07bc07760 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shaped.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shaped.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_shaped_background"/>
-    <foreground android:drawable="@mipmap/ic_shaped_foreground"/>
+    <background android:drawable="@color/ic_shaped_background" />
+    <foreground android:drawable="@mipmap/ic_shaped_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shaped_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shaped_round.xml
index 81a28a261..07bc07760 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_shaped_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shaped_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_shaped_background"/>
-    <foreground android:drawable="@mipmap/ic_shaped_foreground"/>
+    <background android:drawable="@color/ic_shaped_background" />
+    <foreground android:drawable="@mipmap/ic_shaped_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_torch.xml b/app/src/main/res/mipmap-anydpi-v26/ic_torch.xml
index cfc9336e8..70a211127 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_torch.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_torch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_torch_background"/>
-    <foreground android:drawable="@mipmap/ic_torch_foreground"/>
+    <background android:drawable="@color/ic_torch_background" />
+    <foreground android:drawable="@mipmap/ic_torch_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_torch_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_torch_round.xml
index cfc9336e8..70a211127 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_torch_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_torch_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_torch_background"/>
-    <foreground android:drawable="@mipmap/ic_torch_foreground"/>
+    <background android:drawable="@color/ic_torch_background" />
+    <foreground android:drawable="@mipmap/ic_torch_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml
index 8ae1af75e..a8c74d80b 100644
--- a/app/src/main/res/navigation/nav.xml
+++ b/app/src/main/res/navigation/nav.xml
@@ -19,8 +19,7 @@
         android:id="@+id/library"
         android:name="com.github.libretube.Library"
         android:label="fragment_library"
-        tools:layout="@layout/fragment_library" >
-    </fragment>
+        tools:layout="@layout/fragment_library"></fragment>
     <fragment
         android:id="@+id/searchFragment"
         android:name="com.github.libretube.fragments.SearchFragment"
@@ -30,7 +29,7 @@
         android:id="@+id/channel"
         android:name="com.github.libretube.fragments.ChannelFragment"
         android:label="channel"
-        tools:layout="@layout/fragment_channel" >
+        tools:layout="@layout/fragment_channel">
         <argument
             android:name="channel_id"
             app:argType="string" />
@@ -39,7 +38,7 @@
         android:id="@+id/playlistFragment"
         android:name="com.github.libretube.fragments.PlaylistFragment"
         android:label="fragment_playlist"
-        tools:layout="@layout/fragment_playlist" >
+        tools:layout="@layout/fragment_playlist">
         <argument
             android:name="playlist_id"
             app:argType="string" />
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9ba5e64ff..047ad87fd 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -10,15 +10,24 @@
 
     <style name="Theme.Red" parent="Theme.Material3.Dark.NoActionBar">
 
-        <item name="colorPrimary">@color/red_dark_accentLight</item> // container
-        <item name="colorOnPrimary">@color/red_dark_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/red_dark_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/red_dark_accentLight</item> //
-        <item name="colorSecondary">@color/red_dark_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/red_dark_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/red_dark_accentDark</item> // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/red_dark_background</item> --> // navbar icon fill
-        <item name="android:colorBackground">@color/red_dark_background</item> // background
+        <item name="colorPrimary">@color/red_dark_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/red_dark_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/red_dark_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/red_dark_accentLight</item>
+        //
+        <item name="colorSecondary">@color/red_dark_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/red_dark_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/red_dark_accentDark</item>
+        // navbar surround
+        <!-- <item name="colorOnSecondaryContainer">@color/red_dark_background</item> --> // navbar
+        icon fill
+        <item name="android:colorBackground">@color/red_dark_background</item>
+        // background
         <item name="colorOnBackground">@color/red_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -29,15 +38,24 @@
 
     <style name="Theme.Blue" parent="Theme.Material3.Dark.NoActionBar">
 
-        <item name="colorPrimary">@color/blue_dark_accentLight</item> // container
-        <item name="colorOnPrimary">@color/blue_dark_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/blue_dark_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/blue_dark_accentLight</item> //
-        <item name="colorSecondary">@color/blue_dark_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/blue_dark_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/blue_dark_accentDark</item> // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/blue_dark_background</item> --> // navbar icon fill
-        <item name="android:colorBackground">@color/blue_dark_background</item> // background
+        <item name="colorPrimary">@color/blue_dark_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/blue_dark_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/blue_dark_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/blue_dark_accentLight</item>
+        //
+        <item name="colorSecondary">@color/blue_dark_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/blue_dark_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/blue_dark_accentDark</item>
+        // navbar surround
+        <!-- <item name="colorOnSecondaryContainer">@color/blue_dark_background</item> --> // navbar
+        icon fill
+        <item name="android:colorBackground">@color/blue_dark_background</item>
+        // background
         <item name="colorOnBackground">@color/blue_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -48,15 +66,24 @@
 
     <style name="Theme.Yellow" parent="Theme.Material3.Dark.NoActionBar">
 
-        <item name="colorPrimary">@color/yellow_dark_accentLight</item> // container
-        <item name="colorOnPrimary">@color/yellow_dark_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/yellow_dark_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/yellow_dark_accentLight</item> //
-        <item name="colorSecondary">@color/yellow_dark_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/yellow_dark_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/yellow_dark_accentDark</item> // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/yellow_dark_background</item> --> // navbar icon fill
-        <item name="android:colorBackground">@color/yellow_dark_background</item> // background
+        <item name="colorPrimary">@color/yellow_dark_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/yellow_dark_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/yellow_dark_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/yellow_dark_accentLight</item>
+        //
+        <item name="colorSecondary">@color/yellow_dark_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/yellow_dark_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/yellow_dark_accentDark</item>
+        // navbar surround
+        <!-- <item name="colorOnSecondaryContainer">@color/yellow_dark_background</item> --> //
+        navbar icon fill
+        <item name="android:colorBackground">@color/yellow_dark_background</item>
+        // background
         <item name="colorOnBackground">@color/yellow_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -67,15 +94,24 @@
 
     <style name="Theme.Green" parent="Theme.Material3.Dark.NoActionBar">
 
-        <item name="colorPrimary">@color/green_dark_accentLight</item> // container
-        <item name="colorOnPrimary">@color/green_dark_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/green_dark_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/green_dark_accentLight</item> //
-        <item name="colorSecondary">@color/green_dark_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/green_dark_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/green_dark_accentDark</item> // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/green_dark_background</item> --> // navbar icon fill
-        <item name="android:colorBackground">@color/green_dark_background</item> // background
+        <item name="colorPrimary">@color/green_dark_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/green_dark_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/green_dark_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/green_dark_accentLight</item>
+        //
+        <item name="colorSecondary">@color/green_dark_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/green_dark_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/green_dark_accentDark</item>
+        // navbar surround
+        <!-- <item name="colorOnSecondaryContainer">@color/green_dark_background</item> --> //
+        navbar icon fill
+        <item name="android:colorBackground">@color/green_dark_background</item>
+        // background
         <item name="colorOnBackground">@color/green_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -86,15 +122,24 @@
 
     <style name="Theme.Purple" parent="Theme.Material3.Dark.NoActionBar">
 
-        <item name="colorPrimary">@color/purple_dark_accentLight</item> // container
-        <item name="colorOnPrimary">@color/purple_dark_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/purple_dark_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/purple_dark_accentLight</item> //
-        <item name="colorSecondary">@color/purple_dark_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/purple_dark_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/purple_dark_accentDark</item> // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/purple_dark_background</item> --> // navbar icon fill
-        <item name="android:colorBackground">@color/purple_dark_background</item> // background
+        <item name="colorPrimary">@color/purple_dark_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/purple_dark_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/purple_dark_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/purple_dark_accentLight</item>
+        //
+        <item name="colorSecondary">@color/purple_dark_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/purple_dark_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/purple_dark_accentDark</item>
+        // navbar surround
+        <!-- <item name="colorOnSecondaryContainer">@color/purple_dark_background</item> --> //
+        navbar icon fill
+        <item name="android:colorBackground">@color/purple_dark_background</item>
+        // background
         <item name="colorOnBackground">@color/purple_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 1fb1461b6..8b592d10a 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -11,15 +11,24 @@
 
     <style name="Theme.Red" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/red_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/red_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/red_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item> //
-        <item name="colorSecondary">@color/red_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/red_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/red_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/red_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/red_light_background</item> // background
+        <item name="colorPrimary">@color/red_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/red_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/red_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/red_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/red_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/red_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/red_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/red_light_background</item>
+        // background
         <item name="colorOnBackground">@color/red_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -30,15 +39,24 @@
 
     <style name="Theme.Blue" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/blue_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/blue_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/blue_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item> //
-        <item name="colorSecondary">@color/blue_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/blue_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/blue_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/blue_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/blue_light_background</item> // background
+        <item name="colorPrimary">@color/blue_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/blue_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/blue_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/blue_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/blue_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/blue_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/blue_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/blue_light_background</item>
+        // background
         <item name="colorOnBackground">@color/blue_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -49,15 +67,24 @@
 
     <style name="Theme.Yellow" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/yellow_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/yellow_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item> //
-        <item name="colorSecondary">@color/yellow_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/yellow_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/yellow_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/yellow_light_background</item> // background
+        <item name="colorPrimary">@color/yellow_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/yellow_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/yellow_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/yellow_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/yellow_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/yellow_light_background</item>
+        // background
         <item name="colorOnBackground">@color/yellow_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -68,15 +95,24 @@
 
     <style name="Theme.Green" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/green_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/green_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/green_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item> //
-        <item name="colorSecondary">@color/green_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/green_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/green_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/green_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/green_light_background</item> // background
+        <item name="colorPrimary">@color/green_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/green_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/green_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/green_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/green_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/green_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/green_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/green_light_background</item>
+        // background
         <item name="colorOnBackground">@color/green_light_background</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -86,15 +122,24 @@
 
     <style name="Theme.Purple" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/purple_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/purple_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/purple_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item> //
-        <item name="colorSecondary">@color/purple_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/purple_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/purple_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/purple_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/purple_light_background</item> // background
+        <item name="colorPrimary">@color/purple_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/purple_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/purple_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/purple_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/purple_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/purple_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/purple_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/purple_light_background</item>
+        // background
         <item name="colorOnBackground">@color/purple_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index f2e84d642..b2fd47858 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="roundedImageViewRounded">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">10%</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dbf4f2b6f..12d40f8c9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.MY" parent="Theme.Material3.Light.NoActionBar">
 
@@ -8,15 +8,24 @@
 
     <style name="Theme.Red" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/red_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/red_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/red_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item> //
-        <item name="colorSecondary">@color/red_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/red_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/red_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/red_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/red_light_background</item> // background
+        <item name="colorPrimary">@color/red_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/red_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/red_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/red_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/red_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/red_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/red_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/red_light_background</item>
+        // background
         <item name="colorOnBackground">@color/red_light_background</item>
 
         <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -24,15 +33,24 @@
 
     <style name="Theme.Blue" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/blue_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/blue_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/blue_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item> //
-        <item name="colorSecondary">@color/blue_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/blue_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/blue_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/blue_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/blue_light_background</item> // background
+        <item name="colorPrimary">@color/blue_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/blue_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/blue_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/blue_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/blue_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/blue_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/blue_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/blue_light_background</item>
+        // background
         <item name="colorOnBackground">@color/blue_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -41,15 +59,24 @@
 
     <style name="Theme.Yellow" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/yellow_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/yellow_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item> //
-        <item name="colorSecondary">@color/yellow_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/yellow_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/yellow_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/yellow_light_background</item> // background
+        <item name="colorPrimary">@color/yellow_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/yellow_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/yellow_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/yellow_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/yellow_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/yellow_light_background</item>
+        // background
         <item name="colorOnBackground">@color/yellow_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -58,15 +85,24 @@
 
     <style name="Theme.Green" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/green_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/green_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/green_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item> //
-        <item name="colorSecondary">@color/green_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/green_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/green_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/green_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/green_light_background</item> // background
+        <item name="colorPrimary">@color/green_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/green_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/green_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/green_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/green_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/green_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/green_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/green_light_background</item>
+        // background
         <item name="colorOnBackground">@color/green_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
@@ -75,15 +111,24 @@
 
     <style name="Theme.Purple" parent="Theme.Material3.Light.NoActionBar">
 
-        <item name="colorPrimary">@color/purple_light_accentLight</item> // container
-        <item name="colorOnPrimary">@color/purple_light_accentDark</item> // title
-        <item name="colorPrimaryContainer">@color/purple_light_accentLight</item> //
-        <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item> //
-        <item name="colorSecondary">@color/purple_light_accentLight</item> // Settings Categories
-        <item name="colorOnSecondary">@color/purple_light_accentDark</item> //
-        <item name="colorSecondaryContainer">@color/purple_light_accentDark</item> // navbar surround
-        <item name="colorOnSecondaryContainer">@color/purple_light_background</item> // navbar icon fill
-        <item name="android:colorBackground">@color/purple_light_background</item> // background
+        <item name="colorPrimary">@color/purple_light_accentLight</item>
+        // container
+        <item name="colorOnPrimary">@color/purple_light_accentDark</item>
+        // title
+        <item name="colorPrimaryContainer">@color/purple_light_accentLight</item>
+        //
+        <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item>
+        //
+        <item name="colorSecondary">@color/purple_light_accentLight</item>
+        // Settings Categories
+        <item name="colorOnSecondary">@color/purple_light_accentDark</item>
+        //
+        <item name="colorSecondaryContainer">@color/purple_light_accentDark</item>
+        // navbar surround
+        <item name="colorOnSecondaryContainer">@color/purple_light_background</item>
+        // navbar icon fill
+        <item name="android:colorBackground">@color/purple_light_background</item>
+        // background
         <item name="colorOnBackground">@color/purple_light_background</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/xml/activity_main_scene.xml b/app/src/main/res/xml/activity_main_scene.xml
index 449d6bdf8..7cc4eddb9 100644
--- a/app/src/main/res/xml/activity_main_scene.xml
+++ b/app/src/main/res/xml/activity_main_scene.xml
@@ -1,37 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MotionScene
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:motion="http://schemas.android.com/apk/res-auto">
 
     <Transition
         motion:constraintSetEnd="@+id/end"
         motion:constraintSetStart="@id/start"
         motion:duration="10"
-        motion:layoutDuringTransition="honorRequest"
-        >
-       <KeyFrameSet>
-           <KeyAttribute
-               motion:motionTarget="@+id/bottomNav"
-               motion:framePosition="0"
-               android:translationY="0dp" />
-           <KeyAttribute
-               motion:motionTarget="@+id/bottomNav"
-               motion:framePosition="75"
-               android:translationY="55dp" />
-           <KeyAttribute
-               motion:motionTarget="@+id/container"
-               motion:framePosition="50"
-               android:scaleY="1" />
-           <KeyAttribute
-               motion:motionTarget="@+id/container"
-               motion:framePosition="100"
-               android:translationY="-80dp" />
-       </KeyFrameSet>
+        motion:layoutDuringTransition="honorRequest">
+        <KeyFrameSet>
+            <KeyAttribute
+                motion:motionTarget="@+id/bottomNav"
+                motion:framePosition="0"
+                android:translationY="0dp" />
+            <KeyAttribute
+                motion:motionTarget="@+id/bottomNav"
+                motion:framePosition="75"
+                android:translationY="55dp" />
+            <KeyAttribute
+                motion:motionTarget="@+id/container"
+                motion:framePosition="50"
+                android:scaleY="1" />
+            <KeyAttribute
+                motion:motionTarget="@+id/container"
+                motion:framePosition="100"
+                android:translationY="-80dp" />
+        </KeyFrameSet>
     </Transition>
 
-    <ConstraintSet android:id="@+id/start">
-    </ConstraintSet>
+    <ConstraintSet android:id="@+id/start"></ConstraintSet>
 
-    <ConstraintSet android:id="@+id/end">
-    </ConstraintSet>
+    <ConstraintSet android:id="@+id/end"></ConstraintSet>
 </MotionScene>
\ No newline at end of file
diff --git a/app/src/main/res/xml/player_scene.xml b/app/src/main/res/xml/player_scene.xml
index b29aacd64..bb4092578 100644
--- a/app/src/main/res/xml/player_scene.xml
+++ b/app/src/main/res/xml/player_scene.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MotionScene
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:motion="http://schemas.android.com/apk/res-auto">
 
     <Transition
@@ -8,29 +7,27 @@
         motion:constraintSetEnd="@+id/end"
         motion:constraintSetStart="@id/start"
         motion:duration="10"
-        motion:motionInterpolator="easeInOut"
-        >
-       <KeyFrameSet>
-           <KeyAttribute
-               motion:motionTarget="@+id/close_imageView"
-               motion:framePosition="90"
-               android:alpha="0" />
-           <KeyAttribute
-               motion:motionTarget="@+id/play_imageView"
-               motion:framePosition="90"
-               android:alpha="0" />
-           <KeyAttribute
-               motion:motionTarget="@+id/title_textView"
-               motion:framePosition="95"
-               android:alpha="0" />
-       </KeyFrameSet>
+        motion:motionInterpolator="easeInOut">
+        <KeyFrameSet>
+            <KeyAttribute
+                motion:motionTarget="@+id/close_imageView"
+                motion:framePosition="90"
+                android:alpha="0" />
+            <KeyAttribute
+                motion:motionTarget="@+id/play_imageView"
+                motion:framePosition="90"
+                android:alpha="0" />
+            <KeyAttribute
+                motion:motionTarget="@+id/title_textView"
+                motion:framePosition="95"
+                android:alpha="0" />
+        </KeyFrameSet>
         <OnSwipe
             motion:touchAnchorId="@+id/main_container"
             motion:dragDirection="dragDown"
             motion:touchAnchorSide="bottom"
             motion:maxAcceleration="40"
-            motion:dragScale="6"
-            />
+            motion:dragScale="6" />
     </Transition>
 
     <ConstraintSet android:id="@+id/start">
@@ -108,8 +105,7 @@
             android:layout_marginEnd="16dp"
             android:alpha="1"
             motion:layout_constraintTop_toTopOf="@id/main_container"
-            android:visibility="visible"
-            />
+            android:visibility="visible" />
         <Constraint
             android:id="@+id/play_imageView"
             motion:layout_constraintEnd_toStartOf="@+id/close_imageView"
@@ -119,8 +115,7 @@
             android:layout_marginEnd="24dp"
             android:alpha="1"
             motion:layout_constraintTop_toTopOf="@+id/close_imageView"
-            android:visibility="visible"
-            />
+            android:visibility="visible" />
         <Constraint
             android:id="@+id/title_textView"
             motion:layout_constraintEnd_toStartOf="@+id/play_imageView"
@@ -132,7 +127,6 @@
             android:alpha="1"
             android:layout_marginStart="8dp"
             motion:layout_constraintTop_toTopOf="@+id/play_imageView"
-            android:visibility="visible"
-            />
+            android:visibility="visible" />
     </ConstraintSet>
 </MotionScene>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 1f9e0037d..fe747aa80 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -4,72 +4,66 @@
 
     <PreferenceCategory app:title="@string/location">
 
-    <ListPreference
-        app:key="region"
-        app:title="@string/region"
-        app:entries="@array/regions"
-        app:entryValues="@array/regionsValue"
-        app:defaultValue="US"
-        app:useSimpleSummaryProvider="true"
-        android:icon="@drawable/ic_region"
-        />
+        <ListPreference
+            app:key="region"
+            app:title="@string/region"
+            app:entries="@array/regions"
+            app:entryValues="@array/regionsValue"
+            app:defaultValue="US"
+            app:useSimpleSummaryProvider="true"
+            android:icon="@drawable/ic_region" />
 
-    <ListPreference
-        app:key="language"
-        app:title="@string/changeLanguage"
-        app:entries="@array/languages"
-        app:entryValues="@array/languagesValue"
-        app:defaultValue="sys"
-        app:useSimpleSummaryProvider="true"
-        android:icon="@drawable/ic_translate"
-        />
+        <ListPreference
+            app:key="language"
+            app:title="@string/changeLanguage"
+            app:entries="@array/languages"
+            app:entryValues="@array/languagesValue"
+            app:defaultValue="sys"
+            app:useSimpleSummaryProvider="true"
+            android:icon="@drawable/ic_translate" />
 
     </PreferenceCategory>
 
 
     <PreferenceCategory app:title="@string/instance">
 
-    <ListPreference
-        app:key="instance"
-        app:title="@string/instances"
-        app:entries="@array/instances"
-        app:entryValues="@array/instancesValue"
-        app:defaultValue="https://pipedapi.kavin.rocks/"
-        android:icon="@drawable/ic_server"
-        />
+        <ListPreference
+            app:key="instance"
+            app:title="@string/instances"
+            app:entries="@array/instances"
+            app:entryValues="@array/instancesValue"
+            app:defaultValue="https://pipedapi.kavin.rocks/"
+            android:icon="@drawable/ic_server" />
 
-    <androidx.preference.EditTextPreference
-    app:key="customInstance"
-    app:title="@string/customInstance"
-        app:isPreferenceVisible="false"/>
+        <androidx.preference.EditTextPreference
+            app:key="customInstance"
+            app:title="@string/customInstance"
+            app:isPreferenceVisible="false" />
 
-    <androidx.preference.Preference
-        app:key="login_register"
-        app:title="@string/login_register"
-        android:icon="@drawable/ic_login"
-        android:summary="@string/notgmail"
-        />
+        <androidx.preference.Preference
+            app:key="login_register"
+            app:title="@string/login_register"
+            android:icon="@drawable/ic_login"
+            android:summary="@string/notgmail" />
 
-    <androidx.preference.Preference
-        app:key="import_from_yt"
-        app:title="@string/import_from_yt"
-        android:summary="@string/import_from_yt_summary"
-        android:icon="@drawable/ic_upload"
-        />
+        <androidx.preference.Preference
+            app:key="import_from_yt"
+            app:title="@string/import_from_yt"
+            android:summary="@string/import_from_yt_summary"
+            android:icon="@drawable/ic_upload" />
 
     </PreferenceCategory>
 
 
     <PreferenceCategory app:title="@string/customization">
 
-    <ListPreference
-        app:title="@string/app_theme"
-        app:key="theme_togglee"
-        app:entries="@array/themes"
-        app:entryValues="@array/themesValue"
-        app:defaultValue="A"
-        android:icon="@drawable/ic_theme"
-        />
+        <ListPreference
+            app:title="@string/app_theme"
+            app:key="theme_togglee"
+            app:entries="@array/themes"
+            app:entryValues="@array/themesValue"
+            app:defaultValue="A"
+            android:icon="@drawable/ic_theme" />
 
         <ListPreference
             app:title="@string/color_accent"
@@ -77,8 +71,7 @@
             app:entries="@array/accents"
             app:entryValues="@array/accentsValue"
             app:defaultValue="red"
-            android:icon="@drawable/ic_color"
-            />
+            android:icon="@drawable/ic_color" />
 
         <ListPreference
             app:title="@string/app_icon"
@@ -86,44 +79,39 @@
             app:entries="@array/icons"
             app:entryValues="@array/iconsValue"
             app:defaultValue="MainActivity"
-            android:icon="@drawable/ic_frame"
-            />
+            android:icon="@drawable/ic_frame" />
 
-    <androidx.preference.Preference
-        app:title="@string/sponsorblock"
-        app:key="sponsorblock"
-        app:summary="@string/sponsorblock_summary"
-        android:icon="@drawable/ic_block"
-        />
+        <androidx.preference.Preference
+            app:title="@string/sponsorblock"
+            app:key="sponsorblock"
+            app:summary="@string/sponsorblock_summary"
+            android:icon="@drawable/ic_block" />
 
-    <ListPreference
-        app:title="@string/defaultTab"
-        app:key="default_tab"
-        app:entries="@array/tabs"
-        app:entryValues="@array/tabsValue"
-        app:defaultValue="home"
-        android:icon="@drawable/ic_home_outlined"
-        />
+        <ListPreference
+            app:title="@string/defaultTab"
+            app:key="default_tab"
+            app:entries="@array/tabs"
+            app:entryValues="@array/tabsValue"
+            app:defaultValue="home"
+            android:icon="@drawable/ic_home_outlined" />
 
-    <ListPreference
-        app:title="@string/defres"
-        app:key="default_res"
-        app:entries="@array/defres"
-        app:entryValues="@array/defresValue"
-        app:defaultValue=""
-        android:icon="@drawable/ic_hd"
-        app:useSimpleSummaryProvider="true"
-        />
+        <ListPreference
+            app:title="@string/defres"
+            app:key="default_res"
+            app:entries="@array/defres"
+            app:entryValues="@array/defresValue"
+            app:defaultValue=""
+            android:icon="@drawable/ic_hd"
+            app:useSimpleSummaryProvider="true" />
 
-    <ListPreference
-        app:title="@string/grid"
-        app:key="grid"
-        app:entries="@array/grid"
-        app:entryValues="@array/grid"
-        app:defaultValue="@integer/grid_items"
-        android:icon="@drawable/ic_grid"
-        app:useSimpleSummaryProvider="true"
-        />
+        <ListPreference
+            app:title="@string/grid"
+            app:key="grid"
+            app:entries="@array/grid"
+            app:entryValues="@array/grid"
+            app:defaultValue="@integer/grid_items"
+            android:icon="@drawable/ic_grid"
+            app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
 
@@ -144,10 +132,10 @@
 
     <PreferenceCategory app:title="@string/about">
 
-    <Preference
-        app:title="@string/website"
-        app:key="about"
-        android:icon="@drawable/ic_region" />
+        <Preference
+            app:title="@string/website"
+            app:key="about"
+            android:icon="@drawable/ic_region" />
 
         <Preference
             app:title="@string/license"
diff --git a/app/src/main/res/xml/sponsorblock_settings.xml b/app/src/main/res/xml/sponsorblock_settings.xml
index a27ce125e..6aad2752b 100644
--- a/app/src/main/res/xml/sponsorblock_settings.xml
+++ b/app/src/main/res/xml/sponsorblock_settings.xml
@@ -6,40 +6,40 @@
         app:key="sb_enabled_key"
         app:title="@string/sponsorblock"
         android:summaryOff="@string/disabled"
-        android:summaryOn="@string/enabled"/>
+        android:summaryOn="@string/enabled" />
 
-        <SwitchPreferenceCompat
-            app:key="sb_notifications_key"
-            app:title="@string/sponsorblock_notifications"
-            android:summaryOff="@string/disabled"
-            android:summaryOn="@string/enabled"/>
+    <SwitchPreferenceCompat
+        app:key="sb_notifications_key"
+        app:title="@string/sponsorblock_notifications"
+        android:summaryOff="@string/disabled"
+        android:summaryOn="@string/enabled" />
 
     <PreferenceCategory app:title="@string/category_segments">
 
-    <SwitchPreferenceCompat
-        app:key="sponsors_category_key"
-        app:title="@string/category_sponsor"
-        app:summary="@string/category_sponsor_description"/>
+        <SwitchPreferenceCompat
+            app:key="sponsors_category_key"
+            app:title="@string/category_sponsor"
+            app:summary="@string/category_sponsor_description" />
 
-    <SwitchPreferenceCompat
-        app:key="selfpromo_category_key"
-        app:title="@string/category_selfpromo"
-        app:summary="@string/category_selfpromo_description"/>
+        <SwitchPreferenceCompat
+            app:key="selfpromo_category_key"
+            app:title="@string/category_selfpromo"
+            app:summary="@string/category_selfpromo_description" />
 
-    <SwitchPreferenceCompat
-        app:key="interaction_category_key"
-        app:title="@string/category_interaction"
-        app:summary="@string/category_interaction_description"/>
+        <SwitchPreferenceCompat
+            app:key="interaction_category_key"
+            app:title="@string/category_interaction"
+            app:summary="@string/category_interaction_description" />
 
-    <SwitchPreferenceCompat
-        app:key="intro_category_key"
-        app:title="@string/category_intro"
-        app:summary="@string/category_intro_description"/>
+        <SwitchPreferenceCompat
+            app:key="intro_category_key"
+            app:title="@string/category_intro"
+            app:summary="@string/category_intro_description" />
 
-    <SwitchPreferenceCompat
-        app:key="outro_category_key"
-        app:title="@string/category_outro"
-        app:summary="@string/category_outro_description"/>
+        <SwitchPreferenceCompat
+            app:key="outro_category_key"
+            app:title="@string/category_outro"
+            app:summary="@string/category_outro_description" />
 
     </PreferenceCategory>